Added patch to make ejection work on FreeBSD.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 101 insertions, 5 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 6f02a2d8d874..7aa60a96f03e 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,12 @@
 # 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.40 2005/07/22 21:44:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.41 2005/07/23 19:07:14 flameeyes Exp $
+
+*libcdio-0.75-r1 (23 Jul 2005)
+
+  23 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libcdio-0.75-freebsd.patch, +libcdio-0.75-r1.ebuild:
+  Added patch to make ejection work on FreeBSD.
 
 *libcdio-0.75 (20 Jul 2005)
 
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 12fcf9c22497..3d23b0265d17 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 301c1625b901995feff5745d57e7ac8e ChangeLog 5063
+MD5 1e9193838f67a0dd6e0f8fc24bf73140 ChangeLog 5259
 MD5 9db9dca79d0867f61570cdeb7c8d7862 libcdio-0.64.ebuild 600
 MD5 9276ebf133096b17b42459071ff9557a libcdio-0.69.ebuild 807
 MD5 a4f6c3f80890696765a72ff20a86b20c libcdio-0.70.ebuild 1053
@@ -9,16 +9,19 @@ MD5 09106b891d306c1083b1ef79a7192402 libcdio-0.73.ebuild 1539
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 e26723ead93a1b3ca44453d6dcd6bf99 libcdio-0.74.ebuild 1683
 MD5 5e28084adc64a06f4c2dde45edc0b542 libcdio-0.75.ebuild 1326
+MD5 53cb5c7928e1adc77af1f36f51ac12c0 libcdio-0.75-r1.ebuild 1369
 MD5 0165911115603b51b34b8ae19ab71e2a files/digest-libcdio-0.64 65
 MD5 8276d2edab3e451a5639073967339ebb files/digest-libcdio-0.69 65
 MD5 29744769327f1087e4de0f7c5d8e9fbb files/digest-libcdio-0.70 65
 MD5 c6110cfe0ed9c90901a77e77d3a308e5 files/digest-libcdio-0.73 65
 MD5 c4a757d92ae8d58de0538803b4650900 files/digest-libcdio-0.74 65
 MD5 bad51b787d2f4b600b5cd550fff8b986 files/digest-libcdio-0.75 65
+MD5 a6c330ba467869360ed8db78de15e9b7 files/libcdio-0.75-freebsd.patch 1227
+MD5 bad51b787d2f4b600b5cd550fff8b986 files/digest-libcdio-0.75-r1 65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC4Wjmj5H05b2HAEkRAky1AKCPpvHbymvhWhMrXu46B+PI9tsR7gCePZZO
-jNjp2XxBZIQFCMZCC8wEoEs=
-=IIIo
+iD8DBQFC4pWYj5H05b2HAEkRAlj2AJ9e6GlO/zdh/6EYThw/7V1UhgsnYQCgh9WS
+FJ0cEc284orskJvReczozpQ=
+=U+Yw
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libcdio/files/digest-libcdio-0.75-r1 b/dev-libs/libcdio/files/digest-libcdio-0.75-r1
new file mode 100644
index 000000000000..bad65657cc97
--- /dev/null
+++ b/dev-libs/libcdio/files/digest-libcdio-0.75-r1
@@ -0,0 +1 @@
+MD5 628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz 1810819
diff --git a/dev-libs/libcdio/files/libcdio-0.75-freebsd.patch b/dev-libs/libcdio/files/libcdio-0.75-freebsd.patch
new file mode 100644
index 000000000000..43c25ac6445c
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-0.75-freebsd.patch
@@ -0,0 +1,37 @@
+diff -ur -x '*~' libcdio-0.75/lib/driver/FreeBSD/freebsd_ioctl.c libcdio-0.75-fbsd/lib/driver/FreeBSD/freebsd_ioctl.c
+--- libcdio-0.75/lib/driver/FreeBSD/freebsd_ioctl.c	2005-01-27 05:00:48.000000000 +0100
++++ libcdio-0.75-fbsd/lib/driver/FreeBSD/freebsd_ioctl.c	2005-07-23 18:55:58.379631392 +0200
+@@ -140,25 +140,20 @@
+ }
+ 
+ /*!
+-  Eject media. Return 1 if successful, 0 otherwise.
++  Eject media. Return 0 if successful, 1 otherwise.
+  */
+ int 
+ eject_media_freebsd_ioctl (_img_private_t *env) 
+ {
+   _img_private_t *_obj = env;
+-  int ret=2;
+-  int fd;
++  int ret=1;
+ 
+-  if ((fd = open(_obj->gen.source_name, O_RDONLY|O_NONBLOCK)) > -1) {
+-    ret = 1;
+-    if (ioctl(fd, CDIOCALLOW) == -1) {
+-      cdio_warn("ioctl(fd, CDIOCALLOW) failed: %s\n", strerror(errno));
+-    } else if (ioctl(fd, CDIOCEJECT) == -1) {
+-      cdio_warn("ioctl(CDIOCEJECT) failed: %s\n", strerror(errno));
+-    } else {
+-      ret = 0;
+-    }
+-    close(fd);
++  if (ioctl(_obj->gen.fd, CDIOCALLOW) == -1) {
++    cdio_warn("ioctl(fd, CDIOCALLOW) failed: %s\n", strerror(errno));
++  } else if (ioctl(_obj->gen.fd, CDIOCEJECT) == -1) {
++    cdio_warn("ioctl(CDIOCEJECT) failed: %s\n", strerror(errno));
++  } else {
++    ret=0;
+   }
+ 
+   return ret;
diff --git a/dev-libs/libcdio/libcdio-0.75-r1.ebuild b/dev-libs/libcdio/libcdio-0.75-r1.ebuild
new file mode 100644
index 000000000000..def5af738081
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-0.75-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.75-r1.ebuild,v 1.1 2005/07/23 19:07:14 flameeyes Exp $
+
+inherit libtool eutils
+
+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 ~sparc ~x86"
+IUSE="cddb minimal"
+
+RDEPEND="!minimal? ( dev-libs/popt )
+	cddb? ( >=media-libs/libcddb-0.9.4 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	elibtoolize --reverse-deps
+
+	epatch ${FILESDIR}/${P}-freebsd.patch
+}
+
+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
+}