Disable asm code for x32 so it at least runs #420241 by Xavier Miller.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 62 insertions, 13 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index 7d7a16075298..830576199f01 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/x264
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.75 2012/09/01 10:21:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.76 2012/09/25 03:11:57 vapier Exp $
+
+  25 Sep 2012; Mike Frysinger <vapier@gentoo.org> +files/x264-x32.patch,
+  x264-0.0.20120707.ebuild:
+  Disable asm code for x32 so it at least runs #420241 by Xavier Miller.
 
   01 Sep 2012; Luca Barbato <lu_zero@gentoo.org> x264-0.0.20120707.ebuild:
   Update to support prefix, fix bug #351219, thanks to the people involved
@@ -336,4 +340,3 @@
   +x264-0.0.20080406.ebuild:
   Initial commit, pkgmove from x264-svn. Version bump 0.0.20080406 using
   upstream's nightly git snapshot tarball.
-
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 97ec8228d537..24467c8d215f 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -3,21 +3,32 @@ Hash: SHA256
 
 AUX x264-nostrip.patch 433 SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa SHA512 4103c43f54aebc814f4c5aecac0f115ff9f25fef352ce5945b37eb9d7a191fc21c1f608f81b6fb3d534a0a72b8bc4e49c6ed7e1e0d86fe39d18ad4d55241d6dd WHIRLPOOL ae648a2a61d2fcd3c35f5fe16b110249b7acbe2b2bac497b980c557bb3e95f8975296361f7482b5419ca88a1cf25258da60be53805feb6fa426b865dcd0ff4e3
 AUX x264-onlylib-20110425.patch 1120 SHA256 a0bdcfe1a86fdde9f56d7842f203d90eefcc4080664653ea42a8a4cc6231dbbe SHA512 a94d93b4a9f1243b41db4c82b8483767a5da4b69dcbd0ad9414ae4dbb7caa4dee6bb10b2b9f8325d9cda2341e78d9aa89d79f24844ea405cfddbe8d857f43457 WHIRLPOOL 4aa9ba6e18e1b9de1ad6a8e8c90635a399bfa0ae64be89c0b0383a844022fb474686774a5887903b0a639406c5e7165ec862dc03fa7710f1714d03bdeb8aa8df
