Date: Wednesday, February 17, 2016 @ 08:59:45 Author: arojas Revision: 259888
ffmpeg 3.0 rebuild Added: xine-lib/trunk/xine-lib-ffmpeg3.patch Modified: xine-lib/trunk/PKGBUILD ------------------------+ PKGBUILD | 13 ++++++++--- xine-lib-ffmpeg3.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-02-17 07:47:13 UTC (rev 259887) +++ PKGBUILD 2016-02-17 07:59:45 UTC (rev 259888) @@ -3,7 +3,7 @@ pkgname=xine-lib pkgver=1.2.6 -pkgrel=7 +pkgrel=8 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" @@ -32,9 +32,16 @@ 'libvdpau: for using the VDPAU plugin' \ 'smbclient: for using the samba plugin' \ 'gdk-pixbuf2: for using the gdk-pixbuf plugin') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) -sha1sums=('ac929eef2b7bf5c27699bbed612b953a01fccba5') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz xine-lib-ffmpeg3.patch) +sha1sums=('ac929eef2b7bf5c27699bbed612b953a01fccba5' + 'b4466616bb17142aef8aa1bb80fff67cd2d0d15d') +prepare() { + cd $pkgname-$pkgver +# Fix build with ffmpeg 3.0 (Gentoo) + patch -p1 -i ../xine-lib-ffmpeg3.patch +} + build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-wavpack --enable-vdpau --with-external-dvdnav \ Added: xine-lib-ffmpeg3.patch =================================================================== --- xine-lib-ffmpeg3.patch (rev 0) +++ xine-lib-ffmpeg3.patch 2016-02-17 07:59:45 UTC (rev 259888) @@ -0,0 +1,55 @@ +Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c +=================================================================== +--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c ++++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c +@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec + int got_frame; + float gain = this->class->gain; + if (!this->av_frame) +- this->av_frame = avcodec_alloc_frame (); ++ this->av_frame = av_frame_alloc (); + + consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); + if ((consumed >= 0) && got_frame) { +@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode + /* try to reset the wma decoder */ + if( this->decoder_ok ) { + #if AVAUDIO > 3 +- avcodec_free_frame (&this->av_frame); ++ av_frame_free (&this->av_frame); + #endif + pthread_mutex_lock (&ffmpeg_lock); + avcodec_close (this->context); +@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco + + if( this->context && this->decoder_ok ) { + #if AVAUDIO > 3 +- avcodec_free_frame (&this->av_frame); ++ av_frame_free (&this->av_frame); + #endif + pthread_mutex_lock (&ffmpeg_lock); + avcodec_close (this->context); +Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c +=================================================================== +--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c ++++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c +@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl + this->stream = stream; + this->class = (ff_video_class_t *) class_gen; + +- this->av_frame = avcodec_alloc_frame(); ++ this->av_frame = av_frame_alloc(); + this->context = avcodec_alloc_context(); + this->context->opaque = this; + #if AVPALETTE == 1 +--- xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c.orig 2016-02-17 07:54:31.950881580 +0000 ++++ xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c 2016-02-17 07:55:42.897237494 +0000 +@@ -161,7 +161,7 @@ + "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n"); + return 0; + } +- this->picture = avcodec_alloc_frame(); ++ this->picture = av_frame_alloc(); + if (!this->picture) { + xprintf(drv->class->xine, XINE_VERBOSITY_LOG, + "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");