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

[Eric Bélanger]

    Date: Friday, July 12, 2013 @ 06:43:32
  Author: eric
Revision: 93960

upgpkg: gpac 4288-3

Rebuild against ffmpeg 2.0 and x264 20130702, Update svn url

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

-------------------+
 PKGBUILD          |   14 ++++++++++----
 gpac-ffmpeg.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-12 01:36:36 UTC (rev 93959)
+++ PKGBUILD	2013-07-12 04:43:32 UTC (rev 93960)
@@ -3,7 +3,7 @@
 
 pkgname=gpac
 pkgver=4288
-pkgrel=2
+pkgrel=3
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
 arch=('i686' 'x86_64')
 url="http://gpac.sourceforge.net"
@@ -13,15 +13,16 @@
 optdepends=('jack: for jack support' 'a52dec: for A52 support'
             'faad2: for AAC support' 'libmad: for mp3 support')
 options=('!makeflags')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} gpac-ffmpeg.patch)
 sha1sums=('6ba29de672b6e4260e510e0e16d5bc0ab09cabb6'
-          '794b0e4a497af527e093ff0328f1acc8995f2b04')
+          'SKIP'
+          '63f59ab745c57bf7d242e942e30a4e6c7a1236b0')
 
 # source PKGBUILD && mksource
 mksource() {
   [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
   _svnver=${pkgver}
-  _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac"
+  _svntrunk="svn://svn.code.sf.net/p/gpac/code/trunk/gpac"
   _svnmod="$pkgname-${pkgver}"
   mkdir ${pkgname}-${pkgver}
   pushd ${pkgname}-${pkgver}
@@ -35,6 +36,11 @@
   gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
 }
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}/gpac-ffmpeg.patch"
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no

Added: gpac-ffmpeg.patch
===================================================================
--- gpac-ffmpeg.patch	                        (rev 0)
+++ gpac-ffmpeg.patch	2013-07-12 04:43:32 UTC (rev 93960)
@@ -0,0 +1,37 @@
+--- 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
+ 
+-#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
+ #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);
+ #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 @@
+ 
+ 	/*for audio packed frames*/
+ 	u32 frame_start;
+-	char audio_buf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
++	char audio_buf[192000];
+ 	Bool check_h264_isma;
+ 
+ 	u32 base_ES_ID;