Version bump. New patches added for newer ffmpeg issues, thanks to Vasily Shmelev in bug 242680 and Filipe Sousa in bug 234383. Fixes bugs 232590, 234383, 242678 and 242680. Remove rc version.

(Portage version: 2.2_rc12_p11688/cvs/Linux 2.6.26-hh3 i686)

4 files changed, 95 insertions, 7 deletions

diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog
index 07187381a11f..5898e7bb953a 100644
--- a/x11-misc/xvidcap/ChangeLog
+++ b/x11-misc/xvidcap/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/xvidcap
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.43 2008/07/17 08:04:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.44 2008/10/20 22:55:10 yngwin Exp $
+
+*xvidcap-1.1.7 (20 Oct 2008)
+
+  20 Oct 2008; Ben de Groot <yngwin@gentoo.org>
+  -xvidcap-1.1.7_rc1.ebuild, +files/xvidcap-1.1.7-ffmpeg-headers.patch,
+  +files/xvidcap-1.1.7-ffmpeg-trellis.patch, +xvidcap-1.1.7.ebuild:
+  Version bump. New patches added for newer ffmpeg issues, thanks to Vasily
+  Shmelev in bug 242680 and Filipe Sousa in bug 234383. Fixes bugs 232590,
+  234383, 242678 and 242680. Remove rc version.
 
   17 Jul 2008; Alexis Ballier <aballier@gentoo.org> xvidcap-1.1.6-r2.ebuild:
   Fix deps wrt ffmpeg: 0.4.9_p20070616-r3 to -r20 doesn't have swscaler, -r1
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch
new file mode 100644
index 000000000000..005ed2ba4c6d
--- /dev/null
+++ b/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch
@@ -0,0 +1,49 @@
+diff -wru /home/fsousa/tmp/xvidcap-1.1.7/src/codecs.c xvidcap-1.1.7/src/codecs.c
+--- src/codecs.c	2008-05-25 23:01:53.000000000 +0100
++++ src/codecs.c	2008-08-10 15:58:40.000000000 +0100
+@@ -43,8 +43,8 @@
+ #include <locale.h>
+ 
+ #ifdef USE_FFMPEG
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ #endif     // USE_FFMPEG
+ 
+ #include "app_data.h"
+diff -wru /home/fsousa/tmp/xvidcap-1.1.7/src/main.c xvidcap-1.1.7/src/main.c
+--- src/main.c	2008-05-25 23:01:54.000000000 +0100
++++ src/main.c	2008-08-10 15:59:07.000000000 +0100
+@@ -45,7 +45,7 @@
+ #include <locale.h>
+ 
+ #ifdef USE_FFMPEG
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #endif     // USE_FFMPEG
+ 
+ #include "control.h"
+diff -wru /home/fsousa/tmp/xvidcap-1.1.7/src/xtoffmpeg.c xvidcap-1.1.7/src/xtoffmpeg.c
+--- src/xtoffmpeg.c	2008-05-25 23:01:54.000000000 +0100
++++ src/xtoffmpeg.c	2008-08-10 16:01:08.000000000 +0100
+@@ -56,13 +56,13 @@
+ #include "xvidcap-intl.h"
+ 
+ // ffmpeg stuff
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/avdevice.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libavdevice/avdevice.h>
+ //#include <ffmpeg/dsputil.h>
+-#include <ffmpeg/swscale.h>
+-#include <ffmpeg/rgb2rgb.h>
+-#include <ffmpeg/fifo.h>
++#include <libswscale/swscale.h>
++#include <libswscale/rgb2rgb.h>
++#include <libavutil/fifo.h>
+ #define swscale_isRGB(x) ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24 \
+                         || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \
+                         || (x)==PIX_FMT_RGB8 || (x)==PIX_FMT_RGB4 \
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-trellis.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-trellis.patch
new file mode 100644
index 000000000000..10f800593c49
--- /dev/null
+++ b/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-trellis.patch
@@ -0,0 +1,26 @@
+--- xvidcap-1.1.7-orig/src/main.c	2008-10-21 00:27:54.000000000 +0200
++++ xvidcap-1.1.7/src/main.c	2008-10-21 00:28:17.000000000 +0200
+@@ -217,9 +217,6 @@
+ 
+     if (app)
+         xvc_appdata_free (app);
+-#ifdef USE_FFMPEG
+-    av_free_static ();
+-#endif
+ }
+ 
+ /**
+--- xvidcap-1.1.7-orig/src/xtoffmpeg.c	2008-10-21 00:08:19.000000000 +0200
++++ xvidcap-1.1.7/src/xtoffmpeg.c	2008-10-21 00:11:00.000000000 +0200
+@@ -1248,7 +1248,11 @@
+     st->codec->flags |= CODEC_FLAG2_FAST;
+     // there is no trellis quantiser in libav* for mjpeg
+     if (st->codec->codec_id != CODEC_ID_MJPEG)
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         st->codec->flags |= CODEC_FLAG_TRELLIS_QUANT;
++#else
++		st->codec->trellis = 1;
++#endif
+     st->codec->flags &= ~CODEC_FLAG_OBMC;
+     // some formats want stream headers to be seperate
+     if (oc->oformat->flags & AVFMT_GLOBALHEADER)
diff --git a/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild b/x11-misc/xvidcap/xvidcap-1.1.7.ebuild
index e4e385f19c73..a3a07f7b818f 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.7_rc1.ebuild,v 1.2 2008/06/29 07:48:22 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.7.ebuild,v 1.1 2008/10/20 22:55:10 yngwin Exp $
 
 GCONF_DEBUG="no"
 
 inherit eutils autotools gnome2
 
 MY_P=${P/_rc/rc}
-DESCRIPTION="Screen capture utility enabling you to create videos of your desktop for illustration or documentation purposes."
+DESCRIPTION="Screen capture utility to create videos of your desktop for documentation purposes"
 HOMEPAGE="http://xvidcap.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
@@ -29,14 +29,15 @@ DEPEND="${RDEPEND}
 	dev-perl/XML-Parser
 	app-text/gnome-doc-utils"
 
-S=${WORKDIR}/${PN}-1.1.6
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
-	epatch "${FILESDIR}"/${P}-new-ffmpeg-headers.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg-headers.patch
+	# bug 242680
+	epatch "${FILESDIR}"/${P}-ffmpeg-trellis.patch
 	eautoreconf
+	# bug 242678
+	intltoolize --force || die "intltoolize failed"
 }
 
 src_compile() {
@@ -52,4 +53,7 @@ src_install() {
 	# Almost like bug #58322 but directory name changed.
 	rm -rf "${D}"/usr/share/doc/${PN}
 	dodoc AUTHORS ChangeLog README TODO.tasks
+
+	# Optional. See also bug 232590.
+	elog "For previewing the captured movie you should install media-video/mplayer"
 }