Bump to enable swsscaler.

Package-Manager: portage-2.1.3_rc5

5 files changed, 25 insertions, 30 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/Manifest b/x11-misc/xvidcap/Manifest
index a2b3afbed75d..5dd1643c9314 100644
--- a/x11-misc/xvidcap/Manifest
+++ b/x11-misc/xvidcap/Manifest
@@ -1,25 +1,25 @@
-AUX xvidcap-1.1.6-ffmpeg.patch 1164 RMD160 3f47cf3e3761bcb1ff1c6b6a76e6c26ecdce8e97 SHA1 92192a29df387b26c5bba790c11b027028102413 SHA256 8b5dd831d2128ce8b763f566112c16e57c4e1b194205078275378f61baa75c0b
-MD5 25e7042bbcd844bc1d358ca1d95ec40e files/xvidcap-1.1.6-ffmpeg.patch 1164
-RMD160 3f47cf3e3761bcb1ff1c6b6a76e6c26ecdce8e97 files/xvidcap-1.1.6-ffmpeg.patch 1164
-SHA256 8b5dd831d2128ce8b763f566112c16e57c4e1b194205078275378f61baa75c0b files/xvidcap-1.1.6-ffmpeg.patch 1164
+AUX xvidcap-1.1.6-ffmpeg.patch 426 RMD160 feb6301777033bc3ff18bbc73ac9fde1d50b85a1 SHA1 b1f3942b3addb454d3d5aadce4c89ed9eb774e8c SHA256 7de6304ece3db116174d59f1c61d020d334c7289584993c6d193c69980c37561
+MD5 15dfd357aa5b5cc4aa7e22256dca590a files/xvidcap-1.1.6-ffmpeg.patch 426
+RMD160 feb6301777033bc3ff18bbc73ac9fde1d50b85a1 files/xvidcap-1.1.6-ffmpeg.patch 426
+SHA256 7de6304ece3db116174d59f1c61d020d334c7289584993c6d193c69980c37561 files/xvidcap-1.1.6-ffmpeg.patch 426
 DIST xvidcap-1.1.4rc1.tar.gz 2642762 RMD160 9e0d13da57feb6991a6ebe0d42db399d97da3c18 SHA1 473c9d4dd7dcae645077b711de4d5fcb56bab9fd SHA256 912df39e610397e78d40197dc603178d62d1e9de1c522de53a82db92810d8648
 DIST xvidcap-1.1.6.tar.gz 4298103 RMD160 d204c5285ad7d7926b844b543b6233c2adce5a0c SHA1 64a179c301a9b3d06fe47f596721033be9a1a305 SHA256 17ca7b7f8ce12f7e312b2abc2da7f381dc0e964cdac6312631cd7987f02b9fba
 EBUILD xvidcap-1.1.4_rc1.ebuild 1019 RMD160 408c7ae362f95045c8f4593079b2d01d88bed3f0 SHA1 f2a1be1dceb3192ac21bb3941514f4801e052ba6 SHA256 84df47ac5ebeb3c8c90da534034aa72831d57af1d87b6989d342048744465b2c
 MD5 2f7bd715e9f6266adee17d8624ccaa40 xvidcap-1.1.4_rc1.ebuild 1019
 RMD160 408c7ae362f95045c8f4593079b2d01d88bed3f0 xvidcap-1.1.4_rc1.ebuild 1019
 SHA256 84df47ac5ebeb3c8c90da534034aa72831d57af1d87b6989d342048744465b2c xvidcap-1.1.4_rc1.ebuild 1019
