Fix typing error in old version. Revision bump to new version which uses system ffmpeg, instead of bundled ffmpeg.

Package-Manager: portage-2.1.3_rc5

7 files changed, 83 insertions, 36 deletions

diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog
index 34ff0d5c2de0..6e443c285e44 100644
--- a/x11-misc/xvidcap/ChangeLog
+++ b/x11-misc/xvidcap/ChangeLog
@@ -1,6 +1,14 @@
 # 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.34 2007/05/31 12:20:03 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.35 2007/06/26 16:22:33 drac Exp $
+
+*xvidcap-1.1.6-r1 (26 Jun 2007)
+
+  26 Jun 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xvidcap-1.1.6-ffmpeg.patch, -xvidcap-1.1.5.ebuild,
+  xvidcap-1.1.6.ebuild, +xvidcap-1.1.6-r1.ebuild:
+  Fix typing error in old version. Revision bump to new version which uses
+  system ffmpeg, instead of bundled ffmpeg.
 
 *xvidcap-1.1.6 (31 May 2007)
 
diff --git a/x11-misc/xvidcap/Manifest b/x11-misc/xvidcap/Manifest
index e5c61a93abff..a2b3afbed75d 100644
--- a/x11-misc/xvidcap/Manifest
+++ b/x11-misc/xvidcap/Manifest
@@ -1,22 +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
 DIST xvidcap-1.1.4rc1.tar.gz 2642762 RMD160 9e0d13da57feb6991a6ebe0d42db399d97da3c18 SHA1 473c9d4dd7dcae645077b711de4d5fcb56bab9fd SHA256 912df39e610397e78d40197dc603178d62d1e9de1c522de53a82db92810d8648
-DIST xvidcap-1.1.5.tar.gz 4253561 RMD160 6654239d02cf859c788c63a500f3cc0a4c5be9ef SHA1 acf62059b3850d98c7501412cc96f7409221425f SHA256 56a052b9ab8ec081c4edd6f1460f7b7bde6f1eb503c7bf38ef45ed7a45e35271
 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.5.ebuild 1015 RMD160 1640d964abbbb8f72b6a0294240d343a3cd904c0 SHA1 affe4fe515369f299d1e0951dbdbaeadda8eacb6 SHA256 935f4e6b01bc922f6e1a1c823f26af3b2827e2d2d9553d14b5556a7c8d3c6b50
-MD5 5661bfd570b1f219b92f1527fe6b6ebb xvidcap-1.1.5.ebuild 1015
-RMD160 1640d964abbbb8f72b6a0294240d343a3cd904c0 xvidcap-1.1.5.ebuild 1015
-SHA256 935f4e6b01bc922f6e1a1c823f26af3b2827e2d2d9553d14b5556a7c8d3c6b50 xvidcap-1.1.5.ebuild 1015
-EBUILD xvidcap-1.1.6.ebuild 1107 RMD160 6f41cc7b51de817e383a553d67e8927831b969ea SHA1 0ae44a15f7873f953b0f1faced2691fcd53e485b SHA256 c97ec0b4036c17f1bda05ab09fb96e6c15b6f355d23da29c1530822438715c4a
-MD5 52f05659118d23b3aea5d457ee00810e xvidcap-1.1.6.ebuild 1107
-RMD160 6f41cc7b51de817e383a553d67e8927831b969ea xvidcap-1.1.6.ebuild 1107
-SHA256 c97ec0b4036c17f1bda05ab09fb96e6c15b6f355d23da29c1530822438715c4a xvidcap-1.1.6.ebuild 1107
-MISC ChangeLog 5087 RMD160 7d8bbf502429ca674246363b09ff7cb013ec6b6a SHA1 cda08b18d32e2eb6fdb917e0272d81b2c7301b5b SHA256 061717845c34686e99cb9d233cd2bab5025eff8b2c36f38c28c322c8ae8e4ed9
-MD5 5c23c818703ce872f0bacde32e81b86b ChangeLog 5087
-RMD160 7d8bbf502429ca674246363b09ff7cb013ec6b6a ChangeLog 5087
-SHA256 061717845c34686e99cb9d233cd2bab5025eff8b2c36f38c28c322c8ae8e4ed9 ChangeLog 5087
+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.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 metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -24,9 +27,9 @@ SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata
 MD5 164c233bad539af54d3bfbf11604a03e files/digest-xvidcap-1.1.4_rc1 253
 RMD160 887e29c30f6635107a1f26440ae4daa0fcd27f9c files/digest-xvidcap-1.1.4_rc1 253
 SHA256 80537b20385946efc650f02264f73e0c193a8138c55bab27bfb583e5241ccbfa files/digest-xvidcap-1.1.4_rc1 253
