Bump to enable swsscaler.

(Portage version: 2.1.3_rc5)

4 files changed, 10 insertions, 15 deletions

diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog
index 6e443c285e44..d4063cf43a1c 100644
--- a/x11-misc/xvidcap/ChangeLog
+++ b/x11-misc/xvidcap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xvidcap
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.35 2007/06/26 16:22:33 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.36 2007/06/26 20:44:14 drac Exp $
+
+*xvidcap-1.1.6-r2 (26 Jun 2007)
+
+  26 Jun 2007; Samuli Suominen <drac@gentoo.org>
+  files/xvidcap-1.1.6-ffmpeg.patch, -xvidcap-1.1.6-r1.ebuild,
+  +xvidcap-1.1.6-r2.ebuild:
+  Bump to enable swsscaler.
 
 *xvidcap-1.1.6-r1 (26 Jun 2007)
 
diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.6-r1 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.6-r2
index d58bc8018d57..d58bc8018d57 100644
--- a/x11-misc/xvidcap/files/digest-xvidcap-1.1.6-r1
+++ b/x11-misc/xvidcap/files/digest-xvidcap-1.1.6-r2
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.6-ffmpeg.patch b/x11-misc/xvidcap/files/xvidcap-1.1.6-ffmpeg.patch
index 3c5b8dfeedd8..a5e4a5bec507 100644
--- a/x11-misc/xvidcap/files/xvidcap-1.1.6-ffmpeg.patch
+++ b/x11-misc/xvidcap/files/xvidcap-1.1.6-ffmpeg.patch
@@ -1,15 +1,3 @@
-diff -ur xvidcap-1.1.6.orig/configure.in xvidcap-1.1.6/configure.in
---- xvidcap-1.1.6.orig/configure.in	2007-05-29 23:39:43.000000000 +0300
-+++ xvidcap-1.1.6/configure.in	2007-06-26 18:59:28.000000000 +0300
-@@ -402,7 +402,7 @@
- 
- 
- # only use ffmpeg if ALL required libs are present
--if ( `test x$ac_cv_lib_avcodec_avcodec_encode_video = xyes -a x$ac_cv_lib_avformat_av_write_header = xyes -a x$ac_cv_lib_avutil_av_rescale = xyes -a x$ac_cv_lib_swscale_sws_scale = xyes` ) ; then
-+if ( `test x$ac_cv_lib_avcodec_avcodec_encode_video = xyes -a x$ac_cv_lib_avformat_av_write_header = xyes -a x$ac_cv_lib_avutil_av_rescale = xyes` ) ; then
-     ac_cv_lib_avcodec_avcodec_encode_video=yes
- else
-     ac_cv_lib_avcodec_avcodec_encode_video=no
 diff -ur xvidcap-1.1.6.orig/src/xtoffmpeg.c xvidcap-1.1.6/src/xtoffmpeg.c
 --- xvidcap-1.1.6.orig/src/xtoffmpeg.c	2007-05-13 01:24:22.000000000 +0300
 +++ xvidcap-1.1.6/src/xtoffmpeg.c	2007-06-26 19:07:30.000000000 +0300
diff --git a/x11-misc/xvidcap/xvidcap-1.1.6-r1.ebuild b/x11-misc/xvidcap/xvidcap-1.1.6-r2.ebuild
index d14b56e8a796..0978b47a5755 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.6-r1.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.6-r1.ebuild,v 1.1 2007/06/26 16:22:33 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.6-r2.ebuild,v 1.1 2007/06/26 20:44:14 drac Exp $
 
 GCONF_DEBUG="no"
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mp3 theora"
 
 RDEPEND=">=x11-libs/gtk+-2.6
-	>=media-video/ffmpeg-0.4.9_p20070616
+	>=media-video/ffmpeg-0.4.9_p20070616-r1
 	mp3? ( media-sound/lame )
 	theora? ( media-libs/libtheora )"
 DEPEND="${RDEPEND}