[arch-commits] Commit in gpac/trunk (PKGBUILD gpac-ffmpeg.patch)

[Eric Bélanger]

    Date: Tuesday, September 16, 2014 @ 07:28:36
  Author: eric
Revision: 119043

upgpkg: gpac 5324-1

Upstream update, Rebuild against ffmpeg 2.4

Modified:
  gpac/trunk/PKGBUILD
  gpac/trunk/gpac-ffmpeg.patch

-------------------+
 PKGBUILD          |   10 +++----
 gpac-ffmpeg.patch |   70 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 45 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-16 00:04:03 UTC (rev 119042)
+++ PKGBUILD	2014-09-16 05:28:36 UTC (rev 119043)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=gpac
-pkgver=4288
-pkgrel=3
+pkgver=5324
+pkgrel=1
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
 arch=('i686' 'x86_64')
 url="http://gpac.sourceforge.net"
@@ -14,9 +14,9 @@
             'faad2: for AAC support' 'libmad: for mp3 support')
 options=('staticlibs' '!makeflags')
 source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} gpac-ffmpeg.patch)
-sha1sums=('6ba29de672b6e4260e510e0e16d5bc0ab09cabb6'
+sha1sums=('cd00b88aa6da97708532fc8eb7ab65f6a0d0c1e0'
           'SKIP'
-          '63f59ab745c57bf7d242e942e30a4e6c7a1236b0')
+          'e758b8cdb0b4bca37134241a1b8ccc33d4deb54a')
 
 # source PKGBUILD && mksource
 mksource() {
@@ -38,7 +38,7 @@
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -p0 -i "${srcdir}/gpac-ffmpeg.patch"
+  patch -p3 -i "${srcdir}/gpac-ffmpeg.patch"
 }
 
 build() {

Modified: gpac-ffmpeg.patch
===================================================================
--- gpac-ffmpeg.patch	2014-09-16 00:04:03 UTC (rev 119042)
+++ gpac-ffmpeg.patch	2014-09-16 05:28:36 UTC (rev 119043)
@@ -1,37 +1,47 @@
---- modules/ffmpeg_in/ffmpeg_decode.c	2013-03-11 21:43:22.000000000 -0400
-+++ modules/ffmpeg_in/ffmpeg_decode.c	2013-07-11 23:38:15.108181474 -0400
-@@ -38,7 +38,9 @@
- #undef USE_AVCODEC2
- #endif
+--- a/trunk/gpac/modules/ffmpeg_in/ffmpeg_demux.c
++++ b/trunk/gpac/modules/ffmpeg_in/ffmpeg_demux.c
+@@ -54,13 +54,10 @@
+ #endif /* AVERROR_NOFMT */
  
--#if (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35)
-+#if (LIBAVCODEC_VERSION_MAJOR >= 55) 
-+#define USE_AVCTX3
-+#elif (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35)
- #define USE_AVCTX3
+ 
+-#if (LIBAVFORMAT_VERSION_MAJOR >= 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)
++#if ((LIBAVFORMAT_VERSION_MAJOR == 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)) || (LIBAVFORMAT_VERSION_MAJOR > 54)
+ 
+ #define av_find_stream_info(__c)	avformat_find_stream_info(__c, NULL)
+-#ifndef FF_API_FORMAT_PARAMETERS
+-#define FF_API_FORMAT_PARAMETERS	1
+-#endif
+-
++#define USE_AVFORMAT_OPEN_INPUT	1
  #endif
  
-@@ -625,10 +628,11 @@
- 		if (ffd->frame_start>inBufferLength) ffd->frame_start = 0;
  
- redecode:
--		gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- #ifdef USE_AVCODEC2
-+		gotpic = 192000;
- 		len = avcodec_decode_audio3(ctx, (short *)ffd->audio_buf, &gotpic, &pkt);
+@@ -275,7 +272,7 @@
+ 	}
+ 	if (!has_audio && !has_video) goto exit;
+ 	ret = 1;
+-#if LIBAVFORMAT_VERSION_MAJOR < 53 && LIBAVFORMAT_VERSION_MINOR < 45
++#if ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 47)) || (LIBAVFORMAT_VERSION_MAJOR < 52)
+ 	fmt_out = guess_stream_format(NULL, url, NULL);
  #else
-+		gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- 		len = avcodec_decode_audio2(ctx, (short *)ffd->audio_buf, &gotpic, inBuffer + ffd->frame_start, inBufferLength - ffd->frame_start);
- #endif
- 		if (len<0) { ffd->frame_start = 0; return GF_NON_COMPLIANT_BITSTREAM; }
---- modules/ffmpeg_in/ffmpeg_in.h	2013-03-11 21:43:22.000000000 -0400
-+++ modules/ffmpeg_in/ffmpeg_in.h	2013-07-11 23:38:15.108181474 -0400
-@@ -120,7 +120,7 @@
+ 	fmt_out = av_guess_format(NULL, url, NULL);
+@@ -588,7 +585,7 @@
+ 			}
+ 			/*setup downloader*/
+ 			av_in->flags |= AVFMT_NOFILE;
+-#if FF_API_FORMAT_PARAMETERS /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
++#ifdef USE_AVFORMAT_OPEN_INPUT /*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);
+--- a/trunk/gpac/modules/ffmpeg_in/ffmpeg_in.h
++++ b/trunk/gpac/modules/ffmpeg_in/ffmpeg_in.h
+@@ -99,7 +99,7 @@
  
- 	/*for audio packed frames*/
- 	u32 frame_start;
--	char audio_buf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
-+	char audio_buf[192000];
- 	Bool check_h264_isma;
+ #ifndef FFMPEG_OLD_HEADERS
  
- 	u32 base_ES_ID;
+-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 20)
++#if ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR <= 20)) || (LIBAVCODEC_VERSION_MAJOR < 52)
+ #undef USE_AVCODEC2
+ #else
+ #define USE_AVCODEC2	1