Compilation passes with libav and it plays movies. Moving from media-video/ffmpeg to virtual/ffmpeg (unversioned because oldest sattisfy the dependency requirements). Fixes bug #361123.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
author: Tomas Chvatal <scarabeus@gentoo.org> 2011-04-03 11:17:09 +0000
committer: Tomas Chvatal <scarabeus@gentoo.org> 2011-04-03 11:17:09 +0000
commit: cc1e269c6dfde274aa005c15c2dcbac90e44c3d2 (patch)
tree: b9d3b09f0ebb46c36b665efb0ced3c0cd9dffe9e /media-video/vlc
parent: Drop old, #361773, thank Dustin Polke for this job. (diff)
download: historical-cc1e269c6dfde274aa005c15c2dcbac90e44c3d2.tar.gz
historical-cc1e269c6dfde274aa005c15c2dcbac90e44c3d2.tar.bz2
historical-cc1e269c6dfde274aa005c15c2dcbac90e44c3d2.zip
6 files changed, 29 insertions, 25 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index d171bd9807a2..b7d735448774 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.700 2011/04/02 07:59:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.701 2011/04/03 11:17:09 scarabeus Exp $
+
+  03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> vlc-1.1.7.ebuild,
+  vlc-1.1.8.ebuild, vlc-1.1.9999.ebuild, vlc-9999.ebuild:
+  Compilation passes with libav and it plays movies. Moving from
+  media-video/ffmpeg to virtual/ffmpeg (unversioned because oldest sattisfy the
+  dependency requirements). Fixes bug #361123.
 
   02 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> vlc-1.1.8.ebuild:
   ppc64 stable wrt #360189
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index c9fe46d9e3b3..4e7bae8c9e56 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -6,18 +6,16 @@ DIST vlc-1.1.8.tar.bz2 25212756 RMD160 728085c222f0a3c831d28f149898cc77f6cbe3a2
 DIST vlc-patches-88.tar.bz2 3341 RMD160 b29676117f2a4033e66f4c956b5de1cc1be872b0 SHA1 93bbfd854270596fa6e5084e68c93a66dc73c616 SHA256 64544578d02a9c2cfa5aa9ba3181106d9e631c5cd2989874d632caed38acd3d1
 DIST vlc-patches-92.tar.bz2 4580 RMD160 e6ede3a3d588944f5b3455ef56449bcb49e1fec3 SHA1 4dafe13667462fb0f9474fa2cb408e247e739795 SHA256 961a656070804eaeaecbe6d3f9f7ffd31b484cdf521ca75afc1460a5ad341b9a
 DIST vlc-patches-93.tar.bz2 3384 RMD160 5676a0e7ecb9ec643b5bbcdb3e31bc4262e77f76 SHA1 70620a6f10a6b813a6fd201421954470c62829c1 SHA256 e22286e170c5a734637c6f0c868d8a9a575f67690aa50920fb9227ad26026f83
