diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2007-04-11 20:53:40 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2007-04-11 20:53:40 +0000 |
| commit | 0d39fe5d506cb6c68a63006429d7d0ed950961da (patch) | |
| tree | c16d97d09f510abe2b5ddbecc32e0c9d0c1736f4 | |
| parent | stable for x86; fix QA warnings with patch to configure.ac (diff) | |
| download | gentoo-2-0d39fe5d506cb6c68a63006429d7d0ed950961da.tar.gz gentoo-2-0d39fe5d506cb6c68a63006429d7d0ed950961da.tar.bz2 gentoo-2-0d39fe5d506cb6c68a63006429d7d0ed950961da.zip | |
fix build with recent ffmpeg snapshots, bug #173772
(Portage version: 2.1.2.3)
| -rw-r--r-- | media-video/gpac/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/gpac/files/gpac-0.4.2-ffmpeg-errno.patch | 20 | ||||
| -rw-r--r-- | media-video/gpac/gpac-0.4.2-r1.ebuild | 3 |
3 files changed, 27 insertions, 2 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog index daafe2f485e3..53b884097a07 100644 --- a/media-video/gpac/ChangeLog +++ b/media-video/gpac/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/gpac # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.38 2007/02/14 19:09:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.39 2007/04/11 20:53:40 aballier Exp $ + + 11 Apr 2007; Alexis Ballier <aballier@gentoo.org> + +files/gpac-0.4.2-ffmpeg-errno.patch, gpac-0.4.2-r1.ebuild: + fix build with recent ffmpeg snapshots, bug #173772 14 Feb 2007; Alexis Ballier <aballier@gentoo.org> -files/gpac-0.4.0-downloader.patch, diff --git a/media-video/gpac/files/gpac-0.4.2-ffmpeg-errno.patch b/media-video/gpac/files/gpac-0.4.2-ffmpeg-errno.patch new file mode 100644 index 000000000000..ec59cec5e881 --- /dev/null +++ b/media-video/gpac/files/gpac-0.4.2-ffmpeg-errno.patch @@ -0,0 +1,20 @@ +Index: gpac/modules/ffmpeg_in/ffmpeg_demux.c +=================================================================== +--- gpac.orig/modules/ffmpeg_in/ffmpeg_demux.c ++++ gpac/modules/ffmpeg_in/ffmpeg_demux.c +@@ -23,6 +23,7 @@ + */ + + #include "ffmpeg_in.h" ++#include <errno.h> + + /*default buffer is 200 ms per channel*/ + #define FFD_DATA_BUFFER 800 +@@ -285,7 +286,6 @@ static GF_ESD *FFD_GetESDescriptor(FFDem + case CODEC_ID_MP3: + esd->decoderConfig->objectTypeIndication = 0x69; + break; +- case CODEC_ID_MPEG4AAC: + case CODEC_ID_AAC: + if (!dec->extradata_size) goto opaque_audio; + esd->decoderConfig->objectTypeIndication = 0x40; diff --git a/media-video/gpac/gpac-0.4.2-r1.ebuild b/media-video/gpac/gpac-0.4.2-r1.ebuild index 06847d9ceb4c..e338fa892218 100644 --- a/media-video/gpac/gpac-0.4.2-r1.ebuild +++ b/media-video/gpac/gpac-0.4.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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-r1.ebuild,v 1.9 2007/02/07 21:06:10 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.10 2007/04/11 20:53:40 aballier Exp $ inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs @@ -101,6 +101,7 @@ src_unpack() { epatch "${WORKDIR}/${P}-pic.patch" epatch "${FILESDIR}/${P}-bsd.patch" + epatch "${FILESDIR}/${P}-ffmpeg-errno.patch" } src_compile() { |