4 files changed, 41 insertions, 57 deletions

diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb
index 513845194d..63993bfbeb 100644
--- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb
+++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb
@@ -19,3 +19,6 @@ EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \
                  --without-cdk \
 "
 
+do_compile:prepend() {
+        sed -i -e 's/--sysroot=[^ "]*//g' ${B}/config.h
+}
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
deleted file mode 100644
index fd647b7386..0000000000
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 31a5d2f7db18737aef08c34e8707b4f69f7e5156 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 21 Oct 2012 17:59:20 +0200
-Subject: [PATCH] configure.ac: remove AM_PO_SUBDIRS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-together with oe autotools.bbclass this is done twice and causes:
-
-| autoreconf: running: aclocal --system-acdir=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/aclocal-copy/ --automake-acdir=/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ --force -I auto-m4 -I m4m
-| configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac                 |    1 -
- libgphoto2_port/configure.ac |    1 -
- 2 files changed, 0 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -282,7 +282,6 @@ dnl ------------------------------------
- GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2],
-                  [${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],
-                  [po])
--AM_PO_SUBDIRS()
- AM_GNU_GETTEXT_VERSION([0.19.1])
- AM_GNU_GETTEXT([external])
- AM_ICONV()
---- a/libgphoto2_port/configure.ac
-+++ b/libgphoto2_port/configure.ac
-@@ -122,7 +122,6 @@ dnl ------------------------------------
- GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2_PORT],
-                  [${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],
-                  [po])
--AM_PO_SUBDIRS()
- AM_GNU_GETTEXT_VERSION([0.19.1])
- AM_GNU_GETTEXT([external])
- AM_ICONV()
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch
new file mode 100644
index 0000000000..0c2a8d4bd0
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch
@@ -0,0 +1,36 @@
+From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Mon, 4 Dec 2023 13:26:08 +0100
+Subject: [PATCH] align outlen length with jpeg jeaders. fixes
+ https://github.com/gphoto/libgphoto2/issues/941
+
+---
+Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/721f7f8c3ec8058d504607873e4c317aac0c99c5]
+
+ camlibs/ptp2/chdk.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c
+index e1d898f378..e775ea1d4b 100644
+--- a/camlibs/ptp2/chdk.c
++++ b/camlibs/ptp2/chdk.c
+@@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
+        struct          jpeg_error_mgr jerr;
+        JSAMPROW        row_ptr[1];
+        uint8_t         *outbuf = NULL, *tmprowbuf = NULL;
+-       uint64_t        outlen = 0;
++       unsigned long   outlen = 0;
+        unsigned int    row_inc;
+        int             sshift, dshift, xshift, skip;
+ 
+@@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
+                sshift = 6;
+                dshift = (width/height > 2) ? 6 : 12;
+                xshift = 4;
+-       /* Digic 6 cameras: 8 bit per element UYVY,
+-        * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */
++               /* Digic 6 cameras: 8 bit per element UYVY,
++                * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */
+        } else {
+                row_inc = buf_width*2;
+                sshift = 4;
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
index cc42b6a9c6..0b58e8e75f 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
@@ -11,8 +11,8 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \
            file://40-libgphoto2.rules \
-           file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
            file://0001-configure-Filter-out-buildpaths-from-CC.patch \
+           file://fix-build-with-gcc-14.patch \
 "
 SRC_URI[libgphoto2.sha256sum] = "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b"
 
@@ -24,21 +24,9 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[gd] = ",--without-gdlib,gd"
 PACKAGECONFIG[serial] = "--enable-serial,--disable-serial,lockdev"
 
-do_configure:prepend() {
-    rm -rf ${S}/libgphoto2_port/auto-m4/*
-    rm -rf ${S}/auto-m4/*
-}
-
-do_configure:append() {
-    cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/
-    cd ${S}/libgphoto2_port/
-    autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
-    cd ${S}
-}
-
 do_install:append() {
     install -d ${D}${sysconfdir}/udev/rules.d/
-    install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${UNPACKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
 }
 
 PACKAGES =+ "libgphotoport libgphoto2-camlibs"
@@ -48,6 +36,4 @@ RRECOMMENDS:${PN} = "libgphoto2-camlibs"
 FILES:libgphotoport = "${libdir}/libgphoto2_port.so.*"
 
 FILES:${PN} += "${nonarch_base_libdir}/udev/*"
-FILES:${PN}-dbg += "${libdir}/*/*/.debug"
-FILES:${PN}-dev += "${libdir}/*/*/*.la"
 FILES:${PN}-doc += "${datadir}/libgphoto2_port/0.12.?/vcamera/README.txt"