From 7fa0a82c6d1e03a315717a0b662765e52387fe07306ceef5bbb27787418f8b55 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 1 Feb 2010 14:33:43 +0000 Subject: [PATCH 01/11] Accepting request 30997 from home:jengelh:baselibs Copy from home:jengelh:baselibs/xine-lib via accept of submit request 30997 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/30997 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=24 --- ready | 0 xine-lib.spec | 384 +------------------------------------------------- 2 files changed, 2 insertions(+), 382 deletions(-) create mode 100644 ready diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/xine-lib.spec b/xine-lib.spec index 2d8ceec..51c345f 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -98,7 +98,7 @@ BuildRequires: DirectFB BuildRequires: libmodplug-devel %endif Version: 1.1.17 -Release: 2 +Release: 1 # bug437293 %ifarch ppc64 Obsoletes: xine-lib-64bit @@ -114,7 +114,7 @@ Source: xine-lib-%{version}-crippled.tar.bz2 %else Source: xine-lib-%{version}.tar.bz2 %endif -Source2: baselibs.conf +Source2: baselibs.conf Source10: README.SuSE Source99: precheckin_cripple_tarball.sh # *** xine-lib: Bugfixes @@ -183,18 +183,6 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. -xine is a video player with a graphical front-end that supports a large -number of file formats (VCD and MPEG2, for example) using plug-ins. -Several plug-ins are included. Others can be installed after xine -installation. xine supports stereo sound using OSS and AC5.1 using -Alsa. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - %if %{with distributable} This version of xine may lack certain features because of legal requirements (potential patent violation). See also @@ -219,18 +207,6 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. -xine is a video player with a graphical front-end that supports a large -number of file formats (VCD and MPEG2, for example) using plug-ins. -Several plug-ins are included. Others can be installed after xine -installation. xine supports stereo sound using OSS and AC5.1 using -Alsa. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - %if %{with distributable} Diese xine-Version lässt eventuell einige Funktione aus rechtlichen Gründen vermissen (mögliche Patentverletzungen). Siehe dazu @@ -279,25 +255,6 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. -This package contains all necessary include files, libraries and -configuration files needed to compile applications that use the xine -media player. - -xine is a video player which supports a large number of file formats -(i.e., VCD, MPEG2) using plug-ins. Several plug-ins are included. -Others can be post-installed. Supports stereo sound using OSS and AC5.1 -using Alsa. - -Dieses Paket enthält alle nötigen Include Dateien, Biblioteken und -Konfigurationsdateien, die benötigt werden, um Anwendungen zu -kompilieren, die den xine Media Player verwenden. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - %if %{with distributable} This version of xine may lack certain features because of legal requirements (potential patent violation). See also @@ -329,25 +286,6 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. -This package contains all necessary include files, libraries and -configuration files needed to compile applications that use the xine -media player. - -xine is a video player which supports a large number of file formats -(i.e., VCD, MPEG2) using plug-ins. Several plug-ins are included. -Others can be post-installed. Supports stereo sound using OSS and AC5.1 -using Alsa. - -Dieses Paket enthält alle nötigen Include Dateien, Biblioteken und -Konfigurationsdateien, die benötigt werden, um Anwendungen zu -kompilieren, die den xine Media Player verwenden. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - %if %{with distributable} Diese xine-Version lässt eventuell einige Funktione aus rechtlichen Gründen vermissen (mögliche Patentverletzungen). Siehe dazu @@ -380,22 +318,6 @@ xine Soundausgabeplugin für den Pulseaudio Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the pulseaudio soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den Pulseaudio Soundserver - - - Autoren: -------- Guenter Bartsch @@ -413,22 +335,6 @@ xine Soundausgabeplugin für den Pulseaudio Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the pulseaudio soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den Pulseaudio Soundserver - - - Autoren: -------- Guenter Bartsch @@ -455,22 +361,6 @@ SDL xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -SDL xine video output plugin - - - -Authors: --------- - Guenter Bartsch - -SDL xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -488,22 +378,6 @@ SDL xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -SDL xine video output plugin - - - -Authors: --------- - Guenter Bartsch - -SDL xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -538,30 +412,6 @@ xine sound output plugin for the arts soundserver -Authors: --------- - Guenter Bartsch - -xine sound output plugin for the arts soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den arts Soundserver - - - -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the arts soundserver - - - Authors: -------- Guenter Bartsch @@ -587,30 +437,6 @@ xine sound output plugin for the arts soundserver -Authors: --------- - Guenter Bartsch - -xine sound output plugin for the arts soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den arts Soundserver - - - -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the arts soundserver - - - Authors: -------- Guenter Bartsch @@ -638,23 +464,6 @@ aalib and libcaca xine video-output plugin -Authors: --------- - Guenter Bartsch - -aalib and libcaca xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - - -aalib and libcaca xine video-output plugin - - - Authors: -------- Guenter Bartsch @@ -673,23 +482,6 @@ aalib and libcaca xine video-output plugin -Authors: --------- - Guenter Bartsch - -aalib and libcaca xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - - -aalib and libcaca xine video-output plugin - - - Authors: -------- Guenter Bartsch @@ -718,24 +510,6 @@ libxine sound output plugin for the esound soundserver -Authors: --------- - Guenter Bartsch - -libxine sound output plugin for the esound soundserver - - - -Authors: --------- - Guenter Bartsch - -libxine Soundausgabeplugin für den esound Soundserver - -libxine sound output plugin for the esound soundserver - - - Authors: -------- Guenter Bartsch @@ -755,24 +529,6 @@ libxine sound output plugin for the esound soundserver -Authors: --------- - Guenter Bartsch - -libxine sound output plugin for the esound soundserver - - - -Authors: --------- - Guenter Bartsch - -libxine Soundausgabeplugin für den esound Soundserver - -libxine sound output plugin for the esound soundserver - - - Authors: -------- Guenter Bartsch @@ -799,22 +555,6 @@ xine Soundausgabeplugin für den jack Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the jack soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den jack Soundserver - - - Autoren: -------- Guenter Bartsch @@ -832,22 +572,6 @@ xine Soundausgabeplugin für den jack Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the jack soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den jack Soundserver - - - Autoren: -------- Guenter Bartsch @@ -874,22 +598,6 @@ Directfb xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -Directfb xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - -Directfb xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -907,22 +615,6 @@ Directfb xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -Directfb xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - -Directfb xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -950,22 +642,6 @@ Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen -Autoren: --------- - Guenter Bartsch - -Input plugin which enables xine to use Gnome-vfs - - - -Authors: --------- - Guenter Bartsch - -Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen - - - Autoren: -------- Guenter Bartsch @@ -983,22 +659,6 @@ Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen -Autoren: --------- - Guenter Bartsch - -Input plugin which enables xine to use Gnome-vfs - - - -Authors: --------- - Guenter Bartsch - -Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen - - - Autoren: -------- Guenter Bartsch @@ -1048,26 +708,6 @@ http://www.xine-project.org/home -Autoren: --------- - Guenter Bartsch -With these xine plug-ins, you can watch DVDs and all other kind of -media using xine. More information about xine plug-ins can be found at -http://www.xine-project.org/home - - - -Authors: --------- - Guenter Bartsch - -Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten -Medienverainten abspielen. Weitere Informationtne über xine Plugins -finden Sie unter -http://www.xine-project.org/home - - - Autoren: -------- Guenter Bartsch @@ -1089,26 +729,6 @@ http://www.xine-project.org/home -Autoren: --------- - Guenter Bartsch -With these xine plug-ins, you can watch DVDs and all other kind of -media using xine. More information about xine plug-ins can be found at -http://www.xine-project.org/home - - - -Authors: --------- - Guenter Bartsch - -Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten -Medienverainten abspielen. Weitere Informationtne über xine Plugins -finden Sie unter -http://www.xine-project.org/home - - - Autoren: -------- Guenter Bartsch From a57add302ac7536bd361f2baa6da6a2b2d56dc921ae560efc568bf71fd563708 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Wed, 3 Feb 2010 20:09:57 +0000 Subject: [PATCH 02/11] added -F2 for to patches to get it build on 11.3 with crppled and non crippled tarball OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=25 --- xine-lib.changes | 7 +++++++ xine-lib.spec | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/xine-lib.changes b/xine-lib.changes index 468d22b..27fb17a 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 03 21:03:00 CEST 2010 - Manfred.Tremmel@iiv.de + +- sorry guys it's useless to try fuzz=0 getting working without + having two patch versions for crippled and non crippled tarball + added "-F2" for patch 50 and 61 + ------------------------------------------------------------------- Mon Feb 1 12:37:47 UTC 2010 - jengelh@medozas.de diff --git a/xine-lib.spec b/xine-lib.spec index 51c345f..39e9f03 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -760,10 +760,18 @@ EOF %patch26 %patch28 -p1 %patch31 -p1 +%if %suse_version >= 1110 +%patch50 -p1 -F2 +%else %patch50 -p1 +%endif %patch51 -p1 sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am +%if %suse_version >= 1110 +%patch61 -p1 -F2 +%else %patch61 -p1 +%endif %patch62 -p1 #sed -i 's|^ac_config_files="|ac_config_files="src/vdr/Makefile src/mjpeg/Makefile|' configure %if %{with distributable} From 73d0868d5904a1ffd7360c8a026b90b276b8c33808ab5df9862265cb1832415a Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Sat, 6 Feb 2010 11:57:20 +0000 Subject: [PATCH 03/11] fixed changelog and cleanup of the spec file OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=26 --- xine-lib.changes | 5 +- xine-lib.spec | 176 ++--------------------------------------------- 2 files changed, 7 insertions(+), 174 deletions(-) diff --git a/xine-lib.changes b/xine-lib.changes index 27fb17a..4d676f8 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,9 +1,8 @@ ------------------------------------------------------------------- Wed Feb 03 21:03:00 CEST 2010 - Manfred.Tremmel@iiv.de -- sorry guys it's useless to try fuzz=0 getting working without - having two patch versions for crippled and non crippled tarball - added "-F2" for patch 50 and 61 +- patches can't be build to work with crippled and non crippled tarball + with fuzz=0, added "-F2" for patch 50 and 61 to fix this ------------------------------------------------------------------- Mon Feb 1 12:37:47 UTC 2010 - jengelh@medozas.de diff --git a/xine-lib.spec b/xine-lib.spec index 39e9f03..8e81ec6 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -314,23 +314,7 @@ Authors: -------- Guenter Bartsch -xine Soundausgabeplugin für den Pulseaudio Soundserver - - - -Autoren: --------- - Guenter Bartsch - %description -n libxine1-pulse -l de -xine sound output plugin for the pulseaudio soundserver - - - -Authors: --------- - Guenter Bartsch - xine Soundausgabeplugin für den Pulseaudio Soundserver @@ -357,23 +341,7 @@ Authors: -------- Guenter Bartsch -SDL xine Video-Ausgabeplugin - - - -Autoren: --------- - Guenter Bartsch - %description -n libxine1-sdl -l de -SDL xine video output plugin - - - -Authors: --------- - Guenter Bartsch - SDL xine Video-Ausgabeplugin @@ -396,35 +364,11 @@ xine sound output plugin for the arts soundserver -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den arts Soundserver - - - -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the arts soundserver - - - Authors: -------- Guenter Bartsch %description -n libxine1-arts -l de -xine sound output plugin for the arts soundserver - - - -Authors: --------- - Guenter Bartsch - xine Soundausgabeplugin für den arts Soundserver @@ -433,14 +377,6 @@ Autoren: -------- Guenter Bartsch -xine sound output plugin for the arts soundserver - - - -Authors: --------- - Guenter Bartsch - %endif %if %{with aalib} @@ -460,31 +396,14 @@ Authors: Guenter Bartsch -aalib and libcaca xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - %description -n libxine1-aa -l de -aalib and libcaca xine video-output plugin +aalib und libcaca xine Video Ausgabeplugin -Authors: +Autoren: -------- - Guenter Bartsch - - -aalib and libcaca xine video-output plugin - - - -Authors: --------- - Guenter Bartsch + Guenter Bartsch %endif %if %{with esd} @@ -504,29 +423,10 @@ Authors: -------- Guenter Bartsch -libxine Soundausgabeplugin für den esound Soundserver - -libxine sound output plugin for the esound soundserver - - - -Authors: --------- - Guenter Bartsch %description -n libxine1-esd -l de -libxine sound output plugin for the esound soundserver - - - -Authors: --------- - Guenter Bartsch - libxine Soundausgabeplugin für den esound Soundserver -libxine sound output plugin for the esound soundserver - Authors: @@ -551,23 +451,7 @@ Authors: -------- Guenter Bartsch -xine Soundausgabeplugin für den jack Soundserver - - - -Autoren: --------- - Guenter Bartsch - %description -n libxine1-jack -l de -xine sound output plugin for the jack soundserver - - - -Authors: --------- - Guenter Bartsch - xine Soundausgabeplugin für den jack Soundserver @@ -594,23 +478,7 @@ Authors: -------- Guenter Bartsch -Directfb xine Video-Ausgabeplugin - - - -Autoren: --------- - Guenter Bartsch - %description -n libxine1-directfb -l de -Directfb xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - Directfb xine Video-Ausgabeplugin @@ -638,23 +506,7 @@ Authors: -------- Guenter Bartsch -Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen - - - -Autoren: --------- - Guenter Bartsch - %description -n libxine1-gnome-vfs -l de -Input plugin which enables xine to use Gnome-vfs - - - -Authors: --------- - Guenter Bartsch - Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen @@ -701,27 +553,7 @@ Authors: -------- Guenter Bartsch -Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten -Medienverainten abspielen. Weitere Informationtne über xine Plugins -finden Sie unter -http://www.xine-project.org/home - - - -Autoren: --------- - Guenter Bartsch %description -n libxine1-codecs -l de -With these xine plug-ins, you can watch DVDs and all other kind of -media using xine. More information about xine plug-ins can be found at -http://www.xine-project.org/home - - - -Authors: --------- - Guenter Bartsch - Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten Medienverainten abspielen. Weitere Informationtne über xine Plugins finden Sie unter @@ -761,6 +593,7 @@ EOF %patch28 -p1 %patch31 -p1 %if %suse_version >= 1110 +# set fuzzy=2 to get patch work with crippled and noncrippled tarball %patch50 -p1 -F2 %else %patch50 -p1 @@ -768,6 +601,7 @@ EOF %patch51 -p1 sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am %if %suse_version >= 1110 +# set fuzzy=2 to get patch work with crippled and noncrippled tarball %patch61 -p1 -F2 %else %patch61 -p1 From 1f83204385e5beed4e6a8f302688ca87da675e5801843ad94c5ed2bbec1518c4 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Wed, 24 Feb 2010 22:05:20 +0000 Subject: [PATCH 04/11] xine-lib update to 1.1.18 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=27 --- compat.c | 28 ++++++++ vdr-xine-0.9.3.diff.bz2 | 4 +- vdr-xine-SUSE.diff | 11 +-- xine-configure.diff | 9 ++- xine-lib-1.1.17-assert.patch | 10 --- xine-lib-1.1.17-crippled.tar.bz2 | 3 - xine-lib-1.1.17.tar.bz2 | 3 - xine-lib-1.1.18-assert.patch | 13 ++++ xine-lib-1.1.18-crippled.tar.bz2 | 3 + ...-lib-1.1.18-demuxcheckfor_mad_ffmpeg.patch | 19 ++--- ...ne-lib-1.1.18-glitch-free-pulseaudio.patch | 9 ++- ... => xine-lib-1.1.18-ia64-is-not-alpha.diff | 18 ++--- ...ine-lib-1.1.18-install-plugins-helper.diff | 61 ++++++++-------- ...n.diff => xine-lib-1.1.18-mjpegplugin.diff | 69 +++++++++---------- xine-lib-1.1.18.tar.bz2 | 3 + xine-lib-libdvdread_udf.diff | 24 +++---- xine-lib-various-noncrippled.diff | 2 +- xine-lib.changes | 17 +++++ xine-lib.spec | 15 ++-- 19 files changed, 166 insertions(+), 155 deletions(-) create mode 100644 compat.c delete mode 100644 xine-lib-1.1.17-assert.patch delete mode 100644 xine-lib-1.1.17-crippled.tar.bz2 delete mode 100644 xine-lib-1.1.17.tar.bz2 create mode 100644 xine-lib-1.1.18-assert.patch create mode 100644 xine-lib-1.1.18-crippled.tar.bz2 rename xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch => xine-lib-1.1.18-demuxcheckfor_mad_ffmpeg.patch (61%) rename xine-lib-1.1.17-glitch-free-pulseaudio.patch => xine-lib-1.1.18-glitch-free-pulseaudio.patch (68%) rename xine-lib-1.1.17-ia64-is-not-alpha.diff => xine-lib-1.1.18-ia64-is-not-alpha.diff (56%) rename xine-lib-1.1.17-install-plugins-helper.diff => xine-lib-1.1.18-install-plugins-helper.diff (78%) rename xine-lib-1.1.17-mjpegplugin.diff => xine-lib-1.1.18-mjpegplugin.diff (95%) create mode 100644 xine-lib-1.1.18.tar.bz2 diff --git a/compat.c b/compat.c new file mode 100644 index 0000000..dd0e33d --- /dev/null +++ b/compat.c @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2010 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + */ + +/* For compatibility with em8300 < 0.18.0 */ +int dxr3_compat_ioctl (int fd, int rq, void *arg) +{ + int ret = ioctl (fd, rq, arg); + if (ret < 0 && errno == EINVAL || errno == ENOTTY) + ret = ioctl (fd, rq & 0xFF, arg); + return ret; +} diff --git a/vdr-xine-0.9.3.diff.bz2 b/vdr-xine-0.9.3.diff.bz2 index 9878426..143a8ce 100644 --- a/vdr-xine-0.9.3.diff.bz2 +++ b/vdr-xine-0.9.3.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffd45aca1ab74ad3743d704b048203832464247e26276445eaa9b26f3235e287 -size 24533 +oid sha256:4f5782201f9335d4578878d137f9acc6e350852627487633c8b5d8d02fe87e20 +size 24876 diff --git a/vdr-xine-SUSE.diff b/vdr-xine-SUSE.diff index 15c58e2..171d5e7 100644 --- a/vdr-xine-SUSE.diff +++ b/vdr-xine-SUSE.diff @@ -1,11 +1,6 @@ -The vdr plugin is patched to use /var/lib/vdr-xine for fifos and so -needs the part here. Don't remove this patch. - -Signed-off-by: Ludwig Nussel -Index: xine-lib-1.1.9/src/vdr/input_vdr.c -=================================================================== ---- xine-lib-1.1.9.orig/src/vdr/input_vdr.c -+++ xine-lib-1.1.9/src/vdr/input_vdr.c +diff -ur xine-lib-1.1.18.orig/src/vdr/input_vdr.c xine-lib-1.1.18/src/vdr/input_vdr.c +--- xine-lib-1.1.18.orig/src/vdr/input_vdr.c 2010-02-24 21:01:43.658883179 +0100 ++++ xine-lib-1.1.18/src/vdr/input_vdr.c 2010-02-24 21:02:59.800133025 +0100 @@ -51,7 +51,7 @@ diff --git a/xine-configure.diff b/xine-configure.diff index f0647ca..df7303f 100644 --- a/xine-configure.diff +++ b/xine-configure.diff @@ -1,6 +1,7 @@ ---- xine-lib-1.1.12/configure.ac -+++ xine-lib-1.1.12/configure.ac -@@ -118,6 +118,7 @@ dnl Check for programs. +diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac +--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:37:21.487134132 +0100 ++++ xine-lib-1.1.18/configure.ac 2010-02-24 21:40:15.697916133 +0100 +@@ -119,6 +119,7 @@ dnl --------------------------------------------- AC_PROG_CC @@ -8,3 +9,5 @@ AM_PROG_AS case "$host_os" in +Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c. +Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h. diff --git a/xine-lib-1.1.17-assert.patch b/xine-lib-1.1.17-assert.patch deleted file mode 100644 index 86d13e3..0000000 --- a/xine-lib-1.1.17-assert.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xine-lib-1.1.16.3.orig/src/audio_out/audio_alsa_out.c 2008-06-25 15:04:09.000000000 +0200 -+++ xine-lib-1.1.16.3/src/audio_out/audio_alsa_out.c 2009-11-14 10:52:16.423781020 +0100 -@@ -41,6 +41,7 @@ - #ifdef HAVE_ALLOCA_H - #include - #endif -+#include - - #define ALSA_PCM_NEW_HW_PARAMS_API - #define ALSA_PCM_NEW_SW_PARAMS_API diff --git a/xine-lib-1.1.17-crippled.tar.bz2 b/xine-lib-1.1.17-crippled.tar.bz2 deleted file mode 100644 index cf3cee3..0000000 --- a/xine-lib-1.1.17-crippled.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d593dd04e953e5417f72575ed735af603f9dbf8d3a368b8eb40cd0ff2105b50 -size 5110047 diff --git a/xine-lib-1.1.17.tar.bz2 b/xine-lib-1.1.17.tar.bz2 deleted file mode 100644 index 10a256c..0000000 --- a/xine-lib-1.1.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14e17e1665c0aa90f958204570060a3aebded2b93078c5fae14ca8a92c0e79cf -size 7528937 diff --git a/xine-lib-1.1.18-assert.patch b/xine-lib-1.1.18-assert.patch new file mode 100644 index 0000000..213a956 --- /dev/null +++ b/xine-lib-1.1.18-assert.patch @@ -0,0 +1,13 @@ +diff -ur xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.18/src/audio_out/audio_alsa_out.c +--- xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c 2010-01-14 23:17:54.000000000 +0100 ++++ xine-lib-1.1.18/src/audio_out/audio_alsa_out.c 2010-02-24 21:38:21.022134045 +0100 +@@ -41,6 +41,7 @@ + #ifdef HAVE_ALLOCA_H + #include + #endif ++#include + + #define ALSA_PCM_NEW_HW_PARAMS_API + #define ALSA_PCM_NEW_SW_PARAMS_API +Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c. +Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h. diff --git a/xine-lib-1.1.18-crippled.tar.bz2 b/xine-lib-1.1.18-crippled.tar.bz2 new file mode 100644 index 0000000..aa100f7 --- /dev/null +++ b/xine-lib-1.1.18-crippled.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e0297228af8dd134dab60f45817b2ec581eb7786d41f760ab561751ac9bf41f +size 5116221 diff --git a/xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch b/xine-lib-1.1.18-demuxcheckfor_mad_ffmpeg.patch similarity index 61% rename from xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch rename to xine-lib-1.1.18-demuxcheckfor_mad_ffmpeg.patch index def30e0..a9535fa 100644 --- a/xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch +++ b/xine-lib-1.1.18-demuxcheckfor_mad_ffmpeg.patch @@ -1,16 +1,7 @@ -From 8861e0d755127fde4b57d32561491853e49a0edc Mon Sep 17 00:00:00 2001 -From: Ludwig Nussel -Date: Fri, 25 Jul 2008 15:07:23 +0200 -Subject: [PATCH] xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff - -=================================================================== ---- - src/xine-engine/load_plugins.c | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) - ---- xine-lib-1.1.16.3.orig/src/xine-engine/load_plugins.c 2009-02-10 18:21:07.000000000 +0100 -+++ xine-lib-1.1.16.3/src/xine-engine/load_plugins.c 2009-11-14 11:00:26.719796977 +0100 -@@ -2487,9 +2487,18 @@ +diff -ur xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c xine-lib-1.1.18/src/xine-engine/load_plugins.c +--- xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c 2010-01-14 23:17:56.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/load_plugins.c 2010-02-24 21:54:02.396132130 +0100 +@@ -2508,9 +2508,18 @@ plugin_catalog_t *catalog = self->plugin_catalog; int list_id; @@ -29,7 +20,7 @@ Subject: [PATCH] xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff /* calc length of output string and create an array of strings to concatenate */ size_t len = 0; -@@ -2501,7 +2510,13 @@ +@@ -2522,7 +2531,13 @@ if (node->plugin_class || _load_plugin_class(self, node, NULL)) { demux_class_t *const cls = (demux_class_t *)node->plugin_class; if( (extensions[list_id] = cls->get_extensions(cls)) != NULL ) diff --git a/xine-lib-1.1.17-glitch-free-pulseaudio.patch b/xine-lib-1.1.18-glitch-free-pulseaudio.patch similarity index 68% rename from xine-lib-1.1.17-glitch-free-pulseaudio.patch rename to xine-lib-1.1.18-glitch-free-pulseaudio.patch index 7c8752f..e43d57b 100644 --- a/xine-lib-1.1.17-glitch-free-pulseaudio.patch +++ b/xine-lib-1.1.18-glitch-free-pulseaudio.patch @@ -1,8 +1,7 @@ -Index: xine-lib-1.1.17/src/xine-engine/audio_out.c -=================================================================== ---- xine-lib-1.1.17.orig/src/xine-engine/audio_out.c -+++ xine-lib-1.1.17/src/xine-engine/audio_out.c -@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) { +diff -ur xine-lib-1.1.18.orig/src/xine-engine/audio_out.c xine-lib-1.1.18/src/xine-engine/audio_out.c +--- xine-lib-1.1.18.orig/src/xine-engine/audio_out.c 2010-02-23 22:59:05.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/audio_out.c 2010-02-24 20:52:10.870884193 +0100 +@@ -1156,8 +1156,17 @@ /* * calculate gap: diff --git a/xine-lib-1.1.17-ia64-is-not-alpha.diff b/xine-lib-1.1.18-ia64-is-not-alpha.diff similarity index 56% rename from xine-lib-1.1.17-ia64-is-not-alpha.diff rename to xine-lib-1.1.18-ia64-is-not-alpha.diff index 1169272..2e07239 100644 --- a/xine-lib-1.1.17-ia64-is-not-alpha.diff +++ b/xine-lib-1.1.18-ia64-is-not-alpha.diff @@ -1,17 +1,7 @@ -From c781f4b2e726fa3fabf8cc0cdd592f617ae799e2 Mon Sep 17 00:00:00 2001 -From: Ludwig Nussel -Date: Fri, 25 Jul 2008 16:58:56 +0200 -Subject: [PATCH] ia64 is not alpha - ---- - configure.ac | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -Index: xine-lib-1.1.16.3/configure.ac -=================================================================== ---- xine-lib-1.1.16.3.orig/configure.ac 2009-04-02 20:44:45.000000000 +0200 -+++ xine-lib-1.1.16.3/configure.ac 2009-11-14 10:45:11.618782275 +0100 -@@ -2328,10 +2328,13 @@ +diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac +--- xine-lib-1.1.18.orig/configure.ac 2010-02-22 21:03:51.000000000 +0100 ++++ xine-lib-1.1.18/configure.ac 2010-02-24 20:47:41.959133782 +0100 +@@ -2381,10 +2381,13 @@ mips-*) AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation]) ;; diff --git a/xine-lib-1.1.17-install-plugins-helper.diff b/xine-lib-1.1.18-install-plugins-helper.diff similarity index 78% rename from xine-lib-1.1.17-install-plugins-helper.diff rename to xine-lib-1.1.18-install-plugins-helper.diff index 90dd87a..192e411 100644 --- a/xine-lib-1.1.17-install-plugins-helper.diff +++ b/xine-lib-1.1.18-install-plugins-helper.diff @@ -1,8 +1,7 @@ -Index: xine-lib-1.1.17/configure.ac -=================================================================== ---- xine-lib-1.1.17.orig/configure.ac -+++ xine-lib-1.1.17/configure.ac -@@ -2613,6 +2613,28 @@ fi +diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac +--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 22:24:29.445882777 +0100 ++++ xine-lib-1.1.18/configure.ac 2010-02-24 22:26:25.554146234 +0100 +@@ -2631,6 +2631,28 @@ AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno") @@ -31,10 +30,9 @@ Index: xine-lib-1.1.17/configure.ac dnl --------------------------------------------- dnl some include paths ( !!! DO NOT REMOVE !!! ) -Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c -=================================================================== ---- xine-lib-1.1.17.orig/src/xine-engine/audio_decoder.c -+++ xine-lib-1.1.17/src/xine-engine/audio_decoder.c +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.18/src/xine-engine/audio_decoder.c +--- xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c 2010-01-14 23:17:55.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/audio_decoder.c 2010-02-24 22:26:25.555133914 +0100 @@ -41,6 +41,7 @@ #include "xine_internal.h" @@ -43,7 +41,7 @@ Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c static void *audio_decoder_loop (void *stream_gen) { -@@ -341,6 +342,10 @@ static void *audio_decoder_loop (void *s +@@ -341,6 +342,10 @@ _x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED, (stream->audio_decoder_plugin != NULL)); @@ -54,10 +52,9 @@ Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c } if (audio_type != stream->audio_type) { -Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c -=================================================================== ---- /dev/null -+++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c +--- xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c 2010-02-24 22:26:25.556133119 +0100 @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2007 Sascha Sommer @@ -165,10 +162,9 @@ Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c + } +} + -Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h -=================================================================== ---- /dev/null -+++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h +--- xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h 2010-02-24 22:26:25.556133119 +0100 @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2007 Sascha Sommer @@ -205,11 +201,10 @@ Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h + + +#endif -Index: xine-lib-1.1.17/src/xine-engine/Makefile.am -=================================================================== ---- xine-lib-1.1.17.orig/src/xine-engine/Makefile.am -+++ xine-lib-1.1.17/src/xine-engine/Makefile.am -@@ -19,7 +19,7 @@ libxine_la_SOURCES = xine.c metronom.c c +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/Makefile.am xine-lib-1.1.18/src/xine-engine/Makefile.am +--- xine-lib-1.1.18.orig/src/xine-engine/Makefile.am 2010-01-21 00:45:27.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/Makefile.am 2010-02-24 22:26:25.556133119 +0100 +@@ -19,7 +19,7 @@ video_overlay.c osd.c scratch.c demux.c vo_scale.c \ xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \ input_rip.c input_cache.c info_helper.c refcounter.c \ @@ -218,7 +213,7 @@ Index: xine-lib-1.1.17/src/xine-engine/Makefile.am # FIXME: these are currently unused: EXTRA_DIST = lrb.c lrb.h accel_xvmc.h -@@ -39,7 +39,8 @@ xineinclude_HEADERS = buffer.h metronom +@@ -39,7 +39,8 @@ audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \ plugin_catalog.h audio_decoder.h video_decoder.h post.h \ @@ -228,10 +223,9 @@ Index: xine-lib-1.1.17/src/xine-engine/Makefile.am noinst_HEADERS = bswap.h ffmpeg_bswap.h -Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c -=================================================================== ---- xine-lib-1.1.17.orig/src/xine-engine/video_decoder.c -+++ xine-lib-1.1.17/src/xine-engine/video_decoder.c +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c xine-lib-1.1.18/src/xine-engine/video_decoder.c +--- xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c 2010-02-23 23:27:15.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/video_decoder.c 2010-02-24 22:26:25.557133929 +0100 @@ -37,6 +37,7 @@ #include "xine_internal.h" @@ -240,7 +234,7 @@ Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c #include #define SPU_SLEEP_INTERVAL (90000/2) -@@ -376,6 +377,10 @@ static void *video_decoder_loop (void *s +@@ -376,6 +377,10 @@ stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype); _x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL)); @@ -251,11 +245,10 @@ Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c } if (stream->video_decoder_plugin) -Index: xine-lib-1.1.17/src/xine-engine/xine.c -=================================================================== ---- xine-lib-1.1.17.orig/src/xine-engine/xine.c -+++ xine-lib-1.1.17/src/xine-engine/xine.c -@@ -1809,6 +1809,15 @@ void xine_init (xine_t *this) { +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine.c xine-lib-1.1.18/src/xine-engine/xine.c +--- xine-lib-1.1.18.orig/src/xine-engine/xine.c 2010-02-24 22:24:02.482882309 +0100 ++++ xine-lib-1.1.18/src/xine-engine/xine.c 2010-02-24 22:26:25.559133664 +0100 +@@ -1810,6 +1810,15 @@ 0, NULL, this); /* diff --git a/xine-lib-1.1.17-mjpegplugin.diff b/xine-lib-1.1.18-mjpegplugin.diff similarity index 95% rename from xine-lib-1.1.17-mjpegplugin.diff rename to xine-lib-1.1.18-mjpegplugin.diff index 1562b20..203a173 100644 --- a/xine-lib-1.1.17-mjpegplugin.diff +++ b/xine-lib-1.1.18-mjpegplugin.diff @@ -1,8 +1,7 @@ -Index: xine-lib-1.1.17/configure -=================================================================== ---- xine-lib-1.1.17.orig/configure -+++ xine-lib-1.1.17/configure -@@ -48965,6 +48965,7 @@ echo "" +diff -uNr xine-lib-1.1.18.orig/configure xine-lib-1.1.18/configure +--- xine-lib-1.1.18.orig/configure 2010-02-23 23:50:53.000000000 +0100 ++++ xine-lib-1.1.18/configure 2010-02-24 21:28:13.318884098 +0100 +@@ -33611,6 +33611,7 @@ echo " * video decoder plugins:" echo " - MPEG 1,2 - Amiga Bitplane" echo " - Raw RGB - Raw YUV" @@ -10,11 +9,10 @@ Index: xine-lib-1.1.17/configure if test "x$with_external_ffmpeg" = "xyes"; then echo " - ffmpeg (external library):" else -Index: xine-lib-1.1.17/configure.ac -=================================================================== ---- xine-lib-1.1.17.orig/configure.ac -+++ xine-lib-1.1.17/configure.ac -@@ -1086,6 +1086,28 @@ AC_SUBST([SDL_CFLAGS]) +diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac +--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:24:46.643882529 +0100 ++++ xine-lib-1.1.18/configure.ac 2010-02-24 21:28:13.320882133 +0100 +@@ -1104,6 +1104,28 @@ AC_SUBST([SDL_LIBS]) dnl --------------------------------------------- @@ -43,15 +41,15 @@ Index: xine-lib-1.1.17/configure.ac dnl check for Libstk dnl --------------------------------------------- -@@ -2799,6 +2821,7 @@ src/libxineadec/Makefile - - +@@ -2817,6 +2839,7 @@ + src/libxineadec/gsm610/Makefile + src/libxineadec/nosefart/Makefile src/libreal/Makefile +src/mjpeg/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile -@@ -2989,6 +3012,9 @@ echo "" +@@ -3007,6 +3030,9 @@ dnl audio decoders echo " * audio decoder plugins:" echo " - GSM 06.10 - linear PCM" @@ -61,34 +59,31 @@ Index: xine-lib-1.1.17/configure.ac if test "x$with_external_ffmpeg" = "xyes"; then echo " - ffmpeg (external library):" else -Index: xine-lib-1.1.17/src/Makefile.am -=================================================================== ---- xine-lib-1.1.17.orig/src/Makefile.am -+++ xine-lib-1.1.17/src/Makefile.am -@@ -27,6 +27,7 @@ SUBDIRS = \ +diff -uNr xine-lib-1.1.18.orig/src/Makefile.am xine-lib-1.1.18/src/Makefile.am +--- xine-lib-1.1.18.orig/src/Makefile.am 2010-02-24 21:24:46.643882529 +0100 ++++ xine-lib-1.1.18/src/Makefile.am 2010-02-24 21:28:13.321884189 +0100 +@@ -27,6 +27,7 @@ libreal \ - \ + libfaad \ libmusepack \ + mjpeg \ post \ combined \ vdr -Index: xine-lib-1.1.17/src/Makefile.in -=================================================================== ---- xine-lib-1.1.17.orig/src/Makefile.in -+++ xine-lib-1.1.17/src/Makefile.in -@@ -450,6 +450,7 @@ SUBDIRS = \ +diff -uNr xine-lib-1.1.18.orig/src/Makefile.in xine-lib-1.1.18/src/Makefile.in +--- xine-lib-1.1.18.orig/src/Makefile.in 2010-02-23 23:50:35.000000000 +0100 ++++ xine-lib-1.1.18/src/Makefile.in 2010-02-24 21:28:13.321884189 +0100 +@@ -453,6 +453,7 @@ libreal \ - \ + libfaad \ libmusepack \ + mjpeg \ post \ combined -Index: xine-lib-1.1.17/src/mjpeg/Makefile.am -=================================================================== ---- /dev/null -+++ xine-lib-1.1.17/src/mjpeg/Makefile.am +diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.am xine-lib-1.1.18/src/mjpeg/Makefile.am +--- xine-lib-1.1.18.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.18/src/mjpeg/Makefile.am 2010-02-24 21:28:13.323883132 +0100 @@ -0,0 +1,9 @@ +include $(top_srcdir)/misc/Makefile.common + @@ -99,10 +94,9 @@ Index: xine-lib-1.1.17/src/mjpeg/Makefile.am +xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags) +endif -Index: xine-lib-1.1.17/src/mjpeg/Makefile.in -=================================================================== ---- /dev/null -+++ xine-lib-1.1.17/src/mjpeg/Makefile.in +diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.in xine-lib-1.1.18/src/mjpeg/Makefile.in +--- xine-lib-1.1.18.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.18/src/mjpeg/Makefile.in 2010-02-24 21:28:13.324882254 +0100 @@ -0,0 +1,751 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ @@ -855,10 +849,9 @@ Index: xine-lib-1.1.17/src/mjpeg/Makefile.in +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -Index: xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c -=================================================================== ---- /dev/null -+++ xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c +diff -uNr xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c +--- xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c 2010-02-24 21:28:13.325884030 +0100 @@ -0,0 +1,397 @@ +/* + * Copyright (C) 2007 Marcus Meissner diff --git a/xine-lib-1.1.18.tar.bz2 b/xine-lib-1.1.18.tar.bz2 new file mode 100644 index 0000000..0af42ab --- /dev/null +++ b/xine-lib-1.1.18.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ba164c7a192b265a7c72bd623bd69b261bcf7716ecca90a08d67025dd16bfb7 +size 7533013 diff --git a/xine-lib-libdvdread_udf.diff b/xine-lib-libdvdread_udf.diff index 562065f..e31125c 100644 --- a/xine-lib-libdvdread_udf.diff +++ b/xine-lib-libdvdread_udf.diff @@ -1,14 +1,7 @@ -# HG changeset patch -# User Tobias Rautenkranz -# Date 1202208482 -3600 -# Node ID 100241ff36f0730a15018a58456fb86eb590bf18 -# Parent 07c29261ed98fdb710a241c6711dac0215b6074a -Fix playback of DVDs with a broken UDF file system (aka DVD-Movie-Protect). - -diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c ---- a/src/input/libdvdnav/dvd_udf.c Thu Jan 31 22:02:04 2008 +0000 -+++ b/src/input/libdvdnav/dvd_udf.c Tue Feb 05 11:48:02 2008 +0100 -@@ -38,9 +38,15 @@ +diff -ur xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c +--- xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c 2009-11-30 21:57:20.000000000 +0100 ++++ xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c 2010-02-24 21:12:36.032882913 +0100 +@@ -38,10 +38,16 @@ #include #include #include @@ -18,13 +11,14 @@ diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c #include "dvd_reader.h" #include "dvd_udf.h" -+ + +#include "ifo_types.h" +#include "ifo_read.h" - ++ /* Private but located in/shared with dvd_reader.c */ extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number, -@@ -774,7 +780,9 @@ static int UDFFindPartition( dvd_reader_ + size_t block_count, unsigned char *data, +@@ -774,7 +780,9 @@ return part->valid; } @@ -35,7 +29,7 @@ diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c uint32_t *filesize ) { uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ]; -@@ -856,6 +864,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi +@@ -856,6 +864,84 @@ return partition.Start + File.Location; } diff --git a/xine-lib-various-noncrippled.diff b/xine-lib-various-noncrippled.diff index 9acd408..08f9401 100644 --- a/xine-lib-various-noncrippled.diff +++ b/xine-lib-various-noncrippled.diff @@ -2,7 +2,7 @@ Index: src/libw32dll/wine/ldt_keeper.c =================================================================== --- src/libw32dll/wine/ldt_keeper.c.orig +++ src/libw32dll/wine/ldt_keeper.c -@@ -77,6 +77,10 @@ int modify_ldt(int func, void *ptr, unsi +@@ -77,6 +77,10 @@ #ifdef __cplusplus } #endif diff --git a/xine-lib.changes b/xine-lib.changes index 4d676f8..74eff7f 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Feb 24 20:20:00 CEST 2009 - Manfred.Tremmel@iiv.de +- update to 1.1.18 + * Bump the FLAC decoder's priority above ffmpegaudio. This should fix + various problems with FLAC playback. + * Build fix (undefined symbol) for when using older ffmpeg. + * TTA demuxer fixes; allow seeking. + * More meta-information tags. + Only the Ogg demuxer knows about these at present. + * Added basic support for .qtl (Quicktime media link). + * "Fixed" playback of 24-bit FLAC. + * Fixed playback of 24-bit LPCM. + * Work around an ffmpeg bug concerning Sorenson Video 3. + * Flash audio bug fixes, mostly concerning AAC. + * Fix DXR3 support for newer versions of the em8300 driver. + * Added support for WMA Pro. + ------------------------------------------------------------------- Wed Feb 03 21:03:00 CEST 2010 - Manfred.Tremmel@iiv.de diff --git a/xine-lib.spec b/xine-lib.spec index 8e81ec6..79969e8 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,5 +1,5 @@ # -# spec file for package xine-lib (Version 1.1.17) +# spec file for package xine-lib (Version 1.1.18) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -53,7 +53,7 @@ BuildRequires: glib2-devel gnutls-devel gtk2-devel imlib2-devel krb5-devel BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel BuildRequires: readline-devel update-desktop-files vcdimager-devel -BuildRequires: speex-devel +BuildRequires: speex-devel libv4l-devel %if %suse_version >= 1030 BuildRequires: lirc-devel %else @@ -97,13 +97,13 @@ BuildRequires: DirectFB %if %{with modplug} BuildRequires: libmodplug-devel %endif -Version: 1.1.17 +Version: 1.1.18 Release: 1 # bug437293 %ifarch ppc64 Obsoletes: xine-lib-64bit %endif -%define abiversion 1.27 +%define abiversion 1.28 Summary: Video Player with Plug-Ins Group: Productivity/Multimedia/Video/Players License: GPLv2+ ; Public Domain, Freeware @@ -114,8 +114,10 @@ Source: xine-lib-%{version}-crippled.tar.bz2 %else Source: xine-lib-%{version}.tar.bz2 %endif -Source2: baselibs.conf +Source2: baselibs.conf Source10: README.SuSE +# missing file in 1.1.18 tarball +Source80: compat.c Source99: precheckin_cripple_tarball.sh # *** xine-lib: Bugfixes Patch26: xine-lib-doc-fix-X11R6.diff @@ -155,6 +157,7 @@ Group: Productivity/Multimedia/Video/Players License: GPLv2+ Provides: xine-lib = %{version}-%{release} Obsoletes: xine-lib < %{version}-%{release} +Provides: xine-extra = %{version}-%{release} Obsoletes: xine-extra < %{version}-%{release} Provides: libxine1-syncfb = %{version}-%{release} Obsoletes: libxine1-syncfb < %{version}-%{release} @@ -615,6 +618,7 @@ sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/ %else # Only apply to uncrippled source %patch80 +cp %{SOURCE80} src/dxr3/ %endif %patch72 -p1 %patch73 -p1 @@ -707,6 +711,7 @@ xineplug_vo_out_raw xineplug_inp_dvb xineplug_inp_dvd xineplug_inp_v4l +xineplug_inp_v4l2 xineplug_inp_file xineplug_inp_http xineplug_inp_net From 0607cdab7c762334840ff7c3ddbe96f1e7b82910f7b6704dc29cf82b0110180e Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Wed, 24 Feb 2010 22:22:08 +0000 Subject: [PATCH 05/11] xine-lib: libv4l only available for SUSE >= 11.1 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=28 --- xine-lib.changes | 2 +- xine-lib.spec | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/xine-lib.changes b/xine-lib.changes index 74eff7f..62eed31 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Wed Feb 24 20:20:00 CEST 2009 - Manfred.Tremmel@iiv.de +Wed Feb 24 23:14:00 CEST 2010 - Manfred.Tremmel@iiv.de - update to 1.1.18 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix various problems with FLAC playback. diff --git a/xine-lib.spec b/xine-lib.spec index 79969e8..3822c82 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -28,7 +28,7 @@ Name: xine-lib # default for buildservice is no patented codecs %bcond_without distributable %bcond_with onlynondistributable -%if %suse_version >= 1100 +%if 0%{suse_version} >= 1100 %bcond_without pulseaudio %else %bcond_with pulseaudio @@ -40,7 +40,7 @@ Name: xine-lib %bcond_with jack %bcond_without gnome_vfs %bcond_with directfb -%if %suse_version > 1110 +%if 0%{suse_version} > 1110 %bcond_without modplug %else %bcond_with modplug @@ -53,8 +53,11 @@ BuildRequires: glib2-devel gnutls-devel gtk2-devel imlib2-devel krb5-devel BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel BuildRequires: readline-devel update-desktop-files vcdimager-devel -BuildRequires: speex-devel libv4l-devel -%if %suse_version >= 1030 +BuildRequires: speex-devel +%if 0%{suse_version} >= 1110 +BuildRequires: libv4l-devel +%endif +%if 0%{suse_version} >= 1030 BuildRequires: lirc-devel %else BuildRequires: lirc @@ -88,7 +91,7 @@ BuildRequires: gnome-vfs2-devel BuildRequires: libjack-devel %endif %if %{with directfb} -%if %suse_version >= 1020 +%if 0%{suse_version} >= 1020 BuildRequires: DirectFB-devel %else BuildRequires: DirectFB @@ -595,7 +598,7 @@ EOF %patch26 %patch28 -p1 %patch31 -p1 -%if %suse_version >= 1110 +%if 0%{suse_version} >= 1110 # set fuzzy=2 to get patch work with crippled and noncrippled tarball %patch50 -p1 -F2 %else @@ -603,7 +606,7 @@ EOF %endif %patch51 -p1 sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am -%if %suse_version >= 1110 +%if 0%{suse_version} >= 1110 # set fuzzy=2 to get patch work with crippled and noncrippled tarball %patch61 -p1 -F2 %else @@ -663,6 +666,11 @@ AUTOPOINT=true autoreconf -fi %endif %ifarch %{ix86} --with-w32-path=/usr/lib/win32 \ +%endif +%if 0%{suse_version} >= 1110 + --enable-libv4l \ +%else + --disable-libv4l \ %endif --with-install-plugins-helper=${_prefix}/lib/opensuse-codecs-installer %if 0%{?suse_version} < 1110 @@ -711,7 +719,9 @@ xineplug_vo_out_raw xineplug_inp_dvb xineplug_inp_dvd xineplug_inp_v4l +%if 0%{suse_version} >= 1110 xineplug_inp_v4l2 +%endif xineplug_inp_file xineplug_inp_http xineplug_inp_net From 1882be77fc4fbf8dd88d1bc014a711cfe827ca4dbc12677b8e5e62661750d4cc Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Wed, 24 Feb 2010 23:03:03 +0000 Subject: [PATCH 06/11] xine-lib: completely disalbe v4l SUSE < 11.1 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=29 --- xine-lib.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 3822c82..cdcfaaf 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -668,9 +668,9 @@ AUTOPOINT=true autoreconf -fi --with-w32-path=/usr/lib/win32 \ %endif %if 0%{suse_version} >= 1110 - --enable-libv4l \ + --enable-v4l --enable-libv4l \ %else - --disable-libv4l \ + --disable-v4l --disable-libv4l \ %endif --with-install-plugins-helper=${_prefix}/lib/opensuse-codecs-installer %if 0%{?suse_version} < 1110 @@ -718,8 +718,8 @@ xineplug_vo_out_xcbxv xineplug_vo_out_raw xineplug_inp_dvb xineplug_inp_dvd -xineplug_inp_v4l %if 0%{suse_version} >= 1110 +xineplug_inp_v4l xineplug_inp_v4l2 %endif xineplug_inp_file From 3d0ce0199b3ea82bb0a8e5ec2ed83db874c973f20d408c8c838dff8fb62325bd Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Wed, 24 Feb 2010 23:14:42 +0000 Subject: [PATCH 07/11] xine-lib: also pvr input modul is not build on SUSE < 11.1, removed it out of the list OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=30 --- xine-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index cdcfaaf..6167b40 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -721,6 +721,7 @@ xineplug_inp_dvd %if 0%{suse_version} >= 1110 xineplug_inp_v4l xineplug_inp_v4l2 +xineplug_inp_pvr %endif xineplug_inp_file xineplug_inp_http @@ -730,7 +731,6 @@ xineplug_inp_cdda xineplug_inp_smb xineplug_inp_stdin_fifo xineplug_inp_rtsp -xineplug_inp_pvr xineplug_inp_rtp xineplug_decode_bitplane xineplug_decode_rgb From 5fee99c0f72e09000f1b7454b77a480d92b7c5e6739c88cd5650117f967feef9 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Sun, 7 Mar 2010 00:12:27 +0000 Subject: [PATCH 08/11] xine-lib: update to 1.1.18.1 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=31 --- compat.c | 28 ------------------- xine-lib-1.1.18-crippled.tar.bz2 | 3 -- ...rt.patch => xine-lib-1.1.18.1-assert.patch | 0 xine-lib-1.1.18.1-crippled.tar.bz2 | 3 ++ ...ib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch | 0 ...-lib-1.1.18.1-glitch-free-pulseaudio.patch | 0 ...> xine-lib-1.1.18.1-ia64-is-not-alpha.diff | 0 ...e-lib-1.1.18.1-install-plugins-helper.diff | 0 ...diff => xine-lib-1.1.18.1-mjpegplugin.diff | 0 xine-lib-1.1.18.1.tar.bz2 | 3 ++ xine-lib-1.1.18.tar.bz2 | 3 -- xine-lib.changes | 12 ++++++-- xine-lib.spec | 7 ++--- 13 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 compat.c delete mode 100644 xine-lib-1.1.18-crippled.tar.bz2 rename xine-lib-1.1.18-assert.patch => xine-lib-1.1.18.1-assert.patch (100%) create mode 100644 xine-lib-1.1.18.1-crippled.tar.bz2 rename xine-lib-1.1.18-demuxcheckfor_mad_ffmpeg.patch => xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch (100%) rename xine-lib-1.1.18-glitch-free-pulseaudio.patch => xine-lib-1.1.18.1-glitch-free-pulseaudio.patch (100%) rename xine-lib-1.1.18-ia64-is-not-alpha.diff => xine-lib-1.1.18.1-ia64-is-not-alpha.diff (100%) rename xine-lib-1.1.18-install-plugins-helper.diff => xine-lib-1.1.18.1-install-plugins-helper.diff (100%) rename xine-lib-1.1.18-mjpegplugin.diff => xine-lib-1.1.18.1-mjpegplugin.diff (100%) create mode 100644 xine-lib-1.1.18.1.tar.bz2 delete mode 100644 xine-lib-1.1.18.tar.bz2 diff --git a/compat.c b/compat.c deleted file mode 100644 index dd0e33d..0000000 --- a/compat.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2010 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - */ - -/* For compatibility with em8300 < 0.18.0 */ -int dxr3_compat_ioctl (int fd, int rq, void *arg) -{ - int ret = ioctl (fd, rq, arg); - if (ret < 0 && errno == EINVAL || errno == ENOTTY) - ret = ioctl (fd, rq & 0xFF, arg); - return ret; -} diff --git a/xine-lib-1.1.18-crippled.tar.bz2 b/xine-lib-1.1.18-crippled.tar.bz2 deleted file mode 100644 index aa100f7..0000000 --- a/xine-lib-1.1.18-crippled.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e0297228af8dd134dab60f45817b2ec581eb7786d41f760ab561751ac9bf41f -size 5116221 diff --git a/xine-lib-1.1.18-assert.patch b/xine-lib-1.1.18.1-assert.patch similarity index 100% rename from xine-lib-1.1.18-assert.patch rename to xine-lib-1.1.18.1-assert.patch diff --git a/xine-lib-1.1.18.1-crippled.tar.bz2 b/xine-lib-1.1.18.1-crippled.tar.bz2 new file mode 100644 index 0000000..55c5051 --- /dev/null +++ b/xine-lib-1.1.18.1-crippled.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25b45a277f068b816fb65f9655235ee51c2c3d4875670ab6d82adbc77f223ef0 +size 5116260 diff --git a/xine-lib-1.1.18-demuxcheckfor_mad_ffmpeg.patch b/xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch similarity index 100% rename from xine-lib-1.1.18-demuxcheckfor_mad_ffmpeg.patch rename to xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch diff --git a/xine-lib-1.1.18-glitch-free-pulseaudio.patch b/xine-lib-1.1.18.1-glitch-free-pulseaudio.patch similarity index 100% rename from xine-lib-1.1.18-glitch-free-pulseaudio.patch rename to xine-lib-1.1.18.1-glitch-free-pulseaudio.patch diff --git a/xine-lib-1.1.18-ia64-is-not-alpha.diff b/xine-lib-1.1.18.1-ia64-is-not-alpha.diff similarity index 100% rename from xine-lib-1.1.18-ia64-is-not-alpha.diff rename to xine-lib-1.1.18.1-ia64-is-not-alpha.diff diff --git a/xine-lib-1.1.18-install-plugins-helper.diff b/xine-lib-1.1.18.1-install-plugins-helper.diff similarity index 100% rename from xine-lib-1.1.18-install-plugins-helper.diff rename to xine-lib-1.1.18.1-install-plugins-helper.diff diff --git a/xine-lib-1.1.18-mjpegplugin.diff b/xine-lib-1.1.18.1-mjpegplugin.diff similarity index 100% rename from xine-lib-1.1.18-mjpegplugin.diff rename to xine-lib-1.1.18.1-mjpegplugin.diff diff --git a/xine-lib-1.1.18.1.tar.bz2 b/xine-lib-1.1.18.1.tar.bz2 new file mode 100644 index 0000000..08e545c --- /dev/null +++ b/xine-lib-1.1.18.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a9af8b928e7a65732fc256c6c092e4a74c554d19c977728f06baa1bda358311 +size 7530681 diff --git a/xine-lib-1.1.18.tar.bz2 b/xine-lib-1.1.18.tar.bz2 deleted file mode 100644 index 0af42ab..0000000 --- a/xine-lib-1.1.18.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ba164c7a192b265a7c72bd623bd69b261bcf7716ecca90a08d67025dd16bfb7 -size 7533013 diff --git a/xine-lib.changes b/xine-lib.changes index 62eed31..225e979 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,5 +1,13 @@ ------------------------------------------------------------------- -Wed Feb 24 23:14:00 CEST 2010 - Manfred.Tremmel@iiv.de +Sun Mar 7 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de +- update to 1.1.18.1 + * Oops. compat.c (for DXR3 support) was omitted. + * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. + * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. + * Fix build with the old, outdated and deprecated internal ffmpeg. + +------------------------------------------------------------------- +Wed Feb 24 23:14:00 CET 2010 - Manfred.Tremmel@iiv.de - update to 1.1.18 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix various problems with FLAC playback. @@ -16,7 +24,7 @@ Wed Feb 24 23:14:00 CEST 2010 - Manfred.Tremmel@iiv.de * Added support for WMA Pro. ------------------------------------------------------------------- -Wed Feb 03 21:03:00 CEST 2010 - Manfred.Tremmel@iiv.de +Wed Feb 03 21:03:00 CET 2010 - Manfred.Tremmel@iiv.de - patches can't be build to work with crippled and non crippled tarball with fuzz=0, added "-F2" for patch 50 and 61 to fix this diff --git a/xine-lib.spec b/xine-lib.spec index 6167b40..9297360 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,5 +1,5 @@ # -# spec file for package xine-lib (Version 1.1.18) +# spec file for package xine-lib (Version 1.1.18.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -100,7 +100,7 @@ BuildRequires: DirectFB %if %{with modplug} BuildRequires: libmodplug-devel %endif -Version: 1.1.18 +Version: 1.1.18.1 Release: 1 # bug437293 %ifarch ppc64 @@ -119,8 +119,6 @@ Source: xine-lib-%{version}.tar.bz2 %endif Source2: baselibs.conf Source10: README.SuSE -# missing file in 1.1.18 tarball -Source80: compat.c Source99: precheckin_cripple_tarball.sh # *** xine-lib: Bugfixes Patch26: xine-lib-doc-fix-X11R6.diff @@ -621,7 +619,6 @@ sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/ %else # Only apply to uncrippled source %patch80 -cp %{SOURCE80} src/dxr3/ %endif %patch72 -p1 %patch73 -p1 From bfebc08db826007c70efaeb26baa0013c025867820c277054a2b703296bb284c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 15:36:49 +0000 Subject: [PATCH 09/11] Updating link to change in openSUSE:Factory/xine-lib revision 30.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=163184681f71eea6badc65476dd07fbd --- ready | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ready diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From ab32987a2e39d12bac70f05bc91dcd7047385f8ec10d3897a76952a59e3dbd94 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 1 Apr 2010 01:28:35 +0000 Subject: [PATCH 10/11] Accepting request 36468 from multimedia:xine checked in (request 36468) OBS-URL: https://build.opensuse.org/request/show/36468 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=32 --- vdr-xine-0.9.3.diff.bz2 | 4 +- vdr-xine-SUSE.diff | 11 +- xine-configure.diff | 9 +- xine-lib-1.1.17-assert.patch | 10 + xine-lib-1.1.17-crippled.tar.bz2 | 3 + ...-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch | 19 +- ...ne-lib-1.1.17-glitch-free-pulseaudio.patch | 9 +- ... => xine-lib-1.1.17-ia64-is-not-alpha.diff | 18 +- ...ine-lib-1.1.17-install-plugins-helper.diff | 61 +- ...n.diff => xine-lib-1.1.17-mjpegplugin.diff | 69 +- xine-lib-1.1.17.tar.bz2 | 3 + xine-lib-1.1.18.1-assert.patch | 13 - xine-lib-1.1.18.1-crippled.tar.bz2 | 3 - xine-lib-1.1.18.1.tar.bz2 | 3 - xine-lib-libdvdread_udf.diff | 24 +- xine-lib-various-noncrippled.diff | 2 +- xine-lib.changes | 31 - xine-lib.spec | 598 ++++++++++++++++-- 18 files changed, 712 insertions(+), 178 deletions(-) create mode 100644 xine-lib-1.1.17-assert.patch create mode 100644 xine-lib-1.1.17-crippled.tar.bz2 rename xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch => xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch (61%) rename xine-lib-1.1.18.1-glitch-free-pulseaudio.patch => xine-lib-1.1.17-glitch-free-pulseaudio.patch (68%) rename xine-lib-1.1.18.1-ia64-is-not-alpha.diff => xine-lib-1.1.17-ia64-is-not-alpha.diff (56%) rename xine-lib-1.1.18.1-install-plugins-helper.diff => xine-lib-1.1.17-install-plugins-helper.diff (78%) rename xine-lib-1.1.18.1-mjpegplugin.diff => xine-lib-1.1.17-mjpegplugin.diff (95%) create mode 100644 xine-lib-1.1.17.tar.bz2 delete mode 100644 xine-lib-1.1.18.1-assert.patch delete mode 100644 xine-lib-1.1.18.1-crippled.tar.bz2 delete mode 100644 xine-lib-1.1.18.1.tar.bz2 diff --git a/vdr-xine-0.9.3.diff.bz2 b/vdr-xine-0.9.3.diff.bz2 index 143a8ce..9878426 100644 --- a/vdr-xine-0.9.3.diff.bz2 +++ b/vdr-xine-0.9.3.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f5782201f9335d4578878d137f9acc6e350852627487633c8b5d8d02fe87e20 -size 24876 +oid sha256:ffd45aca1ab74ad3743d704b048203832464247e26276445eaa9b26f3235e287 +size 24533 diff --git a/vdr-xine-SUSE.diff b/vdr-xine-SUSE.diff index 171d5e7..15c58e2 100644 --- a/vdr-xine-SUSE.diff +++ b/vdr-xine-SUSE.diff @@ -1,6 +1,11 @@ -diff -ur xine-lib-1.1.18.orig/src/vdr/input_vdr.c xine-lib-1.1.18/src/vdr/input_vdr.c ---- xine-lib-1.1.18.orig/src/vdr/input_vdr.c 2010-02-24 21:01:43.658883179 +0100 -+++ xine-lib-1.1.18/src/vdr/input_vdr.c 2010-02-24 21:02:59.800133025 +0100 +The vdr plugin is patched to use /var/lib/vdr-xine for fifos and so +needs the part here. Don't remove this patch. + +Signed-off-by: Ludwig Nussel +Index: xine-lib-1.1.9/src/vdr/input_vdr.c +=================================================================== +--- xine-lib-1.1.9.orig/src/vdr/input_vdr.c ++++ xine-lib-1.1.9/src/vdr/input_vdr.c @@ -51,7 +51,7 @@ diff --git a/xine-configure.diff b/xine-configure.diff index df7303f..f0647ca 100644 --- a/xine-configure.diff +++ b/xine-configure.diff @@ -1,7 +1,6 @@ -diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac ---- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:37:21.487134132 +0100 -+++ xine-lib-1.1.18/configure.ac 2010-02-24 21:40:15.697916133 +0100 -@@ -119,6 +119,7 @@ +--- xine-lib-1.1.12/configure.ac ++++ xine-lib-1.1.12/configure.ac +@@ -118,6 +118,7 @@ dnl Check for programs. dnl --------------------------------------------- AC_PROG_CC @@ -9,5 +8,3 @@ diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac AM_PROG_AS case "$host_os" in -Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c. -Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h. diff --git a/xine-lib-1.1.17-assert.patch b/xine-lib-1.1.17-assert.patch new file mode 100644 index 0000000..86d13e3 --- /dev/null +++ b/xine-lib-1.1.17-assert.patch @@ -0,0 +1,10 @@ +--- xine-lib-1.1.16.3.orig/src/audio_out/audio_alsa_out.c 2008-06-25 15:04:09.000000000 +0200 ++++ xine-lib-1.1.16.3/src/audio_out/audio_alsa_out.c 2009-11-14 10:52:16.423781020 +0100 +@@ -41,6 +41,7 @@ + #ifdef HAVE_ALLOCA_H + #include + #endif ++#include + + #define ALSA_PCM_NEW_HW_PARAMS_API + #define ALSA_PCM_NEW_SW_PARAMS_API diff --git a/xine-lib-1.1.17-crippled.tar.bz2 b/xine-lib-1.1.17-crippled.tar.bz2 new file mode 100644 index 0000000..cf3cee3 --- /dev/null +++ b/xine-lib-1.1.17-crippled.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d593dd04e953e5417f72575ed735af603f9dbf8d3a368b8eb40cd0ff2105b50 +size 5110047 diff --git a/xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch b/xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch similarity index 61% rename from xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch rename to xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch index a9535fa..def30e0 100644 --- a/xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch +++ b/xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch @@ -1,7 +1,16 @@ -diff -ur xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c xine-lib-1.1.18/src/xine-engine/load_plugins.c ---- xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c 2010-01-14 23:17:56.000000000 +0100 -+++ xine-lib-1.1.18/src/xine-engine/load_plugins.c 2010-02-24 21:54:02.396132130 +0100 -@@ -2508,9 +2508,18 @@ +From 8861e0d755127fde4b57d32561491853e49a0edc Mon Sep 17 00:00:00 2001 +From: Ludwig Nussel +Date: Fri, 25 Jul 2008 15:07:23 +0200 +Subject: [PATCH] xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff + +=================================================================== +--- + src/xine-engine/load_plugins.c | 17 ++++++++++++++++- + 1 files changed, 16 insertions(+), 1 deletions(-) + +--- xine-lib-1.1.16.3.orig/src/xine-engine/load_plugins.c 2009-02-10 18:21:07.000000000 +0100 ++++ xine-lib-1.1.16.3/src/xine-engine/load_plugins.c 2009-11-14 11:00:26.719796977 +0100 +@@ -2487,9 +2487,18 @@ plugin_catalog_t *catalog = self->plugin_catalog; int list_id; @@ -20,7 +29,7 @@ diff -ur xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c xine-lib-1.1.18/src /* calc length of output string and create an array of strings to concatenate */ size_t len = 0; -@@ -2522,7 +2531,13 @@ +@@ -2501,7 +2510,13 @@ if (node->plugin_class || _load_plugin_class(self, node, NULL)) { demux_class_t *const cls = (demux_class_t *)node->plugin_class; if( (extensions[list_id] = cls->get_extensions(cls)) != NULL ) diff --git a/xine-lib-1.1.18.1-glitch-free-pulseaudio.patch b/xine-lib-1.1.17-glitch-free-pulseaudio.patch similarity index 68% rename from xine-lib-1.1.18.1-glitch-free-pulseaudio.patch rename to xine-lib-1.1.17-glitch-free-pulseaudio.patch index e43d57b..7c8752f 100644 --- a/xine-lib-1.1.18.1-glitch-free-pulseaudio.patch +++ b/xine-lib-1.1.17-glitch-free-pulseaudio.patch @@ -1,7 +1,8 @@ -diff -ur xine-lib-1.1.18.orig/src/xine-engine/audio_out.c xine-lib-1.1.18/src/xine-engine/audio_out.c ---- xine-lib-1.1.18.orig/src/xine-engine/audio_out.c 2010-02-23 22:59:05.000000000 +0100 -+++ xine-lib-1.1.18/src/xine-engine/audio_out.c 2010-02-24 20:52:10.870884193 +0100 -@@ -1156,8 +1156,17 @@ +Index: xine-lib-1.1.17/src/xine-engine/audio_out.c +=================================================================== +--- xine-lib-1.1.17.orig/src/xine-engine/audio_out.c ++++ xine-lib-1.1.17/src/xine-engine/audio_out.c +@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) { /* * calculate gap: diff --git a/xine-lib-1.1.18.1-ia64-is-not-alpha.diff b/xine-lib-1.1.17-ia64-is-not-alpha.diff similarity index 56% rename from xine-lib-1.1.18.1-ia64-is-not-alpha.diff rename to xine-lib-1.1.17-ia64-is-not-alpha.diff index 2e07239..1169272 100644 --- a/xine-lib-1.1.18.1-ia64-is-not-alpha.diff +++ b/xine-lib-1.1.17-ia64-is-not-alpha.diff @@ -1,7 +1,17 @@ -diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac ---- xine-lib-1.1.18.orig/configure.ac 2010-02-22 21:03:51.000000000 +0100 -+++ xine-lib-1.1.18/configure.ac 2010-02-24 20:47:41.959133782 +0100 -@@ -2381,10 +2381,13 @@ +From c781f4b2e726fa3fabf8cc0cdd592f617ae799e2 Mon Sep 17 00:00:00 2001 +From: Ludwig Nussel +Date: Fri, 25 Jul 2008 16:58:56 +0200 +Subject: [PATCH] ia64 is not alpha + +--- + configure.ac | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +Index: xine-lib-1.1.16.3/configure.ac +=================================================================== +--- xine-lib-1.1.16.3.orig/configure.ac 2009-04-02 20:44:45.000000000 +0200 ++++ xine-lib-1.1.16.3/configure.ac 2009-11-14 10:45:11.618782275 +0100 +@@ -2328,10 +2328,13 @@ mips-*) AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation]) ;; diff --git a/xine-lib-1.1.18.1-install-plugins-helper.diff b/xine-lib-1.1.17-install-plugins-helper.diff similarity index 78% rename from xine-lib-1.1.18.1-install-plugins-helper.diff rename to xine-lib-1.1.17-install-plugins-helper.diff index 192e411..90dd87a 100644 --- a/xine-lib-1.1.18.1-install-plugins-helper.diff +++ b/xine-lib-1.1.17-install-plugins-helper.diff @@ -1,7 +1,8 @@ -diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac ---- xine-lib-1.1.18.orig/configure.ac 2010-02-24 22:24:29.445882777 +0100 -+++ xine-lib-1.1.18/configure.ac 2010-02-24 22:26:25.554146234 +0100 -@@ -2631,6 +2631,28 @@ +Index: xine-lib-1.1.17/configure.ac +=================================================================== +--- xine-lib-1.1.17.orig/configure.ac ++++ xine-lib-1.1.17/configure.ac +@@ -2613,6 +2613,28 @@ fi AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno") @@ -30,9 +31,10 @@ diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac dnl --------------------------------------------- dnl some include paths ( !!! DO NOT REMOVE !!! ) -diff -uNr xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.18/src/xine-engine/audio_decoder.c ---- xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c 2010-01-14 23:17:55.000000000 +0100 -+++ xine-lib-1.1.18/src/xine-engine/audio_decoder.c 2010-02-24 22:26:25.555133914 +0100 +Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c +=================================================================== +--- xine-lib-1.1.17.orig/src/xine-engine/audio_decoder.c ++++ xine-lib-1.1.17/src/xine-engine/audio_decoder.c @@ -41,6 +41,7 @@ #include "xine_internal.h" @@ -41,7 +43,7 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.18/s static void *audio_decoder_loop (void *stream_gen) { -@@ -341,6 +342,10 @@ +@@ -341,6 +342,10 @@ static void *audio_decoder_loop (void *s _x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED, (stream->audio_decoder_plugin != NULL)); @@ -52,9 +54,10 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.18/s } if (audio_type != stream->audio_type) { -diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c ---- xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c 2010-02-24 22:26:25.556133119 +0100 +Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c +=================================================================== +--- /dev/null ++++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2007 Sascha Sommer @@ -162,9 +165,10 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c xine-lib + } +} + -diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h ---- xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h 2010-02-24 22:26:25.556133119 +0100 +Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h +=================================================================== +--- /dev/null ++++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2007 Sascha Sommer @@ -201,10 +205,11 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h xine-lib + + +#endif -diff -uNr xine-lib-1.1.18.orig/src/xine-engine/Makefile.am xine-lib-1.1.18/src/xine-engine/Makefile.am ---- xine-lib-1.1.18.orig/src/xine-engine/Makefile.am 2010-01-21 00:45:27.000000000 +0100 -+++ xine-lib-1.1.18/src/xine-engine/Makefile.am 2010-02-24 22:26:25.556133119 +0100 -@@ -19,7 +19,7 @@ +Index: xine-lib-1.1.17/src/xine-engine/Makefile.am +=================================================================== +--- xine-lib-1.1.17.orig/src/xine-engine/Makefile.am ++++ xine-lib-1.1.17/src/xine-engine/Makefile.am +@@ -19,7 +19,7 @@ libxine_la_SOURCES = xine.c metronom.c c video_overlay.c osd.c scratch.c demux.c vo_scale.c \ xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \ input_rip.c input_cache.c info_helper.c refcounter.c \ @@ -213,7 +218,7 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/Makefile.am xine-lib-1.1.18/src/x # FIXME: these are currently unused: EXTRA_DIST = lrb.c lrb.h accel_xvmc.h -@@ -39,7 +39,8 @@ +@@ -39,7 +39,8 @@ xineinclude_HEADERS = buffer.h metronom audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \ plugin_catalog.h audio_decoder.h video_decoder.h post.h \ @@ -223,9 +228,10 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/Makefile.am xine-lib-1.1.18/src/x noinst_HEADERS = bswap.h ffmpeg_bswap.h -diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c xine-lib-1.1.18/src/xine-engine/video_decoder.c ---- xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c 2010-02-23 23:27:15.000000000 +0100 -+++ xine-lib-1.1.18/src/xine-engine/video_decoder.c 2010-02-24 22:26:25.557133929 +0100 +Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c +=================================================================== +--- xine-lib-1.1.17.orig/src/xine-engine/video_decoder.c ++++ xine-lib-1.1.17/src/xine-engine/video_decoder.c @@ -37,6 +37,7 @@ #include "xine_internal.h" @@ -234,7 +240,7 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c xine-lib-1.1.18/s #include #define SPU_SLEEP_INTERVAL (90000/2) -@@ -376,6 +377,10 @@ +@@ -376,6 +377,10 @@ static void *video_decoder_loop (void *s stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype); _x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL)); @@ -245,10 +251,11 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c xine-lib-1.1.18/s } if (stream->video_decoder_plugin) -diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine.c xine-lib-1.1.18/src/xine-engine/xine.c ---- xine-lib-1.1.18.orig/src/xine-engine/xine.c 2010-02-24 22:24:02.482882309 +0100 -+++ xine-lib-1.1.18/src/xine-engine/xine.c 2010-02-24 22:26:25.559133664 +0100 -@@ -1810,6 +1810,15 @@ +Index: xine-lib-1.1.17/src/xine-engine/xine.c +=================================================================== +--- xine-lib-1.1.17.orig/src/xine-engine/xine.c ++++ xine-lib-1.1.17/src/xine-engine/xine.c +@@ -1809,6 +1809,15 @@ void xine_init (xine_t *this) { 0, NULL, this); /* diff --git a/xine-lib-1.1.18.1-mjpegplugin.diff b/xine-lib-1.1.17-mjpegplugin.diff similarity index 95% rename from xine-lib-1.1.18.1-mjpegplugin.diff rename to xine-lib-1.1.17-mjpegplugin.diff index 203a173..1562b20 100644 --- a/xine-lib-1.1.18.1-mjpegplugin.diff +++ b/xine-lib-1.1.17-mjpegplugin.diff @@ -1,7 +1,8 @@ -diff -uNr xine-lib-1.1.18.orig/configure xine-lib-1.1.18/configure ---- xine-lib-1.1.18.orig/configure 2010-02-23 23:50:53.000000000 +0100 -+++ xine-lib-1.1.18/configure 2010-02-24 21:28:13.318884098 +0100 -@@ -33611,6 +33611,7 @@ +Index: xine-lib-1.1.17/configure +=================================================================== +--- xine-lib-1.1.17.orig/configure ++++ xine-lib-1.1.17/configure +@@ -48965,6 +48965,7 @@ echo "" echo " * video decoder plugins:" echo " - MPEG 1,2 - Amiga Bitplane" echo " - Raw RGB - Raw YUV" @@ -9,10 +10,11 @@ diff -uNr xine-lib-1.1.18.orig/configure xine-lib-1.1.18/configure if test "x$with_external_ffmpeg" = "xyes"; then echo " - ffmpeg (external library):" else -diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac ---- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:24:46.643882529 +0100 -+++ xine-lib-1.1.18/configure.ac 2010-02-24 21:28:13.320882133 +0100 -@@ -1104,6 +1104,28 @@ +Index: xine-lib-1.1.17/configure.ac +=================================================================== +--- xine-lib-1.1.17.orig/configure.ac ++++ xine-lib-1.1.17/configure.ac +@@ -1086,6 +1086,28 @@ AC_SUBST([SDL_CFLAGS]) AC_SUBST([SDL_LIBS]) dnl --------------------------------------------- @@ -41,15 +43,15 @@ diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac dnl check for Libstk dnl --------------------------------------------- -@@ -2817,6 +2839,7 @@ - src/libxineadec/gsm610/Makefile - src/libxineadec/nosefart/Makefile +@@ -2799,6 +2821,7 @@ src/libxineadec/Makefile + + src/libreal/Makefile +src/mjpeg/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile -@@ -3007,6 +3030,9 @@ +@@ -2989,6 +3012,9 @@ echo "" dnl audio decoders echo " * audio decoder plugins:" echo " - GSM 06.10 - linear PCM" @@ -59,31 +61,34 @@ diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac if test "x$with_external_ffmpeg" = "xyes"; then echo " - ffmpeg (external library):" else -diff -uNr xine-lib-1.1.18.orig/src/Makefile.am xine-lib-1.1.18/src/Makefile.am ---- xine-lib-1.1.18.orig/src/Makefile.am 2010-02-24 21:24:46.643882529 +0100 -+++ xine-lib-1.1.18/src/Makefile.am 2010-02-24 21:28:13.321884189 +0100 -@@ -27,6 +27,7 @@ +Index: xine-lib-1.1.17/src/Makefile.am +=================================================================== +--- xine-lib-1.1.17.orig/src/Makefile.am ++++ xine-lib-1.1.17/src/Makefile.am +@@ -27,6 +27,7 @@ SUBDIRS = \ libreal \ - libfaad \ + \ libmusepack \ + mjpeg \ post \ combined \ vdr -diff -uNr xine-lib-1.1.18.orig/src/Makefile.in xine-lib-1.1.18/src/Makefile.in ---- xine-lib-1.1.18.orig/src/Makefile.in 2010-02-23 23:50:35.000000000 +0100 -+++ xine-lib-1.1.18/src/Makefile.in 2010-02-24 21:28:13.321884189 +0100 -@@ -453,6 +453,7 @@ +Index: xine-lib-1.1.17/src/Makefile.in +=================================================================== +--- xine-lib-1.1.17.orig/src/Makefile.in ++++ xine-lib-1.1.17/src/Makefile.in +@@ -450,6 +450,7 @@ SUBDIRS = \ libreal \ - libfaad \ + \ libmusepack \ + mjpeg \ post \ combined -diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.am xine-lib-1.1.18/src/mjpeg/Makefile.am ---- xine-lib-1.1.18.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.18/src/mjpeg/Makefile.am 2010-02-24 21:28:13.323883132 +0100 +Index: xine-lib-1.1.17/src/mjpeg/Makefile.am +=================================================================== +--- /dev/null ++++ xine-lib-1.1.17/src/mjpeg/Makefile.am @@ -0,0 +1,9 @@ +include $(top_srcdir)/misc/Makefile.common + @@ -94,9 +99,10 @@ diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.am xine-lib-1.1.18/src/mjpeg/M +xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags) +endif -diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.in xine-lib-1.1.18/src/mjpeg/Makefile.in ---- xine-lib-1.1.18.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.18/src/mjpeg/Makefile.in 2010-02-24 21:28:13.324882254 +0100 +Index: xine-lib-1.1.17/src/mjpeg/Makefile.in +=================================================================== +--- /dev/null ++++ xine-lib-1.1.17/src/mjpeg/Makefile.in @@ -0,0 +1,751 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ @@ -849,9 +855,10 @@ diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.in xine-lib-1.1.18/src/mjpeg/M +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -uNr xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c ---- xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c 2010-02-24 21:28:13.325884030 +0100 +Index: xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c +=================================================================== +--- /dev/null ++++ xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c @@ -0,0 +1,397 @@ +/* + * Copyright (C) 2007 Marcus Meissner diff --git a/xine-lib-1.1.17.tar.bz2 b/xine-lib-1.1.17.tar.bz2 new file mode 100644 index 0000000..10a256c --- /dev/null +++ b/xine-lib-1.1.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14e17e1665c0aa90f958204570060a3aebded2b93078c5fae14ca8a92c0e79cf +size 7528937 diff --git a/xine-lib-1.1.18.1-assert.patch b/xine-lib-1.1.18.1-assert.patch deleted file mode 100644 index 213a956..0000000 --- a/xine-lib-1.1.18.1-assert.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.18/src/audio_out/audio_alsa_out.c ---- xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c 2010-01-14 23:17:54.000000000 +0100 -+++ xine-lib-1.1.18/src/audio_out/audio_alsa_out.c 2010-02-24 21:38:21.022134045 +0100 -@@ -41,6 +41,7 @@ - #ifdef HAVE_ALLOCA_H - #include - #endif -+#include - - #define ALSA_PCM_NEW_HW_PARAMS_API - #define ALSA_PCM_NEW_SW_PARAMS_API -Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c. -Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h. diff --git a/xine-lib-1.1.18.1-crippled.tar.bz2 b/xine-lib-1.1.18.1-crippled.tar.bz2 deleted file mode 100644 index 55c5051..0000000 --- a/xine-lib-1.1.18.1-crippled.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25b45a277f068b816fb65f9655235ee51c2c3d4875670ab6d82adbc77f223ef0 -size 5116260 diff --git a/xine-lib-1.1.18.1.tar.bz2 b/xine-lib-1.1.18.1.tar.bz2 deleted file mode 100644 index 08e545c..0000000 --- a/xine-lib-1.1.18.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a9af8b928e7a65732fc256c6c092e4a74c554d19c977728f06baa1bda358311 -size 7530681 diff --git a/xine-lib-libdvdread_udf.diff b/xine-lib-libdvdread_udf.diff index e31125c..562065f 100644 --- a/xine-lib-libdvdread_udf.diff +++ b/xine-lib-libdvdread_udf.diff @@ -1,7 +1,14 @@ -diff -ur xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c ---- xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c 2009-11-30 21:57:20.000000000 +0100 -+++ xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c 2010-02-24 21:12:36.032882913 +0100 -@@ -38,10 +38,16 @@ +# HG changeset patch +# User Tobias Rautenkranz +# Date 1202208482 -3600 +# Node ID 100241ff36f0730a15018a58456fb86eb590bf18 +# Parent 07c29261ed98fdb710a241c6711dac0215b6074a +Fix playback of DVDs with a broken UDF file system (aka DVD-Movie-Protect). + +diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c +--- a/src/input/libdvdnav/dvd_udf.c Thu Jan 31 22:02:04 2008 +0000 ++++ b/src/input/libdvdnav/dvd_udf.c Tue Feb 05 11:48:02 2008 +0100 +@@ -38,9 +38,15 @@ #include #include #include @@ -11,14 +18,13 @@ diff -ur xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c xine-lib-1.1.18/src/ #include "dvd_reader.h" #include "dvd_udf.h" - ++ +#include "ifo_types.h" +#include "ifo_read.h" -+ + /* Private but located in/shared with dvd_reader.c */ extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number, - size_t block_count, unsigned char *data, -@@ -774,7 +780,9 @@ +@@ -774,7 +780,9 @@ static int UDFFindPartition( dvd_reader_ return part->valid; } @@ -29,7 +35,7 @@ diff -ur xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c xine-lib-1.1.18/src/ uint32_t *filesize ) { uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ]; -@@ -856,6 +864,84 @@ +@@ -856,6 +864,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi return partition.Start + File.Location; } diff --git a/xine-lib-various-noncrippled.diff b/xine-lib-various-noncrippled.diff index 08f9401..9acd408 100644 --- a/xine-lib-various-noncrippled.diff +++ b/xine-lib-various-noncrippled.diff @@ -2,7 +2,7 @@ Index: src/libw32dll/wine/ldt_keeper.c =================================================================== --- src/libw32dll/wine/ldt_keeper.c.orig +++ src/libw32dll/wine/ldt_keeper.c -@@ -77,6 +77,10 @@ +@@ -77,6 +77,10 @@ int modify_ldt(int func, void *ptr, unsi #ifdef __cplusplus } #endif diff --git a/xine-lib.changes b/xine-lib.changes index 225e979..468d22b 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,34 +1,3 @@ -------------------------------------------------------------------- -Sun Mar 7 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de -- update to 1.1.18.1 - * Oops. compat.c (for DXR3 support) was omitted. - * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. - * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. - * Fix build with the old, outdated and deprecated internal ffmpeg. - -------------------------------------------------------------------- -Wed Feb 24 23:14:00 CET 2010 - Manfred.Tremmel@iiv.de -- update to 1.1.18 - * Bump the FLAC decoder's priority above ffmpegaudio. This should fix - various problems with FLAC playback. - * Build fix (undefined symbol) for when using older ffmpeg. - * TTA demuxer fixes; allow seeking. - * More meta-information tags. - Only the Ogg demuxer knows about these at present. - * Added basic support for .qtl (Quicktime media link). - * "Fixed" playback of 24-bit FLAC. - * Fixed playback of 24-bit LPCM. - * Work around an ffmpeg bug concerning Sorenson Video 3. - * Flash audio bug fixes, mostly concerning AAC. - * Fix DXR3 support for newer versions of the em8300 driver. - * Added support for WMA Pro. - -------------------------------------------------------------------- -Wed Feb 03 21:03:00 CET 2010 - Manfred.Tremmel@iiv.de - -- patches can't be build to work with crippled and non crippled tarball - with fuzz=0, added "-F2" for patch 50 and 61 to fix this - ------------------------------------------------------------------- Mon Feb 1 12:37:47 UTC 2010 - jengelh@medozas.de diff --git a/xine-lib.spec b/xine-lib.spec index 9297360..2d8ceec 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,5 +1,5 @@ # -# spec file for package xine-lib (Version 1.1.18.1) +# spec file for package xine-lib (Version 1.1.17) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ Name: xine-lib # default for buildservice is no patented codecs %bcond_without distributable %bcond_with onlynondistributable -%if 0%{suse_version} >= 1100 +%if %suse_version >= 1100 %bcond_without pulseaudio %else %bcond_with pulseaudio @@ -40,7 +40,7 @@ Name: xine-lib %bcond_with jack %bcond_without gnome_vfs %bcond_with directfb -%if 0%{suse_version} > 1110 +%if %suse_version > 1110 %bcond_without modplug %else %bcond_with modplug @@ -54,10 +54,7 @@ BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel BuildRequires: readline-devel update-desktop-files vcdimager-devel BuildRequires: speex-devel -%if 0%{suse_version} >= 1110 -BuildRequires: libv4l-devel -%endif -%if 0%{suse_version} >= 1030 +%if %suse_version >= 1030 BuildRequires: lirc-devel %else BuildRequires: lirc @@ -91,7 +88,7 @@ BuildRequires: gnome-vfs2-devel BuildRequires: libjack-devel %endif %if %{with directfb} -%if 0%{suse_version} >= 1020 +%if %suse_version >= 1020 BuildRequires: DirectFB-devel %else BuildRequires: DirectFB @@ -100,13 +97,13 @@ BuildRequires: DirectFB %if %{with modplug} BuildRequires: libmodplug-devel %endif -Version: 1.1.18.1 -Release: 1 +Version: 1.1.17 +Release: 2 # bug437293 %ifarch ppc64 Obsoletes: xine-lib-64bit %endif -%define abiversion 1.28 +%define abiversion 1.27 Summary: Video Player with Plug-Ins Group: Productivity/Multimedia/Video/Players License: GPLv2+ ; Public Domain, Freeware @@ -158,7 +155,6 @@ Group: Productivity/Multimedia/Video/Players License: GPLv2+ Provides: xine-lib = %{version}-%{release} Obsoletes: xine-lib < %{version}-%{release} -Provides: xine-extra = %{version}-%{release} Obsoletes: xine-extra < %{version}-%{release} Provides: libxine1-syncfb = %{version}-%{release} Obsoletes: libxine1-syncfb < %{version}-%{release} @@ -187,6 +183,18 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. +xine is a video player with a graphical front-end that supports a large +number of file formats (VCD and MPEG2, for example) using plug-ins. +Several plug-ins are included. Others can be installed after xine +installation. xine supports stereo sound using OSS and AC5.1 using +Alsa. + +xine ist ein Videoplayer mit grafischem Frontend und unterstützt +eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von +Plugins. Einige Plugins sind enthalten, andere können nach der +Installation von xine nachinstalliert werden. xine untersützt +Stereosound via OSS und AC5.1 per Alsa. + %if %{with distributable} This version of xine may lack certain features because of legal requirements (potential patent violation). See also @@ -211,6 +219,18 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. +xine is a video player with a graphical front-end that supports a large +number of file formats (VCD and MPEG2, for example) using plug-ins. +Several plug-ins are included. Others can be installed after xine +installation. xine supports stereo sound using OSS and AC5.1 using +Alsa. + +xine ist ein Videoplayer mit grafischem Frontend und unterstützt +eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von +Plugins. Einige Plugins sind enthalten, andere können nach der +Installation von xine nachinstalliert werden. xine untersützt +Stereosound via OSS und AC5.1 per Alsa. + %if %{with distributable} Diese xine-Version lässt eventuell einige Funktione aus rechtlichen Gründen vermissen (mögliche Patentverletzungen). Siehe dazu @@ -259,6 +279,25 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. +This package contains all necessary include files, libraries and +configuration files needed to compile applications that use the xine +media player. + +xine is a video player which supports a large number of file formats +(i.e., VCD, MPEG2) using plug-ins. Several plug-ins are included. +Others can be post-installed. Supports stereo sound using OSS and AC5.1 +using Alsa. + +Dieses Paket enthält alle nötigen Include Dateien, Biblioteken und +Konfigurationsdateien, die benötigt werden, um Anwendungen zu +kompilieren, die den xine Media Player verwenden. + +xine ist ein Videoplayer mit grafischem Frontend und unterstützt +eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von +Plugins. Einige Plugins sind enthalten, andere können nach der +Installation von xine nachinstalliert werden. xine untersützt +Stereosound via OSS und AC5.1 per Alsa. + %if %{with distributable} This version of xine may lack certain features because of legal requirements (potential patent violation). See also @@ -290,6 +329,25 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. +This package contains all necessary include files, libraries and +configuration files needed to compile applications that use the xine +media player. + +xine is a video player which supports a large number of file formats +(i.e., VCD, MPEG2) using plug-ins. Several plug-ins are included. +Others can be post-installed. Supports stereo sound using OSS and AC5.1 +using Alsa. + +Dieses Paket enthält alle nötigen Include Dateien, Biblioteken und +Konfigurationsdateien, die benötigt werden, um Anwendungen zu +kompilieren, die den xine Media Player verwenden. + +xine ist ein Videoplayer mit grafischem Frontend und unterstützt +eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von +Plugins. Einige Plugins sind enthalten, andere können nach der +Installation von xine nachinstalliert werden. xine untersützt +Stereosound via OSS und AC5.1 per Alsa. + %if %{with distributable} Diese xine-Version lässt eventuell einige Funktione aus rechtlichen Gründen vermissen (mögliche Patentverletzungen). Siehe dazu @@ -318,7 +376,55 @@ Authors: -------- Guenter Bartsch +xine Soundausgabeplugin für den Pulseaudio Soundserver + + + +Autoren: +-------- + Guenter Bartsch + +xine sound output plugin for the pulseaudio soundserver + + + +Authors: +-------- + Guenter Bartsch + +xine Soundausgabeplugin für den Pulseaudio Soundserver + + + +Autoren: +-------- + Guenter Bartsch + %description -n libxine1-pulse -l de +xine sound output plugin for the pulseaudio soundserver + + + +Authors: +-------- + Guenter Bartsch + +xine Soundausgabeplugin für den Pulseaudio Soundserver + + + +Autoren: +-------- + Guenter Bartsch + +xine sound output plugin for the pulseaudio soundserver + + + +Authors: +-------- + Guenter Bartsch + xine Soundausgabeplugin für den Pulseaudio Soundserver @@ -345,7 +451,55 @@ Authors: -------- Guenter Bartsch +SDL xine Video-Ausgabeplugin + + + +Autoren: +-------- + Guenter Bartsch + +SDL xine video output plugin + + + +Authors: +-------- + Guenter Bartsch + +SDL xine Video-Ausgabeplugin + + + +Autoren: +-------- + Guenter Bartsch + %description -n libxine1-sdl -l de +SDL xine video output plugin + + + +Authors: +-------- + Guenter Bartsch + +SDL xine Video-Ausgabeplugin + + + +Autoren: +-------- + Guenter Bartsch + +SDL xine video output plugin + + + +Authors: +-------- + Guenter Bartsch + SDL xine Video-Ausgabeplugin @@ -372,7 +526,6 @@ Authors: -------- Guenter Bartsch -%description -n libxine1-arts -l de xine Soundausgabeplugin für den arts Soundserver @@ -381,6 +534,87 @@ Autoren: -------- Guenter Bartsch +xine sound output plugin for the arts soundserver + + + +Authors: +-------- + Guenter Bartsch + +xine sound output plugin for the arts soundserver + + + +Authors: +-------- + Guenter Bartsch + +xine Soundausgabeplugin für den arts Soundserver + + + +Autoren: +-------- + Guenter Bartsch + +xine sound output plugin for the arts soundserver + + + +Authors: +-------- + Guenter Bartsch + +%description -n libxine1-arts -l de +xine sound output plugin for the arts soundserver + + + +Authors: +-------- + Guenter Bartsch + +xine Soundausgabeplugin für den arts Soundserver + + + +Autoren: +-------- + Guenter Bartsch + +xine sound output plugin for the arts soundserver + + + +Authors: +-------- + Guenter Bartsch + +xine sound output plugin for the arts soundserver + + + +Authors: +-------- + Guenter Bartsch + +xine Soundausgabeplugin für den arts Soundserver + + + +Autoren: +-------- + Guenter Bartsch + +xine sound output plugin for the arts soundserver + + + +Authors: +-------- + Guenter Bartsch + %endif %if %{with aalib} @@ -400,14 +634,65 @@ Authors: Guenter Bartsch -%description -n libxine1-aa -l de -aalib und libcaca xine Video Ausgabeplugin +aalib and libcaca xine video-output plugin -Autoren: +Authors: -------- - Guenter Bartsch + Guenter Bartsch + +aalib and libcaca xine video-output plugin + + + +Authors: +-------- + Guenter Bartsch + + +aalib and libcaca xine video-output plugin + + + +Authors: +-------- + Guenter Bartsch + +%description -n libxine1-aa -l de +aalib and libcaca xine video-output plugin + + + +Authors: +-------- + Guenter Bartsch + + +aalib and libcaca xine video-output plugin + + + +Authors: +-------- + Guenter Bartsch + +aalib and libcaca xine video-output plugin + + + +Authors: +-------- + Guenter Bartsch + + +aalib and libcaca xine video-output plugin + + + +Authors: +-------- + Guenter Bartsch %endif %if %{with esd} @@ -427,10 +712,65 @@ Authors: -------- Guenter Bartsch +libxine Soundausgabeplugin für den esound Soundserver + +libxine sound output plugin for the esound soundserver + + + +Authors: +-------- + Guenter Bartsch + +libxine sound output plugin for the esound soundserver + + + +Authors: +-------- + Guenter Bartsch + +libxine Soundausgabeplugin für den esound Soundserver + +libxine sound output plugin for the esound soundserver + + + +Authors: +-------- + Guenter Bartsch %description -n libxine1-esd -l de +libxine sound output plugin for the esound soundserver + + + +Authors: +-------- + Guenter Bartsch + libxine Soundausgabeplugin für den esound Soundserver +libxine sound output plugin for the esound soundserver + + + +Authors: +-------- + Guenter Bartsch + +libxine sound output plugin for the esound soundserver + + + +Authors: +-------- + Guenter Bartsch + +libxine Soundausgabeplugin für den esound Soundserver + +libxine sound output plugin for the esound soundserver + Authors: @@ -455,7 +795,55 @@ Authors: -------- Guenter Bartsch +xine Soundausgabeplugin für den jack Soundserver + + + +Autoren: +-------- + Guenter Bartsch + +xine sound output plugin for the jack soundserver + + + +Authors: +-------- + Guenter Bartsch + +xine Soundausgabeplugin für den jack Soundserver + + + +Autoren: +-------- + Guenter Bartsch + %description -n libxine1-jack -l de +xine sound output plugin for the jack soundserver + + + +Authors: +-------- + Guenter Bartsch + +xine Soundausgabeplugin für den jack Soundserver + + + +Autoren: +-------- + Guenter Bartsch + +xine sound output plugin for the jack soundserver + + + +Authors: +-------- + Guenter Bartsch + xine Soundausgabeplugin für den jack Soundserver @@ -482,7 +870,55 @@ Authors: -------- Guenter Bartsch +Directfb xine Video-Ausgabeplugin + + + +Autoren: +-------- + Guenter Bartsch + +Directfb xine video-output plugin + + + +Authors: +-------- + Guenter Bartsch + +Directfb xine Video-Ausgabeplugin + + + +Autoren: +-------- + Guenter Bartsch + %description -n libxine1-directfb -l de +Directfb xine video-output plugin + + + +Authors: +-------- + Guenter Bartsch + +Directfb xine Video-Ausgabeplugin + + + +Autoren: +-------- + Guenter Bartsch + +Directfb xine video-output plugin + + + +Authors: +-------- + Guenter Bartsch + Directfb xine Video-Ausgabeplugin @@ -510,7 +946,55 @@ Authors: -------- Guenter Bartsch +Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen + + + +Autoren: +-------- + Guenter Bartsch + +Input plugin which enables xine to use Gnome-vfs + + + +Authors: +-------- + Guenter Bartsch + +Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen + + + +Autoren: +-------- + Guenter Bartsch + %description -n libxine1-gnome-vfs -l de +Input plugin which enables xine to use Gnome-vfs + + + +Authors: +-------- + Guenter Bartsch + +Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen + + + +Autoren: +-------- + Guenter Bartsch + +Input plugin which enables xine to use Gnome-vfs + + + +Authors: +-------- + Guenter Bartsch + Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen @@ -557,7 +1041,67 @@ Authors: -------- Guenter Bartsch +Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten +Medienverainten abspielen. Weitere Informationtne über xine Plugins +finden Sie unter +http://www.xine-project.org/home + + + +Autoren: +-------- + Guenter Bartsch +With these xine plug-ins, you can watch DVDs and all other kind of +media using xine. More information about xine plug-ins can be found at +http://www.xine-project.org/home + + + +Authors: +-------- + Guenter Bartsch + +Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten +Medienverainten abspielen. Weitere Informationtne über xine Plugins +finden Sie unter +http://www.xine-project.org/home + + + +Autoren: +-------- + Guenter Bartsch %description -n libxine1-codecs -l de +With these xine plug-ins, you can watch DVDs and all other kind of +media using xine. More information about xine plug-ins can be found at +http://www.xine-project.org/home + + + +Authors: +-------- + Guenter Bartsch + +Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten +Medienverainten abspielen. Weitere Informationtne über xine Plugins +finden Sie unter +http://www.xine-project.org/home + + + +Autoren: +-------- + Guenter Bartsch +With these xine plug-ins, you can watch DVDs and all other kind of +media using xine. More information about xine plug-ins can be found at +http://www.xine-project.org/home + + + +Authors: +-------- + Guenter Bartsch + Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten Medienverainten abspielen. Weitere Informationtne über xine Plugins finden Sie unter @@ -596,20 +1140,10 @@ EOF %patch26 %patch28 -p1 %patch31 -p1 -%if 0%{suse_version} >= 1110 -# set fuzzy=2 to get patch work with crippled and noncrippled tarball -%patch50 -p1 -F2 -%else %patch50 -p1 -%endif %patch51 -p1 sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am -%if 0%{suse_version} >= 1110 -# set fuzzy=2 to get patch work with crippled and noncrippled tarball -%patch61 -p1 -F2 -%else %patch61 -p1 -%endif %patch62 -p1 #sed -i 's|^ac_config_files="|ac_config_files="src/vdr/Makefile src/mjpeg/Makefile|' configure %if %{with distributable} @@ -663,11 +1197,6 @@ AUTOPOINT=true autoreconf -fi %endif %ifarch %{ix86} --with-w32-path=/usr/lib/win32 \ -%endif -%if 0%{suse_version} >= 1110 - --enable-v4l --enable-libv4l \ -%else - --disable-v4l --disable-libv4l \ %endif --with-install-plugins-helper=${_prefix}/lib/opensuse-codecs-installer %if 0%{?suse_version} < 1110 @@ -715,11 +1244,7 @@ xineplug_vo_out_xcbxv xineplug_vo_out_raw xineplug_inp_dvb xineplug_inp_dvd -%if 0%{suse_version} >= 1110 xineplug_inp_v4l -xineplug_inp_v4l2 -xineplug_inp_pvr -%endif xineplug_inp_file xineplug_inp_http xineplug_inp_net @@ -728,6 +1253,7 @@ xineplug_inp_cdda xineplug_inp_smb xineplug_inp_stdin_fifo xineplug_inp_rtsp +xineplug_inp_pvr xineplug_inp_rtp xineplug_decode_bitplane xineplug_decode_rgb From 1f9a4dcbb4bebfd8a9577429d8162cf2f25689b9ad81819a3ad77f5fdc381a65 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 1 Apr 2010 01:28:37 +0000 Subject: [PATCH 11/11] Updating link to change in openSUSE:Factory/xine-lib revision 31.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=8a12f75f62d405a62ab84a536d891f97 --- vdr-xine-0.9.3.diff.bz2 | 4 +- vdr-xine-SUSE.diff | 11 +- xine-configure.diff | 9 +- xine-lib-1.1.17-assert.patch | 10 - xine-lib-1.1.17-crippled.tar.bz2 | 3 - xine-lib-1.1.17.tar.bz2 | 3 - xine-lib-1.1.18.1-assert.patch | 13 + xine-lib-1.1.18.1-crippled.tar.bz2 | 3 + ...ib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch | 19 +- ...-lib-1.1.18.1-glitch-free-pulseaudio.patch | 9 +- ...> xine-lib-1.1.18.1-ia64-is-not-alpha.diff | 18 +- ...e-lib-1.1.18.1-install-plugins-helper.diff | 61 ++- ...diff => xine-lib-1.1.18.1-mjpegplugin.diff | 69 ++-- xine-lib-1.1.18.1.tar.bz2 | 3 + xine-lib-libdvdread_udf.diff | 24 +- xine-lib-various-noncrippled.diff | 2 +- xine-lib.changes | 31 ++ xine-lib.spec | 388 ++---------------- 18 files changed, 179 insertions(+), 501 deletions(-) delete mode 100644 xine-lib-1.1.17-assert.patch delete mode 100644 xine-lib-1.1.17-crippled.tar.bz2 delete mode 100644 xine-lib-1.1.17.tar.bz2 create mode 100644 xine-lib-1.1.18.1-assert.patch create mode 100644 xine-lib-1.1.18.1-crippled.tar.bz2 rename xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch => xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch (61%) rename xine-lib-1.1.17-glitch-free-pulseaudio.patch => xine-lib-1.1.18.1-glitch-free-pulseaudio.patch (68%) rename xine-lib-1.1.17-ia64-is-not-alpha.diff => xine-lib-1.1.18.1-ia64-is-not-alpha.diff (56%) rename xine-lib-1.1.17-install-plugins-helper.diff => xine-lib-1.1.18.1-install-plugins-helper.diff (78%) rename xine-lib-1.1.17-mjpegplugin.diff => xine-lib-1.1.18.1-mjpegplugin.diff (95%) create mode 100644 xine-lib-1.1.18.1.tar.bz2 diff --git a/vdr-xine-0.9.3.diff.bz2 b/vdr-xine-0.9.3.diff.bz2 index 9878426..143a8ce 100644 --- a/vdr-xine-0.9.3.diff.bz2 +++ b/vdr-xine-0.9.3.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffd45aca1ab74ad3743d704b048203832464247e26276445eaa9b26f3235e287 -size 24533 +oid sha256:4f5782201f9335d4578878d137f9acc6e350852627487633c8b5d8d02fe87e20 +size 24876 diff --git a/vdr-xine-SUSE.diff b/vdr-xine-SUSE.diff index 15c58e2..171d5e7 100644 --- a/vdr-xine-SUSE.diff +++ b/vdr-xine-SUSE.diff @@ -1,11 +1,6 @@ -The vdr plugin is patched to use /var/lib/vdr-xine for fifos and so -needs the part here. Don't remove this patch. - -Signed-off-by: Ludwig Nussel -Index: xine-lib-1.1.9/src/vdr/input_vdr.c -=================================================================== ---- xine-lib-1.1.9.orig/src/vdr/input_vdr.c -+++ xine-lib-1.1.9/src/vdr/input_vdr.c +diff -ur xine-lib-1.1.18.orig/src/vdr/input_vdr.c xine-lib-1.1.18/src/vdr/input_vdr.c +--- xine-lib-1.1.18.orig/src/vdr/input_vdr.c 2010-02-24 21:01:43.658883179 +0100 ++++ xine-lib-1.1.18/src/vdr/input_vdr.c 2010-02-24 21:02:59.800133025 +0100 @@ -51,7 +51,7 @@ diff --git a/xine-configure.diff b/xine-configure.diff index f0647ca..df7303f 100644 --- a/xine-configure.diff +++ b/xine-configure.diff @@ -1,6 +1,7 @@ ---- xine-lib-1.1.12/configure.ac -+++ xine-lib-1.1.12/configure.ac -@@ -118,6 +118,7 @@ dnl Check for programs. +diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac +--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:37:21.487134132 +0100 ++++ xine-lib-1.1.18/configure.ac 2010-02-24 21:40:15.697916133 +0100 +@@ -119,6 +119,7 @@ dnl --------------------------------------------- AC_PROG_CC @@ -8,3 +9,5 @@ AM_PROG_AS case "$host_os" in +Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c. +Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h. diff --git a/xine-lib-1.1.17-assert.patch b/xine-lib-1.1.17-assert.patch deleted file mode 100644 index 86d13e3..0000000 --- a/xine-lib-1.1.17-assert.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xine-lib-1.1.16.3.orig/src/audio_out/audio_alsa_out.c 2008-06-25 15:04:09.000000000 +0200 -+++ xine-lib-1.1.16.3/src/audio_out/audio_alsa_out.c 2009-11-14 10:52:16.423781020 +0100 -@@ -41,6 +41,7 @@ - #ifdef HAVE_ALLOCA_H - #include - #endif -+#include - - #define ALSA_PCM_NEW_HW_PARAMS_API - #define ALSA_PCM_NEW_SW_PARAMS_API diff --git a/xine-lib-1.1.17-crippled.tar.bz2 b/xine-lib-1.1.17-crippled.tar.bz2 deleted file mode 100644 index cf3cee3..0000000 --- a/xine-lib-1.1.17-crippled.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d593dd04e953e5417f72575ed735af603f9dbf8d3a368b8eb40cd0ff2105b50 -size 5110047 diff --git a/xine-lib-1.1.17.tar.bz2 b/xine-lib-1.1.17.tar.bz2 deleted file mode 100644 index 10a256c..0000000 --- a/xine-lib-1.1.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14e17e1665c0aa90f958204570060a3aebded2b93078c5fae14ca8a92c0e79cf -size 7528937 diff --git a/xine-lib-1.1.18.1-assert.patch b/xine-lib-1.1.18.1-assert.patch new file mode 100644 index 0000000..213a956 --- /dev/null +++ b/xine-lib-1.1.18.1-assert.patch @@ -0,0 +1,13 @@ +diff -ur xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.18/src/audio_out/audio_alsa_out.c +--- xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c 2010-01-14 23:17:54.000000000 +0100 ++++ xine-lib-1.1.18/src/audio_out/audio_alsa_out.c 2010-02-24 21:38:21.022134045 +0100 +@@ -41,6 +41,7 @@ + #ifdef HAVE_ALLOCA_H + #include + #endif ++#include + + #define ALSA_PCM_NEW_HW_PARAMS_API + #define ALSA_PCM_NEW_SW_PARAMS_API +Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c. +Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h. diff --git a/xine-lib-1.1.18.1-crippled.tar.bz2 b/xine-lib-1.1.18.1-crippled.tar.bz2 new file mode 100644 index 0000000..55c5051 --- /dev/null +++ b/xine-lib-1.1.18.1-crippled.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25b45a277f068b816fb65f9655235ee51c2c3d4875670ab6d82adbc77f223ef0 +size 5116260 diff --git a/xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch b/xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch similarity index 61% rename from xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch rename to xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch index def30e0..a9535fa 100644 --- a/xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch +++ b/xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch @@ -1,16 +1,7 @@ -From 8861e0d755127fde4b57d32561491853e49a0edc Mon Sep 17 00:00:00 2001 -From: Ludwig Nussel -Date: Fri, 25 Jul 2008 15:07:23 +0200 -Subject: [PATCH] xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff - -=================================================================== ---- - src/xine-engine/load_plugins.c | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) - ---- xine-lib-1.1.16.3.orig/src/xine-engine/load_plugins.c 2009-02-10 18:21:07.000000000 +0100 -+++ xine-lib-1.1.16.3/src/xine-engine/load_plugins.c 2009-11-14 11:00:26.719796977 +0100 -@@ -2487,9 +2487,18 @@ +diff -ur xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c xine-lib-1.1.18/src/xine-engine/load_plugins.c +--- xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c 2010-01-14 23:17:56.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/load_plugins.c 2010-02-24 21:54:02.396132130 +0100 +@@ -2508,9 +2508,18 @@ plugin_catalog_t *catalog = self->plugin_catalog; int list_id; @@ -29,7 +20,7 @@ Subject: [PATCH] xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff /* calc length of output string and create an array of strings to concatenate */ size_t len = 0; -@@ -2501,7 +2510,13 @@ +@@ -2522,7 +2531,13 @@ if (node->plugin_class || _load_plugin_class(self, node, NULL)) { demux_class_t *const cls = (demux_class_t *)node->plugin_class; if( (extensions[list_id] = cls->get_extensions(cls)) != NULL ) diff --git a/xine-lib-1.1.17-glitch-free-pulseaudio.patch b/xine-lib-1.1.18.1-glitch-free-pulseaudio.patch similarity index 68% rename from xine-lib-1.1.17-glitch-free-pulseaudio.patch rename to xine-lib-1.1.18.1-glitch-free-pulseaudio.patch index 7c8752f..e43d57b 100644 --- a/xine-lib-1.1.17-glitch-free-pulseaudio.patch +++ b/xine-lib-1.1.18.1-glitch-free-pulseaudio.patch @@ -1,8 +1,7 @@ -Index: xine-lib-1.1.17/src/xine-engine/audio_out.c -=================================================================== ---- xine-lib-1.1.17.orig/src/xine-engine/audio_out.c -+++ xine-lib-1.1.17/src/xine-engine/audio_out.c -@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) { +diff -ur xine-lib-1.1.18.orig/src/xine-engine/audio_out.c xine-lib-1.1.18/src/xine-engine/audio_out.c +--- xine-lib-1.1.18.orig/src/xine-engine/audio_out.c 2010-02-23 22:59:05.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/audio_out.c 2010-02-24 20:52:10.870884193 +0100 +@@ -1156,8 +1156,17 @@ /* * calculate gap: diff --git a/xine-lib-1.1.17-ia64-is-not-alpha.diff b/xine-lib-1.1.18.1-ia64-is-not-alpha.diff similarity index 56% rename from xine-lib-1.1.17-ia64-is-not-alpha.diff rename to xine-lib-1.1.18.1-ia64-is-not-alpha.diff index 1169272..2e07239 100644 --- a/xine-lib-1.1.17-ia64-is-not-alpha.diff +++ b/xine-lib-1.1.18.1-ia64-is-not-alpha.diff @@ -1,17 +1,7 @@ -From c781f4b2e726fa3fabf8cc0cdd592f617ae799e2 Mon Sep 17 00:00:00 2001 -From: Ludwig Nussel -Date: Fri, 25 Jul 2008 16:58:56 +0200 -Subject: [PATCH] ia64 is not alpha - ---- - configure.ac | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -Index: xine-lib-1.1.16.3/configure.ac -=================================================================== ---- xine-lib-1.1.16.3.orig/configure.ac 2009-04-02 20:44:45.000000000 +0200 -+++ xine-lib-1.1.16.3/configure.ac 2009-11-14 10:45:11.618782275 +0100 -@@ -2328,10 +2328,13 @@ +diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac +--- xine-lib-1.1.18.orig/configure.ac 2010-02-22 21:03:51.000000000 +0100 ++++ xine-lib-1.1.18/configure.ac 2010-02-24 20:47:41.959133782 +0100 +@@ -2381,10 +2381,13 @@ mips-*) AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation]) ;; diff --git a/xine-lib-1.1.17-install-plugins-helper.diff b/xine-lib-1.1.18.1-install-plugins-helper.diff similarity index 78% rename from xine-lib-1.1.17-install-plugins-helper.diff rename to xine-lib-1.1.18.1-install-plugins-helper.diff index 90dd87a..192e411 100644 --- a/xine-lib-1.1.17-install-plugins-helper.diff +++ b/xine-lib-1.1.18.1-install-plugins-helper.diff @@ -1,8 +1,7 @@ -Index: xine-lib-1.1.17/configure.ac -=================================================================== ---- xine-lib-1.1.17.orig/configure.ac -+++ xine-lib-1.1.17/configure.ac -@@ -2613,6 +2613,28 @@ fi +diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac +--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 22:24:29.445882777 +0100 ++++ xine-lib-1.1.18/configure.ac 2010-02-24 22:26:25.554146234 +0100 +@@ -2631,6 +2631,28 @@ AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno") @@ -31,10 +30,9 @@ Index: xine-lib-1.1.17/configure.ac dnl --------------------------------------------- dnl some include paths ( !!! DO NOT REMOVE !!! ) -Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c -=================================================================== ---- xine-lib-1.1.17.orig/src/xine-engine/audio_decoder.c -+++ xine-lib-1.1.17/src/xine-engine/audio_decoder.c +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.18/src/xine-engine/audio_decoder.c +--- xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c 2010-01-14 23:17:55.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/audio_decoder.c 2010-02-24 22:26:25.555133914 +0100 @@ -41,6 +41,7 @@ #include "xine_internal.h" @@ -43,7 +41,7 @@ Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c static void *audio_decoder_loop (void *stream_gen) { -@@ -341,6 +342,10 @@ static void *audio_decoder_loop (void *s +@@ -341,6 +342,10 @@ _x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED, (stream->audio_decoder_plugin != NULL)); @@ -54,10 +52,9 @@ Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c } if (audio_type != stream->audio_type) { -Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c -=================================================================== ---- /dev/null -+++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c +--- xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c 2010-02-24 22:26:25.556133119 +0100 @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2007 Sascha Sommer @@ -165,10 +162,9 @@ Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c + } +} + -Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h -=================================================================== ---- /dev/null -+++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h +--- xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h 2010-02-24 22:26:25.556133119 +0100 @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2007 Sascha Sommer @@ -205,11 +201,10 @@ Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h + + +#endif -Index: xine-lib-1.1.17/src/xine-engine/Makefile.am -=================================================================== ---- xine-lib-1.1.17.orig/src/xine-engine/Makefile.am -+++ xine-lib-1.1.17/src/xine-engine/Makefile.am -@@ -19,7 +19,7 @@ libxine_la_SOURCES = xine.c metronom.c c +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/Makefile.am xine-lib-1.1.18/src/xine-engine/Makefile.am +--- xine-lib-1.1.18.orig/src/xine-engine/Makefile.am 2010-01-21 00:45:27.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/Makefile.am 2010-02-24 22:26:25.556133119 +0100 +@@ -19,7 +19,7 @@ video_overlay.c osd.c scratch.c demux.c vo_scale.c \ xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \ input_rip.c input_cache.c info_helper.c refcounter.c \ @@ -218,7 +213,7 @@ Index: xine-lib-1.1.17/src/xine-engine/Makefile.am # FIXME: these are currently unused: EXTRA_DIST = lrb.c lrb.h accel_xvmc.h -@@ -39,7 +39,8 @@ xineinclude_HEADERS = buffer.h metronom +@@ -39,7 +39,8 @@ audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \ plugin_catalog.h audio_decoder.h video_decoder.h post.h \ @@ -228,10 +223,9 @@ Index: xine-lib-1.1.17/src/xine-engine/Makefile.am noinst_HEADERS = bswap.h ffmpeg_bswap.h -Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c -=================================================================== ---- xine-lib-1.1.17.orig/src/xine-engine/video_decoder.c -+++ xine-lib-1.1.17/src/xine-engine/video_decoder.c +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c xine-lib-1.1.18/src/xine-engine/video_decoder.c +--- xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c 2010-02-23 23:27:15.000000000 +0100 ++++ xine-lib-1.1.18/src/xine-engine/video_decoder.c 2010-02-24 22:26:25.557133929 +0100 @@ -37,6 +37,7 @@ #include "xine_internal.h" @@ -240,7 +234,7 @@ Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c #include #define SPU_SLEEP_INTERVAL (90000/2) -@@ -376,6 +377,10 @@ static void *video_decoder_loop (void *s +@@ -376,6 +377,10 @@ stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype); _x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL)); @@ -251,11 +245,10 @@ Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c } if (stream->video_decoder_plugin) -Index: xine-lib-1.1.17/src/xine-engine/xine.c -=================================================================== ---- xine-lib-1.1.17.orig/src/xine-engine/xine.c -+++ xine-lib-1.1.17/src/xine-engine/xine.c -@@ -1809,6 +1809,15 @@ void xine_init (xine_t *this) { +diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine.c xine-lib-1.1.18/src/xine-engine/xine.c +--- xine-lib-1.1.18.orig/src/xine-engine/xine.c 2010-02-24 22:24:02.482882309 +0100 ++++ xine-lib-1.1.18/src/xine-engine/xine.c 2010-02-24 22:26:25.559133664 +0100 +@@ -1810,6 +1810,15 @@ 0, NULL, this); /* diff --git a/xine-lib-1.1.17-mjpegplugin.diff b/xine-lib-1.1.18.1-mjpegplugin.diff similarity index 95% rename from xine-lib-1.1.17-mjpegplugin.diff rename to xine-lib-1.1.18.1-mjpegplugin.diff index 1562b20..203a173 100644 --- a/xine-lib-1.1.17-mjpegplugin.diff +++ b/xine-lib-1.1.18.1-mjpegplugin.diff @@ -1,8 +1,7 @@ -Index: xine-lib-1.1.17/configure -=================================================================== ---- xine-lib-1.1.17.orig/configure -+++ xine-lib-1.1.17/configure -@@ -48965,6 +48965,7 @@ echo "" +diff -uNr xine-lib-1.1.18.orig/configure xine-lib-1.1.18/configure +--- xine-lib-1.1.18.orig/configure 2010-02-23 23:50:53.000000000 +0100 ++++ xine-lib-1.1.18/configure 2010-02-24 21:28:13.318884098 +0100 +@@ -33611,6 +33611,7 @@ echo " * video decoder plugins:" echo " - MPEG 1,2 - Amiga Bitplane" echo " - Raw RGB - Raw YUV" @@ -10,11 +9,10 @@ Index: xine-lib-1.1.17/configure if test "x$with_external_ffmpeg" = "xyes"; then echo " - ffmpeg (external library):" else -Index: xine-lib-1.1.17/configure.ac -=================================================================== ---- xine-lib-1.1.17.orig/configure.ac -+++ xine-lib-1.1.17/configure.ac -@@ -1086,6 +1086,28 @@ AC_SUBST([SDL_CFLAGS]) +diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac +--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:24:46.643882529 +0100 ++++ xine-lib-1.1.18/configure.ac 2010-02-24 21:28:13.320882133 +0100 +@@ -1104,6 +1104,28 @@ AC_SUBST([SDL_LIBS]) dnl --------------------------------------------- @@ -43,15 +41,15 @@ Index: xine-lib-1.1.17/configure.ac dnl check for Libstk dnl --------------------------------------------- -@@ -2799,6 +2821,7 @@ src/libxineadec/Makefile - - +@@ -2817,6 +2839,7 @@ + src/libxineadec/gsm610/Makefile + src/libxineadec/nosefart/Makefile src/libreal/Makefile +src/mjpeg/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile -@@ -2989,6 +3012,9 @@ echo "" +@@ -3007,6 +3030,9 @@ dnl audio decoders echo " * audio decoder plugins:" echo " - GSM 06.10 - linear PCM" @@ -61,34 +59,31 @@ Index: xine-lib-1.1.17/configure.ac if test "x$with_external_ffmpeg" = "xyes"; then echo " - ffmpeg (external library):" else -Index: xine-lib-1.1.17/src/Makefile.am -=================================================================== ---- xine-lib-1.1.17.orig/src/Makefile.am -+++ xine-lib-1.1.17/src/Makefile.am -@@ -27,6 +27,7 @@ SUBDIRS = \ +diff -uNr xine-lib-1.1.18.orig/src/Makefile.am xine-lib-1.1.18/src/Makefile.am +--- xine-lib-1.1.18.orig/src/Makefile.am 2010-02-24 21:24:46.643882529 +0100 ++++ xine-lib-1.1.18/src/Makefile.am 2010-02-24 21:28:13.321884189 +0100 +@@ -27,6 +27,7 @@ libreal \ - \ + libfaad \ libmusepack \ + mjpeg \ post \ combined \ vdr -Index: xine-lib-1.1.17/src/Makefile.in -=================================================================== ---- xine-lib-1.1.17.orig/src/Makefile.in -+++ xine-lib-1.1.17/src/Makefile.in -@@ -450,6 +450,7 @@ SUBDIRS = \ +diff -uNr xine-lib-1.1.18.orig/src/Makefile.in xine-lib-1.1.18/src/Makefile.in +--- xine-lib-1.1.18.orig/src/Makefile.in 2010-02-23 23:50:35.000000000 +0100 ++++ xine-lib-1.1.18/src/Makefile.in 2010-02-24 21:28:13.321884189 +0100 +@@ -453,6 +453,7 @@ libreal \ - \ + libfaad \ libmusepack \ + mjpeg \ post \ combined -Index: xine-lib-1.1.17/src/mjpeg/Makefile.am -=================================================================== ---- /dev/null -+++ xine-lib-1.1.17/src/mjpeg/Makefile.am +diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.am xine-lib-1.1.18/src/mjpeg/Makefile.am +--- xine-lib-1.1.18.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.18/src/mjpeg/Makefile.am 2010-02-24 21:28:13.323883132 +0100 @@ -0,0 +1,9 @@ +include $(top_srcdir)/misc/Makefile.common + @@ -99,10 +94,9 @@ Index: xine-lib-1.1.17/src/mjpeg/Makefile.am +xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags) +endif -Index: xine-lib-1.1.17/src/mjpeg/Makefile.in -=================================================================== ---- /dev/null -+++ xine-lib-1.1.17/src/mjpeg/Makefile.in +diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.in xine-lib-1.1.18/src/mjpeg/Makefile.in +--- xine-lib-1.1.18.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.18/src/mjpeg/Makefile.in 2010-02-24 21:28:13.324882254 +0100 @@ -0,0 +1,751 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ @@ -855,10 +849,9 @@ Index: xine-lib-1.1.17/src/mjpeg/Makefile.in +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -Index: xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c -=================================================================== ---- /dev/null -+++ xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c +diff -uNr xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c +--- xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c 2010-02-24 21:28:13.325884030 +0100 @@ -0,0 +1,397 @@ +/* + * Copyright (C) 2007 Marcus Meissner diff --git a/xine-lib-1.1.18.1.tar.bz2 b/xine-lib-1.1.18.1.tar.bz2 new file mode 100644 index 0000000..08e545c --- /dev/null +++ b/xine-lib-1.1.18.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a9af8b928e7a65732fc256c6c092e4a74c554d19c977728f06baa1bda358311 +size 7530681 diff --git a/xine-lib-libdvdread_udf.diff b/xine-lib-libdvdread_udf.diff index 562065f..e31125c 100644 --- a/xine-lib-libdvdread_udf.diff +++ b/xine-lib-libdvdread_udf.diff @@ -1,14 +1,7 @@ -# HG changeset patch -# User Tobias Rautenkranz -# Date 1202208482 -3600 -# Node ID 100241ff36f0730a15018a58456fb86eb590bf18 -# Parent 07c29261ed98fdb710a241c6711dac0215b6074a -Fix playback of DVDs with a broken UDF file system (aka DVD-Movie-Protect). - -diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c ---- a/src/input/libdvdnav/dvd_udf.c Thu Jan 31 22:02:04 2008 +0000 -+++ b/src/input/libdvdnav/dvd_udf.c Tue Feb 05 11:48:02 2008 +0100 -@@ -38,9 +38,15 @@ +diff -ur xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c +--- xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c 2009-11-30 21:57:20.000000000 +0100 ++++ xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c 2010-02-24 21:12:36.032882913 +0100 +@@ -38,10 +38,16 @@ #include #include #include @@ -18,13 +11,14 @@ diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c #include "dvd_reader.h" #include "dvd_udf.h" -+ + +#include "ifo_types.h" +#include "ifo_read.h" - ++ /* Private but located in/shared with dvd_reader.c */ extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number, -@@ -774,7 +780,9 @@ static int UDFFindPartition( dvd_reader_ + size_t block_count, unsigned char *data, +@@ -774,7 +780,9 @@ return part->valid; } @@ -35,7 +29,7 @@ diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c uint32_t *filesize ) { uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ]; -@@ -856,6 +864,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi +@@ -856,6 +864,84 @@ return partition.Start + File.Location; } diff --git a/xine-lib-various-noncrippled.diff b/xine-lib-various-noncrippled.diff index 9acd408..08f9401 100644 --- a/xine-lib-various-noncrippled.diff +++ b/xine-lib-various-noncrippled.diff @@ -2,7 +2,7 @@ Index: src/libw32dll/wine/ldt_keeper.c =================================================================== --- src/libw32dll/wine/ldt_keeper.c.orig +++ src/libw32dll/wine/ldt_keeper.c -@@ -77,6 +77,10 @@ int modify_ldt(int func, void *ptr, unsi +@@ -77,6 +77,10 @@ #ifdef __cplusplus } #endif diff --git a/xine-lib.changes b/xine-lib.changes index 468d22b..225e979 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Sun Mar 7 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de +- update to 1.1.18.1 + * Oops. compat.c (for DXR3 support) was omitted. + * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. + * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. + * Fix build with the old, outdated and deprecated internal ffmpeg. + +------------------------------------------------------------------- +Wed Feb 24 23:14:00 CET 2010 - Manfred.Tremmel@iiv.de +- update to 1.1.18 + * Bump the FLAC decoder's priority above ffmpegaudio. This should fix + various problems with FLAC playback. + * Build fix (undefined symbol) for when using older ffmpeg. + * TTA demuxer fixes; allow seeking. + * More meta-information tags. + Only the Ogg demuxer knows about these at present. + * Added basic support for .qtl (Quicktime media link). + * "Fixed" playback of 24-bit FLAC. + * Fixed playback of 24-bit LPCM. + * Work around an ffmpeg bug concerning Sorenson Video 3. + * Flash audio bug fixes, mostly concerning AAC. + * Fix DXR3 support for newer versions of the em8300 driver. + * Added support for WMA Pro. + +------------------------------------------------------------------- +Wed Feb 03 21:03:00 CET 2010 - Manfred.Tremmel@iiv.de + +- patches can't be build to work with crippled and non crippled tarball + with fuzz=0, added "-F2" for patch 50 and 61 to fix this + ------------------------------------------------------------------- Mon Feb 1 12:37:47 UTC 2010 - jengelh@medozas.de diff --git a/xine-lib.spec b/xine-lib.spec index 2d8ceec..45560e3 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,5 +1,5 @@ # -# spec file for package xine-lib (Version 1.1.17) +# spec file for package xine-lib (Version 1.1.18.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ Name: xine-lib # default for buildservice is no patented codecs %bcond_without distributable %bcond_with onlynondistributable -%if %suse_version >= 1100 +%if 0%{suse_version} >= 1100 %bcond_without pulseaudio %else %bcond_with pulseaudio @@ -40,7 +40,7 @@ Name: xine-lib %bcond_with jack %bcond_without gnome_vfs %bcond_with directfb -%if %suse_version > 1110 +%if 0%{suse_version} > 1110 %bcond_without modplug %else %bcond_with modplug @@ -54,7 +54,10 @@ BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel BuildRequires: readline-devel update-desktop-files vcdimager-devel BuildRequires: speex-devel -%if %suse_version >= 1030 +%if 0%{suse_version} >= 1110 +BuildRequires: libv4l-devel +%endif +%if 0%{suse_version} >= 1030 BuildRequires: lirc-devel %else BuildRequires: lirc @@ -88,7 +91,7 @@ BuildRequires: gnome-vfs2-devel BuildRequires: libjack-devel %endif %if %{with directfb} -%if %suse_version >= 1020 +%if 0%{suse_version} >= 1020 BuildRequires: DirectFB-devel %else BuildRequires: DirectFB @@ -97,13 +100,13 @@ BuildRequires: DirectFB %if %{with modplug} BuildRequires: libmodplug-devel %endif -Version: 1.1.17 -Release: 2 +Version: 1.1.18.1 +Release: 1 # bug437293 %ifarch ppc64 Obsoletes: xine-lib-64bit %endif -%define abiversion 1.27 +%define abiversion 1.28 Summary: Video Player with Plug-Ins Group: Productivity/Multimedia/Video/Players License: GPLv2+ ; Public Domain, Freeware @@ -155,6 +158,7 @@ Group: Productivity/Multimedia/Video/Players License: GPLv2+ Provides: xine-lib = %{version}-%{release} Obsoletes: xine-lib < %{version}-%{release} +Provides: xine-extra = %{version}-%{release} Obsoletes: xine-extra < %{version}-%{release} Provides: libxine1-syncfb = %{version}-%{release} Obsoletes: libxine1-syncfb < %{version}-%{release} @@ -380,22 +384,6 @@ xine Soundausgabeplugin für den Pulseaudio Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the pulseaudio soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den Pulseaudio Soundserver - - - Autoren: -------- Guenter Bartsch @@ -413,22 +401,6 @@ xine Soundausgabeplugin für den Pulseaudio Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the pulseaudio soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den Pulseaudio Soundserver - - - Autoren: -------- Guenter Bartsch @@ -455,22 +427,6 @@ SDL xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -SDL xine video output plugin - - - -Authors: --------- - Guenter Bartsch - -SDL xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -488,22 +444,6 @@ SDL xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -SDL xine video output plugin - - - -Authors: --------- - Guenter Bartsch - -SDL xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -534,38 +474,6 @@ Autoren: -------- Guenter Bartsch -xine sound output plugin for the arts soundserver - - - -Authors: --------- - Guenter Bartsch - -xine sound output plugin for the arts soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den arts Soundserver - - - -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the arts soundserver - - - -Authors: --------- - Guenter Bartsch - %description -n libxine1-arts -l de xine sound output plugin for the arts soundserver @@ -583,38 +491,6 @@ Autoren: -------- Guenter Bartsch -xine sound output plugin for the arts soundserver - - - -Authors: --------- - Guenter Bartsch - -xine sound output plugin for the arts soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den arts Soundserver - - - -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the arts soundserver - - - -Authors: --------- - Guenter Bartsch - %endif %if %{with aalib} @@ -634,30 +510,13 @@ Authors: Guenter Bartsch -aalib and libcaca xine video-output plugin +aalib und libcaca xine Video Ausgabeplugin -Authors: +Autoren: -------- - Guenter Bartsch - -aalib and libcaca xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - - -aalib and libcaca xine video-output plugin - - - -Authors: --------- - Guenter Bartsch + Guenter Bartsch %description -n libxine1-aa -l de aalib and libcaca xine video-output plugin @@ -669,30 +528,13 @@ Authors: Guenter Bartsch -aalib and libcaca xine video-output plugin +aalib und libcaca xine Video Ausgabeplugin -Authors: +Autoren: -------- - Guenter Bartsch - -aalib and libcaca xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - - -aalib and libcaca xine video-output plugin - - - -Authors: --------- - Guenter Bartsch + Guenter Bartsch %endif %if %{with esd} @@ -712,28 +554,9 @@ Authors: -------- Guenter Bartsch -libxine Soundausgabeplugin für den esound Soundserver - -libxine sound output plugin for the esound soundserver - - - -Authors: --------- - Guenter Bartsch - -libxine sound output plugin for the esound soundserver - - - -Authors: --------- - Guenter Bartsch libxine Soundausgabeplugin für den esound Soundserver -libxine sound output plugin for the esound soundserver - Authors: @@ -749,28 +572,9 @@ Authors: -------- Guenter Bartsch -libxine Soundausgabeplugin für den esound Soundserver - -libxine sound output plugin for the esound soundserver - - - -Authors: --------- - Guenter Bartsch - -libxine sound output plugin for the esound soundserver - - - -Authors: --------- - Guenter Bartsch libxine Soundausgabeplugin für den esound Soundserver -libxine sound output plugin for the esound soundserver - Authors: @@ -799,22 +603,6 @@ xine Soundausgabeplugin für den jack Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the jack soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den jack Soundserver - - - Autoren: -------- Guenter Bartsch @@ -832,22 +620,6 @@ xine Soundausgabeplugin für den jack Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the jack soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den jack Soundserver - - - Autoren: -------- Guenter Bartsch @@ -874,22 +646,6 @@ Directfb xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -Directfb xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - -Directfb xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -907,22 +663,6 @@ Directfb xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -Directfb xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - -Directfb xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -950,22 +690,6 @@ Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen -Autoren: --------- - Guenter Bartsch - -Input plugin which enables xine to use Gnome-vfs - - - -Authors: --------- - Guenter Bartsch - -Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen - - - Autoren: -------- Guenter Bartsch @@ -983,22 +707,6 @@ Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen -Autoren: --------- - Guenter Bartsch - -Input plugin which enables xine to use Gnome-vfs - - - -Authors: --------- - Guenter Bartsch - -Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen - - - Autoren: -------- Guenter Bartsch @@ -1048,26 +756,6 @@ http://www.xine-project.org/home -Autoren: --------- - Guenter Bartsch -With these xine plug-ins, you can watch DVDs and all other kind of -media using xine. More information about xine plug-ins can be found at -http://www.xine-project.org/home - - - -Authors: --------- - Guenter Bartsch - -Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten -Medienverainten abspielen. Weitere Informationtne über xine Plugins -finden Sie unter -http://www.xine-project.org/home - - - Autoren: -------- Guenter Bartsch @@ -1089,26 +777,6 @@ http://www.xine-project.org/home -Autoren: --------- - Guenter Bartsch -With these xine plug-ins, you can watch DVDs and all other kind of -media using xine. More information about xine plug-ins can be found at -http://www.xine-project.org/home - - - -Authors: --------- - Guenter Bartsch - -Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten -Medienverainten abspielen. Weitere Informationtne über xine Plugins -finden Sie unter -http://www.xine-project.org/home - - - Autoren: -------- Guenter Bartsch @@ -1140,10 +808,20 @@ EOF %patch26 %patch28 -p1 %patch31 -p1 +%if 0%{suse_version} >= 1110 +# set fuzzy=2 to get patch work with crippled and noncrippled tarball +%patch50 -p1 -F2 +%else %patch50 -p1 +%endif %patch51 -p1 sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am +%if 0%{suse_version} >= 1110 +# set fuzzy=2 to get patch work with crippled and noncrippled tarball +%patch61 -p1 -F2 +%else %patch61 -p1 +%endif %patch62 -p1 #sed -i 's|^ac_config_files="|ac_config_files="src/vdr/Makefile src/mjpeg/Makefile|' configure %if %{with distributable} @@ -1197,6 +875,11 @@ AUTOPOINT=true autoreconf -fi %endif %ifarch %{ix86} --with-w32-path=/usr/lib/win32 \ +%endif +%if 0%{suse_version} >= 1110 + --enable-v4l --enable-libv4l \ +%else + --disable-v4l --disable-libv4l \ %endif --with-install-plugins-helper=${_prefix}/lib/opensuse-codecs-installer %if 0%{?suse_version} < 1110 @@ -1244,7 +927,11 @@ xineplug_vo_out_xcbxv xineplug_vo_out_raw xineplug_inp_dvb xineplug_inp_dvd +%if 0%{suse_version} >= 1110 xineplug_inp_v4l +xineplug_inp_v4l2 +xineplug_inp_pvr +%endif xineplug_inp_file xineplug_inp_http xineplug_inp_net @@ -1253,7 +940,6 @@ xineplug_inp_cdda xineplug_inp_smb xineplug_inp_stdin_fifo xineplug_inp_rtsp -xineplug_inp_pvr xineplug_inp_rtp xineplug_decode_bitplane xineplug_decode_rgb