Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[meta-oe][fido] Update libgphoto2 and add gphoto2 tool #15

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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

Original file line number Diff line number Diff line change
@@ -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

22 changes: 22 additions & 0 deletions meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb
Original file line number Diff line number Diff line change
@@ -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 \
"

1,104 changes: 0 additions & 1,104 deletions meta-oe/recipes-graphics/gphoto2/libgphoto2-2.4.11/40-libgphoto2.rules

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ diff --git a/configure.ac b/configure.ac
index 2f8e1b8..2e90acf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,7 +227,6 @@ ALL_LINGUAS="da de es eu fr hu it ja nl pl ru sv uk vi zh_CN"
@@ -209,7 +209,6 @@ ALL_LINGUAS="cs da de es eu fr hu it ja nl pl ru sv uk vi zh_CN"
GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}])
AM_GNU_GETTEXT_VERSION([0.14.1])
AM_GNU_GETTEXT([external])
Expand All @@ -35,8 +35,8 @@ diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
index 0b66d58..df47357 100644
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -116,7 +116,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],[Lutz Mueller and ot
ALL_LINGUAS="cs da de fr es eu it ja nl pl pt_BR ru sk sv uk vi zh_CN zh_TW"
@@ -124,7 +124,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],[Lutz Mueller and ot
ALL_LINGUAS="cs da de es eu fi fr it ja nl pl pt_BR ru sk sr sv uk vi zh_CN zh_TW"
AM_GNU_GETTEXT_VERSION([0.14.1])
AM_GNU_GETTEXT([external])
-AM_PO_SUBDIRS()
Expand Down
Loading