diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer2/Manifest | 22 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-2.0_p20131009.ebuild | 7 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-9999.ebuild | 11 |
4 files changed, 28 insertions, 18 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index 2743c5b4d044..f488a2f55e3f 100644 --- a/media-video/mplayer2/ChangeLog +++ b/media-video/mplayer2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.120 2014/05/02 19:28:40 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.121 2014/06/09 19:27:56 maksbotan Exp $ + + 09 Jun 2014; Maxim Koltsov <maksbotan@gentoo.org> + mplayer2-2.0_p20131009.ebuild, mplayer2-9999.ebuild: + Fix ffmpeg/libav deps, bug #511046. Thanks to Nikoli. *mplayer2-2.0_p20131009 (02 May 2014) diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest index 21bae2927bdf..bf4e3f916cd7 100644 --- a/media-video/mplayer2/Manifest +++ b/media-video/mplayer2/Manifest @@ -9,18 +9,18 @@ DIST mplayer2-2.0_p20130428.tar.xz 1911464 SHA256 41e54e6c86761196e111250fd6db79 DIST mplayer2-2.0_p20131009.tar.xz 1907780 SHA256 c105b3804d4d66af29015d4ecd46abbdff75c39d78d5457c535519ecc4d3855a SHA512 8c072bf8fa6a908d3c587e5f26daa6a07098abc8dabd20f77b172e8de5537125873ac1cfc8f07e5616eb0b35aaa73fbab2b30e94a057d220c481dae7740cb3e6 WHIRLPOOL f595c4032371239f1f31f6356d5c7d07534fc8227ba3f1e1452b507ac64baec0747c80b067eaed5fbdc58ee957875a39d9d782eed45b6d797d9a283a34496b78 EBUILD mplayer2-2.0_p20130126.ebuild 11686 SHA256 9a56cd8eb35665a77423fde35a76c98cc2b091f9837376821fb2271bfb4d94bb SHA512 9be3e0cc59a7166a615cce848be8b09db375a813fe774d221dde9624f79d954f820de092d39248ab79d8703670bbdd072bf670fcca609443c809f098e2fadc54 WHIRLPOOL d3aa4cf4d5a2c48a969c46bbf3bedbde8952026c0f58466fa3ebed5c2e359ae1688c1243f43dc31d2c4d2b0c25f5781cf57df4ca6692a4b064dc2f4aee60b27e EBUILD mplayer2-2.0_p20130428-r1.ebuild 10360 SHA256 b7e1021fdbb83a1fbf3b48be3be61325fe040b24b5a062cfd4422ad7c8f4a70c SHA512 7a0a46abea3a6b9a1e292f074437db79bcc6151f123b7555304012f781248f80d54b9526de6b94438774416d51aa3ccc73e4994fabb6190ce4477d3dcc9e6a5d WHIRLPOOL 45c61da51c4f41905448a57abf7840abd6be1dff8d7b2d0b8ed7d2a0a4f6160377edf970c7c937ad5f636f1b23a49be80d5159f66048bdfb3ce8f2927bced3ec -EBUILD mplayer2-2.0_p20131009.ebuild 10351 SHA256 ab3f03237d0268c81f066262d45db7f9404e0ba37ff9e72fd9ba992d73cff161 SHA512 fa292d63be6e57d8dffcb0687d403d521bf02fb3ac5b1a80591bd37782e89b13af514f6bdeddbc9e3e80673a11ae9bf72ded8c539f1d5c2dc364726691746330 WHIRLPOOL 0dbb2387a9cd6a63b67bb3c80af56f6051f722a11a09c3490c9c0296d4fd0885cacdcab3f2cf7ba707685a26ee3217ba234059c4e53c368cc2fba4a412c13f6b -EBUILD mplayer2-9999.ebuild 10345 SHA256 4a2615e1d763bcbd2a95eb4b1f8840fd715ee425563c2ec047d6ce14b394c6ba SHA512 4f18140f68b92de96159e6844b8fd71ccf06d1bc110fe53608c72039822d6f9e67a7f6fa4943e1aca58c772d104ab4f21f3274a254781c3bfedc0a4a3c71f95f WHIRLPOOL 14ac5085fd2af8f0e65d15d069534e0a2bcf87cad0f0ad9b175d9e7c35874a9aa2fae31b946354352e432f579c8c58c65fc4a534571a12c3b7d97b8aaf66c970 -MISC ChangeLog 22475 SHA256 a4d5b7965c314f2ba9026c395ec54f084f47361e1ab1929d48079de623dd09d2 SHA512 853a23dcc64c09a950094d83e15508a5a60ea46fc69c72609d9f6a7e8d0ff960d1c165b5ed99b56a741f4c7e2f6881b69279195b5f57dd7988e4c2c45a152088 WHIRLPOOL 0d077e3332de35e5a2b5c431fbe89880929c5d93eeefe01e979c06245eeab48fcf03d7ac2cc60bb250c7ec4877b989af086f60def217a96986d8d8d6a841cef2 +EBUILD mplayer2-2.0_p20131009.ebuild 10418 SHA256 b5e6c3b308d3af7d08cb04eb837040eb9baddae4c2c1a1d003ce6a48d1488df4 SHA512 61c66083e901c156b90a25d1b2a50e703899f91e12b06fb9e41998df04ab7276add90fa4d61d12ce42676e445417a99b6c45b9b8f0b8dc1571f0b9c52d0a26b5 WHIRLPOOL 5b144a81ec210f9580149a72312a34ea024a380d065c5bc7e448be1c2ab185289221a6f5da98a59b8af87df43b5f460c7622ce034567ffe73e8154a181051874 +EBUILD mplayer2-9999.ebuild 10410 SHA256 ae8ad7828cb616e3b0ab1e90611a5bd042ca205063f5cadc945cc7ee4b92caba SHA512 e5d530701c4f38fe4084c94d994d362e6c7c4b3d6368fe533c9b5522d7efaac5a539686089852ecb363d66b11fd448a7fa107635f314639e1a7cf2be26cd0f97 WHIRLPOOL d992e3841a432b14fbe66a7bc3488996cf6b08a7d6cb98b11d4bcfd762a88ef83a9ebe5ceeb6d8db0d4591b1cfe4d238e8bc0f3eada61f1e788b4b59544ae670 +MISC ChangeLog 22639 SHA256 e8edaf923a2c0614cb4eca8ca9ebffac16f45474f57d80d064533d156c41a23c SHA512 ff65edd65e6598aa8258cbcd84e32f2325fb5e4379aaffef7f35f0de1d3dda3e66d6daf2d7501c3795e9b4d5551605d9f2caf2fa887b4d07e214ba4c88161364 WHIRLPOOL 3daf97386cde7ca7a5fec5f102df57a330f29ab6facbc476af98070cb1a3db9e618c74b6d4ef3ddae09a21e6db4c5f0c797095e89393f79ce0ef0d3478036114 MISC metadata.xml 3147 SHA256 b59a051d61995b8e8f565110f91005df45b271b19f55f12e873160189d523ed9 SHA512 88338f85b67efc54241fb4d6bb91883ee337fcabac184bf7cac2cb971e81bc53fd9bd9fbec1c71a2353ab5f5263218fc673d58f45642a42e9934dcf8240e9c11 WHIRLPOOL 98da9689a06cad004f9056e31766771bdd62274c05ad9334144845ea2be378197343e87c86debec08c6beaff027f82534792b3b76ae444ce7aa3eb2b4dca2cb6 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQEcBAEBCAAGBQJTY/HcAAoJEAmJmMX429reG3IH/2jsaWmnjicAzQsdCduSMnQ/ -VD2CFmeEt+WX5IlPC+EhoxNEVOQbQhJoEpk+YqPlK9XvAXwNYB6/PL/fx8UFRAeT -f/xxv9UC5/Jb2Qx7wYTQqOZlBZ0xQTY1Xlip0YCTbCN5I5a+jbqKMOv/cEyqZTQ2 -kpzywxOZWuQsiWYj9gdkXotKs9GV5LKspQ4ccvuJDpkkBlzDuPW2Z3UB2eqIC16Z -3z3SQzgBw+U9wVXMYfVfkKj7FKdeT9ol4XrqfrIBUwihNfnetmrhK3TtLwfTewQO -UjAZaq5niIgBeuQee8kBPgLuve5arj9tyOl/vZ4CmG5xhg00tZnogA+5VNC/0Lk= -=8OiB +iQEcBAEBCAAGBQJTlgq0AAoJEAmJmMX429reRJ8IAKmlTrF2cXm6Bwlys4nnN2oj +UnLHo4fFZXnezD19ZfBRJ8O3REbZGddC8X6fodTs1YRQ43megCFn+vN2qxkg6ent +s0+/TqAJJdArzYNRd1uytq9VObiXEWI9o+KlNR8OzDK6jhyLLR7Fp0jo2uMQArAp +X3iblblSctXm4StKGKdJhGkx90srRzydSk5YMSkL8CwBEb8GTt0oFSdBlVeUgkYJ +fyzNsSmSWjxAf5IK3w/gAveTONsRitEuVq3EjY0un0ZaXHVAWtLXkT6R4INHUekc +BOBsTlAYiyRWYMwaZ/PizZDJtNCSMa7AAbVTcU/Pk/PanngVaEJ4hV0WZlSLoNQ= +=OCyH -----END PGP SIGNATURE----- diff --git a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild b/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild index b9b9c61a9c75..d752899ac103 100644 --- a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild +++ b/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.1 2014/05/02 19:28:40 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.2 2014/06/09 19:27:56 maksbotan Exp $ EAPI=5 @@ -106,7 +106,10 @@ RDEPEND+=" quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mplayer ) - >=virtual/ffmpeg-9[threads?,vdpau?] + || ( + >=media-video/libav-9.12:=[threads?,vdpau?] + >=media-video/ffmpeg-1.2.6:0=[threads?,vdpau?] + ) symlink? ( !media-video/mplayer ) " DEPEND="${RDEPEND} diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild index d4cf8977190f..833acc460b51 100644 --- a/media-video/mplayer2/mplayer2-9999.ebuild +++ b/media-video/mplayer2/mplayer2-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.66 2014/05/01 20:17:09 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.67 2014/06/09 19:27:56 maksbotan Exp $ EAPI=5 @@ -16,12 +16,12 @@ NAMESUF="${PN/mplayer/}" DESCRIPTION="Media Player for Linux" HOMEPAGE="http://www.mplayer2.org/" [[ ${PV} == *9999* ]] || \ -SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz" +SRC_URI="http://dev.gentoo.org/~maksbotan/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" [[ ${PV} == *9999* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="+alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc dvb +dvd +dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libcaca lirc md5sum mng +mp3 +network +opengl oss png pnm portaudio +postproc pulseaudio @@ -106,7 +106,10 @@ RDEPEND+=" quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mplayer ) - >=virtual/ffmpeg-9[threads?,vdpau?] + || ( + >=media-video/libav-9.12:=[threads?,vdpau?] + >=media-video/ffmpeg-1.2.6:0=[threads?,vdpau?] + ) symlink? ( !media-video/mplayer ) " DEPEND="${RDEPEND} |