diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-02-13 22:34:53 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-02-13 22:34:53 +0000 |
| commit | da98cd12396fb2bb3061e83b7d825d5f329704c0 (patch) | |
| tree | 0b13857e6862eadaca5584b117161de0c758a2a8 /ffmpeg | |
| parent | 2b6d6d6f014e38a11187a6e9961a9dd7edc779e6 (diff) | |
| download | asb-da98cd12396fb2bb3061e83b7d825d5f329704c0.tar.gz asb-da98cd12396fb2bb3061e83b7d825d5f329704c0.tar.xz | |
Initial revision
Diffstat (limited to 'ffmpeg')
| -rw-r--r-- | ffmpeg/build/patches/libjpeg-turbo_1.5.0_fix.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/ffmpeg/build/patches/libjpeg-turbo_1.5.0_fix.patch b/ffmpeg/build/patches/libjpeg-turbo_1.5.0_fix.patch new file mode 100644 index 00000000..b75e7dfa --- /dev/null +++ b/ffmpeg/build/patches/libjpeg-turbo_1.5.0_fix.patch @@ -0,0 +1,72 @@ +Description: Close bug #827629. + conflicting types for 'jpeg_mem_src' with + libjpeg-turbo62 1.5.0 +Author: Patrick Ohly <patrick.ohly@intel.com> +Reviewed-by: Herbert Parentes Fortes Neto <hpfn@ig.com.br> +Last-Update: 2016-06-19 +Index: libgphoto2-2.5.10/camlibs/ax203/jpeg_memsrcdest.c +=================================================================== +--- libgphoto2-2.5.10.orig/camlibs/ax203/jpeg_memsrcdest.c ++++ libgphoto2-2.5.10/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 */ + +Index: libgphoto2-2.5.10/camlibs/ax203/jpeg_memsrcdest.h +=================================================================== +--- libgphoto2-2.5.10.orig/camlibs/ax203/jpeg_memsrcdest.h ++++ libgphoto2-2.5.10/camlibs/ax203/jpeg_memsrcdest.h +@@ -1,5 +1,7 @@ + #include <jpeglib.h> + ++#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, un + void + jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, + unsigned long * outsize); ++ ++#endif +Index: libgphoto2-2.5.10/camlibs/jl2005c/jpeg_memsrcdest.c +=================================================================== +--- libgphoto2-2.5.10.orig/camlibs/jl2005c/jpeg_memsrcdest.c ++++ libgphoto2-2.5.10/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 */ + +Index: libgphoto2-2.5.10/camlibs/jl2005c/jpeg_memsrcdest.h +=================================================================== +--- libgphoto2-2.5.10.orig/camlibs/jl2005c/jpeg_memsrcdest.h ++++ libgphoto2-2.5.10/camlibs/jl2005c/jpeg_memsrcdest.h +@@ -1,5 +1,7 @@ + #include <jpeglib.h> + ++#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, un + void + jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, + unsigned long * outsize); ++ ++#endif |