Add patches to fix a crash within nrg driver and to support DragonFly BSD if that will ever be needed.

(Portage version: 2.1_pre4-r1)

6 files changed, 160 insertions, 12 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 7929a7118db1..21cd68df58bb 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libcdio
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.44 2005/10/21 14:51:24 matsuu Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.45 2006/02/12 03:44:29 flameeyes Exp $
+
+*libcdio-0.76-r1 (12 Feb 2006)
+
+  12 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libcdio-0.76-dragonfly.patch, +files/libcdio-0.76-nrg-crash.patch,
+  +libcdio-0.76-r1.ebuild:
+  Add patches to fix a crash within nrg driver and to support DragonFly BSD if
+  that will ever be needed.
 
   21 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> libcdio-0.76.ebuild:
   Fixed libcddb dependency.
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index a1b1211179cf..80c8c34d9e58 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,29 +1,69 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 10f5251f1144accaf1077ec8796334e1 ChangeLog 5613
+RMD160 621dc0799cba251a072ca89b20e1fd986dd2658f ChangeLog 5613
+SHA256 495ad114a3645d1c0b5bcbb843911538b9053e7d5c6af4fb61dd74c15e7c847c ChangeLog 5613
 MD5 0165911115603b51b34b8ae19ab71e2a files/digest-libcdio-0.64 65
+RMD160 62054a8147645683f92d15003fc1311cc2a852ec files/digest-libcdio-0.64 65
+SHA256 0c3ae23e88a6fccd63913a0bc67bd3a64a2bf2e85eba6627ac6bc82146d54922 files/digest-libcdio-0.64 65
 MD5 8276d2edab3e451a5639073967339ebb files/digest-libcdio-0.69 65
+RMD160 3afc01a6995a0ad1e19c730f2e46003d4dc31787 files/digest-libcdio-0.69 65
+SHA256 35c934fe805bbcbad2f7a14197548516c8127201b369f48431e34bb385342ff8 files/digest-libcdio-0.69 65
 MD5 29744769327f1087e4de0f7c5d8e9fbb files/digest-libcdio-0.70 65
+RMD160 3312fdde11047bfade4539e606f2f6879c682c1a files/digest-libcdio-0.70 65
+SHA256 f5995b5af753703211bcd5b4efa519ea9305f66b167e7cf81909a233287f0f78 files/digest-libcdio-0.70 65
 MD5 c6110cfe0ed9c90901a77e77d3a308e5 files/digest-libcdio-0.73 65
+RMD160 4546b801e3b176258b50224641f09c6b3ef987e0 files/digest-libcdio-0.73 65
+SHA256 10b103bb8fee9bc7899c2256ca697289c2b7ee50d7e63d1de8f5f983d4a42027 files/digest-libcdio-0.73 65
 MD5 c4a757d92ae8d58de0538803b4650900 files/digest-libcdio-0.74 65
+RMD160 42325e43fac395bb5d484286b4339d75b3c3ef1e files/digest-libcdio-0.74 65
+SHA256 5451d1c4935ad0d4bba97e1ae9bde624e006157e80942ce2d1cb4dfdb7f13545 files/digest-libcdio-0.74 65
 MD5 bad51b787d2f4b600b5cd550fff8b986 files/digest-libcdio-0.75 65
+RMD160 643413642cf165366b7dfe2b1e9280267aec950f files/digest-libcdio-0.75 65
+SHA256 8c63d89fae4562cb3697ac43617627eb7ae382f1206792dda0bae9318f490a5a files/digest-libcdio-0.75 65
 MD5 bad51b787d2f4b600b5cd550fff8b986 files/digest-libcdio-0.75-r1 65
+RMD160 643413642cf165366b7dfe2b1e9280267aec950f files/digest-libcdio-0.75-r1 65
+SHA256 8c63d89fae4562cb3697ac43617627eb7ae382f1206792dda0bae9318f490a5a files/digest-libcdio-0.75-r1 65
 MD5 f2b45d6e206620dddfde7136a8939409 files/digest-libcdio-0.76 65
+RMD160 edc68384f1875f13efea705a6f2829ca0d25e927 files/digest-libcdio-0.76 65
+SHA256 ba91b2c54daa9ac56d0f3df95046fc6ddde4092f9e94b6a854ecd8d13747f949 files/digest-libcdio-0.76 65
+MD5 ae18e64aee5b96b5f1f67f36ee5442e3 files/digest-libcdio-0.76-r1 241
+RMD160 5c9370b8254a19f9ad5a68dc10cd76983dd61eee files/digest-libcdio-0.76-r1 241
+SHA256 b7ff230276729d67c66d1592293feea5b83b14df2f28e9d8ea6e4c6a3e5117f1 files/digest-libcdio-0.76-r1 241
 MD5 a6c330ba467869360ed8db78de15e9b7 files/libcdio-0.75-freebsd.patch 1227