-DIST x264-snapshot-20110426-2245.tar.bz2 495607 SHA256 2610ea30eb8857f7b8933137f8994f83243038fd8e336343e3422a5f25459fcc
-DIST x264-snapshot-20111220-2245.tar.bz2 532402 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a
-DIST x264-snapshot-20120327-2245.tar.bz2 551101 SHA256 065ffdbd7c9f9dcc7194bd6a4943b0d4b2e99b5dd68979fb3634644c725c2cbe
+AUX x264-x32.patch 1224 SHA256 1daaa89caef24923d703528f438918496360bfbf3e2b56334a4edb5e7659a000 SHA512 ad1ff51b086b7f11adff73ea997feee1d9dfec47bbb457cfd47e0681c11d6bde1b62b5b896d032707a7cb70c9f739cffe500c4c9c5be2e19fe4ccc3463b314db WHIRLPOOL 17d1a51fad912ab5b728335c629f73b00572f033fa52ba7154604664e92fbf91ae192c9e3ab61048e48e5517f829e1582aba2c95b905aca35c21f920490d13e6
+DIST x264-snapshot-20110426-2245.tar.bz2 495607 SHA256 2610ea30eb8857f7b8933137f8994f83243038fd8e336343e3422a5f25459fcc SHA512 556f83b7aeee72696e018de5d874052c8daa6a3fba650578e3d3e5d796272d70d2060d3b50bfcfce20988dc5939fcc4918b48690f878679eab12bf583c049bab WHIRLPOOL d2bcfab2adb7baf49d014681f2fffc55fcdbe7179b0e0c4af5d3b550246d4b884b01a91a9fe11d5785138c85e0e767121dfe9a27bc20ab1a07d8579ea9ff4514
+DIST x264-snapshot-20111220-2245.tar.bz2 532402 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a SHA512 d6801f326f9848672f889cb9fe43da865b2351143b8f31f17341c62b89ac01f430cdc56c12d8bf9cf9f041e8381494915a84508eaf41898ef87631385ee6f3c2 WHIRLPOOL 6aed824854947435819d157c2c371ca358ce05d518adcfea9ec6c47a74bdd97d9c527e989b9eb0a6d2f00060c45186d3a3ade22af21d450c9e2c25be9aa46b34
+DIST x264-snapshot-20120327-2245.tar.bz2 551101 SHA256 065ffdbd7c9f9dcc7194bd6a4943b0d4b2e99b5dd68979fb3634644c725c2cbe SHA512 915e2933596f4809a7cba25a6eb7f8a555daaeeb3a5a95a314cb947940d562e12d164f52ab6b94d7abd52e66ee986d3414c54685390a619357eef22ba0cd6a6a WHIRLPOOL e61b779d9eba7cad48899bc7eb88e9b5e140013d016792ddd4d2c149f7447d8bbf528615b751c095813519218bc7e3072ded407c386043dff8270d2c43a7ecb9
 DIST x264-snapshot-20120707-2245.tar.bz2 554243 SHA256 52fdc8b558fa7dcb6419fef73fb07e771cdc2544f7652cde42968d640139eedb SHA512 5e263dfe4b4defd66a8a855467692473723ada9c34ab8da7042f2d10327f944914d0c8103f22edd4dc7a1c4664db5bfbf42052652c9f57b392db32f4ab77081b WHIRLPOOL 1a9061e5940e22071390b579abf859fec49f8da51f31e241b65513566eda66178c46b4b4c20318bb981230a16511e84b89e6174bc7f9ccbd48915a909cef3b5b
 EBUILD x264-0.0.20110426.ebuild 1519 SHA256 20405a5c868e308166ae2126427fe948afcd60e82c7b7537ec28a35b98a4da61 SHA512 d38cc20294c33839898cbd0431ba19f9f54d6dbbc7a9c6c8d79b58722e9893ba266657e36e4f17ca2570fda7fadf75ba9581e0e9ee2d5f6281332f82f2303733 WHIRLPOOL 2d4a72b6801e1b311709c1579ca2f16bedf7861fc475990acaee6c25e75ea60dab4f6fccfd24f4678702def90daf4620b29ccbf2415ba4659667c93f8507aafa
 EBUILD x264-0.0.20111220.ebuild 2295 SHA256 9edfe8c4845f70f1cf485077aefead1f3e81cc154a2c92b9da675dde94ceb688 SHA512 cb97fd3f6d71ceec4970e7a61ad6a8510c04f76915d719d209acf133bcbf0264974b92c53c2af0de4febaa2daffdc428e3056e6057fa34c72996f971796b0195 WHIRLPOOL 3fab3ee6cce1ec903a60b709e33df983f5d7edc56a6f93387066caa53b5a594d80cd6d96a7fa3cc7d9026855c85846f17bd9ead4d3fb070d9f1f98ad99515200
 EBUILD x264-0.0.20120327.ebuild 2369 SHA256 652c96142181d3339fb820c0add88ebc21646daf74b24c3bb9b1eaa88737dfc1 SHA512 f90c9af66c75d4f445f1a7443180b8bc4885b0b6be5c64d2c13633ee2094a76dbc74dc33241fd03bba5dcba293df130d45aeb918d8d0b131e8912918583b06de WHIRLPOOL 029fd0b95c4b29e36b6e3cd01671dee797a999631b4a0c086606718295a41ee1c92f667a75d29b1556e2d62a69fd542c323461350f32ff3537ad5706f43fa71a
