Fix build with libavutil 50.0.0, aka ffmpeg trunk.

Package-Manager: portage-2.2_rc24/cvs/Linux x86_64

4 files changed, 32 insertions, 9 deletions

diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog
index bd8d88daf0bc..07bcd009db14 100644
--- a/x11-misc/xvidcap/ChangeLog
+++ b/x11-misc/xvidcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xvidcap
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.47 2009/01/19 23:15:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.48 2009/03/11 22:43:18 aballier Exp $
+
+  11 Mar 2009; Alexis Ballier <aballier@gentoo.org>
+  +files/xvidcap-1.1.7-avutil.patch, xvidcap-1.1.7.ebuild:
+  Fix build with libavutil 50.0.0, aka ffmpeg trunk.
 
   19 Jan 2009; Alexis Ballier <aballier@gentoo.org>
   files/xvidcap-1.1.7-ffmpeg-headers.patch:
diff --git a/x11-misc/xvidcap/Manifest b/x11-misc/xvidcap/Manifest
index bae55557889a..9700214150d5 100644
--- a/x11-misc/xvidcap/Manifest
+++ b/x11-misc/xvidcap/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xvidcap-1.1.7-avutil.patch 634 RMD160 f550512be618431df655c12439ecf96eff5c458c SHA1 b8f1e7a31452b446ef8d1c2ef33e10b5e98011ab SHA256 5f143452c4f3c4c1ecba72707195caa8bf64ccfabf9d362b31b67021bc4ba0a7
 AUX xvidcap-1.1.7-ffmpeg-headers.patch 1657 RMD160 4e016f3c5dbdbad5885afa647b24bb612ea6896b SHA1 b10df1e4eef15d3311ddefa3b27d1c0311e29c10 SHA256 7536d5f166948aa5ffeb05b6f84ae732fa9978554fea7aa751d1826c046e220e
 AUX xvidcap-1.1.7-ffmpeg-trellis.patch 878 RMD160 c8ecffe12a8f9c7fd140250c2dd5371e09bba76a SHA1 0d1f7576b8098c2d20b95a62ec98563b9b8de0ec SHA256 e856b43cd95ee28a5101d9ed14bb05097e8c61f0eb4ce29307428eef1900bb0f
 DIST xvidcap-1.1.7.tar.gz 4789924 RMD160 782f0f8b4693bb3e96fdf06de71b2f6832b246e0 SHA1 ccdf8ac85c76b202dbf46074df6b3844faf127d1 SHA256 154622801e8d5e91b834e7707e9e1cc65cf20d0161f6e0323bc3bf0efd85195d
-EBUILD xvidcap-1.1.7.ebuild 1563 RMD160 4315789b0e9fd6c935bfcb6d240a4129f03127a4 SHA1 5cccd9a388ef835f25106ce95b27b6af8b9d44da SHA256 cc60abb48b6276fa5dfaf81505b56d0cfae00962d7bcdd3aa8696ae2a456dd17
-MISC ChangeLog 7652 RMD160 3576961259373b52fd6b7c2362e885e145fbf10d SHA1 8c2cf493084209ff8f83678b84fde73e3968b2ab SHA256 70fd5e7bd073f6ab6ed76ff151487d417c55a5585fd98ffa2c71d2a6cfe2e002
+EBUILD xvidcap-1.1.7.ebuild 1605 RMD160 1e8705b45cefc6fa300e3148bf08670bd9c8a8ee SHA1 6c91fe36135f65ac6a927e386fa3eec98b3dce06 SHA256 b380866d4e350678eb26f754c6f4f5958a07f210206c3ef3dc0222664feb7356
+MISC ChangeLog 7817 RMD160 6af0efc6d918634da0ddf3a3cdf6dba46965c197 SHA1 e632192f61f5504e5a83b17d6b3af53116eac155 SHA256 a6dd7983e46d7df3183342ec42eb16b844a9b450b49759e744695c20adfae5bb
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEUEARECAAYFAkl1CZwACgkQvFcC4BYPU0pUmgCfdEbyKK1DHQl9jylNpLcFAOM4
-DY8Al1dp27CXQuq7erHF2X+h7sql8gg=
-=jQl5
+iEYEARECAAYFAkm4PowACgkQvFcC4BYPU0rEWgCgwMuVfKXwbFammUm49Q7Fpawm
+wKUAoKVAQcc7vjOl8a6HiKkSWIwyQYi9
+=fF4y
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7-avutil.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7-avutil.patch
new file mode 100644
index 000000000000..ab66cd00a057
--- /dev/null
+++ b/x11-misc/xvidcap/files/xvidcap-1.1.7-avutil.patch
@@ -0,0 +1,17 @@
+Dont use pixel formats that have been deprecated for years. This fixes the build
+against libavutil 50.0.0
+
+
+Index: xvidcap-1.1.7/src/xtoffmpeg.c
+===================================================================
+--- xvidcap-1.1.7.orig/src/xtoffmpeg.c
++++ xvidcap-1.1.7/src/xtoffmpeg.c
+@@ -96,7 +96,7 @@
+                         || (x)==PIX_FMT_YUVJ420P || (x)==PIX_FMT_YUVJ422P \
+                         || (x)==PIX_FMT_YUVJ444P)
+ 
+-#define PIX_FMT_ARGB32 PIX_FMT_RGBA32  /* this is just my personal
++#define PIX_FMT_ARGB32 PIX_FMT_RGB32   /* this is just my personal
+                                         * convenience */
+ 
+ /*
diff --git a/x11-misc/xvidcap/xvidcap-1.1.7.ebuild b/x11-misc/xvidcap/xvidcap-1.1.7.ebuild
index a3a07f7b818f..7bd77f3089e4 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.7.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.ebuild,v 1.1 2008/10/20 22:55:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.7.ebuild,v 1.2 2009/03/11 22:43:18 aballier Exp $
 
 GCONF_DEBUG="no"
 
@@ -35,6 +35,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-ffmpeg-headers.patch
 	# bug 242680
 	epatch "${FILESDIR}"/${P}-ffmpeg-trellis.patch
+	epatch "${FILESDIR}"/${P}-avutil.patch
 	eautoreconf
 	# bug 242678
 	intltoolize --force || die "intltoolize failed"