diff options
Diffstat (limited to 'meta-oe/recipes-graphics/gphoto2')
3 files changed, 80 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch new file mode 100644 index 0000000000..7800fdd570 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch @@ -0,0 +1,26 @@ +From 60b6d5c95ca3632e02031ac04fb5486dd209011c Mon Sep 17 00:00:00 2001 +From: Andreas Baak <andreas.baak@gmail.com> +Date: Sun, 12 Jul 2015 01:02:15 -0700 +Subject: [PATCH] configure.ac remove AM_PO_SUBDIRS + +This is done twice together with oe autotools.bbclass. + +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index bb5b795..93fbaf2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,7 +64,6 @@ GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) + ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" + AM_GNU_GETTEXT_VERSION([0.14.1]) + AM_GNU_GETTEXT([external]) +-AM_PO_SUBDIRS() + AM_ICONV() + GP_GETTEXT_FLAGS() + +-- +1.9.1 + diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch new file mode 100644 index 0000000000..e6c7dd6675 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch @@ -0,0 +1,32 @@ +From 884d4c9bbd2dc147d614a5fabc25dbea7a71cd48 Mon Sep 17 00:00:00 2001 +From: Andreas Baak <andreas.baak@gmail.com> +Date: Sun, 12 Jul 2015 02:13:58 -0700 +Subject: [PATCH] Look for popt with GP_CHECK_LIBRARY function + +The previously used proprietary function GP_CHECK_POPT +defined in /.m4m/gp-check-opt.m4 is not ready for cross +compilation since it looks for the library and headers +in the host system. Yocto reports the following error: +"QA Issue: gphoto2: The compile log indicates that host +include and/or library paths were used." +Using the GP_CHECK_LIBRARY function fixes this problem +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 93fbaf2..6d661f0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -285,7 +285,7 @@ GP_CONFIG_MSG([Text preview support],[$aa_msg]) + dnl --------------------------------------------------------------------------- + dnl popt.h: Simplifies handling of command-line options enormously. + dnl --------------------------------------------------------------------------- +-GP_CHECK_POPT([mandatory]) ++GP_CHECK_LIBRARY([POPT], [popt], [], [popt.h], [], [], [mandatory]) + + + dnl --------------------------------------------------------------------------- +-- +1.9.1 + diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb new file mode 100644 index 0000000000..62d283b889 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb @@ -0,0 +1,22 @@ +SUMMARY = "gphoto2 - a command-line frontend to libgphoto2" +HOMEPAGE = "http://www.gphoto.com/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "libgphoto2 popt readline" +RDEPENDS_gphoto2 = "libgphoto2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \ + file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ + file://0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch \ +" + +SRC_URI[gphoto2.md5sum] = "bae369aee6881e590c5c91bdbb11a5f8" +SRC_URI[gphoto2.sha256sum] = "a9abcd15d95f205318d17e3ac12af7ce523d2bc4943709d50b0a12c30cc5ee4d" + +inherit autotools pkgconfig gettext + +EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \ + --without-cdk \ +" + |