1 |
commit: a3075ac05a23feb1ef3033246c4aaacf54679c6c |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 8 15:28:44 2018 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 8 15:40:27 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3075ac0 |
7 |
|
8 |
media-gfx/gphoto2: 2.5.15 → 2.5.20 |
9 |
|
10 |
Fix aalib automagic detection. Clean up some old ebuild tweaks. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/637418 |
13 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
14 |
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> |
15 |
|
16 |
media-gfx/gphoto2/Manifest | 1 + |
17 |
...ted-automagic-activation-of-aalib-support.patch | 37 ++++++++++++++ |
18 |
media-gfx/gphoto2/gphoto2-2.5.20.ebuild | 57 ++++++++++++++++++++++ |
19 |
3 files changed, 95 insertions(+) |
20 |
|
21 |
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest |
22 |
index 2c319362fd6..5c482014878 100644 |
23 |
--- a/media-gfx/gphoto2/Manifest |
24 |
+++ b/media-gfx/gphoto2/Manifest |
25 |
@@ -1,2 +1,3 @@ |
26 |
DIST gphoto2-2.5.14.tar.bz2 784442 BLAKE2B 185bd0d18e0b8d280c0ec366738850bd1fe2d1405179700fe25678c04a88b2092820aa5f049bcc6f97c964b5875bd32e3f8c7c5240ef3a71f2af04d6bfdaadb9 SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331 |
27 |
DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40 |
28 |
+DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3 |
29 |
|
30 |
diff --git a/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch b/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..8e78578d71d |
33 |
--- /dev/null |
34 |
+++ b/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch |
35 |
@@ -0,0 +1,37 @@ |
36 |
+From 45fb2a39195b5b31f61f376323ff78ab40940760 Mon Sep 17 00:00:00 2001 |
37 |
+From: Gilles Dartiguelongue <eva@g.o> |
38 |
+Date: Sat, 8 Dec 2018 16:19:35 +0100 |
39 |
+Subject: [PATCH] Fix unwanted automagic activation of aalib support |
40 |
+ |
41 |
+--- |
42 |
+ configure.ac | 7 +++---- |
43 |
+ 1 file changed, 3 insertions(+), 4 deletions(-) |
44 |
+ |
45 |
+diff --git a/configure.ac b/configure.ac |
46 |
+index a6068c9..c19fed9 100644 |
47 |
+--- a/configure.ac |
48 |
++++ b/configure.ac |
49 |
+@@ -306,8 +306,9 @@ aa_msg="no (http://www.sourceforge.net/projects/aa-project)" |
50 |
+ try_aa=: |
51 |
+ have_aa=false |
52 |
+ AC_ARG_WITH([aalib],AS_HELP_STRING([--with-aalib],[Do use aalib for preview ASCII rendering]),[ |
53 |
+- if test x$withval = xyes; then |
54 |
+- try_aa=: |
55 |
++ if test x$withval = xno; then |
56 |
++ try_aa=false |
57 |
++ aa_msg="no (not requested)" |
58 |
+ fi |
59 |
+ ]) |
60 |
+ if $try_aa; then |
61 |
+@@ -323,8 +324,6 @@ if $try_aa; then |
62 |
+ AA_LIBS="-laa" |
63 |
+ fi |
64 |
+ ]) |
65 |
+-else |
66 |
+- aa_msg="no (not requested)" |
67 |
+ fi |
68 |
+ AM_CONDITIONAL([HAVE_AA], [$have_aa]) |
69 |
+ AC_SUBST([AA_LIBS]) |
70 |
+-- |
71 |
+2.19.2 |
72 |
+ |
73 |
|
74 |
diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild |
75 |
new file mode 100644 |
76 |
index 00000000000..5470646b4f2 |
77 |
--- /dev/null |
78 |
+++ b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild |
79 |
@@ -0,0 +1,57 @@ |
80 |
+# Copyright 1999-2018 Gentoo Authors |
81 |
+# Distributed under the terms of the GNU General Public License v2 |
82 |
+ |
83 |
+EAPI=6 |
84 |
+inherit autotools |
85 |
+ |
86 |
+DESCRIPTION="Free, redistributable digital camera software application" |
87 |
+HOMEPAGE="http://www.gphoto.org/" |
88 |
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" |
89 |
+ |
90 |
+LICENSE="GPL-2" |
91 |
+SLOT="0" |
92 |
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
93 |
+IUSE="aalib exif ncurses nls readline" |
94 |
+ |
95 |
+# aalib -> needs libjpeg |
96 |
+RDEPEND=" |
97 |
+ dev-libs/popt |
98 |
+ >=media-libs/libgphoto2-2.5.17:=[exif?] |
99 |
+ aalib? ( |
100 |
+ media-libs/aalib |
101 |
+ virtual/jpeg:0 ) |
102 |
+ exif? ( media-libs/libexif ) |
103 |
+ ncurses? ( dev-libs/cdk:0= ) |
104 |
+ readline? ( sys-libs/readline:0= ) |
105 |
+" |
106 |
+DEPEND="${RDEPEND} |
107 |
+ virtual/pkgconfig |
108 |
+ nls? ( >=sys-devel/gettext-0.14.1 ) |
109 |
+" |
110 |
+ |
111 |
+PATCHES=( |
112 |
+ # https://github.com/gphoto/gphoto2/pull/179 |
113 |
+ "${FILESDIR}"/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch |
114 |
+) |
115 |
+ |
116 |
+src_prepare() { |
117 |
+ default |
118 |
+ if ! use exif ; then |
119 |
+ # Remove tests that require EXIF to pass, bug 610024 |
120 |
+ rm "${S}"/tests/data/test0{35,36,37,40}* || die |
121 |
+ fi |
122 |
+ # Leave GCC debug builds under user control |
123 |
+ sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \ |
124 |
+ -i configure{.ac,} || die |
125 |
+ eautoreconf |
126 |
+} |
127 |
+ |
128 |
+src_configure() { |
129 |
+ econf \ |
130 |
+ $(use_with aalib) \ |
131 |
+ $(use_with aalib jpeg) \ |
132 |
+ $(use_with exif libexif auto) \ |
133 |
+ $(use_with ncurses cdk) \ |
134 |
+ $(use_enable nls) \ |
135 |
+ $(use_with readline) |
136 |
+} |