From: Joseph Jezak Date: Thu, 11 Mar 2010 13:55:38 +0000 (+0000) Subject: Fixed compilation on ppc/ppc64 and added keywords. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=420c0f6b2bbaccc029b5cbaceff034d63079ccba;p=gentoo.git Fixed compilation on ppc/ppc64 and added keywords. Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- 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 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/Manifest b/media-video/mpeg-tools/Manifest index ceff49a735d2..416ef488908b 100644 --- a/media-video/mpeg-tools/Manifest +++ b/media-video/mpeg-tools/Manifest @@ -4,6 +4,7 @@ Hash: SHA1 AUX mpeg-tools-1.5b-64bit_fixes.patch 6986 RMD160 7bfb2fdaf89846043d95074a5226c77f0f9ef98b SHA1 18bb11dac577a0a8cb4352ea12a0f2571de37065 SHA256 76e8add6d8241898abf20c27ff93655df05ee90866632a0eb852ff6665078d4e AUX mpeg-tools-1.5b-as-needed.patch 1526 RMD160 1f0e0de79dde5c44d555d083fe7dd4104fc640a0 SHA1 fcf635e9c3a47ca14767d0fd7bcdda778d53940b SHA256 204f1ca6fc2d30c1bd4c7ed69d2d0fc3792e819bcc31837c945ade680b333961 AUX mpeg-tools-1.5b-build.patch 1414 RMD160 987151e4c0c30097c7bc993552dd7459686fba5b SHA1 e5eff3be21eca4da940a5d964e1704b0948fbea9 SHA256 0cbcc0e0de74f02b069059588334ba0766bf74769fdd63d37c1702d2e47eb1e5 +AUX mpeg-tools-1.5b-powerpc.patch 993 RMD160 0bd82bcf5e7fd0d7d3ae420bb223ecf637045ca5 SHA1 b548d674e04b6e057b17caf8aa08eeb30a7bebd5 SHA256 d079f534f26d8643b9888bb43bdc87ab046b3bbe5bb5d10c319af048ccca2440 AUX mpeg-tools-1.5b-system-jpeg-7.patch 907 RMD160 5f4bee5cb8a663579d29a1ad944a2fabf7f91579 SHA1 06395853b6130d7e27e74224790428ae1f22a682 SHA256 de0815e2f9be14761b25cef0a6602d79eaed47411ce1148c4e64826c3cfd46dc AUX mpeg-tools-1.5b-system-jpeg.patch 893 RMD160 e32d6e6f0d355085f1781eef5b0569940fbd274e SHA1 25067d834bdc72e4709d9b01bb93ad2a88f48e2d SHA256 f0e9f99bf42c12b91cebb0e17c1a8567629d522b269e11c2adc6fffaed43afa8 AUX mpeg-tools-1.5b-tempfile-convert.patch 4097 RMD160 3e37f83093c2d09051b4fc131cc0b8b91e7351cf SHA1 efd786d90f3faf655f127b10540a2ad702e5991b SHA256 a8f67272493e7bd6536e020b75bcf2174a7ae1f453dc0bd3b09f134ed3f1a649 @@ -11,13 +12,13 @@ AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538 RMD160 3bc3e29da8cdd4d05de50 AUX mpeg-tools-1.5b-tempfile-tests.patch 5256 RMD160 e292bfec28bb13bf35ec40e4f86702ff086dbc72 SHA1 dc3c2458a077bac43bd6fc6cf7d1d07f3c892163 SHA256 ba156158d92dc6f3803b40ad3b0e8e248b0e74c5b59415a91f55c1e775a6e5a4 DIST mpeg_encode-1.5b-src.tar.gz 2028724 RMD160 24c0a1090076630c292936639c5fb275778f6470 SHA1 853cd175f73b8064ce28deb256e4b81159a684ed SHA256 dd8db42f88393bb0ff0d738defa271729a8aa9b8de24ed13bc6bd27014f2daf5 EBUILD mpeg-tools-1.5b-r3.ebuild 1808 RMD160 b8336d836774e58db0e83ba71c03b87e357a23fa SHA1 39241ee4b32751d592193ee1d066b606ce5d9872 SHA256 e350f7ffaf5ab874c5f8bbeb5a3bd37f83e322728d6a015111b04781c69014e4 -EBUILD mpeg-tools-1.5b-r4.ebuild 1884 RMD160 971586e1daa76df5831aee2ef276c0971aaeb78d SHA1 86f2cd27b5c840925803140b580e58c9dd102a2c SHA256 f441892080713c409d6ddefe30d2235267f11611aaa92023f3c3a407a5628684 -MISC ChangeLog 3848 RMD160 7217f03e556d5dc2415d920c921601ce3a08dba7 SHA1 a54fdf6c79ca6dbec4c9832470dc2981b2dc309c SHA256 b36ceedad55a1afa21e334c989fee7c66893b123243ffd07d1a7192e819e628e +EBUILD mpeg-tools-1.5b-r4.ebuild 1939 RMD160 0c9afe6f40694b99e6be36ed3f3abcb83010e02b SHA1 a72b2c29003824adbdaf36bfe1aa923e55067eb1 SHA256 6796be0bd6556a585216b91cfcbabace88682aaae520ae1e34145f2d0cdb8dc2 +MISC ChangeLog 4019 RMD160 63681924c12d894b37868a718202279f3dcf018b SHA1 7be5b0c5f9f1779877b7aa026c54a504d5a3e8e4 SHA256 1a74791e9ef4ba10268be9800efcbc4d73d84d1a5fa73101d0691e3e455f275c MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAktrW6sACgkQgAnW8HDreRao9ACfT1fjwYVdvBw6kzBEfZYQgcSE -yvsAn3X4NODz9DoDZU9GFLjez0QfTJUD -=e5aO +iEYEARECAAYFAkuY9kIACgkQcsIHjyDViGRNFQCfTBLmB+oaZB1oomcJDXta7Hid +nGgAoM9drugBQbQIhX5COLhRhrZXgEcB +=Hu7Q -----END PGP SIGNATURE----- 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