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

(Portage version: 2.1.3_rc5)

6 files changed, 64 insertions, 20 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/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."
 }