From root@hilbert.suse.de Thu Mar 31 11:03:41 2016
From: root@hilbert.suse.de
To: commit@lists.opensuse.org
Subject: commit xine-lib for openSUSE:Factory
Date: Thu, 31 Mar 2016 13:03:41 +0200
Message-ID: <20160331110341.7AF12AE057@hilbert.suse.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1759814174158931168=="
--===============1759814174158931168==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Hello community,
here is the log from the commit of package xine-lib for openSUSE:Factory chec=
ked in at 2016-03-31 13:03:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xine-lib (Old)
and /work/SRC/openSUSE:Factory/.xine-lib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xine-lib"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xine-lib/xine-lib.changes 2015-11-11 10:35:42.=
000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xine-lib.new/xine-lib.changes 2016-03-31 13:0=
3:40.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Feb 26 15:12:34 UTC 2016 - joerg.lorenzen(a)ki.tng.de
+
+- Added xine-lib-ffmpeg3.0.patch to build against ffmpeg-3.0
+ libraries on PMBS.
+- Add pkgconfig(libva-glx) to BuildRequires because it's a separate
+ package for openSUSE > 13.2.
+
+-------------------------------------------------------------------
New:
----
xine-lib-ffmpeg3.0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-lib.spec ++++++
--- /var/tmp/diff_new_pack.zBevQY/_old 2016-03-31 13:03:41.000000000 +0200
+++ /var/tmp/diff_new_pack.zBevQY/_new 2016-03-31 13:03:41.000000000 +0200
@@ -73,12 +73,13 @@
%endif
%if !%{with distributable}
BuildRequires: libfaad-devel
-BuildRequires: pkgconfig(libavcodec) >=3D 51.68.0
-BuildRequires: pkgconfig(libavutil) >=3D 49.6.0
+BuildRequires: pkgconfig(libavcodec) >=3D 57
+BuildRequires: pkgconfig(libavutil) >=3D 55
BuildRequires: pkgconfig(libbluray) >=3D 0.2.1
BuildRequires: pkgconfig(libdts)
-BuildRequires: pkgconfig(libpostproc)
+BuildRequires: pkgconfig(libpostproc) >=3D 54
BuildRequires: pkgconfig(libva)
+BuildRequires: pkgconfig(libva-glx)
BuildRequires: pkgconfig(mad)
BuildRequires: pkgconfig(vdpau)
%else
@@ -136,6 +137,7 @@
Patch3: fix-non-x86-build.diff
# Add theora FOURCC to libxine I found an avi container that xine wouldn't p=
lay.
Patch4: xine-lib-theora.patch
+Patch5: xine-lib-ffmpeg3.0.patch
=20
%description
Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Qui=
cktime ...
You need a frontend for xine-lib like xine-ui, gxine, kaffeine or totem.
Since 1-rc6 the package number is reduced, all you m=
ay miss, is in the base package
If you want to play css encrypted Video=
-DVD's, you need to install libdvdcss.
@@ -509,6 +511,8 @@
%endif
%if %{with distributable}
%patch2 -p1
+%else
+%patch5 -p0
%endif
%ifnarch %ix86 x86_64
%patch3
++++++ xine-lib-ffmpeg3.0.patch ++++++
--- src/combined/ffmpeg/ff_audio_decoder.c.orig 2014-06-09 =E2=80=8F=E2=80=8E=
18:08:42.000000000 +0200
+++ src/combined/ffmpeg/ff_audio_decoder.c 2016-02-26 14:31:45.000000000 +0100
@@ -593,7 +593,7 @@
int got_frame;
float gain =3D this->class->gain;
if (!this->av_frame)
- this->av_frame =3D avcodec_alloc_frame ();
+ this->av_frame =3D av_frame_alloc ();
=20
consumed =3D avcodec_decode_audio4 (this->context, this->av_frame, &got_fr=
ame, &avpkt);
if ((consumed >=3D 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);
@@ -1106,7 +1106,7 @@
=20
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);
--- src/combined/ffmpeg/ff_video_decoder.c.orig 2014-06-24 =E2=80=8F=E2=80=8E=
18:21:06.000000000 +0200
+++ src/combined/ffmpeg/ff_video_decoder.c 2016-02-26 14:31:45.000000000 +0100
@@ -2526,7 +2526,7 @@
this->stream =3D stream;
this->class =3D (ff_video_class_t *) class_gen;
=20
- this->av_frame =3D avcodec_alloc_frame();
+ this->av_frame =3D av_frame_alloc();
this->context =3D avcodec_alloc_context();
this->context->opaque =3D this;
#if AVPALETTE =3D=3D 1
--- src/dxr3/ffmpeg_encoder.c.orig 2014-03-13 =E2=80=8F=E2=80=8E05:06:09.0000=
00000 +0200
+++ src/dxr3/ffmpeg_encoder.c 2016-02-26 14:31:45.000000000 +0100
@@ -164,7 +164,7 @@
"dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n");
return 0;
}
- this->picture =3D avcodec_alloc_frame();
+ this->picture =3D av_frame_alloc();
if (!this->picture) {
xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
"dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
--===============1759814174158931168==--