From 514c7796251993986a234e1ff1b075c7ec1000c9 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 11 Nov 2017 14:29:40 +0100 Subject: gphoto2: update 2.5.8 -> 2.5.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Armin Kuster --- .../0001-configure.ac-remove-AM_PO_SUBDIRS.patch | 26 ------------------ ...k-for-popt-with-GP_CHECK_LIBRARY-function.patch | 32 ---------------------- .../0001-configure.ac-remove-AM_PO_SUBDIRS.patch | 26 ++++++++++++++++++ ...k-for-popt-with-GP_CHECK_LIBRARY-function.patch | 32 ++++++++++++++++++++++ meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb | 22 +++++++++++++++ meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb | 22 --------------- 6 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch delete mode 100644 meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch create mode 100644 meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch create mode 100644 meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch create mode 100644 meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb delete mode 100644 meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb (limited to 'meta-oe/recipes-graphics') 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 deleted file mode 100644 index 7800fdd57..000000000 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 60b6d5c95ca3632e02031ac04fb5486dd209011c Mon Sep 17 00:00:00 2001 -From: Andreas Baak -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 deleted file mode 100644 index e6c7dd667..000000000 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 884d4c9bbd2dc147d614a5fabc25dbea7a71cd48 Mon Sep 17 00:00:00 2001 -From: Andreas Baak -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/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch new file mode 100644 index 000000000..7800fdd57 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch @@ -0,0 +1,26 @@ +From 60b6d5c95ca3632e02031ac04fb5486dd209011c Mon Sep 17 00:00:00 2001 +From: Andreas Baak +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/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch new file mode 100644 index 000000000..e6c7dd667 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/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 +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.14.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb new file mode 100644 index 000000000..75ad7f4f0 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.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] = "6c6a21b5e879330cdd71ef92dce36399" +SRC_URI[gphoto2.sha256sum] = "9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c" + +inherit autotools pkgconfig gettext + +EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \ + --without-cdk \ +" + diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb deleted file mode 100644 index 62d283b88..000000000 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb +++ /dev/null @@ -1,22 +0,0 @@ -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 \ -" - -- cgit v1.2.3-54-g00ecf