libgphoto2: fix build with gcc-14

Fixes:
libgphoto2-2.5.31/camlibs/ptp2/chdk.c:1187:41: error: passing argument 3 of 'jpeg_mem_dest' from incompatible pointer type [-Wincompatible-pointer-types]

https://github.com/gphoto/libgphoto2/issues/959
https://github.com/gphoto/libgphoto2/issues/941

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 37 insertions, 0 deletions

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 1d0b37826d..57c9d199eb 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
@@ -13,6 +13,7 @@ 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"