-EBUILD x264-0.0.20120707.ebuild 2860 SHA256 49886e6ca06a662c42400b5379c1d99ff8a79d4f3197fcb7eda1a41147185a76 SHA512 81b6d2676c0a1bb8c95c7ad1e3cf988958649e454f0b2a7644a4169cb9d04b7a5d2cdf1d134119a29230b72726c88428cbdce9cf34bfa4d2708be3a008ac565f WHIRLPOOL c4ff877d1dff7e16cc735f57c761426e71d3a9c28441ecd47f3af33a20d35262085fbe6f100d61dc5f735a03ad1f3c11e9bc86b3e8d6922b7f8e962e28b812b7
+EBUILD x264-0.0.20120707.ebuild 2930 SHA256 454c3413bbb572f4626750852d7f9baa8ad3f24c9e21fe99ac599443172d4f18 SHA512 9d3e0da723e26ac318fd56e4b45e23f29c8aa9df3da369db008b862a807a5055c8ae0555e93630bbb3634aa5db8d3deae29b138f6df3a27b8a0d8cb9a9310d99 WHIRLPOOL 272ae84bc7627946102abf0464eba471278338f20c1cf42b4214313343adc22933268f32070255431707231e7e6ae3055446e068f6ced7708b16c9696314f701
 EBUILD x264-9999.ebuild 1807 SHA256 a3643ed5a8f9245e00c4fd5b300a7bc5c1498975529c4b86492f8e84f507887d SHA512 acf17efe8f8e35c157664c8dff65f17e58304dd5e1453f424eb5639a17cdfbcbebda433659f590c68a834bf388e24b152e5a680d51d92d15915ac00c7d7f6ef5 WHIRLPOOL 761f27e5a8cf12e610ef83a50bebea9142e760e160e68ff130fdc862f76ea71a43ebcd35f0ad4cd48d6d56180a58cee0d10ff49dc5ae56410ea5d3246bcc7fd0
-MISC ChangeLog 11305 SHA256 6124404d8c4ce66d75e4abcaf88618d1fa3976500d4773fdd86fd8d7fce51067 SHA512 89fb714e4a5a9b2160cc7c1bae59f668d88c8b8142aa18df118d9b0d2c0b7b0ab2dbba29fdfb847f5da904ff7182ab5069efb9fc6ba1a1fb04a257a6ee1f673f WHIRLPOOL 302608d09d39051e31b7f44cdcdfa13846d65e22fe712c4bdad3031bf7cb436cd721901872c81849d98130a39bb45466e63bd6d72c16db59fbf90df653f891e5
+MISC ChangeLog 11478 SHA256 36cb2bfb163385a83e44ee549fa705d8680914fdeafa875a05779227adf7cddf SHA512 bf4bb80ff3b6cd738ff1f9e468738a2e2eed7a334f817377507ae4ff25781a843404d95d32b7d3029138e6058f4a01bed8949d4b7618f637e1cd8d063bc0c058 WHIRLPOOL b1197775341d6f12ef43db2cc2c333d43b54052f5cd191688db3887798a7be76d799688d62fb263b4d0adaa6ef16be8155c9f987f62abc03cc1108c4762ed1e0
 MISC metadata.xml 554 SHA256 1e4bcd3b571c5401aa3dc2f1e07801153596a4437d6309d1c7b6366e6cc552e5 SHA512 9a23212939b2e396b94d9716b97c141386147c378a85cfa1e7b7fa3c828ebe0bf6cb4cc16a35e98ed5290f0c4a8480340dcec67aaf39af6101de1acebc114430 WHIRLPOOL 2a1cd7188f168635eb9c6cb59f4fb13956312068566464838f7c1aefd9aba59baed4f1d62187efaa8e4a8390e21c74ebe3490328f23e5815bf0da30ec98b7357
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBB4asACgkQcXOrnRGRc45ZNQEAyhr1/7c4862nNFHp7M40ML01
-36sGIqSsngiPAtyac6EA/R2jbwcGuBq4h4qfLbuV5VvL5LpnJ1OMaRz+dlJfizNl
-=Z2uu
+iQIcBAEBCAAGBQJQYSEJAAoJELEHsLL7fEFW2pUP/3PbVH5Vz4t3uDSOCALlDMSv
+V5g1NJO2mUwESGjYvBlBtz7oMdPzjzgtaRP6SBFP+LRgiWyr0zATu8jnBqt28Bt4
+eKLxPrFjYtc+SudbLWfU9CpJn2vP1KsL30+c5KvGcfsGFi8NcVHAaV9nsEbIuE6j
+4AkYY7GuMcQgNS9nvsQqobyMww4DMvaZ9oeqpK7tun2WEuW60NVP4BVDyen8B0iD
+aAWYXkPFpQ2IiaT+2ED2ufGrn8WShmFf59Jbqxm+9uNFRfMzC4+o4fBNnykhtJ3S
+eF/ZpaLibpbqmORAbOL2q5xNQhfYqxrcoU8qSZ0Onh0hfZ3m33cfOeCqi9CqeYk2
+VOPNXpipowVI9PuGe/Ia0GfgOaArp0BuUrnXQzprgV1GFRwh472h5qeLG5kUErwS
+fZ8ypjnDITnzanR0Sq4MPaZb9kMebcc25eKg1ZAsVEtHbWxGvHFaKxbqJZiqTgjG
+cyvlsc6W0LpgfMfWdUizbD32/q7CCIC2Qb7hAvH9Js/sZM991ebw652O0N84+6i/
+mw6ZusZv6OVyBZcTczwB6r9RwutEj+Smuj3W057HcNnzd48puuH/yJAWHVyvCsec
+ReRTakP27ErQ9YaF4gZooO2Lzu0rMLX5DK5E1gNXR5Wowhu/xGkkBE5hels2k7KJ
+rZhNRh2Ar+R8aALwCueZ
+=BaiS
 -----END PGP SIGNATURE-----
