From 2be0ee443134fe3af135f829904173012f4f06c3 Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Thu, 2 Nov 2017 09:16:08 +0100 Subject: [PATCH] media-libs/libgphoto2: remove unused patch --- .../files/libgphoto2-2.5.10-jpeg.patch | 92 ------------------- 1 file changed, 92 deletions(-) delete mode 100644 media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch deleted file mode 100644 index 34baeadd695f..000000000000 --- a/media-libs/libgphoto2/files/libgphoto2-2.5.10-jpeg.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 0df14db3eda1b780a27b1c54bc8f251d15afebbc Mon Sep 17 00:00:00 2001 -From: Patrick Ohly -Date: Wed, 15 Jun 2016 10:33:24 +0200 -Subject: [PATCH] jpeg_memsrcdest: extend feature check - -libjpeg.h in OpenEmbedded master (from libjpeg-turbo 1.5.0) provides -these methods if "JPEG_LIB_VERSION >= 80 || -defined(MEM_SRCDST_SUPPORTED)". - -The support for the jpeg_mem functions was added even when not -emulating the libjpeg8 API, controlled via the MEM_SRCDST_SUPPORTED -define, so checking for the version alone is not enough anymore. - -See https://github.com/libjpeg-turbo/libjpeg-turbo/commit/ab70623eb29e09e67222be5b9e1ea320fe5aa0e9 - -This fixes errors about conflicting declarations (signed vs. unsigned -char). - -Signed-off-by: Patrick Ohly ---- - camlibs/ax203/jpeg_memsrcdest.c | 4 ++-- - camlibs/ax203/jpeg_memsrcdest.h | 4 ++++ - camlibs/jl2005c/jpeg_memsrcdest.c | 4 ++-- - camlibs/jl2005c/jpeg_memsrcdest.h | 4 ++++ - 4 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/camlibs/ax203/jpeg_memsrcdest.c b/camlibs/ax203/jpeg_memsrcdest.c -index 0ed83b1..5614573 100644 ---- a/camlibs/ax203/jpeg_memsrcdest.c -+++ b/camlibs/ax203/jpeg_memsrcdest.c -@@ -25,8 +25,8 @@ - #include "jpeg_memsrcdest.h" - - /* libjpeg8 and later come with their own (API compatible) memory source -- and dest */ --#if JPEG_LIB_VERSION < 80 -+ and dest, and older versions may have it backported */ -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) - - /* Expanded data source object for memory input */ - -diff --git a/camlibs/ax203/jpeg_memsrcdest.h b/camlibs/ax203/jpeg_memsrcdest.h -index e971182..b13bf3f 100644 ---- a/camlibs/ax203/jpeg_memsrcdest.h -+++ b/camlibs/ax203/jpeg_memsrcdest.h -@@ -1,5 +1,7 @@ - #include - -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) -+ - void - jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - unsigned long bufsize); -@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - void - jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, - unsigned long * outsize); -+ -+#endif -diff --git a/camlibs/jl2005c/jpeg_memsrcdest.c b/camlibs/jl2005c/jpeg_memsrcdest.c -index 321f926..b65310e 100644 ---- a/camlibs/jl2005c/jpeg_memsrcdest.c -+++ b/camlibs/jl2005c/jpeg_memsrcdest.c -@@ -25,8 +25,8 @@ - #include "jpeg_memsrcdest.h" - - /* libjpeg8 and later come with their own (API compatible) memory source -- and dest */ --#if JPEG_LIB_VERSION < 80 -+ and dest, and older versions may have it backported */ -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) - - /* Expanded data source object for memory input */ - -diff --git a/camlibs/jl2005c/jpeg_memsrcdest.h b/camlibs/jl2005c/jpeg_memsrcdest.h -index e971182..b13bf3f 100644 ---- a/camlibs/jl2005c/jpeg_memsrcdest.h -+++ b/camlibs/jl2005c/jpeg_memsrcdest.h -@@ -1,5 +1,7 @@ - #include - -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) -+ - void - jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - unsigned long bufsize); -@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - void - jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, - unsigned long * outsize); -+ -+#endif -- 2.26.2