diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-07 02:09:38 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-07 02:09:38 +0000 |
| commit | ae85ca22d78fa3a7021cb0e24c75c196d21b4094 (patch) | |
| tree | 58e41c1ab8e0cdfb4930f92e77f5679567e9f92c /media-video | |
| parent | Added multilib support. Closes bug #479484. Thanks to Emery Hemingway for the... (diff) | |
| download | gentoo-2-ae85ca22d78fa3a7021cb0e24c75c196d21b4094.tar.gz gentoo-2-ae85ca22d78fa3a7021cb0e24c75c196d21b4094.tar.bz2 gentoo-2-ae85ca22d78fa3a7021cb0e24c75c196d21b4094.zip | |
fix build with ffmpeg2
(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/gpac/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/gpac/files/gpac-0.5.0-ffmpeg2.patch | 28 | ||||
| -rw-r--r-- | media-video/gpac/gpac-0.5.0.ebuild | 5 |
3 files changed, 36 insertions, 3 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog index 0129967087b9..1b8c730c8bc9 100644 --- a/media-video/gpac/ChangeLog +++ b/media-video/gpac/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/gpac # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.105 2013/06/22 16:28:36 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.106 2013/08/07 02:09:38 aballier Exp $ + + 07 Aug 2013; Alexis Ballier <aballier@gentoo.org> gpac-0.5.0.ebuild, + +files/gpac-0.5.0-ffmpeg2.patch: + fix build with ffmpeg2 22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> +files/gpac-0.5.0-libav9.patch, gpac-0.5.0.ebuild: diff --git a/media-video/gpac/files/gpac-0.5.0-ffmpeg2.patch b/media-video/gpac/files/gpac-0.5.0-ffmpeg2.patch new file mode 100644 index 000000000000..f9dd4ba340a7 --- /dev/null +++ b/media-video/gpac/files/gpac-0.5.0-ffmpeg2.patch @@ -0,0 +1,28 @@ +Index: gpac/modules/ffmpeg_in/ffmpeg_demux.c +=================================================================== +--- gpac.orig/modules/ffmpeg_in/ffmpeg_demux.c ++++ gpac/modules/ffmpeg_in/ffmpeg_demux.c +@@ -614,7 +614,7 @@ static GF_Err FFD_ConnectService(GF_Inpu + } + /*setup downloader*/ + av_in->flags |= AVFMT_NOFILE; +-#if (LIBAVFORMAT_VERSION_MAJOR < 55) /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/ ++#if (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,4,0)) /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/ + res = avformat_open_input(&ffd->ctx, szName, av_in, NULL); + #else + res = av_open_input_stream(&ffd->ctx, &ffd->io, szName, av_in, NULL); +Index: gpac/modules/ffmpeg_in/ffmpeg_in.h +=================================================================== +--- gpac.orig/modules/ffmpeg_in/ffmpeg_in.h ++++ gpac/modules/ffmpeg_in/ffmpeg_in.h +@@ -96,6 +96,10 @@ void gf_av_vlog(void* avcl, int level, c + #endif + + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#endif ++ + + + /*FFMPEG decoder module */ diff --git a/media-video/gpac/gpac-0.5.0.ebuild b/media-video/gpac/gpac-0.5.0.ebuild index dbc1c2d26a17..ebff59c6d210 100644 --- a/media-video/gpac/gpac-0.5.0.ebuild +++ b/media-video/gpac/gpac-0.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.4 2013/06/22 16:28:36 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.5 2013/08/07 02:09:38 aballier Exp $ EAPI=4 @@ -60,7 +60,8 @@ src_prepare() { "${FILESDIR}"/160_all_externalamr.patch \ "${FILESDIR}"/210_all_system_libogg.patch \ "${FILESDIR}"/${P}-build-fixes.patch \ - "${FILESDIR}"/${P}-libav9.patch + "${FILESDIR}"/${P}-libav9.patch \ + "${FILESDIR}"/${P}-ffmpeg2.patch # remove last of internal ogg sed -i \ |