diff options
author | Derek Straka <derek@asterius.io> | 2016-06-15 09:18:02 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-22 17:12:37 +0200 |
commit | 9222832866c45716cea5a7e8d9332b5dd1de36f5 (patch) | |
tree | fb19e10f220e3037cd74cb31bc183e5adf51c3d5 /meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb | |
parent | 7e8e0fbadd5a83be03de757091b5267054196774 (diff) | |
download | meta-openembedded-9222832866c45716cea5a7e8d9332b5dd1de36f5.tar.gz |
libgphoto2: correct compatibility issues with libjpeg-turbo-1.5.0
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb')
-rw-r--r-- | meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb | 5 |
1 files changed, 1 insertions, 4 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 f0e8b13b7..dde14adcb 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 | |||
14 | file://10-camera-libgphoto2.fdi \ | 14 | file://10-camera-libgphoto2.fdi \ |
15 | file://40-libgphoto2.rules \ | 15 | file://40-libgphoto2.rules \ |
16 | file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ | 16 | file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ |
17 | file://0002-correct-jpeg-memsrcdest-support.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI[libgphoto2.md5sum] = "873ab01aced49c6b92a98e515db5dcef" | 20 | SRC_URI[libgphoto2.md5sum] = "873ab01aced49c6b92a98e515db5dcef" |
@@ -52,7 +53,3 @@ FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" | |||
52 | FILES_${PN} += "${nonarch_base_libdir}/udev/* ${datadir}/hal" | 53 | FILES_${PN} += "${nonarch_base_libdir}/udev/* ${datadir}/hal" |
53 | FILES_${PN}-dbg += "${libdir}/*/*/.debug" | 54 | FILES_${PN}-dbg += "${libdir}/*/*/.debug" |
54 | FILES_${PN}-dev += "${libdir}/*/*/*.la" | 55 | FILES_${PN}-dev += "${libdir}/*/*/*.la" |
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, | ||
58 | PNBLACKLIST[libgphoto2] ?= "Not compatible with libjpeg-turbo-1.5.0" | ||