summaryrefslogtreecommitdiff
path: root/media-libs/libgphoto2/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-12-04 16:58:27 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-12-04 16:58:27 +0000
commit4c552e09a1ece7792f2a20ccf4322348acbe3139 (patch)
treea0748a931217558c420eaac365cbf63f15eb25c0 /media-libs/libgphoto2/files
parent4ead5818a5d230bcc875202c487761a9b786e945 (diff)
gentoo auto-resync : 04:12:2023 - 16:58:27
Diffstat (limited to 'media-libs/libgphoto2/files')
-rw-r--r--media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch
new file mode 100644
index 000000000000..fae8903f1e2d
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/919086
+https://github.com/gphoto/libgphoto2/issues/941
+https://github.com/gphoto/libgphoto2/commit/721f7f8c3ec8058d504607873e4c317aac0c99c5
+
+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
+
+--- 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;
+