diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /media-gfx/gphoto2 | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'media-gfx/gphoto2')
-rw-r--r-- | media-gfx/gphoto2/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch | 37 | ||||
-rw-r--r-- | media-gfx/gphoto2/gphoto2-2.5.15.ebuild | 4 | ||||
-rw-r--r-- | media-gfx/gphoto2/gphoto2-2.5.20.ebuild | 57 |
4 files changed, 100 insertions, 3 deletions
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest index 2045ae4db0e1..a68a98c999ca 100644 --- a/media-gfx/gphoto2/Manifest +++ b/media-gfx/gphoto2/Manifest @@ -1,5 +1,8 @@ +AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 62afe72d6630420fa0068e652cdfbfde3c4e73541e53154627ad1cc23ad10f72ac85cf5ae317d2b0bf4127e474af2ca2268e57011eb835d57d88e2d6fa65a85f SHA512 252390cfb2533e9c15d1f881f6729660e2f6cd737a9257c5dec7f06f72f2960c3b5fe940e7fc774c862e6156f517357ca7b933822c23a466ef39fbfc2f14bf8c DIST gphoto2-2.5.14.tar.bz2 784442 BLAKE2B 185bd0d18e0b8d280c0ec366738850bd1fe2d1405179700fe25678c04a88b2092820aa5f049bcc6f97c964b5875bd32e3f8c7c5240ef3a71f2af04d6bfdaadb9 SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331 DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40 +DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3 EBUILD gphoto2-2.5.14.ebuild 1392 BLAKE2B d9dad5be797d3f5e2f789c42060c62499d59f8f8aa5129608eea7f023b0257a38d1d3e2d54b4889128f0a867368a3abcac4e3f47bddf98c675049f0b9f24f314 SHA512 6ef5220aaf64e480a95e71d5596093179a41d93912c1d17614034e4814832ba8788a1e282a8711096482eb94c284a65365fb85c67a748fb060a38ef921349a8c -EBUILD gphoto2-2.5.15.ebuild 1394 BLAKE2B 37ee8b2690588d840705c0892cbfeecce0b374ef1f61d6786de4602c3360ccdcbb8c586ca970978d90cc5ca9e6c9756d103c2a9ebb1186d12f140d955dc49f76 SHA512 d31216163f52a33ada64f20e0892b9208b7b468524517c799778df7ef7b53dfc9492a9a81a39be625bf43a4d6e02538b2205ff04a4b665acc0c31e0e94376538 +EBUILD gphoto2-2.5.15.ebuild 1390 BLAKE2B f932004b8728e3bc850d93e4bdb95bf181f4396961919634683b0524e1f02e4e576703d9438b5ba82c390c3e697ca6f8e7a97935939ac755f7094d9ee30703c8 SHA512 3668c7919a7f32273797172b331d83d9dcbf3fcd8fb4d6aae90f8fe49bfef26b4160819112a963f75ae630411fb47a4393c6756a26a34cdee64079fed4b24182 +EBUILD gphoto2-2.5.20.ebuild 1331 BLAKE2B 89ef478df066b8824503bea7a1dcbad7257974b22731080a6eeadb16ef45885c72edeef77b600c6088a72ee4007bbf54a28befce6f536f400cc7c10cfdd9e7e9 SHA512 31d763dd83771ad375011cab0d9a8ff563b47654677db787f1b953a239b7d977a70ca412a5ba8bc85bb847c2019fe322a79cbe1b2a794ed6f51788071d450825 MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53 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 new file mode 100644 index 000000000000..8e78578d71d1 --- /dev/null +++ b/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch @@ -0,0 +1,37 @@ +From 45fb2a39195b5b31f61f376323ff78ab40940760 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sat, 8 Dec 2018 16:19:35 +0100 +Subject: [PATCH] Fix unwanted automagic activation of aalib support + +--- + configure.ac | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a6068c9..c19fed9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -306,8 +306,9 @@ aa_msg="no (http://www.sourceforge.net/projects/aa-project)" + try_aa=: + have_aa=false + AC_ARG_WITH([aalib],AS_HELP_STRING([--with-aalib],[Do use aalib for preview ASCII rendering]),[ +- if test x$withval = xyes; then +- try_aa=: ++ if test x$withval = xno; then ++ try_aa=false ++ aa_msg="no (not requested)" + fi + ]) + if $try_aa; then +@@ -323,8 +324,6 @@ if $try_aa; then + AA_LIBS="-laa" + fi + ]) +-else +- aa_msg="no (not requested)" + fi + AM_CONDITIONAL([HAVE_AA], [$have_aa]) + AC_SUBST([AA_LIBS]) +-- +2.19.2 + diff --git a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild index bf31c418c6d9..7fb110bd99d0 100644 --- a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild +++ b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~hppa ~ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86" IUSE="aalib exif ncurses nls readline" # aalib -> needs libjpeg diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild new file mode 100644 index 000000000000..5470646b4f22 --- /dev/null +++ b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools + +DESCRIPTION="Free, redistributable digital camera software application" +HOMEPAGE="http://www.gphoto.org/" +SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="aalib exif ncurses nls readline" + +# aalib -> needs libjpeg +RDEPEND=" + dev-libs/popt + >=media-libs/libgphoto2-2.5.17:=[exif?] + aalib? ( + media-libs/aalib + virtual/jpeg:0 ) + exif? ( media-libs/libexif ) + ncurses? ( dev-libs/cdk:0= ) + readline? ( sys-libs/readline:0= ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( >=sys-devel/gettext-0.14.1 ) +" + +PATCHES=( + # https://github.com/gphoto/gphoto2/pull/179 + "${FILESDIR}"/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch +) + +src_prepare() { + default + if ! use exif ; then + # Remove tests that require EXIF to pass, bug 610024 + rm "${S}"/tests/data/test0{35,36,37,40}* || die + fi + # Leave GCC debug builds under user control + sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \ + -i configure{.ac,} || die + eautoreconf +} + +src_configure() { + econf \ + $(use_with aalib) \ + $(use_with aalib jpeg) \ + $(use_with exif libexif auto) \ + $(use_with ncurses cdk) \ + $(use_enable nls) \ + $(use_with readline) +} |