diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-03-11 22:43:18 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-03-11 22:43:18 +0000 |
| commit | 818cc3cd10f90153317072ce2345b67a6ecb73c4 (patch) | |
| tree | 829b0385f591da871471091c9686b2f62185e184 /x11-misc/xvidcap | |
| parent | amd64 stable, bug #253551 (diff) | |
| download | gentoo-2-818cc3cd10f90153317072ce2345b67a6ecb73c4.tar.gz gentoo-2-818cc3cd10f90153317072ce2345b67a6ecb73c4.tar.bz2 gentoo-2-818cc3cd10f90153317072ce2345b67a6ecb73c4.zip | |
Fix build with libavutil 50.0.0, aka ffmpeg trunk.
(Portage version: 2.2_rc24/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xvidcap')
| -rw-r--r-- | x11-misc/xvidcap/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xvidcap/files/xvidcap-1.1.7-avutil.patch | 17 | ||||
| -rw-r--r-- | x11-misc/xvidcap/xvidcap-1.1.7.ebuild | 5 |
3 files changed, 25 insertions, 3 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/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" |