From 0d68a511a0d784d261d2e87542ce640a095a8746 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Sun, 23 Oct 2011 08:18:24 +0000 Subject: [PATCH] (non-maintainer commit) Backport patch that allows build system to properly detect arch on ppc64 with 32ul. Fixes bug 341235 and 387207 Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64 --- media-video/ffmpeg/ChangeLog | 7 ++- media-video/ffmpeg/Manifest | 23 +++++++--- media-video/ffmpeg/ffmpeg-0.7.6.ebuild | 3 +- .../files/ffmpeg-0.7.6-fix_ppc64_32ul.patch | 43 +++++++++++++++++++ 4 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 media-video/ffmpeg/files/ffmpeg-0.7.6-fix_ppc64_32ul.patch diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 6c1364d0e22c..55c0715d8d87 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.474 2011/10/21 12:52:01 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.475 2011/10/23 08:18:24 xarthisius Exp $ + + 23 Oct 2011; Kacper Kowalik + +files/ffmpeg-0.7.6-fix_ppc64_32ul.patch, ffmpeg-0.7.6.ebuild: + (non-maintainer commit) Backport patch that allows build system to properly + detect arch on ppc64 with 32ul. Fixes bug 341235 and 387207 21 Oct 2011; Alexis Ballier ffmpeg-9999.ebuild: bump x264 dep diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 1ab98416dfdd..cb5cab3b07bd 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,17 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX ffmpeg-0.7.6-fix_ppc64_32ul.patch 1094 RMD160 b765f1f8420701e6d9447391dd498f6807b2e2e7 SHA1 f4fd276e9a88d815657282d67b716dc793f30988 SHA256 b6e60ba7f9d179b8b2ba03cf74694d1e92e6fc6d4626cda258ab1af50e0afea4 DIST ffmpeg-0.7.6.tar.bz2 4529035 RMD160 18641ae249d8b6f14f99013d1fccd85b0baddfa5 SHA1 0ea9ea769e195bf79d1b787acf253582481413b5 SHA256 f23265dc55fa8424872bc6cd026e340a367bc7eb4d5a6a32ca4aacb581b13cc2 DIST ffmpeg-0.8.5.tar.bz2 4523772 RMD160 16659c26a5158aeee454ce555562ca059af6fa04 SHA1 a69d909958b23f8b2509ddda6cdeba2601edf5ff SHA256 f63df1ee08c2c64a4b3f106a88dd055b9f19e3457f1d7c23d8b8169e0a0ef115 -EBUILD ffmpeg-0.7.6.ebuild 8288 RMD160 cb215eac0869975ed2e05b8977978119cdf89ae8 SHA1 276c513d16dba90053e506a903c71e50ab0e2977 SHA256 60ce2b9d78935d113b58e2bca757943d7b26c0f8ebbcaaaf7aa516203bb160b4 +EBUILD ffmpeg-0.7.6.ebuild 8347 RMD160 322ce30d8d758c0b0c1e0a50777f7c081218e178 SHA1 ed7b2d2b2b8d66be47b771f5a25ae8040429e153 SHA256 fabf0d4fbe3d4ce88c75afa12fd5946ff70a480590a1c9d5ea33e96e2c42375c EBUILD ffmpeg-0.8.5.ebuild 7957 RMD160 6e36e2a9d2fa093900ac40959e845820d76ed0cb SHA1 f3e9ded0636709371afbb168370e988b1456b0c9 SHA256 66abdf62f56e1289cc44f37146bc7e6e7d17b9c3abc81b0efc39c8895db96b0c EBUILD ffmpeg-9999.ebuild 8205 RMD160 bc51e201d4ce70f6cc64c7e1275cb12e88d58bfd SHA1 ab031fd6ece05b85f15e9c1c2c25f46dbe4dccb8 SHA256 984da202bda2783f2b0cb475e0d6668351e886b42ab34afccec126cfbfcb7c6d -MISC ChangeLog 68654 RMD160 73f52109db2bc63ed9d68bc1312232d678b97c66 SHA1 59331411d84a77de1094f2d4dc7abd9ea032a183 SHA256 78342a3cf5b8fe279e056c1b0ecea648ff8f473aefe86b89c4f162c8d6d9dc84 +MISC ChangeLog 68916 RMD160 ab2868f204adbb75df8df4b3d48ab31774b7baa2 SHA1 a825062581b68b119c5bb77bb9d6944298acebf2 SHA256 caf08059baf4e6969ed12ea1c9cb7a8e9c3d8608af38360c09c1db5cd2d93457 MISC metadata.xml 2730 RMD160 30f7472831c62be2fd787b0c914681db7853361e SHA1 3a5abcd6fc24ce3e19497aa4b3d5cbf740ef7a4d SHA256 1e86d46c8891df413c68f98fe41e61691820fb66781717394a03327b907eeddc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6hlS4ACgkQvFcC4BYPU0qwzACdF2aWYhB78Xrwk0TH6in83iuX -MQMAmwdRgOroOnPXxWlR9h8piDmyZMRB -=B7D3 +iQIcBAEBCAAGBQJOo83cAAoJEF0huFKJUZL5xCQP/AkF2XScw890+DtxA+HFVZph +L4QLPI0tL147uAgXC2ks70WIhM9Um0FOXrQ70/pDrGvNvHYJ9WaUEFlQEa4w491Y +3eFPZlPnULoIt3jHB41yMJRMHFhufM5TaL69IGeL25CnKzExwBw2n0YAx7umpIVT +yRiEvtGiGn5sgG5Rkz1HB2EZqdZQsEiQB3pna562hdkKY5jrACqZ+ewhSWrIKV5t +6erO0ytzXuMv7x800f5ADXigwdR/3UgnIO9jwd9FIuwEDe7yO/TipA0MGWvv21kB +Fbnh59ofWAQ1yF2yb77ArXiSYDn4Y6RnCfNRz65uDU1H+kfcoq0ySck5OGMtUOwC +z3rhzsAu0RVcd5HS8TBf232O35G3+paFzunlZT5M7eENU4iaEKS8bMl/aykAsXIW +Qg7Jos4MstCxELiNEIKhuyaeHYt14t/QzmtZXTsyJleoEy423RGD1xlRak9n2IMM +hNjLvT2rGFJd/KA4T0GK2mfMAHHDJqDfQOxR5/EEvCHc7DRHgoKgVd72R6d8HR/5 +ovj61iJG+02Fw6Q1Ql1EOcND6uNXY+ooKAGZTSf6krr3Q61Ah7QiW4EivEoiA3/V +fKtI/TK0OYbGvyUa1SyPJi6lyaKMLC+KV85BdKoCQPpLdGT9WShunjv0gqqDF8TY +PcXEo9NaApjHRn/0i8dY +=baMo -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-0.7.6.ebuild b/media-video/ffmpeg/ffmpeg-0.7.6.ebuild index 8b80c2c84927..22459942d9ed 100644 --- a/media-video/ffmpeg/ffmpeg-0.7.6.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.7.6.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/ffmpeg/ffmpeg-0.7.6.ebuild,v 1.7 2011/10/12 15:11:45 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.6.ebuild,v 1.8 2011/10/23 08:18:24 xarthisius Exp $ EAPI="2" @@ -96,6 +96,7 @@ src_prepare() { if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot export revision=git-N-${FFMPEG_REVISION} fi + epatch "${FILESDIR}"/${P}-fix_ppc64_32ul.patch #387207 } src_configure() { diff --git a/media-video/ffmpeg/files/ffmpeg-0.7.6-fix_ppc64_32ul.patch b/media-video/ffmpeg/files/ffmpeg-0.7.6-fix_ppc64_32ul.patch new file mode 100644 index 000000000000..9754d5fd5a19 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-0.7.6-fix_ppc64_32ul.patch @@ -0,0 +1,43 @@ +Autodetect PowerPC vs. PowerPC64. + +This is the same code as for x86_64. +This is necessary because uname returns PPC64 if the hardware +is 64 bit, however the userland can still be fully 32 bit. +In that case FFmpeg fails to compile because some macros in the +asm code are set up incorrectly. +For details see https://bugs.gentoo.org/show_bug.cgi?id=341235 +https://bugs.gentoo.org/show_bug.cgi?id=387207 + +author: Reimar Döffinger + +diff --git a/configure b/configure +index 6aa194c..0752d73 100755 +--- a/configure ++++ b/configure +@@ -2188,13 +2188,9 @@ case "$arch" in + arch="parisc" + subarch="parisc64" + ;; +- "Power Macintosh"|ppc|powerpc) ++ "Power Macintosh"|ppc|powerpc|ppc64|powerpc64) + arch="ppc" + ;; +- ppc64|powerpc64) +- arch="ppc" +- subarch="ppc64" +- ;; + s390|s390x) + arch="s390" + ;; +@@ -2392,6 +2388,11 @@ EOF + spic=$shared + fi + ;; ++ ppc) ++ check_cc <