diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2017-11-11 14:29:40 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-11-19 13:36:24 -0800 |
commit | 514c7796251993986a234e1ff1b075c7ec1000c9 (patch) | |
tree | 97b545f19308940e700baa2a24131eac41569f21 /meta-oe/recipes-graphics/gphoto2/gphoto2 | |
parent | 6757fc3c887f31981ee8cb01536ad4b84e0ba508 (diff) | |
download | meta-openembedded-514c7796251993986a234e1ff1b075c7ec1000c9.tar.gz |
gphoto2: update 2.5.8 -> 2.5.14
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/gphoto2/gphoto2')
2 files changed, 58 insertions, 0 deletions
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 @@ | |||
1 | From 60b6d5c95ca3632e02031ac04fb5486dd209011c Mon Sep 17 00:00:00 2001 | ||
2 | From: Andreas Baak <andreas.baak@gmail.com> | ||
3 | Date: Sun, 12 Jul 2015 01:02:15 -0700 | ||
4 | Subject: [PATCH] configure.ac remove AM_PO_SUBDIRS | ||
5 | |||
6 | This is done twice together with oe autotools.bbclass. | ||
7 | |||
8 | --- | ||
9 | configure.ac | 1 - | ||
10 | 1 file changed, 1 deletion(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index bb5b795..93fbaf2 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -64,7 +64,6 @@ GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) | ||
17 | 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" | ||
18 | AM_GNU_GETTEXT_VERSION([0.14.1]) | ||
19 | AM_GNU_GETTEXT([external]) | ||
20 | -AM_PO_SUBDIRS() | ||
21 | AM_ICONV() | ||
22 | GP_GETTEXT_FLAGS() | ||
23 | |||
24 | -- | ||
25 | 1.9.1 | ||
26 | |||
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 @@ | |||
1 | From 884d4c9bbd2dc147d614a5fabc25dbea7a71cd48 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andreas Baak <andreas.baak@gmail.com> | ||
3 | Date: Sun, 12 Jul 2015 02:13:58 -0700 | ||
4 | Subject: [PATCH] Look for popt with GP_CHECK_LIBRARY function | ||
5 | |||
6 | The previously used proprietary function GP_CHECK_POPT | ||
7 | defined in /.m4m/gp-check-opt.m4 is not ready for cross | ||
8 | compilation since it looks for the library and headers | ||
9 | in the host system. Yocto reports the following error: | ||
10 | "QA Issue: gphoto2: The compile log indicates that host | ||
11 | include and/or library paths were used." | ||
12 | Using the GP_CHECK_LIBRARY function fixes this problem | ||
13 | --- | ||
14 | configure.ac | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 93fbaf2..6d661f0 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -285,7 +285,7 @@ GP_CONFIG_MSG([Text preview support],[$aa_msg]) | ||
22 | dnl --------------------------------------------------------------------------- | ||
23 | dnl popt.h: Simplifies handling of command-line options enormously. | ||
24 | dnl --------------------------------------------------------------------------- | ||
25 | -GP_CHECK_POPT([mandatory]) | ||
26 | +GP_CHECK_LIBRARY([POPT], [popt], [], [popt.h], [], [], [mandatory]) | ||
27 | |||
28 | |||
29 | dnl --------------------------------------------------------------------------- | ||
30 | -- | ||
31 | 1.9.1 | ||
32 | |||