diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2014-03-19 13:57:15 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2014-03-19 13:57:15 +0000 |
| commit | d546f68be9f1c7b574dd07e4f46e516b5249ec2f (patch) | |
| tree | 32ceeacb9b8e40fb737a870eb39220e4fa3602d0 /media-video | |
| parent | Stable for alpha, wrt bug #498050 (diff) | |
| download | historical-d546f68be9f1c7b574dd07e4f46e516b5249ec2f.tar.gz historical-d546f68be9f1c7b574dd07e4f46e516b5249ec2f.tar.bz2 historical-d546f68be9f1c7b574dd07e4f46e516b5249ec2f.zip | |
Temporarly block non-live FFMPEG versions in live VLC with USE flag vdpau; fixes bug #503168, reported by jospezial.
Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/Manifest | 18 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 10 |
3 files changed, 21 insertions, 13 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 267ab5fcdd00..b33b6c08da36 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.895 2014/03/19 07:57:21 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.896 2014/03/19 13:57:10 tomwij Exp $ + + 19 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild: + Temporarly block non-live FFMPEG versions in live VLC with USE flag vdpau; + fixes bug #503168, reported by jospezial. 19 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.9.ebuild: Adjust upper bound of dvbpsi dependency on vlc 2.0.9; fixes bug #504738, diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index b6aa22ae8d74..10c5b3979468 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -31,18 +31,18 @@ EBUILD vlc-2.1.1.ebuild 14111 SHA256 064cd3dcc88fbf40334d9345c3fb801a4f1cebc2663 EBUILD vlc-2.1.2.ebuild 14111 SHA256 bacaf3cd5b1182023386370d5fcc8c00484c8f258095413466e48277dc80cfb8 SHA512 cc29d52ef9ff0dc2eb2474baa57720d3db3788860c0051fe59d3d2ed312242186d25b49e385b5a90c2f48950c1cceb2bb85e4ba9b06c8d550fec2272cf9332ac WHIRLPOOL 5224e7ecf47f38b6ae2e5dedb1c0bed9b4d866d33234d4f501d6ab9dba6d581e4061b9bf2471bcc5a2e4ff1aeb3fdc5447352ba243746d6f6fa702d62d6a9927 EBUILD vlc-2.1.4.ebuild 14486 SHA256 c4de16a8a6dc508c7f0a04711c5e0b4d58ade2c62a48a25bd63b5fffcd00c90c SHA512 8e9071cd163df3026ec83d5cab4917a3bf978ae470ff1e12279290d441dd266a9c586d493027249ab717351bc2c7b920127e458652721629ee2187ffdb0b7c61 WHIRLPOOL 4f22a732c503aa8707636f99de7248c03b883efc93cd8ad4d61fc40070a782704e87e64ad89b93dd5b74cd21fb0c95e1514c6f6a63c6500343927b7b0d10e915 EBUILD vlc-2.1.9999.ebuild 14502 SHA256 a2b9ba15c8697fffecff6ae091be6a163ebeea3e2f63a76844ffc9f62392c691 SHA512 235848446bca021d4db005d4e932471088a2043373196f8f3244fd960b625166aaaf73b14bf7d9a2196d157923d3174c419d716f6842bca3b0fe9ee31e3b5bca WHIRLPOOL 41da9a81b1f763175ce0f1088933ca252c5bbdaa6bc6d2443d762c814b83cca8634ce8c4ed40473d6797608817c0b1db4f52c68f357230fbeaf61ea6ac6c6070 -EBUILD vlc-9999.ebuild 14660 SHA256 4385ee75c8c7cac331be9cd1f9f6512ac401a62dd07825919543f481ab51594c SHA512 baadfd6438a3b51ae69fb7fd852bdc89b9964ff3f5eda2fad27f19ef8b3e3d9f138297ae49a4fc6010bdb6c2af4fd47e292411b951b805ed47c430378994f387 WHIRLPOOL efaceca95385371afe5366cf014b3edda71e848c30b4464c65dd9b81d3113334a9121f77a1bd148754ab3f0112b3c6acbde529f7c46aeae93ab82108f186d691 -MISC ChangeLog 25581 SHA256 0698db28199352045a767ed021684198089396179b6de7cbf769ee681b530b1b SHA512 57e3b54fde4fbc6389d10f09b1890b054209a52a781aa98c6090dd4f9d0fde78208622761bd4c9da862152ae44f0afd7ac2f4b3fdfbe1b462df22e0a2233ec1e WHIRLPOOL 74f83f209b72bb26d3bcee4a1bb27bebbbd93c2b95f83ed9df34674e91aecb186bd9e086a4610e4db61bd3761f3f992a2eb04220384170c4e984418493865dac +EBUILD vlc-9999.ebuild 14837 SHA256 6c929fb1be611e24ba0ade54bcb8fb4f6639bff2ab9c4c07f37df5ac25d59b2a SHA512 9800e38317fc88800620631c16fb2faa6f4222243ebe5387ef1507a93561e37a83c8ea7bddc1db987cea44cd3f168c12db06c0cd8652c1fcbd23f4c809e77a2d WHIRLPOOL 2c0127aa07d7a20736d98ddbd86dc5e96d4e999975b7bee159bdfbdf6c009cd7918bd041e741453b6846d2f99d8e9d169effe995fb76c786f60402ee3ae7b128 +MISC ChangeLog 25767 SHA256 ae61ee7c60f3e17e1c8ab57cee40040c42b0c7191e77feddf71ed8a177758c7c SHA512 0fb7b95a1c3d88c19e7fc230fac14db5f8cc4653e56d63a837cd9d861b2cbd1f5751ece59d9a3281a33a6ddd7ebca33a8c020a8ba0641ed7c62c366c8abcbc33 WHIRLPOOL 10123b4c199db560fde26fe41af46c76a3f1a9a891ec00eed7424d3ef7182d42e93fec2441179f2568823c6fa3c193359048f52baf8e7df491d6036a4f90bd56 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe MISC metadata.xml 7078 SHA256 06f15f0f664689d21c79529dcd73781bc7be5c087df60cb7512c634445ab62bd SHA512 0186ee55a67cc50a935a7fb39bcbc3119165f27c342bef97695262c6cebf05a792babd899a7933dc79e2255b01d26b9f737c1f55b2b329078edeac3ab4a57319 WHIRLPOOL 674a810ff112b97d341e2453d97d15f4e82bddbf83c61baa970e19ebdf45d3193bd7509f889fea72c309a64146c2879e1bedcb0f9d0b18a3c71fef3990b080c9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJTKU3gAAoJEJWyH81tNOV9cuQH/iiDX8XB9QZkPdsHmBrwmiPh -+M/bVmfjqL3SUNii3zkToDOTqeiWwY7zZ4N3bE9t5tmt5hw5PXiPh9BqTgzZ123G -gmtG7Jk/sHqoH9mjA1oo7bDAjSura0ek7tXMzIqtEnZTbbbwz2whXiKN7l8fT+Eg -v57t6Iq1L0j5+dFgjWv9K57C/OcAJOshhpL1HKE99MsCob+TCtlfOD6TLBqBDHkP -N9olMFn8Lp4sGT45sJESnA4dWB7NhHpKV8XFz22gYlwK+8BKyBHukVY5ojJGWFk6 -6ovq+2/Anz6+dEjcczm+x1ut22Lyd4Pnkj2rBOFYmPtAlV9HEScU50TvfdWJT4Y= -=4ELz +iQEcBAEBCAAGBQJTKaI0AAoJEJWyH81tNOV9azgH/AtiW8JOPqGL3JBQUTB8oine +DSNve4+Jhwm2eWwJaG4dnlO9hNKi61UPMcwc1zpnW2waA8T64YZrNgQoUQZhTJQ7 +oKIC1HFV7LAeGxFsxSiCIppRt7rEm5YBEQN8Z0nfPMfSwN8kStezAOzYuSas0Qk5 +79jIil6edAcaM7UMWZ1y2AENXP/x9L7D7GXLrzwvcHlDrUM8XGRj/g23QQ8DmhqK +wxxdkrJFx/YUTMZDvjMp84cfAB0RKqmU1gM2crZl1TOaBBhr8naNz8JF971yEsWf +OaXrIbUqe4mKGsq8GZF5zJmfhWfur8syDxxI+Lw8c7dVgThcSsuxIA4X9bMVDtg= +=vrVp -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 74228589172c..fd4cc386975b 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-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/vlc/vlc-9999.ebuild,v 1.214 2014/03/12 16:15:16 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.215 2014/03/19 13:57:10 tomwij Exp $ EAPI="5" @@ -142,8 +142,12 @@ RDEPEND=" upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] ) - vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) - vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-10_beta1 ) + vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )" + +# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works; +# thus we'll have to wait for a new release there. +RDEPEND="${RDEPEND} + vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-10_beta1 !<media-video/ffmpeg-9999 ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0 ) |