diff --git a/media-libs/x264/files/x264-x32.patch b/media-libs/x264/files/x264-x32.patch
new file mode 100644
index 000000000000..7af4405a8472
--- /dev/null
+++ b/media-libs/x264/files/x264-x32.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/420241
+
+initial x32 support -- no asm code, just pure C
+
+--- a/configure
++++ b/configure
+@@ -567,7 +567,13 @@ case $host_cpu in
+     x86_64)
+         ARCH="X86_64"
+         AS="yasm"
+-        [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
++        if [ $compiler = GNU ]; then
++            if cpp_check "" "" "__ILP32__" ; then
++                CFLAGS="-mx32 $CFLAGS" && LDFLAGS="-mx32 $LDFLAGS"
++            else
++                CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
++            fi
++        fi
+         if [ "$SYS" = MACOSX ]; then
+             ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX"
+             if cc_check '' "-arch x86_64"; then
+@@ -580,7 +586,11 @@ case $host_cpu in
+             [ $compiler = GNU ] && cc_check "" "-S" && grep -q "_main:" conftest && ASFLAGS="$ASFLAGS -DPREFIX"
+             [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS"
+         else
+-            ASFLAGS="$ASFLAGS -f elf -m amd64"
++            if cpp_check "" "" "__ILP32__" ; then
++                AS="${cross_prefix}as"
++            else
++                ASFLAGS="$ASFLAGS -f elf -m amd64"
++            fi
+         fi
+         ;;
+     powerpc|powerpc64)
diff --git a/media-libs/x264/x264-0.0.20120707.ebuild b/media-libs/x264/x264-0.0.20120707.ebuild
index 56a74c81e385..7b54b01778c0 100644
--- a/media-libs/x264/x264-0.0.20120707.ebuild
+++ b/media-libs/x264/x264-0.0.20120707.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild,v 1.2 2012/09/01 10:21:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild,v 1.3 2012/09/25 03:11:57 vapier Exp $
 
 EAPI=4
 
@@ -57,6 +57,7 @@ src_prepare() {
 	fi
 	# for OSX
 	sed -i -e "s|-arch x86_64||g" configure || die
+	epatch "${FILESDIR}"/x264-x32.patch #420241
 }
 
 src_configure() {
@@ -72,7 +73,7 @@ src_configure() {
 	# let upstream pick the optimization level by default
 	use custom-cflags || filter-flags -O?
 
-	if use x86 && use pic; then
+	if use x86 && use pic || [[ ${ABI} == "x32" ]] ; then
 		myconf+=" --disable-asm"
 	fi