Unstable ppc-macos. Thanks trixtrax@comcast.net for the patches!

Package-Manager: portage-2.0.51-r14

6 files changed, 71 insertions, 8 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index 62f08c22b024..ceddc18fc2c1 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,9 @@
 # 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.41 2005/01/04 14:10:17 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.42 2005/01/20 16:50:13 j4rg0n Exp $
+
+  20 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> xv-3.10a-r9.ebuild:
+  Unstable ppc-macos. Thanks to Trixtrax@comcast.net for the patchset.
 
 *xv-3.10a-r9 (04 Jan 2005)
 
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 5862b3e5330f..c7eaa7eba37f 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,12 +1,15 @@
-MD5 a89b6fc6eab4e5dac42ef667da81aff3 xv-3.10a-r9.ebuild 2362
-MD5 579d25372aebbac36ed16bf4c83a3bff xv-3.10a-r8.ebuild 2181
-MD5 39e5120af8bee5272c60f405e4666276 ChangeLog 7138
+MD5 b7e293b269c8a4fd837230b611e47ca3 ChangeLog 7279
 MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
+MD5 579d25372aebbac36ed16bf4c83a3bff xv-3.10a-r8.ebuild 2181
+MD5 d3caaf1691b52006d2295f1443fe691b xv-3.10a-r9.ebuild 2529
 MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r8 127
-MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r9 127
 MD5 4b034e22d5bb0502e383afcfeb8ea4b0 files/xv-3.10a-ppc.patch 359
 MD5 123bdb40134767bb438eeaccb50f1646 files/xv-3.10a-security.diff 4079
 MD5 cda66dd1f3a032802881a6ae4430e0d6 files/xv-use-getcwd.patch 222
-MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418
+MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r9 127
 MD5 a5b5fd8ad9fbef9a63f360d83f55e546 files/xv-optimize-jpeg.diff 553
 MD5 f555e07727c8b51042dae772ae474f42 files/xv-postscript-double-free.diff 864
+MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418
+MD5 24acb62ee86813a3fde2819683b2ffc9 files/xv-3.10a-makefile-osx.patch 538
+MD5 32841798fbb3c9923d5d8a26994e1b0a files/xv-3.10a-vdcomp-osx.patch 341
+MD5 b6755903a15ab242469da379020a0a66 files/xv-3.10a-xv-osx.patch 615
diff --git a/media-gfx/xv/files/xv-3.10a-makefile-osx.patch b/media-gfx/xv/files/xv-3.10a-makefile-osx.patch
new file mode 100644
index 000000000000..8dc6f6335720
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-makefile-osx.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig	Mon Aug 23 00:49:23 2004
++++ Makefile	Mon Aug 23 00:36:19 2004
+@@ -123,7 +123,7 @@
+ 
+ 
+ ### for LINUX, uncomment the following line
+-MCHN = -DLINUX
++#MCHN = -DLINUX
+ 
+ 
+ # For SCO 1.1 (UNIX 3.2v2) machines, uncomment the following:
+@@ -184,7 +184,7 @@
+ # if, during compilation, your system complains about the types 
+ # 'u_long', 'u_short', 'u_int', etc. as being undefined, uncomment the
+ # following line:
+-BSDTYPES = -DBSDTYPES
++#BSDTYPES = -DBSDTYPES
+ 
+ 
+ # if your machine doesn't have 'vprintf()' or 'vsprintf()'
diff --git a/media-gfx/xv/files/xv-3.10a-vdcomp-osx.patch b/media-gfx/xv/files/xv-3.10a-vdcomp-osx.patch
new file mode 100644
index 000000000000..d05c67967a85
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-vdcomp-osx.patch
@@ -0,0 +1,11 @@
+--- vdcomp.c.orig	Mon Aug 23 00:47:40 2004
++++ vdcomp.c	Mon Aug 23 00:43:34 2004
+@@ -112,6 +112,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/files/xv-3.10a-xv-osx.patch b/media-gfx/xv/files/xv-3.10a-xv-osx.patch
new file mode 100644
index 000000000000..dff79f8719a0
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-xv-osx.patch
@@ -0,0 +1,20 @@
+--- xv.h.orig	Mon Aug 23 00:36:59 2004
++++ xv.h	Mon Aug 23 00:42:13 2004
+@@ -115,7 +115,7 @@
+ #ifndef VMS
+ #  include <errno.h>
+    extern int   errno;             /* SHOULD be in errno.h, but often isn't */
+-#  ifndef __NetBSD__
++#  if defined (__NetBSD__) && !defined(__APPLE__)
+      extern char *sys_errlist[];     /* this too... */
+ #  endif
+ #endif
+@@ -163,6 +163,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-r9.ebuild b/media-gfx/xv/xv-3.10a-r9.ebuild
index 28b918f25792..9edbd7bb67dc 100644
--- a/media-gfx/xv/xv-3.10a-r9.ebuild
+++ b/media-gfx/xv/xv-3.10a-r9.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-r9.ebuild,v 1.1 2005/01/04 14:10:17 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r9.ebuild,v 1.2 2005/01/20 16:50:13 j4rg0n Exp $
 
 inherit ccc flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64 ~ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="virtual/x11
@@ -37,6 +37,12 @@ src_unpack() {
 	epatch ${FILESDIR}/xv-smoothing-algorithm.diff || die
 	epatch ${FILESDIR}/xv-optimize-jpeg.diff || die
 	epatch ${FILESDIR}/xv-postscript-double-free.diff || die
+
+	if use ppc-macos; then
+		epatch ${FILESDIR}/${P}-xv-osx.patch
+		epatch ${FILESDIR}/${P}-vdcomp-osx.patch
+		epatch ${FILESDIR}/${P}-makefile-osx.patch
+	fi
 }
 
 src_compile() {