From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 15 Dec 2011 19:36:23 +0000 (+0000)
Subject: Fix powerpc patch for Darwin, replace malloc.h with stdlib.h for Darwin and BSD-ish... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=71b8c09879f52451cd678679a6eadbd018bc427b;p=gentoo.git

Fix powerpc patch for Darwin, replace malloc.h with stdlib.h for Darwin and BSD-ish systems, keyworded ~ppc-macos and ~x64-macos

Package-Manager: portage-2.2.01.19941-prefix/cvs/Darwin i386
---

diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index 2e95e4327245..30d75d1a0231 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mpeg-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.27 2011/01/19 21:22:55 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.28 2011/12/15 19:36:23 grobian Exp $
+
+  15 Dec 2011; Fabian Groffen <grobian@gentoo.org>
+  files/mpeg-tools-1.5b-powerpc.patch, mpeg-tools-1.5b-r4.ebuild:
+  Fix powerpc patch for Darwin, replace malloc.h with stdlib.h for Darwin and
+  BSD-ish systems, keyworded ~ppc-macos and ~x64-macos
 
   19 Jan 2011; Dror Levin <spatz@gentoo.org> mpeg-tools-1.5b-r3.ebuild,
   mpeg-tools-1.5b-r4.ebuild:
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
index 67afd661e47d..3eb2d5f15a60 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
@@ -5,7 +5,7 @@
   */
  
 -#if defined (mc68000) || defined (sparc)
-+#if defined (mc68000) || defined (sparc) || defined (__powerpc__)
++#if defined (mc68000) || defined (sparc) || defined (__powerpc__) || defined(__POWERPC__)
  #define	DECODE_SHORT(from, to)	*((short *)(to)) = *((short *)(from))
  #define	DECODE_LONG(from, to)	*((long *)(to)) = *((long *)(from))
  #define	DECODE_FLOAT(from, to)	*((float *)(to)) = *((float *)(from))
@@ -14,7 +14,7 @@
  
  /* Most architectures are symmetrical with respect to conversions. */
 -#if defined (mc68000) || defined (sparc) || defined (i386) || defined(__x86_64)
-+#if defined (mc68000) || defined (sparc) || defined (i386) || defined(__x86_64) || defined(__powerpc__)
++#if defined (mc68000) || defined (sparc) || defined (i386) || defined(__x86_64) || defined(__powerpc__) || defined(__POWERPC__)
  #define	ENCODE_SHORT(from, to)		DECODE_SHORT((from), (to))
  #define	ENCODE_LONG(from, to)		DECODE_LONG((from), (to))
  #define	ENCODE_FLOAT(from, to)		DECODE_FLOAT((from), (to))
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
index 912b561385ec..3379f3eb2755 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild,v 1.3 2011/01/19 21:22:55 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild,v 1.4 2011/12/15 19:36:23 grobian Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
@@ -34,6 +34,9 @@ src_unpack () {
 	epatch "${FILESDIR}"/${P}-system-jpeg-7.patch
 	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
 	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
+	# don't include malloc.h, but use stdlib.h instead
+	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:' \
+		convert/*.c convert/mtv/*.c *.c headers/*.h || die
 }
 
 src_compile() {