diff options
Diffstat (limited to 'media-gfx/gphoto2')
| -rw-r--r-- | media-gfx/gphoto2/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch | 29 | ||||
| -rw-r--r-- | media-gfx/gphoto2/gphoto2-2.5.26.ebuild | 57 |
3 files changed, 89 insertions, 0 deletions
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest index 73e616db816f..8953efaba9c1 100644 --- a/media-gfx/gphoto2/Manifest +++ b/media-gfx/gphoto2/Manifest @@ -1,4 +1,7 @@ AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 62afe72d6630420fa0068e652cdfbfde3c4e73541e53154627ad1cc23ad10f72ac85cf5ae317d2b0bf4127e474af2ca2268e57011eb835d57d88e2d6fa65a85f SHA512 252390cfb2533e9c15d1f881f6729660e2f6cd737a9257c5dec7f06f72f2960c3b5fe940e7fc774c862e6156f517357ca7b933822c23a466ef39fbfc2f14bf8c +AUX gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch 883 BLAKE2B cdbc9626b09610eb98cc32e04e68f6d4ea7d13709258ea6d23e9c1a800be1c7bb02589da354234ad523f43d9c93335eeaf8bbd42c26ffe8747a19fbd5fec3b2c SHA512 b2f3e36d151fefa78b63ba478efa17ab419a4f9d60c03a5951b149cb045495d4cd5e102a2977af6097f6d902449c5c56a8b1c0ac55eaa924f08931d08488b0ab DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3 +DIST gphoto2-2.5.26.tar.bz2 804521 BLAKE2B 20ddf39ad8668543864119cb1cf8dd5db4be5a773ccdd73efe434fe790ce001842512acf9a9f3ad08bad43460b42e4de257b2ca5561b5d7727f0703dba8f8098 SHA512 fbfc8d860db830be423271a0f569d51a296e9394884fe1a9e22eafd4ba0b7e4e68d86ba0391df81a64d4a4976b2644b2c39339532bd0e8e01f461b9a89cceb47 EBUILD gphoto2-2.5.20.ebuild 1334 BLAKE2B 0cbad273e56fa22e1612ce973622b44995e1dc98bae1a17c7533a7c8b2df36d51ea61cad8fa4adad201778401f2540de7e7e5728ebfbbba38f7e6bf9c6305398 SHA512 90ec16fdf308d2c92ffa7397bb9789eaa65e1ee30ae853add5993e359ecefebe118a0fac09e2edfe08b4d0ee490b6bb6ef5ec90e01b557d3a92af93df622390a +EBUILD gphoto2-2.5.26.ebuild 1270 BLAKE2B 534c1e6777dd16ef441e91469080669f7489bc0ef3a3bfe8aafc8fb644ef7bebcb2a5a0c2c67a805a9b5db8792a58f35f17e7e1f163c48d94ac57ff1001bb5ba SHA512 d73ae39d2b0efc236965b8d94ac2d556076c9c07eb293bfd5cdfc95cdc50c3b663fd226a1fc85baf7a7d4a6bb4078d91289e7289ea6389607576d839689d9d3a MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7 diff --git a/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch b/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch new file mode 100644 index 000000000000..b68e618cc018 --- /dev/null +++ b/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/679332 + +diff --git a/configure.ac b/configure.ac +index ed76a66..b0db85c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -141,7 +141,7 @@ AC_ARG_WITH([cdk-prefix],AS_HELP_STRING([--with-cdk-prefix=PREFIX], + if $try_cdk; then + CPPFLAGS_save="$CPPFLAGS" + CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS" +- AC_CHECK_HEADER([cdk/cdk.h], [ ++ AC_CHECK_HEADER([cdk.h], [ + have_cdk=: + AC_PATH_PROG([CDK_CONFIG], [cdk5-config]) + if test -n "${CDK_CONFIG}"; then +diff --git a/gphoto2/gphoto2-cmd-config.c b/gphoto2/gphoto2-cmd-config.c +index 360fd61..c801604 100644 +--- a/gphoto2/gphoto2-cmd-config.c ++++ b/gphoto2/gphoto2-cmd-config.c +@@ -29,7 +29,7 @@ + + #include <gphoto2/gphoto2-widget.h> + +-#include <cdk/cdk.h> ++#include <cdk.h> + + #ifndef MAX + # define MAX(a, b) ((a) > (b) ? (a) : (b)) +-- diff --git a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild new file mode 100644 index 000000000000..4e4d43690010 --- /dev/null +++ b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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 ~arm64 ~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}" +BDEPEND=" + virtual/pkgconfig + nls? ( >=sys-devel/gettext-0.14.1 ) +" + +PATCHES=( + "${FILESDIR}"/${P}-s-cdk-cdk.h-cdk.h.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) +} |