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.

Package-Manager: portage-2.2_rc12_p11688/cvs/Linux 2.6.26-hh3 i686

5 files changed, 100 insertions, 20 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/Manifest b/x11-misc/xvidcap/Manifest
index 255566e05fbb..0a744d6a4906 100644
--- a/x11-misc/xvidcap/Manifest
+++ b/x11-misc/xvidcap/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xvidcap-1.1.6-ffmpeg.patch 426 RMD160 feb6301777033bc3ff18bbc73ac9fde1d50b85a1 SHA1 b1f3942b3addb454d3d5aadce4c89ed9eb774e8c SHA256 7de6304ece3db116174d59f1c61d020d334c7289584993c6d193c69980c37561
+AUX xvidcap-1.1.7-ffmpeg-headers.patch 1655 RMD160 6f521cc0027145a3436f3f356e338365f22f0707 SHA1 fcb6294dd73763bb0523fd85674257438674bac8 SHA256 a1866ef6207d06da2aec0ed45e272152d0f23e6e56a25377db8e7d71c7683e7b
+AUX xvidcap-1.1.7-ffmpeg-trellis.patch 878 RMD160 c8ecffe12a8f9c7fd140250c2dd5371e09bba76a SHA1 0d1f7576b8098c2d20b95a62ec98563b9b8de0ec SHA256 e856b43cd95ee28a5101d9ed14bb05097e8c61f0eb4ce29307428eef1900bb0f
 AUX xvidcap-1.1.7_rc1-ffmpeg.patch 6973 RMD160 f20d8adadbc07df0230ee3304f596faceba57eac SHA1 33d16bb2ae95ab89b376c5b625001a65daa010f3 SHA256 886066f9c59c9323e3c0c52a56307c4f45adbe188d5f3f6baf69eff45f30833c
 AUX xvidcap-1.1.7_rc1-new-ffmpeg-headers.patch 1685 RMD160 2960af16c3f3170d1e1fddc9b5667d18fc981f1b SHA1 6f09848845416b04b526bf5dfb2e66c9ba5c97a0 SHA256 be990d311777f362625973fa633ee174eb8b0bb64fda6bf19953d37b633f9453
 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
-DIST xvidcap-1.1.7rc1.tar.gz 4459712 RMD160 a2fb829fb4e7c220de6ffeea513dd995bf0fa340 SHA1 88d935ee17857b190454fbee11cd394f41af60c0 SHA256 487bf07b2f9ead6a59682d091081e47cfe4ca5777de32e6cec5bef55fa51c82f
+DIST xvidcap-1.1.7.tar.gz 4789924 RMD160 782f0f8b4693bb3e96fdf06de71b2f6832b246e0 SHA1 ccdf8ac85c76b202dbf46074df6b3844faf127d1 SHA256 154622801e8d5e91b834e7707e9e1cc65cf20d0161f6e0323bc3bf0efd85195d
 EBUILD xvidcap-1.1.4_rc1.ebuild 1051 RMD160 eacabe656a41c52448c1d956a90e8a149cb2504b SHA1 233d7ae0c015628fb776af0e907a067feb44ec22 SHA256 4cc37fd9c0ab83acd723bc3146c47c7cb6bea992791cb59c7b19dcc959308dfd
 EBUILD xvidcap-1.1.6-r2.ebuild 1309 RMD160 687397bdba7c9d62513b4b28d920763a06a19d1b SHA1 61223ab88f509aae90879c52b9d9e8c91a9bfdc3 SHA256 70f9cf343b4acc0bab4116dabde003f1565e3bfa415e1b388524634d655ddbb9
-EBUILD xvidcap-1.1.7_rc1.ebuild 1424 RMD160 209624285b0bd14fb11777b9c71255469b9fead8 SHA1 b52bdb0aa6923d2d5274d3c963f2f14cacbd0d34 SHA256 ba7d0749ded22ff1b1f8a4588449e6650d188eb4416c497c4bda61021d849fa4
-MISC ChangeLog 6711 RMD160 67d0ccf322ddd4fa1492be6eb1ca76206081caec SHA1 672b0e368683836e8f7df8e09c693310fc945b61 SHA256 2152e51fd80d5a78578d3930734670981a8caf625aded2db293e4795e857b4c5
+EBUILD xvidcap-1.1.7.ebuild 1563 RMD160 4315789b0e9fd6c935bfcb6d240a4129f03127a4 SHA1 5cccd9a388ef835f25106ce95b27b6af8b9d44da SHA256 cc60abb48b6276fa5dfaf81505b56d0cfae00962d7bcdd3aa8696ae2a456dd17
+MISC ChangeLog 7127 RMD160 80296894382b743a38e7a7c3f566be5e4b47ce4e SHA1 ad8ae51f9f85607ec3a9be09cec4ac7a100339a0 SHA256 9ad7874f05e70f2a47718b961fc672631abbda6b5333f0ebceb58baf2d35b6a5
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkh+/SMACgkQvFcC4BYPU0oOawCeLH6w9NPKwVJc17kVlVLWYF+v
-jvcAniVaJZ69fyhGhVzQyZe8MSzMdmwX
-=S3T4
------END PGP SIGNATURE-----
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"
 }