Fix building and working with new ffmpeg (bug #115675). Deps for modular X.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 137 insertions, 3 deletions

diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog
index a631e370dde7..3641303f3474 100644
--- a/x11-misc/xvidcap/ChangeLog
+++ b/x11-misc/xvidcap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xvidcap
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.14 2005/11/01 10:28:07 nelchael Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.15 2006/01/14 13:14:43 nelchael Exp $
+
+*xvidcap-1.1.3-r2 (14 Jan 2006)
+
+  14 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xvidcap-1.1.3-new-ffmpeg.patch, +xvidcap-1.1.3-r2.ebuild:
+  Fix building and working with new ffmpeg (bug #115675). Deps for modular X.
 
   01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org>
   xvidcap-1.1.3-r1.ebuild:
diff --git a/x11-misc/xvidcap/Manifest b/x11-misc/xvidcap/Manifest
index 25eece0d9629..e77c3e58c3fb 100644
--- a/x11-misc/xvidcap/Manifest
+++ b/x11-misc/xvidcap/Manifest
@@ -1,5 +1,8 @@
-MD5 254cf9c1c7df2d66509fcc2f86d332f8 ChangeLog 1696
+MD5 e69d827dcbf13a6af3ec30f503c8b7b9 ChangeLog 1928
 MD5 33358554888df8808749a9c3cf28348b files/digest-xvidcap-1.1.3-r1 66
+MD5 33358554888df8808749a9c3cf28348b files/digest-xvidcap-1.1.3-r2 66
+MD5 093c63bdced794db036ee6ea29df14bd files/xvidcap-1.1.3-new-ffmpeg.patch 2200
 MD5 588ec359065346a6c3413d4ce9427ec5 files/xvidcap-1.1.3-use-ffmpeg-0.4.9.patch 573
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 be08635e21ff337fbe4e5a806cfeed7e xvidcap-1.1.3-r1.ebuild 1084
+MD5 720d65d4b29f01f6ec7bd02fa9b3e59a xvidcap-1.1.3-r2.ebuild 1379
diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r2 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r2
new file mode 100644
index 000000000000..545730f3eabf
--- /dev/null
+++ b/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r2
@@ -0,0 +1 @@
+MD5 ea896ffd35d6fe6d2abf51b38605f5fd xvidcap-1.1.3.tar.gz 1627036
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.3-new-ffmpeg.patch b/x11-misc/xvidcap/files/xvidcap-1.1.3-new-ffmpeg.patch
new file mode 100644
index 000000000000..b12e324c9821
--- /dev/null
+++ b/x11-misc/xvidcap/files/xvidcap-1.1.3-new-ffmpeg.patch
@@ -0,0 +1,60 @@
+diff -Nru xvidcap-1.1.3.vanilla/src/xtoffmpeg.c xvidcap-1.1.3/src/xtoffmpeg.c
+--- xvidcap-1.1.3.vanilla/src/xtoffmpeg.c	2006-01-14 12:20:42.000000000 +0100
++++ xvidcap-1.1.3/src/xtoffmpeg.c	2006-01-14 13:05:06.000000000 +0100
+@@ -682,7 +682,7 @@
+             exit (1);
+         }
+         
+-        c = &out_st->codec;
++        c = out_st->codec;
+         c->codec_id = transCodec;
+         c->codec_type = CODEC_TYPE_VIDEO;
+         
+@@ -696,8 +696,10 @@
+         #endif  /* DEBUG */
+         
+         /* frames per second */
+-        c->frame_rate = job->fps;
+-        c->frame_rate_base = 1;
++        /*c->frame_rate = job->fps;
++        c->frame_rate_base = 1;*/
++		c->time_base.den = job->fps * 1000;
++		c->time_base.num = 1000;
+         c->gop_size = 250; /* emit one intra frame every 10 frames */
+         //        c->me_method = ME_EPZS;
+         //	    c->debug = 0x00000FFF;
+@@ -707,10 +709,13 @@
+          */
+         memset (p_fParams, 0, sizeof(*p_fParams));
+         p_fParams->image_format = image_format;
+-        p_fParams->frame_rate = out_st->codec.frame_rate;
++        /*p_fParams->frame_rate = out_st->codec.frame_rate;
+         p_fParams->frame_rate_base = out_st->codec.frame_rate_base;
+         p_fParams->width = out_st->codec.width;
+-        p_fParams->height = out_st->codec.height;
++        p_fParams->height = out_st->codec.height;*/
++		p_fParams->time_base = out_st->codec->time_base;
++		p_fParams->width = out_st->codec->width;
++		p_fParams->height = out_st->codec->height;
+         if (av_set_parameters (output_file, p_fParams) < 0) {
+             //        if (av_set_parameters(output_file, NULL) < 0) {
+             fprintf (stderr, "xtoffmpeg.XImageToFFMPEG(): Invalid encoding parameters ... aborting\n");
+@@ -720,7 +725,8 @@
+         /*
+          * open codec
+          */
+-        c = &out_st->codec;
++        c = out_st->codec;
++		c->pix_fmt = PIX_FMT_YUV420P;
+         
+         /* find the video encoder */
+         codec = avcodec_find_encoder (c->codec_id);
+@@ -1159,7 +1165,7 @@
+     #endif // HAVE_FFMPEG_AUDIO
+     
+     if (out_st) {
+-        avcodec_close (&out_st->codec);
++        avcodec_close (out_st->codec);
+         out_st = NULL;
+     }
+ 
diff --git a/x11-misc/xvidcap/xvidcap-1.1.3-r2.ebuild b/x11-misc/xvidcap/xvidcap-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..9f026d69f7fe
--- /dev/null
+++ b/x11-misc/xvidcap/xvidcap-1.1.3-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.3-r2.ebuild,v 1.1 2006/01/14 13:14:43 nelchael Exp $
+
+inherit eutils
+
+IUSE="gtk"
+
+DESCRIPTION="Screen capture utility enabling you to create videos of your desktop for illustration or documentation purposes."
+HOMEPAGE="http://xvidcap.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xvidcap/${P}.tar.gz"
+
+KEYWORDS="amd64 ~ppc x86"
+LICENSE="GPL-2"
+
+RDEPEND="gtk? ( >=x11-libs/gtk+-2.0.0 )
+	>=media-video/ffmpeg-0.4.9_pre1
+	media-libs/libpng
+	media-libs/jpeg
+	sys-libs/zlib
+	!gtk? (
+		|| ( (
+			x11-libs/libX11
+			x11-libs/libXmu
+			x11-libs/libXt
+			x11-libs/libXext )
+		virtual/x11 )
+	)"
+
+DEPEND="${RDEPEND}
+	!gtk2? (
+		|| ( (
+			x11-proto/xextproto
+			x11-proto/xf86dgaproto
+			x11-proto/videoproto
+			x11-proto/xproto )
+		virtual/x11 )
+	)"
+
+SLOT="0"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Fix bug #62741
+	epatch "${FILESDIR}/${P}-use-ffmpeg-0.4.9.patch"
+
+	# Fix bug #115675
+	epatch "${FILESDIR}/${P}-new-ffmpeg.patch"
+}
+
+src_compile() {
+	econf `use_with gtk gtk2` || die "Configuration failed"
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	einstall || die "Installation failed"
+
+	# Fix for #58322
+	rm -fr ${D}/usr/share/doc/${PN}_${PV}
+	dodoc NEWS TODO README AUTHORS ChangeLog XVidcap.ad
+}