summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2008-04-05 21:19:11 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2008-04-05 21:19:11 +0000
commit9e7d5cd3da04723bcf690d0162f5c5ef93db5c1e (patch)
tree240a8cc13aec475380cd2a4907b6fceb9279aac5 /media-libs/libgphoto2
parent2.1.5_rc2 bump for bug #216328 (fix broken --newuse). (diff)
downloadgentoo-2-9e7d5cd3da04723bcf690d0162f5c5ef93db5c1e.tar.gz
gentoo-2-9e7d5cd3da04723bcf690d0162f5c5ef93db5c1e.tar.bz2
gentoo-2-9e7d5cd3da04723bcf690d0162f5c5ef93db5c1e.zip
Fix bug #212721, libtool-2 failure. Fix bug #216206, libusb detection.
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-libs/libgphoto2')
-rw-r--r--media-libs/libgphoto2/ChangeLog6
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.4.1.ebuild10
2 files changed, 13 insertions, 3 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index c207d7dd10a6..1de869659ba9 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libgphoto2
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.116 2008/03/30 22:25:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.117 2008/04/05 21:19:11 eva Exp $
+
+ 05 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+ libgphoto2-2.4.1.ebuild:
+ Fix bug #212721, libtool-2 failure. Fix bug #216206, libusb detection.
30 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
libgphoto2-2.4.1.ebuild:
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild
index 8f4f33ee537d..2890ec62d1d2 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild,v 1.3 2008/03/31 01:58:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild,v 1.4 2008/04/05 21:19:11 eva Exp $
# TODO
# 1. Track upstream bug --disable-docs does not work.
@@ -70,7 +70,13 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-2.4.0-rpm.patch
# Fix pkgconfig file when USE="-exif"
- use exif || sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in
+ use exif || sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
+
+ # Fix bug #212721, libtool-2 failure
+ sed -i "s:lt_dlcaller_register:lt_dlinit:g" configure libgphoto2_port/configure || die "libtool sed failed"
+
+ # Fix bug #216206, libusb detection
+ sed -i "s:usb_busses:usb_find_busses:g" libgphoto2_port/configure || die "libusb sed failed"
}
src_compile() {