commit:     0d489ecf277523ce7552fd53e7acc306e9a2d79d
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  3 15:16:26 2026 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Tue Mar  3 15:16:43 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d489ecf

media-gfx/gphotofs: add 1.0, drop 0.5-r1

Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 media-gfx/gphotofs/Manifest                        |  1 +
 .../files/gphotofs-1.0-fuse-prototype.patch        | 22 ++++++++++++++++++
 .../gphotofs/files/gphotofs-1.0-largefile.patch    | 27 ++++++++++++++++++++++
 ...{gphotofs-0.5-r1.ebuild => gphotofs-1.0.ebuild} | 22 ++++++++++++++----
 4 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/media-gfx/gphotofs/Manifest b/media-gfx/gphotofs/Manifest
index 34ee59f61c5b..dd979df99744 100644
--- a/media-gfx/gphotofs/Manifest
+++ b/media-gfx/gphotofs/Manifest
@@ -1 +1,2 @@
 DIST gphotofs-0.5.tar.bz2 261357 BLAKE2B 
6c8194308b461fe8b88aba3e6d16a15715cbb9f247aed2f57147e7192f342e3dbb26d0ce112b0203f73c078333706f717eb1822b86b1e0b5da4e632174907b55
 SHA512 
6f5bcaf8ca820c0590ec95af55ec9438c864a298660ad15c6d6e8f59201a7f873d29f16cf77d13538111f6cec3f958ea0ac88c6c51836ab2d8c9d6cca156ed3a
+DIST gphotofs-1.0.tar.gz 410080 BLAKE2B 
f466c101c1a8f1eb54232cff6334a9c358db72e8f667183849fc6d9f906811f1786ab033b7b072d997d450f0ccb3a79f87af7754440d86b84a359e5c85c92bc9
 SHA512 
f827cd50db49c25bc89fed30c05e447692eef5cd73f845244327e1a0055a2a40098d3f117bea87bebb8aa8bfb496836ba716cbb2d0a1e931546b2c56885ca3dc

diff --git a/media-gfx/gphotofs/files/gphotofs-1.0-fuse-prototype.patch 
b/media-gfx/gphotofs/files/gphotofs-1.0-fuse-prototype.patch
new file mode 100644
index 000000000000..d64b6d2721f9
--- /dev/null
+++ b/media-gfx/gphotofs/files/gphotofs-1.0-fuse-prototype.patch
@@ -0,0 +1,22 @@
+From aa6055cb4602e4617725e6e6cf66fa909a0f4a9e Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <[email protected]>
+Date: Wed, 9 Jul 2025 21:19:03 +0200
+Subject: [PATCH] added fuse prototype to init function
+
+---
+ gphotofs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gphotofs.c b/gphotofs.c
+index c55ffa9..75c6d64 100644
+--- a/gphotofs.c
++++ b/gphotofs.c
+@@ -904,7 +904,7 @@ gphotofs_connect()
+ }
+ 
+ static void *
+-gphotofs_init()
++gphotofs_init(struct fuse_conn_info *conn, struct fuse_config *config)
+ {
+    GPCtx *p;
+ 

diff --git a/media-gfx/gphotofs/files/gphotofs-1.0-largefile.patch 
b/media-gfx/gphotofs/files/gphotofs-1.0-largefile.patch
new file mode 100644
index 000000000000..82648260eb5d
--- /dev/null
+++ b/media-gfx/gphotofs/files/gphotofs-1.0-largefile.patch
@@ -0,0 +1,27 @@
+From 60d964e734d622b0468b8b253775ee6b1b8ea716 Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <[email protected]>
+Date: Wed, 9 Jul 2025 21:18:50 +0200
+Subject: [PATCH] added AC_SYS_LARGEFILE for 64bit offset
+
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5e648b6..535e7ba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,11 +8,13 @@ AM_INIT_AUTOMAKE([gnu 1.9 dist-bzip2])
+ 
+ GP_CHECK_SHELL_ENVIRONMENT
+ 
++
+ AC_PROG_CC
+ AC_PROG_CPP
+ AM_PROG_LIBTOOL
+ AC_PROG_INSTALL
+ AM_PROG_CC_C_O
++AC_SYS_LARGEFILE
+ 
+ GP_PKG_CONFIG
+ 

diff --git a/media-gfx/gphotofs/gphotofs-0.5-r1.ebuild 
b/media-gfx/gphotofs/gphotofs-1.0.ebuild
similarity index 50%
rename from media-gfx/gphotofs/gphotofs-0.5-r1.ebuild
rename to media-gfx/gphotofs/gphotofs-1.0.ebuild
index 803ce5ec8985..0bbf1310e9ab 100644
--- a/media-gfx/gphotofs/gphotofs-0.5-r1.ebuild
+++ b/media-gfx/gphotofs/gphotofs-1.0.ebuild
@@ -1,21 +1,33 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="FUSE file system for interfacing with digital cameras using 
gphoto2"
 HOMEPAGE="http://www.gphoto.org/";
-SRC_URI="https://downloads.sourceforge.net/gphoto/${P}.tar.bz2";
+SRC_URI="https://github.com/gphoto/gphotofs/releases/download/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+       "${FILESDIR}"/"${P}"-fuse-prototype.patch
+       "${FILESDIR}"/"${P}"-largefile.patch
+)
 
 RDEPEND="
        dev-libs/glib:2
        media-libs/libgphoto2:=
-       sys-fs/fuse:0="
+       sys-fs/fuse:3="
 DEPEND="${RDEPEND}"
 BDEPEND="
        sys-devel/gettext
        virtual/pkgconfig"
+
+src_prepare() {
+       default
+       eautoreconf
+}

Reply via email to