diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2006-10-09 21:42:59 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2006-10-09 21:42:59 +0000 |
| commit | cc80df37fcb2a0702f2ea8042e23c8b7998ea4f1 (patch) | |
| tree | 55c0750411bb665fde349197f6483170afd8e101 /media-video | |
| parent | Cleaning up ebuilds (diff) | |
| download | gentoo-2-cc80df37fcb2a0702f2ea8042e23c8b7998ea4f1.tar.gz gentoo-2-cc80df37fcb2a0702f2ea8042e23c8b7998ea4f1.tar.bz2 gentoo-2-cc80df37fcb2a0702f2ea8042e23c8b7998ea4f1.zip | |
media-video/gpac-0.4.2: Fix to compile against latest ffmpeg snapshots, bug #148939
(Portage version: 2.1.2_pre2-r7)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/gpac/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/gpac/files/gpac-0.4.2-ffmpeg-snapshots-compat.patch | 20 | ||||
| -rw-r--r-- | media-video/gpac/gpac-0.4.2.ebuild | 3 |
3 files changed, 27 insertions, 2 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog index 05ac5b4e0796..571b4d675bce 100644 --- a/media-video/gpac/ChangeLog +++ b/media-video/gpac/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/gpac # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.26 2006/09/22 00:13:36 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.27 2006/10/09 21:42:59 aballier Exp $ + + 09 Oct 2006; Alexis Ballier <aballier@gentoo.org> + +files/gpac-0.4.2-ffmpeg-snapshots-compat.patch, gpac-0.4.2.ebuild: + Fix to compile against latest ffmpeg snapshots, bug #148939 22 Sep 2006; Steve Dibb <beandog@gentoo.org> gpac-0.4.1_pre20060122-r1.ebuild, gpac-0.4.2.ebuild: diff --git a/media-video/gpac/files/gpac-0.4.2-ffmpeg-snapshots-compat.patch b/media-video/gpac/files/gpac-0.4.2-ffmpeg-snapshots-compat.patch new file mode 100644 index 000000000000..c40790629188 --- /dev/null +++ b/media-video/gpac/files/gpac-0.4.2-ffmpeg-snapshots-compat.patch @@ -0,0 +1,20 @@ +--- gpac/modules/ffmpeg_in/ffmpeg_decode.c.old 2006-10-09 21:33:37.000000000 +0200 ++++ gpac/modules/ffmpeg_in/ffmpeg_decode.c 2006-10-09 21:34:20.000000000 +0200 +@@ -25,6 +25,17 @@ + #include "ffmpeg_in.h" + #include <gpac/avparse.h> + ++ ++#ifndef STRINGIFY ++# define STRINGIFY(x) STRINGIFY1(x) ++# define STRINGIFY1(x) #x ++#endif ++ ++#ifndef FFMPEG_VERSION ++#define FFMPEG_VERSION STRINGIFY(LIBAVCODEC_VERSION) ++#endif ++ ++ + static AVCodec *ffmpeg_get_codec(u32 codec_4cc) + { + char name[5]; diff --git a/media-video/gpac/gpac-0.4.2.ebuild b/media-video/gpac/gpac-0.4.2.ebuild index 1abe7bc730a0..61f89b56cf94 100644 --- a/media-video/gpac/gpac-0.4.2.ebuild +++ b/media-video/gpac/gpac-0.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2.ebuild,v 1.4 2006/09/22 00:13:36 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2.ebuild,v 1.5 2006/10/09 21:42:59 aballier Exp $ inherit eutils wxwidgets flag-o-matic multilib @@ -60,6 +60,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-static-defs.patch" epatch "${FILESDIR}/${P}-nostrip.patch" epatch "${FILESDIR}/${P}-soname.patch" + epatch "${FILESDIR}/${P}-ffmpeg-snapshots-compat.patch" sed -ie '/ldconfig / d' "${S}/Makefile" if use amr; then |