Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc6.git;a=commitdiff;h=f21415cf809f0edaf0294d3de6f6d35a32a4f3b7

commit f21415cf809f0edaf0294d3de6f6d35a32a4f3b7
Author: crazy <cr...@frugalware.org>
Date:   Thu Sep 22 11:06:38 2016 +0200

xine-lib-1.2.6-11-x86_64
* rebuild with tc / ffmpeg3
* added an patch to fix the build

diff --git a/source/xlib/xine-lib/FrugalBuild b/source/xlib/xine-lib/FrugalBuild
index 8bfce1a..899dd3d 100644
--- a/source/xlib/xine-lib/FrugalBuild
+++ b/source/xlib/xine-lib/FrugalBuild
@@ -4,24 +4,25 @@

pkgname=xine-lib
pkgver=1.2.6
-pkgrel=10
+pkgrel=11
pkgdesc="Xine multimedia playback engine libraries"
_F_sourceforge_dirname="xine"
_F_sourceforge_ext=".tar.xz"
Finclude sourceforge
url="http://xinehq.de";
-depends=('ffmpeg>=2.8.4' 'libmad>=0.15.1b-8' 'libdvdnav>=5.0.3-3' 
'libmpcdec>=1.2.6-3' 'libxvmc>=1.0.9-2' \
+depends=('ffmpeg>=3.1.3' 'libmad>=0.15.1b-9' 'libdvdnav>=5.0.3-3' 
'libmpcdec>=1.2.6-3' 'libxvmc>=1.0.9-2' \
'libxinerama>=1.1.3-2' 'libmodplug>=0.8.8.5-2' 'libdca>=0.0.5-4' 
'libglu>=9.0.0-2' 'libva-glx>=1.6.2-5' \
-       'libmng>=2.0.3-3' 'vcdimager>=0.7.24-5' 'aalib>=1.4rc5-8' 
'imagemagick>=6.9.3' 'wavpack>=4.75.2-2' \
-       'libpng>=1.6.20' 'libffi>=3.2.1' 'libvpx>=1.6.0')
+       'libmng>=2.0.3-3' 'vcdimager>=0.7.24-6' 'aalib>=1.4rc5-8' 
'imagemagick>=6.9.5-2' 'wavpack>=4.75.2-2' \
+       'libpng>=1.6.25' 'libffi>=3.2.1' 'libvpx>=1.6.0')
makedepends=('optipng>=0.7.5' 'xmlto' 'x11-protos' 'mesa>=11.1.0-3')
options=('scriptlet')
groups=('xlib')
archs=('i686' 'x86_64')
source=("${source[@]}" \
-       xine-lib-xcb-1.12.patch )
+       xine-lib-xcb-1.12.patch ffmpeg3.patch)
sha1sums=('ac929eef2b7bf5c27699bbed612b953a01fccba5' \
-          '890c8f044c0080bfb7d4b163061dd42621fc4df1')
+          '890c8f044c0080bfb7d4b163061dd42621fc4df1' \
+          'b75ed4fd79c060010ff99385ef3da33a893e2145')

build()
{
diff --git a/source/xlib/xine-lib/ffmpeg3.patch 
b/source/xlib/xine-lib/ffmpeg3.patch
new file mode 100644
index 0000000..629e8ea
--- /dev/null
+++ b/source/xlib/xine-lib/ffmpeg3.patch
@@ -0,0 +1,56 @@
+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");
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to