[oe] [meta-oe][PATCH] v4l-utils: correct compatibility issues with libjpeg-turbo-1.5.0

[Derek Straka]

Signed-off-by: Derek Straka <derek at asterius.io>
---
 .../0002-correct-jpeg-memsrcdest-support.patch     | 27 ++++++++++++++++++++++
 .../recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb |  5 +---
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-correct-jpeg-memsrcdest-support.patch

diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-correct-jpeg-memsrcdest-support.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-correct-jpeg-memsrcdest-support.patch
new file mode 100644
index 0000000..d3aa1bd
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-correct-jpeg-memsrcdest-support.patch
@@ -0,0 +1,27 @@
+--- v4l-utils-1.6.2/lib/libv4lconvert/jpeg_memsrcdest.h.orig	2016-06-15 09:22:29.765751407 -0400
++++ v4l-utils-1.6.2/lib/libv4lconvert/jpeg_memsrcdest.h	2016-06-15 09:22:47.153751055 -0400
+@@ -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 @@
+ void
+ jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
+ 	unsigned long * outsize);
++
++#endif
+--- v4l-utils-1.6.2/lib/libv4lconvert/jpeg_memsrcdest.c.orig	2016-06-15 09:23:03.825750717 -0400
++++ v4l-utils-1.6.2/lib/libv4lconvert/jpeg_memsrcdest.c	2016-06-15 09:23:12.817750535 -0400
+@@ -27,7 +27,7 @@
+ 
+ /* libjpeg8 and later come with their own (API compatible) memory source
+    and dest */
+-#if JPEG_LIB_VERSION < 80
++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
+ 
+ /* Expanded data source object for memory input */
+ 
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb
index 1141bff..81babdb 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb
@@ -16,6 +16,7 @@ SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \
            file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \
            file://mediactl-pkgconfig.patch \
            file://export-mediactl-headers.patch \
+           file://0002-correct-jpeg-memsrcdest-support.patch \
           "
 SRC_URI[md5sum] = "9cb3c178f937954e65bf30920af433ef"
 SRC_URI[sha256sum] = "d3d6eb1f0204fb11f3d318bfca35d5f73cc077f88fac7665a47856a16496be7d"
@@ -43,7 +44,3 @@ FILES_libv4l-dbg += "${libdir}/libv4l/.debug ${libdir}/libv4l/plugins/.debug"
 FILES_libv4l-dev += "${includedir} ${libdir}/pkgconfig \
                      ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \
                      ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la"
-
-# | ../../../v4l-utils-1.6.2/lib/libv4lconvert/jpeg_memsrcdest.h:4:1: error: conflicting types for 'jpeg_mem_src'
-# |  jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
-PNBLACKLIST[v4l-utils] ?= "Not compatible with libjpeg-turbo-1.5.0"
-- 
1.9.1