-MD5 7c0de783fb0a4b97d8a678d61e6763d7 files/digest-xvidcap-1.1.5 244
-RMD160 37feceb8e913a410cee78362450ee70e439f1475 files/digest-xvidcap-1.1.5 244
-SHA256 c2750e3b2f8c4eafa1b6541573890c21d73efc5a239148ae2c24a83244c37050 files/digest-xvidcap-1.1.5 244
 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
diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.5 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.5
deleted file mode 100644
index 9267a0f6bc87..000000000000
--- a/x11-misc/xvidcap/files/digest-xvidcap-1.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eca025ff2e0c583152cd47dff8d4c950 xvidcap-1.1.5.tar.gz 4253561
-RMD160 6654239d02cf859c788c63a500f3cc0a4c5be9ef xvidcap-1.1.5.tar.gz 4253561
-SHA256 56a052b9ab8ec081c4edd6f1460f7b7bde6f1eb503c7bf38ef45ed7a45e35271 xvidcap-1.1.5.tar.gz 4253561
diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.6-r1 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.6-r1
new file mode 100644
index 000000000000..d58bc8018d57
--- /dev/null
+++ b/x11-misc/xvidcap/files/digest-xvidcap-1.1.6-r1
@@ -0,0 +1,3 @@
+MD5 c6add7ae452e5cecbdda6e55e7c67cdb xvidcap-1.1.6.tar.gz 4298103
+RMD160 d204c5285ad7d7926b844b543b6233c2adce5a0c xvidcap-1.1.6.tar.gz 4298103
+SHA256 17ca7b7f8ce12f7e312b2abc2da7f381dc0e964cdac6312631cd7987f02b9fba xvidcap-1.1.6.tar.gz 4298103
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.6-ffmpeg.patch b/x11-misc/xvidcap/files/xvidcap-1.1.6-ffmpeg.patch
new file mode 100644
index 000000000000..3c5b8dfeedd8
--- /dev/null
+++ b/x11-misc/xvidcap/files/xvidcap-1.1.6-ffmpeg.patch
@@ -0,0 +1,23 @@
+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
+@@ -58,7 +58,6 @@
+ // ffmpeg stuff
+ #include <ffmpeg/avcodec.h>
+ #include <ffmpeg/avformat.h>
+-#include <ffmpeg/dsputil.h>
+ #include <ffmpeg/swscale.h>
+ #include <ffmpeg/rgb2rgb.h>
+ #include <ffmpeg/fifo.h>
diff --git a/x11-misc/xvidcap/xvidcap-1.1.5.ebuild b/x11-misc/xvidcap/xvidcap-1.1.6-r1.ebuild
index 4b5a3a22c356..d14b56e8a796 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.5.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.6-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.5.ebuild,v 1.2 2007/05/15 14:48:23 drac Exp $
+# $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 $
 
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Screen capture utility enabling you to create videos of your desktop for illustration or documentation purposes."
 HOMEPAGE="http://xvidcap.sourceforge.net"
@@ -13,26 +13,39 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/gtk+-2.4
-	media-sound/lame"
+IUSE="mp3 theora"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=media-video/ffmpeg-0.4.9_p20070616
+	mp3? ( media-sound/lame )
+	theora? ( media-libs/libtheora )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
+	virtual/libintl
 	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	sys-devel/gettext"
+	dev-perl/XML-Parser
+	app-text/gnome-doc-utils"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ffmpeg.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf --without-forced-embedded-ffmpeg \
+		--includedir=/usr/include/ffmpeg \
+		$(use_enable mp3 libmp3lame) \
+		$(use_enable theora libtheora)
+	emake || die "emake failed."
+}
 
 src_install() {
 	emake DESTDIR="${D}" install || "emake install failed."
 
 	# Almost like bug #58322 but directory name changed.
 	rm -rf "${D}"/usr/share/doc/${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO.tasks
+	dodoc AUTHORS ChangeLog README TODO.tasks
 }
diff --git a/x11-misc/xvidcap/xvidcap-1.1.6.ebuild b/x11-misc/xvidcap/xvidcap-1.1.6.ebuild
index cd77de920e17..2e5237b43b53 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.6.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.6.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.ebuild,v 1.1 2007/05/31 12:20:03 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.6.ebuild,v 1.2 2007/06/26 16:22:33 drac Exp $
 
 GCONF_DEBUG="no"
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils"
 
 src_compile() {
-	econf $(use_enable mp3 libmp3lame)
+	econf $(use_enable mp3 libmp3lame) \
 		$(use_enable theora libtheora)
 	emake || die "emake failed."
 }