-EBUILD vlc-1.1.7.ebuild 12270 RMD160 1313ed4ad828e9e8cd35cbcc3e8cf1dea83ae024 SHA1 a92e18ce85057987253a585893d9a8a32fdee837 SHA256 db407c34fe091d4a9a913a8495e47e8aef08a15f75cee59b60612233fd57d443
-EBUILD vlc-1.1.8.ebuild 12276 RMD160 8563194fc5e8fc175600358c0c3432e39f248a4d SHA1 8eefb31a7cb261fb48e3470ab6eacfe392a36102 SHA256 e2a5a29447c31d51108cdacb81d1f6a3f3c3afe09a2051a326b8a9ed836fbc0e
-EBUILD vlc-1.1.9999.ebuild 12281 RMD160 51d599a70edd42cf81e2cf4223661541aebfef63 SHA1 15e4cd67a3281956a57fe4ea90a2edd7a47fd770 SHA256 573547f820a79301a68d0193de6b4e00e8c5aaf214e92474771fa572cb949d5b
-EBUILD vlc-9999.ebuild 11036 RMD160 61ed7d841f6ed27b2641987f67f6a92df1831d6d SHA1 c42e9fc2c1cdb4928f890fa5ae2d36b468b216cb SHA256 5d4195433eaa262adccfcbe386325175154630416a079e52ac627b825fa9456f
-MISC ChangeLog 105263 RMD160 736cc5c17122509332bb65814333b6b69ad65922 SHA1 6eea8f12d14dc5e75da6c79c019903eb804f45d7 SHA256 22a86e6049cd7a49c8dd095fa249fff6795e9f8cb1e6b8ef0b8a2622e63957aa
+EBUILD vlc-1.1.7.ebuild 12233 RMD160 a1fe6230762bbf8d8ad8709c79885e5b686e183b SHA1 d0206193aee0ee593dabaf3fd7acc30700c2e41f SHA256 d9af002214cfd3ac22e765e1bf40a7ce26f183fa6aeebfe9a6b018cde02fe53d
+EBUILD vlc-1.1.8.ebuild 12236 RMD160 cd793fa4708b6b5fb39231540aa7c5015a35eb07 SHA1 0741d9ee9f7d34f2d0b9969fd00d8b27839685e3 SHA256 8b4d64d4bed1c807996453ddab8291fd8d2758757f9c6b0bcd965037636bea31
+EBUILD vlc-1.1.9999.ebuild 12243 RMD160 9469eb695e37e554c7834abe226d0654f40b7fe8 SHA1 0f5680c11f8376cdae69311c563c773f731d4dec SHA256 9e449a667b71b9fb480784a0d3ba184ea990d6a6ff8ec14a0fdd9f588e232871
+EBUILD vlc-9999.ebuild 10997 RMD160 dce4406f25d4501b7226c304888d5bf75f1c2d08 SHA1 14dbac5284cd04d865d9289c31a93473406b63dd SHA256 40ef98a7de1bb687643d18748c1ee2ba80b82ea54e245cab4ab487c3e7fbd943
+MISC ChangeLog 105586 RMD160 e285051bc8a410ee7a015abee0f38013e160ede5 SHA1 57175c0f1dce4ddf8906d06c81f3b245e61ab020 SHA256 a41e2a25cb8a3ee3b2665d6e5d896fc88938dd45fc0d6cfae061fb160a7bb380
 MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2W12AACgkQIiMqcbOVdxSpiwP+P9a9saBD0WxJ6qmzB/YMVu+N
-JGtjWJOXl33UxOjkblgqkD8IaCO3Iazm6kcg+1fI9rgVCQ9Q9vDi6AOxkqvwmAT1
-A89m+mW/GwjhUKIOq311RQDnBa6qheVrPujNMG1DOh5E3Pt/6xRb07WVwufTsSJu
-JyNtOjWoB18nG7Yzc4I=
-=1aAX
+iEYEARECAAYFAk2YVzwACgkQHB6c3gNBRYdxEQCfYM+9COZIisLsREsjj6jw7CXz
+mc4AnisnU1FHBRCsQVY2iL0BPJP8M9ob
+=Ua4D
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.7.ebuild b/media-video/vlc/vlc-1.1.7.ebuild
index d62a24de8385..b6d955d362b3 100644
--- a/media-video/vlc/vlc-1.1.7.ebuild
+++ b/media-video/vlc/vlc-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.7.ebuild,v 1.9 2011/02/19 12:22:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.7.ebuild,v 1.10 2011/04/03 11:17:09 scarabeus Exp $
 
 EAPI="3"
 
@@ -76,7 +76,7 @@ RDEPEND="
 		dts? ( media-libs/libdca )
 		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
 		elibc_glibc? ( >=sys-libs/glibc-2.8 )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
+		ffmpeg? ( virtual/ffmpeg )
 		flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
 		fluidsynth? ( media-sound/fluidsynth )
 		fontconfig? ( media-libs/fontconfig )
@@ -135,7 +135,7 @@ RDEPEND="
 		upnp? ( net-libs/libupnp )
 		v4l2? ( libv4l2? ( media-libs/libv4l ) )
 		v4l? ( libv4l? ( media-libs/libv4l ) )
-		vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
+		vaapi? ( x11-libs/libva virtual/ffmpeg )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
diff --git a/media-video/vlc/vlc-1.1.8.ebuild b/media-video/vlc/vlc-1.1.8.ebuild
index 536458234410..7017d54a7210 100644
--- a/media-video/vlc/vlc-1.1.8.ebuild
+++ b/media-video/vlc/vlc-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.8.ebuild,v 1.4 2011/04/02 07:59:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.8.ebuild,v 1.5 2011/04/03 11:17:09 scarabeus Exp $
 
 EAPI="3"
 
