Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1 and -r2 have it, part of bug #231831.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

8 files changed, 28 insertions, 15 deletions

diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog
index a7dc50c13adf..98482d78d9b7 100644
--- a/media-video/ffmpeg2theora/ChangeLog
+++ b/media-video/ffmpeg2theora/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg2theora
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.23 2008/06/13 21:40:13 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.24 2008/07/17 08:02:42 aballier Exp $
+
+  17 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+  ffmpeg2theora-0.19.ebuild, ffmpeg2theora-0.20.ebuild,
+  ffmpeg2theora-0.21.ebuild, ffmpeg2theora-9999.ebuild:
+  Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1
+  and -r2 have it, part of bug #231831.
 
 *ffmpeg2theora-0.21 (13 Jun 2008)
 
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.19.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.19.ebuild
index 6d71db3816d0..45db58d30cf1 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.19.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.19.ebuild,v 1.2 2008/01/03 16:00:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.19.ebuild,v 1.3 2008/07/17 08:02:42 aballier Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=media-video/ffmpeg-0.4.9_p20070616-r1
+RDEPEND=">=media-video/ffmpeg-0.4.9_p20070616-r20
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.0_alpha6"
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.20.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.20.ebuild
index e982b70dd8fc..e08b15fb077a 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.20.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.20.ebuild,v 1.3 2008/01/05 16:11:45 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.20.ebuild,v 1.4 2008/07/17 08:02:42 aballier Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=media-video/ffmpeg-0.4.9_p20070616-r1
+RDEPEND=">=media-video/ffmpeg-0.4.9_p20070616-r20
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.0_beta1"
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.21.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.21.ebuild
index 3f22e821ca8c..5511cdd56aa2 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.21.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.21.ebuild,v 1.1 2008/06/13 21:40:13 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.21.ebuild,v 1.2 2008/07/17 08:02:42 aballier Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=media-video/ffmpeg-0.4.9_p20070616-r1
+RDEPEND=">=media-video/ffmpeg-0.4.9_p20070616-r20
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.0_beta1"
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-9999.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-9999.ebuild
index 4854f18c953b..f2fabf9db1bd 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-9999.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-9999.ebuild,v 1.1 2008/02/12 14:46:01 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-9999.ebuild,v 1.2 2008/07/17 08:02:42 aballier Exp $
 
 ESVN_REPO_URI="http://svn.xiph.org/trunk/${PN}"
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=media-video/ffmpeg-0.4.9_p20070616-r1
+RDEPEND=">=media-video/ffmpeg-0.4.9_p20070616-r20
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.0_beta1"
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index fe5c931e06d0..0c8c5303d5bc 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.359 2008/07/15 17:47:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.360 2008/07/17 07:57:48 aballier Exp $
+
+  17 Jul 2008; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6i.ebuild,
+  vlc-0.9.0_beta2.ebuild:
+  Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1
+  and -r2 have it, part of bug #231831.
 
   15 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org> vlc-0.8.6i.ebuild:
   ppc stable, bug #230692
diff --git a/media-video/vlc/vlc-0.8.6i.ebuild b/media-video/vlc/vlc-0.8.6i.ebuild
index 44c8c7a56151..504382ec8bac 100644
--- a/media-video/vlc/vlc-0.8.6i.ebuild
+++ b/media-video/vlc/vlc-0.8.6i.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6i.ebuild,v 1.4 2008/07/15 17:47:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6i.ebuild,v 1.5 2008/07/17 07:57:48 aballier Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -40,7 +40,9 @@ optimisememory libnotify jack musepack x264 dc1394 gnome xulrunner"
 
 RDEPEND="
 		>=media-video/ffmpeg-0.4.9_p20050226-r1
-		<media-video/ffmpeg-0.4.9_p20070616-r1
+		<media-video/ffmpeg-0.4.9_p20070616-r20
+		!=media-video/ffmpeg-0.4.9_p20070616-r1
+		!=media-video/ffmpeg-0.4.9_p20070616-r2
 		cdda? ( >=dev-libs/libcdio-0.71
 			cddb? ( >=media-libs/libcddb-1.2.0 ) )
 		live? ( >=media-plugins/live-2005.01.29 )
diff --git a/media-video/vlc/vlc-0.9.0_beta2.ebuild b/media-video/vlc/vlc-0.9.0_beta2.ebuild
index 495398b0cfd0..60a1c8b07273 100644
--- a/media-video/vlc/vlc-0.9.0_beta2.ebuild
+++ b/media-video/vlc/vlc-0.9.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_beta2.ebuild,v 1.1 2008/07/14 12:51:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_beta2.ebuild,v 1.2 2008/07/17 07:57:48 aballier Exp $
 
 EAPI="1"
 
@@ -70,7 +70,7 @@ RDEPEND="
 				>=media-libs/libdvdnav-0.1.9
 				media-libs/libdvdplay )
 		esd? ( media-sound/esound )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616 )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r3 )
 		flac? ( media-libs/libogg
 			>=media-libs/flac-1.1.2 )
 		fluidsynth? ( media-sound/fluidsynth )
@@ -176,7 +176,7 @@ vlc_use_enable_force() {
 # Prints the configure argument for the ffmpeg scaling api to use
 vlc_ffmpeg_scaling_api() {
 	if use ffmpeg ; then
-		if has_version ">=media-video/ffmpeg-0.4.9_p20070616-r1" ; then
+		if has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" ; then
 			echo "--enable-swscale --disable-imgresample"
 		else
 			echo "--disable-swscale --enable-imgresample"