+RMD160 40aa05effd3eb76888b4bef47aa6ebe59d365fd9 files/libcdio-0.75-freebsd.patch 1227
+SHA256 24e4fa7895473ae68fae7d7466da82c78b2145288920f183f63a9e7bc48d3357 files/libcdio-0.75-freebsd.patch 1227
+MD5 5144474b861b2c0c64387055b29e8b11 files/libcdio-0.76-dragonfly.patch 526
+RMD160 c849e615361f805d13100ed79828b654d9b79af1 files/libcdio-0.76-dragonfly.patch 526
+SHA256 2c9465eeec8c75aa2e5f6a601b0f15ff0d7ae1fb25798f1fe47370c0c96771c2 files/libcdio-0.76-dragonfly.patch 526
+MD5 c16d4fed8eab926a145ac72810d0fcd5 files/libcdio-0.76-nrg-crash.patch 858
+RMD160 84a9fa34d923bccfd56d62d87fab6c4ea6ce5bb7 files/libcdio-0.76-nrg-crash.patch 858
+SHA256 ba4ee9ee943d3cc934ba5b79f1ee4e49bbb335a1dbe759757b68d5be39c9dfbc files/libcdio-0.76-nrg-crash.patch 858
 MD5 9db9dca79d0867f61570cdeb7c8d7862 libcdio-0.64.ebuild 600
+RMD160 fd93e0058a9ecbda3bcec8038148ec3a1d9143c1 libcdio-0.64.ebuild 600
+SHA256 9a5633f8e8d086b5d3223eee80ed0f3593a5a4906adec65931e90fe68c49640f libcdio-0.64.ebuild 600
 MD5 9276ebf133096b17b42459071ff9557a libcdio-0.69.ebuild 807
+RMD160 c55517c0c3302ec019222fae484d75a8600f87de libcdio-0.69.ebuild 807
+SHA256 4bbc618a2080222f803e55970c0bfaa1a85de864fca23ef722d593ff4cc6a754 libcdio-0.69.ebuild 807
 MD5 a4f6c3f80890696765a72ff20a86b20c libcdio-0.70.ebuild 1053
+RMD160 077bcb07081d5a26be93e779f1daa8ecfa60339a libcdio-0.70.ebuild 1053
+SHA256 c28b1222e0467df21fa30aac92d9c9ac1b804a1182025a4bd08c8c38a0403eec libcdio-0.70.ebuild 1053
 MD5 2306eef70d9db2154bb8b5d294818856 libcdio-0.73.ebuild 1550
+RMD160 65b9a393734eacf4496b6d562b2bf29bcadc2b4a libcdio-0.73.ebuild 1550
+SHA256 648722455842ce262c885728bcae8c8aac0da9d12ae6f6ff2c9851d6ed8ea12a libcdio-0.73.ebuild 1550
 MD5 e26723ead93a1b3ca44453d6dcd6bf99 libcdio-0.74.ebuild 1683
+RMD160 8c7e7378b4adae4dcde854fa994542c4e1d40729 libcdio-0.74.ebuild 1683
+SHA256 d363d8e881ce7d38e2ce6f8f052ab2cda61193f87ed57416b5cf9e264ad25669 libcdio-0.74.ebuild 1683
 MD5 53cb5c7928e1adc77af1f36f51ac12c0 libcdio-0.75-r1.ebuild 1369
+RMD160 be574a2d4db0b85d945b96d5b285884e424fbfe0 libcdio-0.75-r1.ebuild 1369
+SHA256 d8d96827b0e26267ba7af9245696f65a62d2f1d98faca836635b9d210398d695 libcdio-0.75-r1.ebuild 1369
 MD5 5e28084adc64a06f4c2dde45edc0b542 libcdio-0.75.ebuild 1326
+RMD160 06d260a89c232f27754714da68051742116da40f libcdio-0.75.ebuild 1326
+SHA256 7c35bbe6786f78d10cd780f7fee2c14d58691174507039ea413d80af5ed29969 libcdio-0.75.ebuild 1326
+MD5 0a71b60c5bfac88b893a6ae1445816d5 libcdio-0.76-r1.ebuild 1404
+RMD160 bdf98aea622b2664b7743cb0b972ea3256abcd53 libcdio-0.76-r1.ebuild 1404
+SHA256 9a22fd0d6ef90adf19b335e9edd56e275f04d823295af3b5df3a67b12e368daa libcdio-0.76-r1.ebuild 1404
 MD5 4be6f517760fa9937eed8d4f62e1a204 libcdio-0.76.ebuild 1329
