diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-01-17 14:04:36 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-01-17 14:04:36 +0000 |
| commit | 008e8fc8eb95caaf2626fb00388c08bf6fffde49 (patch) | |
| tree | d36e45d36aab7b371297c1e0fc407522dfd6af8f /media-video/mplayer | |
| parent | Add a comment to make clear we need sys-apps/man (for man2html) and not just ... (diff) | |
| download | historical-008e8fc8eb95caaf2626fb00388c08bf6fffde49.tar.gz historical-008e8fc8eb95caaf2626fb00388c08bf6fffde49.tar.bz2 historical-008e8fc8eb95caaf2626fb00388c08bf6fffde49.zip | |
Apply only conditionally the libav-9 patch since it breaks with all non-masked version of ffmpeg or libav...
Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/Manifest | 12 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.1-r1.ebuild | 6 |
3 files changed, 15 insertions, 9 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index ea3fbcee44dd..fbdcfea192e8 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.869 2013/01/17 09:01:57 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.870 2013/01/17 14:04:28 aballier Exp $ + + 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1-r1.ebuild: + Apply only conditionally the libav-9 patch since it breaks with all + non-masked version of ffmpeg or libav... 17 Jan 2013; Luca Barbato <lu_zero@gentoo.org> mplayer-1.1-r1.ebuild, +files/mplayer-1.1-libav-9.patch: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index ca83c2da0896..b57a235f758e 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -22,15 +22,15 @@ DIST mplayer-1.0_rc4_p20120405.tar.xz 5449560 SHA256 8da4ad1daa5c9b70884f775406c EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20417 SHA256 6041d8cffc438f974c5dbe4a288c1d1150f4e57580350b157aac331c889a8f5e SHA512 56cb232cba9a34412f27402f90e92041953f9475e6969eca77f3785bfadf72f9943480adfa2128091f468942237ac85bdfac8667cb581e24af391b2e690041d9 WHIRLPOOL 37630c6cb096da5f2dbfdc4eb016173415a52ca73468b69f5153d174e84feed8ebc1329343d29a8da4796e98bb75f893e583f17ff8b6df2624a7295238ec39f7 EBUILD mplayer-1.0_rc4_p20120213.ebuild 17809 SHA256 6cc016d7af8980f09044137a18e2ae4b698710fc0de16ccd6da8ecd74649b30d SHA512 15c3f093de1e09fda757618dad9e8bcacec39aa126ab25a4a2afb8704a93a37c1dbe37954218deb103ea46dd9120fec90bb36863348c977a02af5f0b9cbfc952 WHIRLPOOL 64d77e04a94bbc15b2b6e5995f580852f69e4904bf4cd7422e36137f6d33ec41c3aafc99f0981855f6772b8e9d47656f26201deff55af76f460f839e0e93ee11 EBUILD mplayer-1.0_rc4_p20120405.ebuild 17909 SHA256 b299103dbaa39026133d2e985d61de2b5ea46c692ad8031098e92b34f88beef7 SHA512 79a76c4ddde85c2cf3a4d77bb2530c82f1bd023ea9ec6f25c3700bce542540130a309fcfad5a879910f036b1c739c4628a0d492c7fb479847cc280e3881b1c63 WHIRLPOOL 606cbfc2f8d709e4abb1bfe5a7ce9cccbab3a1354dc8564f9376832855ecb945b2974058c618564e93c5c083ef633e76da53503baff8a342930786efc9a5abe6 -EBUILD mplayer-1.1-r1.ebuild 18500 SHA256 1951537b9763841f66a3f5fd4611a7e0151ef5f552079efe73194d2c9cb66840 SHA512 a6a7242eaa67e32ad4aafe5a5a71e5dbfd959192525c5bec1d8041e434731318a8566c56a3423e9d2ad0f5f491f34eecc0011ba3740a84c21f8d82bb5a21ec1f WHIRLPOOL 2abc87c7a133a8d4e695d4cfa9be0aeec6c9aab67ad6e8b7d0a5dc2ee39772c59177ce4eba4645ba2686b289288e8b6879a8b321cb496af23b55313e049664e1 +EBUILD mplayer-1.1-r1.ebuild 18603 SHA256 773fb5bf7856e8df81ac33a9d659a4198ae8c7e5b02b7497bca115feb9e66a22 SHA512 be3c498b4c1c5390e1716acd483bf4ca25ce4b76d199cc11310459e16e71ac1bf7acefd0a5347f7d55fb53848f84acd9d4fba13129cc16d4871421cbafdc698f WHIRLPOOL 6ea28c24157647c82b5e556770ebc7d2bae0cc1fb6e983c3d926d274ea396ce218176addb533948bd6829302cae5791d92d7aae3a71150a2b4ad620fb68bb7be EBUILD mplayer-9999.ebuild 17671 SHA256 5c53e6df8311dc6f9720dff36bc1398c98081f30d20f353233461b9b1cbe038b SHA512 dfd6379a1b3c5cab08db0df0f85620879611631af9c324179b6810a0448626f061163928a0e3455c3974f4dbd12989576b05cfdd01f74834eb3af619cc10285d WHIRLPOOL 5462428f499009a637b9a84263b83b1b08c868a4b704a83884676448dbcd88833383ca9e924cc90667d0b444818b4f45adde23d69ac113ec5cd662949cd99fb4 -MISC ChangeLog 44661 SHA256 cde751fdfc97728ea205d701f0f84bf050d9d4bd06e674ab8f751001186fd282 SHA512 9b6af0184756b4c05b389f6dea55cb23908e02e3b067d8ae940ebff0c56724f295146a01e88c0dc25d4234ee432a1e986cd390dd997d945ea8a091a403bfdd95 WHIRLPOOL addc59efbbc791e21fb3181086ee408cf013ac28ad095bda80529891ee4a67150f34827da373f3643e99951eaa83c0f78fdce4b9bd449bfa32d6b5f10144ec80 +MISC ChangeLog 44851 SHA256 7716451ab4703c1fbb157beb5ec2f4ee1376653c8952a096f998fd3d423dd807 SHA512 2d3c10b32c2d183bdbb0717b94f20457358458c332eecb3c402a9975eb81f539f04117f2f25f2e278e810b606e540befb14ad0e17a556bb391d3174ee9569ee7 WHIRLPOOL c4bfa285b2c1c0bd3d2a2e13fb583b32ade749068f9814efa31852608192f27d986f88e311e90be20f78720a89a63f302a568a0590078193cf5ea223646097d2 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74 MISC metadata.xml 3504 SHA256 504d1f70863183cfdd1c5a00f86a2980be675675b7b6c4891b75f1c9f7993a21 SHA512 03662c349a7316c0ac7eff61c2a73c953e9c2e8989d0b76c0f31ddbaf6289a4ba308ac58f59fe71cdf132d55846ae13d6dd1b4023a4a9a278329665f4339f962 WHIRLPOOL f987c3c30783289a9109fb58dddda5a128a0233fa36a8d110b943b8893c75706f757fd7b85e78539dc239989cda069457ec5ea2a9419f19a40a0a9b80788b020 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlD3viAACgkQcXOrnRGRc44NygD/dgbGgtYV6qWRfMm1SxS/T7Ed -ONETH48qFjj+e0yNmaUA/RObqIWcnoCQb0IadFMSWqMfn/wxqMHzUfut5/qSqZpB -=+tks +iEYEAREIAAYFAlD4BO4ACgkQvFcC4BYPU0pP3QCgqGDRVoPLXlebHk69Hjkrhgh+ +P1QAn1eUsdfNouDfJVmkWDKkHG5zllrD +=SqES -----END PGP SIGNATURE----- diff --git a/media-video/mplayer/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild index fa0e675cd139..7e74c6795c4f 100644 --- a/media-video/mplayer/mplayer-1.1-r1.ebuild +++ b/media-video/mplayer/mplayer-1.1-r1.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-video/mplayer/mplayer-1.1-r1.ebuild,v 1.15 2013/01/17 09:01:57 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.16 2013/01/17 14:04:28 aballier Exp $ EAPI=4 @@ -195,7 +195,6 @@ PATCHES=( "${FILESDIR}/${PN}-1.0_rc4-pkg-config.patch" "${FILESDIR}/${P}-ffmpeg.patch" "${FILESDIR}/${P}-libav-0.8.patch" - "${FILESDIR}/${P}-libav-9.patch" "${FILESDIR}/${P}-codecid.patch" ) @@ -269,6 +268,9 @@ src_prepare() { fi base_src_prepare + if has_version '>=media-video/libav-9_rc' || has_version '>=media-video/ffmpeg-1' ; then + epatch "${FILESDIR}/${P}-libav-9.patch" + fi } src_configure() { |