diff options
| -rw-r--r-- | media-libs/x264/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/x264/Manifest | 10 | ||||
| -rw-r--r-- | media-libs/x264/x264-9999.ebuild | 18 |
3 files changed, 11 insertions, 22 deletions
diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog index f6c67f56b31f..e13547d5e9be 100644 --- a/media-libs/x264/ChangeLog +++ b/media-libs/x264/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/x264 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.92 2013/08/01 16:16:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.93 2013/08/01 16:39:38 aballier Exp $ + + 01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild: + drop custom-cflags useflag, bug #473816 01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild: inherit eutils for the x32 patch diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest index e54632d175d9..d4bdb1a1f89c 100644 --- a/media-libs/x264/Manifest +++ b/media-libs/x264/Manifest @@ -13,13 +13,13 @@ EBUILD x264-0.0.20111220.ebuild 2289 SHA256 edf89ceda65eab31f55d66385245eee6481f EBUILD x264-0.0.20120327.ebuild 2369 SHA256 652c96142181d3339fb820c0add88ebc21646daf74b24c3bb9b1eaa88737dfc1 SHA512 f90c9af66c75d4f445f1a7443180b8bc4885b0b6be5c64d2c13633ee2094a76dbc74dc33241fd03bba5dcba293df130d45aeb918d8d0b131e8912918583b06de WHIRLPOOL 029fd0b95c4b29e36b6e3cd01671dee797a999631b4a0c086606718295a41ee1c92f667a75d29b1556e2d62a69fd542c323461350f32ff3537ad5706f43fa71a EBUILD x264-0.0.20120707.ebuild 2880 SHA256 c1058ae73c205292a5ef7e6e8afc48293b74258f353f796a11518e9e78c8f60f SHA512 2091ef73ef17a7fd84ddf41e03593f0b224c1eaa8be8a6e2410ec3352a8146b19e9e89bda5c9d5fcd3a6d9306b126bf96a32f196288b2aab7c76deb82ae8d82d WHIRLPOOL 0ec1b5c56d0e5af2fb285f2f6d662e73e0449ee0a1dcf31fe2d54c82cd26d9bde03f5ffd95ad8350fee1b5de9552663d553a9ae8b87115bfecf2652a4bd1cb9d EBUILD x264-0.0.20130506.ebuild 2303 SHA256 0087e7edbb66caa01bddaaee8f5ef50ce4d17cf0265c840f13967acfdd358bd4 SHA512 c98aae7c6f938a6df1d238295b710bf035868c55c4797f0c87ed90dc47ab5a5a3deba640fd2e63c3931ed53a6816d1164c7a5a77aab1a1fcf98d18c5e4ca735f WHIRLPOOL 5792a11a81c61c814c6b0e644dd381c0e3f832dfb1c4c844a2e606cadaaa8d8cdced3704fc6251350234a5b7a59c806c689f942d30259a22e386147d315171f9 -EBUILD x264-9999.ebuild 2290 SHA256 afc1b6c97466e4a6bdbfbd3372bef44676bbc17d136a4b21bf54b93931ca08c8 SHA512 58ada2089e9410ce1cc220ec52681605e04d3a3e99287f1f095aaaac620545d7ccba48c53312ef9ecd7a9bedfbbbfa780209ff72012bf4165a21bd33e83fe5a6 WHIRLPOOL ab444f66919292a312f9516f0e78286a6456639b898e9d4d80fedcae71a296f64a88b15e718a7a528768a51eea8c506fea29f042aa4c53b961dc2b7074b2ae48 -MISC ChangeLog 13864 SHA256 16899f4b07485bb347840d84022d5d5150e36c10dea0cad265eec2917f7dc235 SHA512 47c083a3a728b99343772d20b1217e01014b4a46c1c6fb7f0ffb267975762b41f9eb4ce5a033050296511d032d787d908ad661557d90abb97de7ecdfa0e2c45c WHIRLPOOL 0b4bdc017ac0292aad433586ebab0b7f73d3a6a4fe386f11a85882de6a75c07e993aa9f6d8fa940c9a7822947086f1fab16c8e710d0ffee42761ca28d7e253b3 +EBUILD x264-9999.ebuild 1802 SHA256 2e8631949a09e9334a2e3f0d86ed9cbb22e25e508caf59b6cb5f5f16996c32f8 SHA512 3c2008237d43c1c97aed0a79cc278e978761a5e0ee6f415963b99abfc6e55092e41a0d14982865c023af8f4ddcf83bca7dafccbe0fb967e8b2e2243a1194f985 WHIRLPOOL 6acddf22dca4c94ff000ae58f1d6a3dbe5f87d32420ca00f6fb381a6d520950f98930a6b12a97d14acfa9ff74d76f6116ea1b864ff6e2f9c8a383cb8c13af8d6 +MISC ChangeLog 13977 SHA256 591718f326d926eb11317a15e82cd67015f799e00ea3295a51e0b944f84f4a11 SHA512 467d2d8c9c7ac958c1e2079a8e3fcd87b26b005af47dbca8597c5b26f38d75c63723f869c3b5d9da7ae46eb261413e49f01ad123f03a9ece48b2f36bb3493853 WHIRLPOOL 2cca961a1b667c94cd1f72cc9159d95962874d77d0b01c2e7ead3ad5e5963864c3c4b4410b60ac430ecac37889c6654cf87a505618ef6337973ede7bc6b03ae2 MISC metadata.xml 554 SHA256 0e6f02e5e6503d39334d4c0e02fd983b554af214819ddfd9eb24dea6dad716f7 SHA512 db986ff0e3509ca49278e8bc4f5a8b4866209e8c49f8fb49724f28ac6e42f8d863ca73a0337945c6344054ce07965a08b86ba6f0e34c9cc6dad5217e8309d1b8 WHIRLPOOL 38de13fe7848bc1b20eef69935d8a8bf575bcd339a5f77ef8724ff74e2ff700fa6ddf85544c33a27c0587f3cc541a49a98ccf2298b94f6a22352168102d0c3ea -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlH6id0ACgkQvFcC4BYPU0r0twCgyh8umQuznCeXhWg4WB+We7pK -xPYAn38NUjMvwKHDwBtDGy2R/WB49kdd -=iqmK +iEYEAREIAAYFAlH6j0sACgkQvFcC4BYPU0rmlwCcC5jr4VtdM73077rWRPBm6ktS +1FgAn2w6hTVgcBuZVsR+pJnAQNfywLG7 +=Xdbx -----END PGP SIGNATURE----- diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index b38eee523b0b..5ee9e172abc5 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.11 2013/08/01 16:16:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.12 2013/08/01 16:39:38 aballier Exp $ EAPI=5 @@ -23,7 +23,7 @@ SONAME="135" SLOT="0/${SONAME}" LICENSE="GPL-2" -IUSE="10bit custom-cflags +interlaced pic static-libs +threads" +IUSE="10bit +interlaced pic static-libs +threads" ASM_DEP=">=dev-lang/yasm-1.2.0" DEPEND="amd64? ( ${ASM_DEP} ) @@ -42,9 +42,6 @@ src_configure() { tc-export CC local asm_conf="" - # let upstream pick the optimization level by default - use custom-cflags || filter-flags -O? - if use x86 && use pic || [[ ${ABI} == "x32" ]]; then asm_conf=" --disable-asm" fi @@ -66,15 +63,4 @@ src_configure() { $(usex static-libs "" "--enable-static") \ $(usex threads "" "--disable-thread") \ ${asm_conf} || die - - # this is a nasty workaround for bug #376925 as upstream doesn't like us - # fiddling with their CFLAGS - if use custom-cflags; then - local cflags - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" - cflags="${cflags//$(get-flag O)/}" - cflags="${cflags//-O? /$(get-flag O) }" - cflags="${cflags//-g /}" - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak - fi } |