-EBUILD xvidcap-1.1.6-r1.ebuild 1336 RMD160 36fc2851a9f54cacedbcecd091f67048ea0d6633 SHA1 c9832e3f6d22a15d124f51bca758e399ec9a7fce SHA256 6e30786544d6ebfabbc7079e3da8db70fa3ab0da4879d730a817898f1dc7ec89
-MD5 c31986a19141f1129aa303500e8cff63 xvidcap-1.1.6-r1.ebuild 1336
-RMD160 36fc2851a9f54cacedbcecd091f67048ea0d6633 xvidcap-1.1.6-r1.ebuild 1336
-SHA256 6e30786544d6ebfabbc7079e3da8db70fa3ab0da4879d730a817898f1dc7ec89 xvidcap-1.1.6-r1.ebuild 1336
+EBUILD xvidcap-1.1.6-r2.ebuild 1339 RMD160 24c82d00dfa61325b7eb04ddad0c8e1b26a5dd5b SHA1 8f2e1c0a12f3038df2a0d1fd0b7ee0dea2fdf5ee SHA256 4ae5f66802cad3639eb4387ffed42cb17ed1bbbaa17dd05191330756c0824b06
+MD5 6213b5bcbd289ed3b367f3c5d594e6fb xvidcap-1.1.6-r2.ebuild 1339
+RMD160 24c82d00dfa61325b7eb04ddad0c8e1b26a5dd5b xvidcap-1.1.6-r2.ebuild 1339
+SHA256 4ae5f66802cad3639eb4387ffed42cb17ed1bbbaa17dd05191330756c0824b06 xvidcap-1.1.6-r2.ebuild 1339
 EBUILD xvidcap-1.1.6.ebuild 1109 RMD160 dc818606408ecfb860afa37dffb3343731558267 SHA1 806f25658ee601a9a1308944eb4599c26cb418cf SHA256 6444225e8b27bf47d58c2bb17bd0899ae92d5a4a81eb21e1149fb931db3ac92d
 MD5 f9604bf49c6eb62f7a1857191c80e848 xvidcap-1.1.6.ebuild 1109
 RMD160 dc818606408ecfb860afa37dffb3343731558267 xvidcap-1.1.6.ebuild 1109
 SHA256 6444225e8b27bf47d58c2bb17bd0899ae92d5a4a81eb21e1149fb931db3ac92d xvidcap-1.1.6.ebuild 1109
-MISC ChangeLog 5399 RMD160 4b99b6327ee603dcdf70a4133bf00932cbc673a2 SHA1 80299c7088fafce0906852e58962e1054598f448 SHA256 7de34d8ed075344c2dcb79a102b2c320b3dc9554b85e53a55ccd1345c9ced6d2
-MD5 e639613f4738204a34d1f14dc3f37268 ChangeLog 5399
-RMD160 4b99b6327ee603dcdf70a4133bf00932cbc673a2 ChangeLog 5399
-SHA256 7de34d8ed075344c2dcb79a102b2c320b3dc9554b85e53a55ccd1345c9ced6d2 ChangeLog 5399
+MISC ChangeLog 5600 RMD160 0c61efc93be92c3bc587265f12313f8ddff2fde1 SHA1 7465d0a46b16f2c0c5ba9bc89166d1c7014abd37 SHA256 cbf790f470688c9f5610e0c518d7542f03dfb338b01f1621b37c18af1a28b8e7
+MD5 0e97522cb34ee6298a70aaeed55a0960 ChangeLog 5600
+RMD160 0c61efc93be92c3bc587265f12313f8ddff2fde1 ChangeLog 5600
+SHA256 cbf790f470688c9f5610e0c518d7542f03dfb338b01f1621b37c18af1a28b8e7 ChangeLog 5600
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -30,6 +30,6 @@ SHA256 80537b20385946efc650f02264f73e0c193a8138c55bab27bfb583e5241ccbfa files/di
 MD5 22fd35b29d4ccad0075f03200e1d6c3a files/digest-xvidcap-1.1.6 244
 RMD160 31bc3ba83fd75d2415cb1aa4caaa025605c86d0e files/digest-xvidcap-1.1.6 244
 SHA256 a23e4f750b320791eeb9793a5efeea33dd281cb66c0f685ed73321c157e4b18d files/digest-xvidcap-1.1.6 244
-MD5 22fd35b29d4ccad0075f03200e1d6c3a files/digest-xvidcap-1.1.6-r1 244
-RMD160 31bc3ba83fd75d2415cb1aa4caaa025605c86d0e files/digest-xvidcap-1.1.6-r1 244
-SHA256 a23e4f750b320791eeb9793a5efeea33dd281cb66c0f685ed73321c157e4b18d files/digest-xvidcap-1.1.6-r1 244
+MD5 22fd35b29d4ccad0075f03200e1d6c3a files/digest-xvidcap-1.1.6-r2 244
+RMD160 31bc3ba83fd75d2415cb1aa4caaa025605c86d0e files/digest-xvidcap-1.1.6-r2 244
+SHA256 a23e4f750b320791eeb9793a5efeea33dd281cb66c0f685ed73321c157e4b18d files/digest-xvidcap-1.1.6-r2 244
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}