+RMD160 1b72072bfdc5d3b058543f7e85cc4fcd0be05029 libcdio-0.76.ebuild 1329
+SHA256 d1d837a8e7d60ea0a319f9530f37f3ad728560d7a19e0dff5272fd8d74c88ecb libcdio-0.76.ebuild 1329
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDyDFF2+ySkm8kpY0RAqU/AJ9wd+qfrCAm+TEiHkIswTC/r2sQbwCfXLaA
-NjCIdYKOqNW449GEFzN3sGA=
-=6YV+
------END PGP SIGNATURE-----
+RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
+SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata.xml 158
diff --git a/dev-libs/libcdio/files/digest-libcdio-0.76-r1 b/dev-libs/libcdio/files/digest-libcdio-0.76-r1
new file mode 100644
index 000000000000..da324353d3eb
--- /dev/null
+++ b/dev-libs/libcdio/files/digest-libcdio-0.76-r1
@@ -0,0 +1,3 @@
+MD5 6d5f97847c8be003f4018dd2b5afe23d libcdio-0.76.tar.gz 1821519
+RMD160 3ebce21179c04c5a8d721d485a28244de9ac82f3 libcdio-0.76.tar.gz 1821519
+SHA256 26e0d08f345de365492671703a597be2c7275885e1aeb6f9fee049725caaf04a libcdio-0.76.tar.gz 1821519
diff --git a/dev-libs/libcdio/files/libcdio-0.76-dragonfly.patch b/dev-libs/libcdio/files/libcdio-0.76-dragonfly.patch
new file mode 100644
index 000000000000..0baf213319e2
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-0.76-dragonfly.patch
@@ -0,0 +1,13 @@
+Index: libcdio-0.76/configure.ac
+===================================================================
+--- libcdio-0.76.orig/configure.ac
++++ libcdio-0.76/configure.ac
+@@ -436,7 +436,7 @@ int has_timeout=sizeof(test.timeout);],
+  	LIBS="$LIBS -lwinmm -mwindows"
+   	cd_drivers="${cd_drivers}, MinGW "
+ 	;;
+-     freebsd4.*|freebsd5.*|freebsd6*)
++     freebsd4.*|freebsd5.*|freebsd6*|dragonfly*)
+      	AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
+                   [Define 1 if you have FreeBSD CD-ROM support])
+  	LIBS="$LIBS -lcam"
diff --git a/dev-libs/libcdio/files/libcdio-0.76-nrg-crash.patch b/dev-libs/libcdio/files/libcdio-0.76-nrg-crash.patch
new file mode 100644
index 000000000000..7de78275904d
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-0.76-nrg-crash.patch
@@ -0,0 +1,31 @@
+Index: libcdio-0.76/lib/driver/image/nrg.c
+===================================================================
+--- libcdio-0.76.orig/lib/driver/image/nrg.c
++++ libcdio-0.76/lib/driver/image/nrg.c
+@@ -1173,21 +1173,14 @@ _get_track_green_nrg(void *p_user_data, 
+ bool
+ cdio_is_nrg(const char *psz_nrg) 
+ {
+-  unsigned int i;
++  size_t psz_len;
+   
+   if (psz_nrg == NULL) return false;
++  psz_len = strlen(psz_nrg);
++  /* At least 4 characters needed for .nrg extension */
++  if ( psz_len < 4 ) return false; 
+ 
+-  i=strlen(psz_nrg)-strlen("nrg");
+-  
+-  if (i>0) {
+-    if (psz_nrg[i]=='n' && psz_nrg[i+1]=='r' && psz_nrg[i+2]=='g') {
+-      return true;
+-    } 
+-    else if (psz_nrg[i]=='N' && psz_nrg[i+1]=='R' && psz_nrg[i+2]=='G') {
+-      return true;
+-    }
+-  }
+-  return false;
++  return strncasecmp( psz_nrg+(psz_len-3), "nrg", 3 ) == 0;
+ }
+ 
+ /*!
diff --git a/dev-libs/libcdio/libcdio-0.76-r1.ebuild b/dev-libs/libcdio/libcdio-0.76-r1.ebuild
new file mode 100644
index 000000000000..bd0b336728c4
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-0.76-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.76-r1.ebuild,v 1.1 2006/02/12 03:44:29 flameeyes Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="A library to encapsulate CD-ROM reading and control"
+HOMEPAGE="http://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="cddb minimal"
+
+RDEPEND="!minimal? ( dev-libs/popt )
+	cddb? ( >=media-libs/libcddb-1.0.1 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-dragonfly.patch"
+	epatch "${FILESDIR}/${P}-nrg-crash.patch"
+
+	AT_M4DIR="${S}" eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable cddb) \
+		$(use_with !minimal cd-drive) \
+		$(use_with !minimal cd-info) \
+		$(use_with !minimal cd-paranoia) \
+		$(use_with !minimal cdda-player) \
+		$(use_with !minimal cd-read) \
+		$(use_with !minimal iso-info) \
+		$(use_with !minimal iso-read) \
+		--with-cd-paranoia-name=libcdio-paranoia \
+		--disable-vcd-info \
+		--disable-dependency-tracking || die "configure failed"
+	# had problem with parallel make (phosphan@gentoo.org)
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}