diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2011-07-01 17:07:59 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2011-07-01 17:07:59 +0000 |
| commit | 735e559b153e6491b047a39dab8072987b19055b (patch) | |
| tree | 2cf4d5c8518165fa9aecaa8ab808b625066f579f /media-gfx/gphoto2 | |
| parent | Really skip tests when unneeded (bug #373069 by Matt Turner). (diff) | |
| download | gentoo-2-735e559b153e6491b047a39dab8072987b19055b.tar.gz gentoo-2-735e559b153e6491b047a39dab8072987b19055b.tar.bz2 gentoo-2-735e559b153e6491b047a39dab8072987b19055b.zip | |
Fix cdk detection and make it compatible with cdk[unicode] (bug #371569 reported by Juergen Rose, patch by Tim Harder and instructions to call configure by upstream.
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/gphoto2')
| -rw-r--r-- | media-gfx/gphoto2/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch | 19 | ||||
| -rw-r--r-- | media-gfx/gphoto2/gphoto2-2.4.11.ebuild | 11 |
3 files changed, 34 insertions, 4 deletions
diff --git a/media-gfx/gphoto2/ChangeLog b/media-gfx/gphoto2/ChangeLog index 0658976b485d..e139bcc366ac 100644 --- a/media-gfx/gphoto2/ChangeLog +++ b/media-gfx/gphoto2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/gphoto2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.113 2011/06/20 16:44:41 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/ChangeLog,v 1.114 2011/07/01 17:07:59 pacho Exp $ + + 01 Jul 2011; Pacho Ramos <pacho@gentoo.org> gphoto2-2.4.11.ebuild, + +files/gphoto2-2.4.11-cdk-libs.patch: + Fix cdk detection and make it compatible with cdk[unicode] (bug #371569 + reported by Juergen Rose, patch by Tim Harder and instructions to call + configure by upstream. *gphoto2-2.4.11 (20 Jun 2011) diff --git a/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch b/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch new file mode 100644 index 000000000000..2e7a89a9f5cd --- /dev/null +++ b/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch @@ -0,0 +1,19 @@ +--- gphoto2-2.4.11/configure.ac.orig ++++ gphoto2-2.4.11/configure.ac +@@ -146,8 +146,14 @@ + CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS" + AC_CHECK_HEADER([cdk/cdk.h], [ + have_cdk=: +- CDK_CFLAGS="-I$cdk_prefix/include" +- CDK_LIBS="-L$cdk_prefix/lib -lcdk -lncurses" ++ AC_PATH_PROG([CDK_CONFIG], [cdk5-config]) ++ if test -n "${CDK_CONFIG}"; then ++ CDK_CFLAGS=`$CDK_CONFIG --cflags` ++ CDK_LIBS=`$CDK_CONFIG --libs` ++ else ++ CDK_CFLAGS="-I$cdk_prefix/include" ++ CDK_LIBS="-L$cdk_prefix/lib -lcdk -lncurses" ++ fi + AC_DEFINE([HAVE_CDK],1,[whether we have CDK]) + LDFLAGS_save="$LDFLAGS" + LDFLAGS="$CDK_LIBS" diff --git a/media-gfx/gphoto2/gphoto2-2.4.11.ebuild b/media-gfx/gphoto2/gphoto2-2.4.11.ebuild index f06ea289f76d..a8ce14ec8a63 100644 --- a/media-gfx/gphoto2/gphoto2-2.4.11.ebuild +++ b/media-gfx/gphoto2/gphoto2-2.4.11.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.4.11.ebuild,v 1.1 2011/06/20 16:44:41 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.4.11.ebuild,v 1.2 2011/07/01 17:07:59 pacho Exp $ EAPI="4" -inherit eutils +inherit eutils autotools DESCRIPTION="free, redistributable digital camera software application" HOMEPAGE="http://www.gphoto.org/" @@ -30,8 +30,13 @@ DEPEND="${RDEPEND} dev-util/pkgconfig nls? ( >=sys-devel/gettext-0.14 )" +src_prepare() { + epatch "${FILESDIR}/${P}-cdk-libs.patch" + eautoreconf +} + src_configure() { - econf \ + CPPFLAGS="-I/usr/include/cdk" econf \ --docdir=/usr/share/doc/${PF} \ $(use_with aalib) \ $(use_with aalib jpeg) \ |