Fix build with GCC 14
The i686 builds were failing with: ptp2/chdk.c:1186:41: error: passing argument 3 of 'jpeg_mem_dest' from incompatible pointer type [-Wincompatible-pointer-types] /usr/include/jpeglib.h:922:43: note: expected 'long unsigned int *' but argument is of type 'uint64_t *' {aka 'long long unsigned int *'} https://github.com/gphoto/libgphoto2/issues/941
This commit is contained in:
parent
7d6829e037
commit
b2013484de
37
gphoto2-gcc14.patch
Normal file
37
gphoto2-gcc14.patch
Normal file
@ -0,0 +1,37 @@
|
||||
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
|
||||
|
||||
---
|
||||
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 e1d898f37..e775ea1d4 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;
|
||||
--
|
||||
2.43.0
|
||||
|
@ -13,6 +13,8 @@ URL: http://www.gphoto.org/
|
||||
Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
|
||||
Patch1: gphoto2-pkgcfg.patch
|
||||
Patch2: gphoto2-device-return.patch
|
||||
# Upstream fix for GCC 14
|
||||
Patch3: gphoto2-gcc14.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
|
Loading…
Reference in New Issue
Block a user