Skip to contentSkip to conversation

libgphoto2, v4l-utils: blacklist, not compatible with libjpeg-turbo-1.5.0

PATCH New Martin Jansa 1 participant 3 messages Jun 14, 2016 – Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libgphoto2, v4l-utils: blacklist, not compatible with libjpeg-turbo-1.5.0

---
 meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb   | 3 +++
 meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb | 4 ++++
 2 files changed, 7 insertions(+)
meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb +3 -0
index 3de6942..f0e8b13 100644
@@ -53,3 +53,6 @@ FILES_${PN} += "${nonarch_base_libdir}/udev/* ${datadir}/hal"
 FILES_${PN}-dbg += "${libdir}/*/*/.debug"
 FILES_${PN}-dev += "${libdir}/*/*/*.la"
 
+# | ../../libgphoto2-2.5.8/camlibs/ax203/jpeg_memsrcdest.h:4:1: error: conflicting types for 'jpeg_mem_src'
+# |  jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+PNBLACKLIST[libgphoto2] ?= "Not compatible with libjpeg-turbo-1.5.0"
meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb +4 -0
index 75a42a2..1141bff 100644
@@ -43,3 +43,7 @@ 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"
Signature · 1 line
2.9.0
#1 lore raw

PATCH 1/2 gphoto2, mpv: blacklist because dependency on broken libgphoto2 and libv4l

---
 meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb | 1 +
 meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb  | 2 ++
 2 files changed, 3 insertions(+)
meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb +1 -0
index 62d283b..ae5a2f4 100644
@@ -20,3 +20,4 @@ EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \
                  --without-cdk \
 "
 
+PNBLACKLIST[gphoto2] ?= "Depends on broken libgphoto2"
meta-oe/recipes-multimedia/mplayer/mpv_0.15.0.bb +2 -0
index 768c87a..b196f60 100644
@@ -57,3 +57,5 @@ do_configure_prepend () {
 }
 
 FILES_${PN} += "${datadir}/icons"
+
+PNBLACKLIST[mpv] ?= "Depends on broken libv4l"
Signature · 1 line
2.9.0
#2 lore raw

PATCH 2/2 gvfs: remove dependency on broken libgphoto2

---
 meta-gnome/recipes-gnome/gvfs/gvfs_1.24.2.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-gnome/recipes-gnome/gvfs/gvfs_1.24.2.bb +4 -1
index aa62070..6f2bd42 100644
@@ -44,7 +44,10 @@ PACKAGES += "${PN}-bash-completion"
 FILES_${PN}-bash-completion = "${datadir}/bash-completion"
 RDEPENDS_${PN}-bash-completion = "bash-completion"
 
-PACKAGECONFIG ?= "libgphoto2"
+# libgphoto2 is currently broken
+# PACKAGECONFIG ?= "libgphoto2"
+PACKAGECONFIG ?= ""
+
 
 PACKAGECONFIG[afc] = "--enable-afc, --disable-afc, libimobiledevice libplist"
 PACKAGECONFIG[archive] = "--enable-archive, --disable-archive, libarchive"
Signature · 1 line
2.9.0