added ~ppc-macos keyword as well as vm and btree patches from DarwinPorts

4 files changed, 56 insertions, 7 deletions

diff --git a/media-libs/libdvdnav/ChangeLog b/media-libs/libdvdnav/ChangeLog
index b90671494d44..0bb5531c5066 100644
--- a/media-libs/libdvdnav/ChangeLog
+++ b/media-libs/libdvdnav/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libdvdnav
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.18 2004/11/06 16:29:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.19 2004/11/14 00:02:18 kito Exp $
+
+  13 Nov 2004; Kito <kito@gentoo.org> libdvdnav-0.1.9.ebuild:
+  added ~ppc-macos keyword as well as vm and btree patches from DarwinPorts
 
   06 Nov 2004; Luca Barbato <lu_zero@gentoo.org> libdvdnav-0.1.9.ebuild:
   Marked ppc
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index 9c7bc525c098..55122879b324 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,6 +1,7 @@
-MD5 5adfaeb33a3ac30d99edd09af5fdbac3 ChangeLog 2237
+MD5 e29c17a29c657aa45fe4f0e07edcac27 ChangeLog 2373
 MD5 6a84ede30c0c13668e04e756b6be0fa8 libdvdnav-0.1.3.ebuild 838
+MD5 388f3266eaae6147e61e7dbcbd62a6c1 libdvdnav-0.1.9.ebuild 968
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 f0713e11554280c368b7d787308dc4ff libdvdnav-0.1.9.ebuild 795
 MD5 039646860182d0d8b81cbe93265d6ffb files/digest-libdvdnav-0.1.3 67
 MD5 300cb5083129b821668609d693f86809 files/digest-libdvdnav-0.1.9 67
+MD5 2c6ca547e6f0d62197be359672f3a401 files/libdvdnav-0.1.9-darwin.diff 1204
diff --git a/media-libs/libdvdnav/files/libdvdnav-0.1.9-darwin.diff b/media-libs/libdvdnav/files/libdvdnav-0.1.9-darwin.diff
new file mode 100644
index 000000000000..135e55ee5f56
--- /dev/null
+++ b/media-libs/libdvdnav/files/libdvdnav-0.1.9-darwin.diff
@@ -0,0 +1,37 @@
+diff -uNr libdvdnav-0.1.9/src/bswap.h libdvdnav-0.1.9-new/src/bswap.h
+--- libdvdnav-0.1.9/src/bswap.h	Tue Apr 29 14:31:35 2003
++++ libdvdnav-0.1.9-new/src/bswap.h	Sat Nov 13 17:37:08 2004
+@@ -59,6 +59,12 @@
+ #define B2N_32(x) x = be32toh(x)
+ #define B2N_64(x) x = be64toh(x)
+ 
++#elif defined(__DARWIN__)
++#include <limits.h>
++#define B2N_16(x) NXSwapShort(x)
++#define B2N_32(x) NXSwapInt(x)
++#define B2N_64(x) NXSwapLongLong(x)
++
+ /* This is a slow but portable implementation, it has multiple evaluation 
+  * problems so beware.
+  * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such 
+diff -uNr libdvdnav-0.1.9/src/vm.c libdvdnav-0.1.9-new/src/vm.c
+--- libdvdnav-0.1.9/src/vm.c	Tue Apr 29 10:25:20 2003
++++ libdvdnav-0.1.9-new/src/vm.c	Sat Nov 13 17:44:18 2004
+@@ -45,6 +45,8 @@
+ #ifdef _MSC_VER
+ #include <io.h>   /* read() */
+ #define lseek64 lseek
++#elif defined(__DARWIN__)
++#define lseek64 lseek
+ #endif /* _MSC_VER */
+ 
+ /*
+@@ -128,7 +130,7 @@
+ 
+ static void dvd_read_name(char *name, const char *device) {
+     int fd, i;
+-#if !defined(__FreeBSD__) && !defined(WIN32)
++#if !defined(__FreeBSD__) && !defined(WIN32) && !defined(__DARWIN__)
+     off64_t off;
+ #else
+     off_t off;
diff --git a/media-libs/libdvdnav/libdvdnav-0.1.9.ebuild b/media-libs/libdvdnav/libdvdnav-0.1.9.ebuild
index 60bf5ed238db..53cdd92eaab2 100644
--- a/media-libs/libdvdnav/libdvdnav-0.1.9.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-0.1.9.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.9.ebuild,v 1.9 2004/11/06 16:29:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.9.ebuild,v 1.10 2004/11/14 00:02:18 kito Exp $
+
+inherit eutils
 
 DESCRIPTION="Library for DVD navigation tools."
 HOMEPAGE="http://sourceforge.net/projects/dvd/"
@@ -8,14 +10,20 @@ SRC_URI="mirror://sourceforge/dvd/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha amd64"
+KEYWORDS="x86 ppc sparc alpha amd64 ~ppc-macos"
 IUSE=""
 
 DEPEND="media-libs/libdvdread"
 
+src_unpack() {
+	unpack ${A}
+	use ppc-macos && epatch ${FILESDIR}/${P}-darwin.diff
+}
+
 src_compile() {
+	use ppc-macos && CFLAGS="${CFLAGS} -D__DARWIN__"
 	econf || die "./configure failed"
-	emake || die
+	emake || die "make failed"
 }
 
 src_install () {
@@ -28,4 +36,4 @@ pkg_postinst() {
 	einfo "Please remove old versions of libdvdnav manually,"
 	einfo "having multiple versions installed can cause problems."
 	einfo
-}
+}
\ No newline at end of file