summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb3
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb4
2 files changed, 7 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb
index 3de694247..f0e8b13b7 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb
@@ -53,3 +53,6 @@ FILES_${PN} += "${nonarch_base_libdir}/udev/* ${datadir}/hal"
53FILES_${PN}-dbg += "${libdir}/*/*/.debug" 53FILES_${PN}-dbg += "${libdir}/*/*/.debug"
54FILES_${PN}-dev += "${libdir}/*/*/*.la" 54FILES_${PN}-dev += "${libdir}/*/*/*.la"
55 55
56# | ../../libgphoto2-2.5.8/camlibs/ax203/jpeg_memsrcdest.h:4:1: error: conflicting types for 'jpeg_mem_src'
57# | jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
58PNBLACKLIST[libgphoto2] ?= "Not compatible with libjpeg-turbo-1.5.0"
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 75a42a20d..1141bff65 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
@@ -43,3 +43,7 @@ FILES_libv4l-dbg += "${libdir}/libv4l/.debug ${libdir}/libv4l/plugins/.debug"
43FILES_libv4l-dev += "${includedir} ${libdir}/pkgconfig \ 43FILES_libv4l-dev += "${includedir} ${libdir}/pkgconfig \
44 ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ 44 ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \
45 ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la" 45 ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la"
46
47# | ../../../v4l-utils-1.6.2/lib/libv4lconvert/jpeg_memsrcdest.h:4:1: error: conflicting types for 'jpeg_mem_src'
48# | jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
49PNBLACKLIST[v4l-utils] ?= "Not compatible with libjpeg-turbo-1.5.0"