summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Jezak <josejx@gentoo.org>2010-03-11 13:55:38 +0000
committerJoseph Jezak <josejx@gentoo.org>2010-03-11 13:55:38 +0000
commit698951714508968926b7f8311f721a618337332e (patch)
tree85b7c42c14a7abd57e33fa7ad53e820e6db08a79
parentpackage.masked x11-plugins/wmmsens (diff)
downloadgentoo-2-698951714508968926b7f8311f721a618337332e.tar.gz
gentoo-2-698951714508968926b7f8311f721a618337332e.tar.bz2
gentoo-2-698951714508968926b7f8311f721a618337332e.zip
Fixed compilation on ppc/ppc64 and added keywords.
(Portage version: 2.1.7.17/cvs/Linux x86_64)
-rw-r--r--media-video/mpeg-tools/ChangeLog6
-rw-r--r--media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch20
-rw-r--r--media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild5
3 files changed, 28 insertions, 3 deletions
diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index 323a5a43eb69..7d74c103e5db 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mpeg-tools
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.24 2010/02/04 23:43:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.25 2010/03/11 13:55:37 josejx Exp $
+
+ 11 Mar 2010; Joseph Jezak <josejx@gentoo.org> mpeg-tools-1.5b-r4.ebuild,
+ +files/mpeg-tools-1.5b-powerpc.patch:
+ Fixed compilation on ppc/ppc64 and added keywords.
*mpeg-tools-1.5b-r4 (04 Feb 2010)
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
new file mode 100644
index 000000000000..67afd661e47d
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
@@ -0,0 +1,20 @@
+--- convert/mtv/archdep.h 2010-03-11 04:35:04.596642403 +0000
++++ convert/mtv/archdep.h 2010-03-11 04:34:38.949974604 +0000
+@@ -17,7 +17,7 @@
+ * Note that these macros *do not* work for in-place transformations.
+ */
+
+-#if defined (mc68000) || defined (sparc)
++#if defined (mc68000) || defined (sparc) || 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))
+@@ -75,7 +75,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__)
+ #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 aaaa75dfe7c4..eeeb5b9eebc1 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-2010 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.1 2010/02/04 23:43:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild,v 1.2 2010/03/11 13:55:37 josejx 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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libX11
@@ -27,6 +27,7 @@ src_unpack () {
epatch "${FILESDIR}"/${P}-64bit_fixes.patch
epatch "${FILESDIR}"/${P}-tempfile-convert.patch
epatch "${FILESDIR}"/${P}-as-needed.patch
+ epatch "${FILESDIR}"/${P}-powerpc.patch
cd "${S}"
rm -r jpeg
epatch "${FILESDIR}"/${P}-system-jpeg.patch