Stable ppc-macos

Package-Manager: portage-2.0.51-r15

4 files changed, 49 insertions, 6 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index 2596d223c490..f3369d5ad52f 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/xv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.61 2005/05/28 03:01:30 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.62 2005/05/28 03:54:48 j4rg0n Exp $
+
+  27 May 2005; Lina Pezzella <j4rg0n@gentoo.org>
+  +files/xv-3.10a-r11-xv-osx.patch, xv-3.10a-r11.ebuild:
+  Fix for Bug 88742.
 
   27 May 2005; Lina Pezzella <j4rg0n@gentoo.org> xv-3.10a-r10.ebuild:
   Fixed Bug with -ffast-math flag on OSX
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index f5cd4f7aad0f..5eb29b731276 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,9 +1,9 @@
-MD5 3bf3c7aca3648b56729a15d85cffbc0d ChangeLog 9543
+MD5 b28874f19f7cf08671bb2f4f30622fa3 ChangeLog 9671
 MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
 MD5 2954b497004732142fd6d69104cf2499 xv-3.10a-r10.ebuild 2689
 MD5 fbe8dc0be0ab018633f1e153b56c1662 xv-3.10a-r8.ebuild 2347
 MD5 d3caaf1691b52006d2295f1443fe691b xv-3.10a-r9.ebuild 2529
-MD5 fc9929bce8b8355907b77bc26cca18b0 xv-3.10a-r11.ebuild 2117
+MD5 34806a0f861f741297baa45ceefa4fff xv-3.10a-r11.ebuild 2311
 MD5 4e275eac68930de71e273c87111a5289 xv-3.10a-r12.ebuild 2125
 MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r10 127
 MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r8 127
@@ -22,3 +22,4 @@ MD5 6f7117c9be7e979494866250a24a3338 files/digest-xv-3.10a-r11 145
 MD5 bf64513c42257ec1f60b78efabf94e6e files/digest-xv-3.10a-r12 145
 MD5 270b4d6ba55f1253d0d1edfde1640844 files/xv-3.10a-bmpfix.patch.bz2 1249
 MD5 4e152e258221470988e2fc31bd8e03d5 files/xv-3.10a-yaos.dif.bz2 4212
+MD5 5abcdae2ed559d5909856a83ab102180 files/xv-3.10a-r11-xv-osx.patch 1088
diff --git a/media-gfx/xv/files/xv-3.10a-r11-xv-osx.patch b/media-gfx/xv/files/xv-3.10a-r11-xv-osx.patch
new file mode 100644
index 000000000000..e0c3f92ea51b
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-r11-xv-osx.patch
@@ -0,0 +1,29 @@
+--- xv.h.orig	2005-05-27 23:35:19.000000000 -0400
++++ xv.h	2005-05-27 23:37:18.000000000 -0400
+@@ -137,7 +137,7 @@
+ #ifndef VMS
+ #  include <errno.h>
+    extern int   errno;             /* SHOULD be in errno.h, but often isn't */
+-#  if !defined(__NetBSD__) && !(defined(__linux__) && defined(__USE_BSD))
++#  if !defined(__NetBSD__) && !(defined(__linux__) && defined(__USE_BSD)) && !defined(__APPLE__)
+      extern char *sys_errlist[];   /* this too... */
+ #  endif
+ #endif
+@@ -147,7 +147,7 @@
+ #ifdef VMS
+ #  define ERRSTR(x) strerror(x, vaxc$errno)
+ #else
+-#  if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */
++#  if defined(__BEOS__) || defined(__linux__) || defined(__APPLE__) /* or all modern/glibc systems? */
+ #    define ERRSTR(x) strerror(x)
+ #  else
+ #    define ERRSTR(x) sys_errlist[x]
+@@ -191,6 +191,8 @@
+ 
+ #  if defined(hp300) || defined(hp800) || defined(NeXT)
+ #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
++#  elif defined(__APPLE__)
++#   include <malloc/malloc.h> 
+ #  else
+ #   include <malloc.h>
+ #  endif
diff --git a/media-gfx/xv/xv-3.10a-r11.ebuild b/media-gfx/xv/xv-3.10a-r11.ebuild
index fae5baeef1e0..5ac1a7d5afd7 100644
--- a/media-gfx/xv/xv-3.10a-r11.ebuild
+++ b/media-gfx/xv/xv-3.10a-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r11.ebuild,v 1.10 2005/04/19 00:15:11 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r11.ebuild,v 1.11 2005/05/28 03:54:48 j4rg0n Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.bz2 ftp:/
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="amd64 x86 sparc ppc ppc64 alpha ia64"
+KEYWORDS="amd64 x86 sparc ppc ppc64 alpha ia64 ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="virtual/x11
@@ -31,6 +31,11 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-bmpfix.patch.bz2 || die
 	epatch ${FILESDIR}/${P}-yaos.dif.bz2 || die
 
+	if use ppc-macos; then
+		epatch ${FILESDIR}/${PF}-xv-osx.patch
+		epatch ${FILESDIR}/${P}-vdcomp-osx.patch
+	fi
+
 	sed -i	-e 's/\(^JPEG.*\)/#\1/g' \
 			-e 's/\(^PNG.*\)/#\1/g' \
 			-e 's/\(^TIFF.*\)/#\1/g' \
@@ -42,7 +47,11 @@ src_unpack() {
 }
 
 src_compile() {
-	append-flags -DUSE_GETCWD -DLINUX -DUSLEEP
+	if use ppc-macos; then
+		append-flags -DUSE_GETCWD -DUSLEEP
+	else
+		append-flags -DUSE_GETCWD -DLINUX -DUSLEEP
+	fi
 
 	einfo "Enabling Optional Features..."
 	if use jpeg; then