@@ -76,7 +76,7 @@ RDEPEND="
 		dts? ( media-libs/libdca )
 		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
 		elibc_glibc? ( >=sys-libs/glibc-2.8 )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
+		ffmpeg? ( virtual/ffmpeg )
 		flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
 		fluidsynth? ( media-sound/fluidsynth )
 		fontconfig? ( media-libs/fontconfig )
@@ -135,7 +135,7 @@ RDEPEND="
 		upnp? ( net-libs/libupnp )
 		v4l2? ( libv4l2? ( media-libs/libv4l ) )
 		v4l? ( libv4l? ( media-libs/libv4l ) )
-		vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
+		vaapi? ( x11-libs/libva virtual/ffmpeg )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index 0867cc31e553..4d3f600fd6bf 100644
--- a/media-video/vlc/vlc-1.1.9999.ebuild
+++ b/media-video/vlc/vlc-1.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.25 2011/03/29 02:20:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.26 2011/04/03 11:17:09 scarabeus Exp $
 
 EAPI="3"
 
@@ -76,7 +76,7 @@ RDEPEND="
 		dts? ( media-libs/libdca )
 		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
 		elibc_glibc? ( >=sys-libs/glibc-2.8 )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
+		ffmpeg? ( virtual/ffmpeg )
 		flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
 		fluidsynth? ( media-sound/fluidsynth )
 		fontconfig? ( media-libs/fontconfig )
@@ -135,7 +135,7 @@ RDEPEND="
 		upnp? ( net-libs/libupnp )
 		v4l2? ( libv4l2? ( media-libs/libv4l ) )
 		v4l? ( libv4l? ( media-libs/libv4l ) )
-		vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
+		vaapi? ( x11-libs/libva virtual/ffmpeg )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a8c2577f38cc..117aba1e2dbd 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.135 2011/03/30 13:10:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.136 2011/04/03 11:17:09 scarabeus Exp $
 
 EAPI="4"
 
@@ -66,8 +66,8 @@ RDEPEND="
 		aac? ( >=media-libs/faad2-2.6.1 )
 		alsa? ( >=media-libs/alsa-lib-1.0.23 )
 		avahi? ( >=net-dns/avahi-0.6[dbus] )
-		avcodec? ( >=media-video/ffmpeg-0.6 )
-		avformat? ( >=media-video/ffmpeg-0.6 )
+		avcodec? ( virtual/ffmpeg )
+		avformat? ( virtual/ffmpeg )
 		bidi? ( >=dev-libs/fribidi-0.10.4 )
 		bluray? ( media-libs/libbluray )
 		cddb? ( >=media-libs/libcddb-1.2.0 )
@@ -113,7 +113,7 @@ RDEPEND="
 		opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
 		png? ( media-libs/libpng sys-libs/zlib )
 		portaudio? ( >=media-libs/portaudio-19_pre )
-		postproc? ( >=media-video/ffmpeg-0.6 )
+		postproc? ( virtual/ffmpeg )
 		projectm? ( media-libs/libprojectm )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
 		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
@@ -127,7 +127,7 @@ RDEPEND="
 		speex? ( media-libs/speex )
 		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
 		svg? ( >=gnome-base/librsvg-2.9.0 )
-		swscale? ( >=media-video/ffmpeg-0.6 )
+		swscale? ( virtual/ffmpeg )
 		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
 		theora? ( >=media-libs/libtheora-1.0_beta3 )
 		truetype? ( media-libs/freetype media-fonts/dejavu )
author	Tomas Chvatal <scarabeus@gentoo.org>	2011-04-03 11:17:09 +0000
committer	Tomas Chvatal <scarabeus@gentoo.org>	2011-04-03 11:17:09 +0000
commit	cc1e269c6dfde274aa005c15c2dcbac90e44c3d2 (patch)
tree	b9d3b09f0ebb46c36b665efb0ced3c0cd9dffe9e /media-video/vlc
parent	Drop old, #361773, thank Dustin Polke for this job. (diff)
download	historical-cc1e269c6dfde274aa005c15c2dcbac90e44c3d2.tar.gz historical-cc1e269c6dfde274aa005c15c2dcbac90e44c3d2.tar.bz2 historical-cc1e269c6dfde274aa005c15c2dcbac90e44c3d2.zip