[packages/xine-lib] - fixed build with ffmpeg 3.x - rel 3
baggins
baggins at pld-linux.org
Mon Mar 21 09:47:21 CET 2016
commit 3fbab57155db2b64118da380b6224d668cdec329
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Mar 21 09:47:00 2016 +0100
- fixed build with ffmpeg 3.x
- rel 3
ffmpeg3.patch | 40 ++++++++++++++++++++++++++++++++++++++++
xine-lib.spec | 6 ++++--
2 files changed, 44 insertions(+), 2 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index ba7003c..be02dc1 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -40,7 +40,7 @@ Summary(pl.UTF-8): Odtwarzacz filmów
Summary(pt_BR.UTF-8): Xine, um player de video
Name: xine-lib
Version: 1.2.6
-Release: 2
+Release: 3
Epoch: 2
License: GPL v2+
Group: Libraries
@@ -53,6 +53,7 @@ Patch3: %{name}-ac.patch
# from DirectFB 1.7.0
Patch4: %{name}-vdpau-hooks.patch
Patch5: x32.patch
+Patch6: ffmpeg3.patch
URL: http://xine.sourceforge.net/
%{?with_directfb:BuildRequires: DirectFB-devel >= 0.9.22}
%{?with_fusionsound:BuildRequires: FusionSound-devel >= 0.9.23}
@@ -68,7 +69,7 @@ BuildRequires: automake >= 1:1.8.1
%{?with_esd:BuildRequires: esound-devel >= 0.2.8}
BuildRequires: faad2-devel
# libavcodec >= 51.68.0, libavutil >= 49.6.0, libpostproc
-BuildRequires: ffmpeg-devel >= 0.8
+BuildRequires: ffmpeg-devel >= 3.0
BuildRequires: flac-devel
BuildRequires: gettext-tools >= 0.17
%{?with_gnome:BuildRequires: gnome-vfs2-devel}
@@ -968,6 +969,7 @@ XINE - wtyczka postprocessingu oparta na libpostproc z pakietu FFmpeg.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
%{__gettextize}
diff --git a/ffmpeg3.patch b/ffmpeg3.patch
new file mode 100644
index 0000000..4169721
--- /dev/null
+++ b/ffmpeg3.patch
@@ -0,0 +1,40 @@
+--- xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c~ 2014-06-09 18:08:42.000000000 +0200
++++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c 2016-03-21 09:43:09.997831950 +0100
+@@ -590,7 +590,7 @@
+ 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 @@
+ /* 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 @@
+
+ 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);
+--- xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c~ 2014-06-24 18:21:06.000000000 +0200
++++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c 2016-03-21 09:43:59.951188184 +0100
+@@ -2523,7 +2523,7 @@
+ 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xine-lib.git/commitdiff/3fbab57155db2b64118da380b6224d668cdec329
More information about the pld-cvs-commit
mailing list