Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 6

xine-lib-12.changes Deleted

xine-lib.changes Added

@@ -0,0 +1,1580 @@
+-------------------------------------------------------------------
+Thu Feb 23 12:51:27 UTC 2012 - coolo@suse.com
+
+- buildrequire xorg-x11-devel to get all X11 libs (better safe
+  than sorry)
+
+-------------------------------------------------------------------
+Mon Feb 13 10:57:56 UTC 2012 - coolo@suse.com
+
+- patch license to follow spdx.org standard
+
+-------------------------------------------------------------------
+Mon Dec 02 22:51:00 UTC 2011 - Manfred.Tremmel@iiv.de
+
+- update to 1.1.20.1
+  * Various bug fixes.
+  * Use the current ImageMagick API (if using ImageMagick).
+  * Fix PVR plugin input building (needs V4L2).
+  * Fixes related to unknown audio & subtitle languages.
+  * Memory leak fixes.
+
+-------------------------------------------------------------------
+Sat Nov 19 15:41:25 UTC 2011 - coolo@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Sun Nov 13 16:58:00 UTC 2011 - Manfred.Tremmel@iiv.de
+
+- update to 1.1.20
+  * Imagine that there's a large poppy here.
+  * Ensure that file and socket descriptors are marked as CLOEXEC.
+  * Enable FFmpeg's support for AAC LATM audio.
+  * Fix build-time check for dvdnav.
+  * Allow use of GraphicsMagick instead of ImageMagick.
+  * Fix build on Debian GNU/kFreeBSD (broken in 1.1.19).
+  * Add a Japanese translation from Takeshi Hamasaki.
+  * Czech translation update.
+  * New MinGW-w64 port, various portability fixes.
+  * MinGW port updates.
+  * Possibility to disable HW acceleration in directx video output.
+  * Header stripping support in Matroska demuxer.
+  * Update nosefart to 2.7-mls (stability with corrupted NSF files).
+  * Add .ass extension to be recognized as subtitle file. [Bug #123]
+-------------------------------------------------------------------
+Sun Nov  6 03:48:03 UTC 2011 - reddwarf@opensuse.org
+
+- Fix Packman build: since /usr/share/xine/mad is no longer needed
+  don't create it
+
+-------------------------------------------------------------------
+Fri Oct 21 09:04:30 UTC 2011 - lnussel@suse.de
+
+- fix build: /usr/share/xine/mad is no longer needed
+
+-------------------------------------------------------------------
+Thu Jul  7 08:49:59 UTC 2011 - idonmez@novell.com
+
+- Add xine-lib-v4l-2.6.38.patch: use the new v4l interface 
+
+-------------------------------------------------------------------
+Sat May 28 17:09:00 CET 2011 - Manfred.Tremmel@iiv.de
+
+- included a patch to build against new ffmpeg abi
+
+-------------------------------------------------------------------
+Thu Nov 18 10:04:52 UTC 2010 - coolo@novell.com
+
+- add patch from arch linux to fix build with newer xorg
+
+-------------------------------------------------------------------
+Tue Aug  3 13:14:49 UTC 2010 - lnussel@suse.de
+
+- remove unneeded libcdio-mini-devel buildignore again
+
+-------------------------------------------------------------------
+Mon Jul 26 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de
+
+- update to 1.1.19
+  * Handle odd widths properly (for ffmpeg-decoded video).
+  * Make buildable with current (external) libdvdnav & libdvdread.
+  * Fix V4L2 check.
+  * Add support for Ogg tag 'DISCNUMBER' and ID3 tag 'TPOS'.
+  * Add support for EAC3.
+  * Recognise video/mp2t and video/mp2p.
+  * TTA fixes.
+  * Add support for Xv gamma adjustment.
+  * Better recovery from ALSA-reported errors.
+  * Report stream buffer stats to the application.
+  * Recognise and handle the WebM container format.
+    (VP8 video is not yet supported.)
+  * Recognise ScreamTracker 2 & 3 files.
+  * Fix playback of the first file handled by the modplug demuxer.
+  * Refuse to build with known-broken libmodplug (0.8.8).
+    http://bugs.debian.org/588465
+  * Fix a potential freeing of unallocated memory.
+
+-------------------------------------------------------------------
+Mon Apr 26 11:39:27 CEST 2010 - ro@suse.de
+
+- buildignore libcdio-mini-devel 
+
+-------------------------------------------------------------------
+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
+
+- package baselibs.conf
+
+-------------------------------------------------------------------
+Fri Jan  8 12:28:04 CET 2010 - ro@suse.de
+
+- rediffed again 
+
+-------------------------------------------------------------------
+Wed Dec 16 11:16:46 CET 2009 - meissner@suse.de
+
+- rediffed for fuzz=0
+
+-------------------------------------------------------------------
+Mon Dec 01 21:14:00 CEST 2009 - Manfred.Tremmel@iiv.de
+
+- update to 1.1.17
+  * Add support for Matroska SIMPLEBLOCK.
+  * Add support for sndio (OpenBSD sound API).
+  * Correct invalid MIME info in the MOD demuxer.
+  * Fix a resource leak in libdvdnav.
+  * Properly NUL-terminate when reading ID3v2.2 tag content.
+  * Fix handling of the length of UTF-16 content sourced from, e.g., ID3 tags.
+  * Make ~/.xine/catalog.cache writing safer: write a new file & atomically
+    replace the old one.
+  * Initial parsing of Xing header LAME extension.
+  * Fixes for gapless playback.
+  * Added padding delay to the first and last frames (MPEG audio).
+  * Fixed buggy discontinuity handling when playing short streams and using the gapless switch. The current time should not be used here.
+  * Added audio padding handling. (New buffer flag for this.)
+  * Fix seeking in large raw DV files.
+  * Ported to new libmpcdec API (retaining build compat. with the old API).
+  * Cope with CDDB return code 211 (multiple entries).
+  * Allow reading of non-block-sized chunks from audio CDs.
+  * Add a user agent & protocol hack ("qthttp://...") to allow direct
+    viewing of Apple film trailers.
+  * Fixed int-to-float conversion in the JACK output plugin.
+  * Work around MOD files with reported length == 0.
+  * Reworked Matroska demuxer. Now reads files created by mkvmerge 2.7.0.
+  * Support BluRay/HDMV streams & subtitles.
+  * The XML parser & lexer code now has re-entrancy.
+  * Fixed a bug which prevented "dvb://" (no channel specified) working with
+    the default configuration.
+  * Handle VC1 extradata requirement (should fix playback).
+
+-------------------------------------------------------------------
+Wed Nov 18 15:11:00 UTC 2009 - lnussel@suse.de
+
+- enable libmodplug on >= 11.2
+
+-------------------------------------------------------------------
+Sat Nov 14 15:31:00 CEST 2009 - Manfred.Tremmel@iiv.de
+
+- merged packman and openSUSE package
+- update to 1.1.16.3
+  * Security fixes:
+    - Fix another possible int overflow in the 4XM demuxer.
+      (ref. TKADV2009-004, CVE-2009-0385)
+    - Fix an integer overflow in the Quicktime demuxer.
+  * Enable libmpeg2new (if configured with --enable-libmpeg2new).
+    This is not yet production code; the old mpeg2 decoder remains the default.
+  * Add support for OpenBSD.

xine-lib-12.spec Deleted

@@ -1,827 +0,0 @@
-#
-# spec file for package xine-lib (Version 1.2.^)
-#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-
-Name: xine-lib-12
-# %bcond_with = default off
-# %bcond_without = default on
-#
-# --with distributable -> don't build libxine1-codecs
-# --without distributable -> build libxine1-codecs
-#
-# default for buildservice is no patented codecs
-%bcond_with distributable
-%bcond_with onlynondistributable
-%bcond_without pulseaudio
-%bcond_without sdl
-%bcond_without aalib
-%bcond_without esd
-%bcond_without jack
-%bcond_without gnome_vfs
-%bcond_with directfb
-%bcond_without modplug
-#
-BuildRequires: alsa-devel ImageMagick-devel flac-devel giflib-devel
-BuildRequires: glib2-devel gnutls-devel gtk2-devel imlib2-devel krb5-devel
-BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient
-BuildRequires: libsmbclient-devel libtheora-devel libvorbis-devel libmpcdec-devel
-BuildRequires: libv4l-devel libtool
-%if %suse_version >= 1030
-BuildRequires: lirc-devel
-%else
-BuildRequires: lirc
-%endif
-BuildRequires: readline-devel libspeex-devel update-desktop-files vcdimager-devel
-%if !%{with distributable}
-# those requiremens are optional but internal copies are likely old
-BuildRequires: libfaad-devel libffmpeg-devel
-%endif
-%if %{with pulseaudio}
-BuildRequires: libpulse-devel
-%endif
-%if %{with sdl}
-BuildRequires: SDL-devel
-%endif
-%if %{with aalib}
-BuildRequires: aalib-devel
-BuildRequires: libcaca-devel
-%endif
-%if %{with esd}
-BuildRequires: esound-devel
-%endif
-%if %{with gnome_vfs}
-BuildRequires: gnome-vfs2-devel
-%endif
-%if %{with jack}
-BuildRequires: libjack-devel
-%endif
-%if %{with directfb}
-%if %suse_version >= 1020
-BuildRequires: DirectFB-devel
-%else
-BuildRequires: DirectFB
-%endif
-%endif
-%if %{with modplug}
-BuildRequires: libmodplug-devel
-%endif
-Version: 1.2.1
-Release: 1
-%define abiversion 2.1
-Summary: Video Player with Plug-Ins
-Group: Productivity/Multimedia/Video/Players
-License: GPL v2 or later; Public Domain, Freeware
-Url: http://www.xine-project.org/home
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-Source0: xine-lib-%{version}.tar.bz2
-Source1: baselibs.conf
-
-Patch0: xine-lib-libdvdread_udf.diff
-Patch1: xine-lib-v4l-2.6.38.patch
-
-%description
-Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...You need a frontend for xine-lib like <a href=http://packman.links2linux.de/package/xine-ui>xine-ui</a>, <a href=http://packman.links2linux.de/package/gxine>gxine</a>, <a href=http://packman.links2linux.de/package/kaffeine>kaffeine</a> or <a href=http://packman.links2linux.de/package/totem>totem</a>.Since 1-rc6 the package number is reduced, all you may miss, is in the base packageIf you want to play css encrypted Video-DVD's, you need to install <a href=http://packman.links2linux.de/package/libdvdcss2>libdvdcss</a>.
-
-%description -l de
-Gro&szlig;artiger Video- und Multimediaplayer mit Support f&uuml;r DVD, MPEG, AVI, DivX, VCD,Quicktime ...Bitte beachten Sie, dass Sie neben der xine-lib auch eine Bedienoberfl&auml;che wie <a href=http://packman.links2linux.de/package/xine-ui>xine-ui</a>, <a href=http://packman.links2linux.de/package/gxine>gxine</a>, <a href=http://packman.links2linux.de/package/kaffeine>kaffeine</a> oder <a href=http://packman.links2linux.de/package/totem>totem</a> ben&ouml;tigen.Seit 1-rc6 wurde die Zahl der Pakete reduziert, alles was sie eventuell vermissen, wurde in das Basispaket integriert.Wenn Sie css verschl&uuml;sselte Video-DVDs abspielen wollen, m&uuml;ssen Sie zus&auml;tzlich die <a href=http://packman.links2linux.de/package/libdvdcss2>libdvdcss</a> installieren.
-
-%package -n libxine2
-Summary: Video Player with Plug-Ins
-Group: Productivity/Multimedia/Video/Players
-License: GPL v2 or later
-Provides: libxine2-syncfb = %{version}-%{release}
-Obsoletes: libxine2-syncfb < %{version}-%{release}
-Provides: libxine2-xvmc = %{version}-%{release}
-Obsoletes: libxine2-xvmc < %{version}-%{release}
-Provides: libxine2-dvb = %{version}-%{release}
-Obsoletes: libxine2-dvb < %{version}-%{release}
-Recommends: libxine2-codecs = %{version}
-Recommends: opensuse-codecs-installer
-
-%description -n libxine2
-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.
-
-%if %{with distributable}
-This version of xine may lack certain features because of legal
-requirements (potential patent violation). See also
-http://www.opensuse.org/XINE#Legal_Matters
-%endif
-
-More information about xine plug-ins can be found at
-http://www.xine-project.org/home
-
-
-
-Authors:
---------
- Guenter Bartsch <guenter@sourceforge.net>
-
-%description -n libxine2 -l de
-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
-http://www.opensuse.org/XINE#Legal_Matters
-%endif
-
-Weitere Informationen über xine Plugins finden Sie unter
-http://www.xine-project.org/home
-
-
-
-Autoren:
---------
- Guenter Bartsch <guenter@sourceforge.net>
-
-%package -n libxine2-devel
-License: GPL v2 or later ; Public Domain, Freeware
-Summary: Development environment for xine-based media players
-Group: Development/Libraries/C and C++
-Requires: glibc-devel freetype2-devel zlib-devel libxine2 = %{version}
-Requires: libv4l-devel
-Requires: libffmpeg-devel
-Obsoletes: libxine2-devel < %{version}-%{release}
-Provides: libxine2-devel = %{version}-%{release}
-Obsoletes: xine-lib-devel < %{version}-%{release}
-Provides: xine-lib-devel = %{version}-%{release}
-# bug437293
-%ifarch ppc64
-Obsoletes: xine-lib-devel-64bit
-%endif
-#
-
-%description -n libxine2-devel
-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.
-
-%if %{with distributable}
-This version of xine may lack certain features because of legal
-requirements (potential patent violation). See also
-http://www.opensuse.org/XINE#Legal_Matters
-%endif
-
-More information about xine plug-ins can be found at
-http://www.xine-project.org/home
-
-
-

xine-lib.spec Added

@@ -0,0 +1,1031 @@
+#
+# spec file for package xine-lib
+#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name: xine-lib
+# %bcond_with = default off
+# %bcond_without = default on
+#
+# --with distributable -> don't build libxine1-codecs
+# --without distributable -> build libxine1-codecs
+#
+# default for buildservice is no patented codecs
+%bcond_without distributable
+%bcond_with onlynondistributable
+%if 0%{suse_version} >= 1100
+%bcond_without pulseaudio
+%else
+%bcond_with pulseaudio
+%endif
+%bcond_with sdl
+%bcond_with aalib
+%bcond_with arts
+%bcond_with esd
+%bcond_with jack
+%bcond_without gnome_vfs
+%bcond_with directfb
+%if 0%{suse_version} > 1110
+%bcond_without modplug
+%else
+%bcond_with modplug
+%endif
+#
+%bcond_without external_ffmpeg
+#
+BuildRequires: ImageMagick-devel
+BuildRequires: Mesa-devel
+BuildRequires: alsa-devel
+BuildRequires: flac-devel
+BuildRequires: giflib-devel
+BuildRequires: glib2-devel
+BuildRequires: gnutls-devel
+BuildRequires: gtk2-devel
+BuildRequires: imlib2-devel
+BuildRequires: krb5-devel
+BuildRequires: libcdio-devel
+BuildRequires: libdrm-devel
+BuildRequires: libmng-devel
+BuildRequires: libsmbclient
+BuildRequires: libsmbclient-devel
+BuildRequires: libtheora-devel
+BuildRequires: libtool
+BuildRequires: libvorbis-devel
+BuildRequires: readline-devel
+BuildRequires: speex-devel
+BuildRequires: update-desktop-files
+BuildRequires: vcdimager-devel
+BuildRequires: xorg-x11-devel
+%if 0%{suse_version} >= 1210
+BuildRequires: libv4l-devel >= 0.8.4
+%else
+%if 0%{suse_version} >= 1110
+BuildRequires: libv4l-devel
+%endif
+%endif
+%if 0%{suse_version} >= 1030
+BuildRequires: lirc-devel
+%else
+BuildRequires: lirc
+%endif
+%if !%{with distributable}
+# those requiremens are optional but internal copies are likely old
+%if %{with external_ffmpeg}
+BuildRequires: libfaad-devel
+BuildRequires: libffmpeg-devel
+%endif
+%endif
+%if %{with pulseaudio}
+BuildRequires: libpulse-devel
+%endif
+%if %{with sdl}
+BuildRequires: SDL-devel
+%endif
+%if %{with aalib}
+BuildRequires: aalib-devel
+BuildRequires: libcaca-devel
+%endif
+%if %{with arts}
+BuildRequires: arts-devel
+%endif
+%if %{with esd}
+BuildRequires: esound-devel
+%endif
+%if %{with gnome_vfs}
+BuildRequires: gnome-vfs2-devel
+%endif
+%if %{with jack}
+BuildRequires: libjack-devel
+%endif
+%if %{with directfb}
+%if 0%{suse_version} >= 1020
+BuildRequires: DirectFB-devel
+%else
+BuildRequires: DirectFB
+%endif
+%endif
+%if %{with modplug}
+BuildRequires: libmodplug-devel
+%endif
+Version: 1.1.20.1
+Release: 0
+# bug437293
+%ifarch ppc64
+Obsoletes: xine-lib-64bit
+%endif
+%define abiversion 1.30
+Summary: Video Player with Plug-Ins
+License: GPL-2.0+
+Group: Productivity/Multimedia/Video/Players
+Url: http://www.xine-project.org/home
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %{with distributable}
+Source: xine-lib-%{version}-crippled.tar.bz2
+%else
+Source: http://downloads.sourceforge.net/project/xine/xine-lib/%{version}/xine-lib-%{version}.tar.bz2
+%endif
+Source2: baselibs.conf
+Source10: README.SuSE
+Source99: precheckin_cripple_tarball.sh
+# *** xine-lib: Bugfixes
+Patch26: xine-lib-doc-fix-X11R6.diff
+Patch28: xine-lib-%{version}-ia64-is-not-alpha.diff
+Patch31: xine-lib-%{version}-glitch-free-pulseaudio.patch
+# *** Addons
+Patch50: vdr-xine-0.9.3.diff.bz2
+Patch51: vdr-xine-SUSE.diff
+Patch61: xine-lib-%{version}-mjpegplugin.diff
+Patch62: xine-lib-libdvdread_udf.diff
+# *** SUSE only changes
+Patch70: xine-lib-crippled-LOCAL.diff
+Patch71: xine-lib-%{version}-demuxcheckfor_mad_ffmpeg.patch
+Patch72: xine-lib-%{version}-install-plugins-helper.diff
+Patch73: xine-lib-%{version}-assert.patch
+Patch74: xine-configure.diff
+Patch75: xine-lib-v4l-2.6.38.patch
+# *** Only working for noncrippled source
+Patch80: xine-lib-various-noncrippled.diff
+
+%description
+xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
+also decodes multimedia files like AVI, MOV, WMV, and MP3 from local
+disk drives, and displays multimedia streamed over the Internet. It
+interprets many of the most common multimedia formats available - and
+some of the most uncommon formats, too.
+
+%description -l de
+xine ist ein freies Multimedia Wiedergabeprogramm. Es spielt Musik-CDs,
+Video-DVDs und VCDs. Es gibt auch Multimeda Dateien wie AVI, MOV, WMV
+und MP3 von der lokalen Platte sowie über das Internet wieder. Es gibt
+die meisten übliche Multimedia Formate wieder, sowie einige weniger
+verbreitete.
+
+%package -n libxine1
+Summary: Video Player with Plug-Ins
+License: GPL-2.0+
+Group: Productivity/Multimedia/Video/Players
+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}
+Provides: libxine1-xvmc = %{version}-%{release}
+Obsoletes: libxine1-xvmc < %{version}-%{release}
+Provides: libxine1-dvb = %{version}-%{release}
+Obsoletes: libxine1-dvb < %{version}-%{release}
+# bug437293
+%ifarch ppc64
+Obsoletes: xine-lib-64bit
+%endif
+#
+Recommends: libxine1-codecs = %{version}
+Recommends: opensuse-codecs-installer
+
+%description -n libxine1
+xine is a video player with a graphical front-end that supports a large

vdr-xine-0.9.3.diff.bz2 Added

@@ -0,0 +1,4982 @@
+diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac
+--- xine-lib-1.1.20.orig/configure.ac	2011-11-13 17:22:58.385897392 +0100
++++ xine-lib-1.1.20/configure.ac	2011-11-13 17:35:47.563072821 +0100
+@@ -2864,6 +2864,7 @@
+ src/video_out/vidix/drivers/Makefile
+ src/xine-utils/Makefile
+ src/xine-engine/Makefile
++src/vdr/Makefile
+ win32/Makefile
+ win32/include/Makefile])
+ AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]])
+@@ -2931,6 +2932,7 @@
+ echo "   - stdin_fifo    - rtp"
+ echo "   - http          - mms"
+ echo "   - pnm           - rtsp"
++echo "   - vdr"
+ if test "$have_supported_dvb" = yes; then
+   echo "   - dvb"
+ fi
+@@ -3145,6 +3147,7 @@
+ echo "   - eq              - eq2"
+ echo "   - boxblur         - denoise3d"
+ echo "   - unsharp         - tvtime"
++echo "   - vdr"
+ echo "  * SFX:"
+ echo "   - goom            - oscope"
+ echo "   - fftscope        - mosaico"
+diff -uNr xine-lib-1.1.20.orig/src/Makefile.am xine-lib-1.1.20/src/Makefile.am
+--- xine-lib-1.1.20.orig/src/Makefile.am	2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.20/src/Makefile.am	2011-11-13 17:35:47.563072821 +0100
+@@ -28,4 +28,5 @@
+ 	libfaad \
+         libmusepack \
+ 	post \
+-	combined
++	combined \
++	vdr
+diff -uNr xine-lib-1.1.20.orig/src/vdr/combined_vdr.c xine-lib-1.1.20/src/vdr/combined_vdr.c
+--- xine-lib-1.1.20.orig/src/vdr/combined_vdr.c	1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/vdr/combined_vdr.c	2011-11-13 17:35:47.563072821 +0100
+@@ -0,0 +1,44 @@
++/*
++ * Copyright (C) 2000-2004 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
++ */
++ 
++/*
++ * plugins for VDR
++ */
++
++#include "xine_internal.h"
++#include "post.h"
++#include "combined_vdr.h"
++
++
++
++static const post_info_t vdr_video_special_info = { XINE_POST_TYPE_VIDEO_FILTER };
++static const post_info_t vdr_audio_special_info = { XINE_POST_TYPE_AUDIO_FILTER };
++
++/* exported plugin catalog entry */
++const plugin_info_t xine_plugin_info[] EXPORTED =
++{
++  /* type       , API, "name"     , version          , special_info           , init_function */  
++  { PLUGIN_INPUT,  17, "VDR"      , XINE_VERSION_CODE, NULL                   , &vdr_input_init_plugin },
++  { PLUGIN_POST ,   9, "vdr"      , XINE_VERSION_CODE, &vdr_video_special_info, &vdr_video_init_plugin },
++  { PLUGIN_POST ,   9, "vdr_video", XINE_VERSION_CODE, &vdr_video_special_info, &vdr_video_init_plugin },
++  { PLUGIN_POST ,   9, "vdr_audio", XINE_VERSION_CODE, &vdr_audio_special_info, &vdr_audio_init_plugin },
++  { PLUGIN_NONE ,   0, ""         , 0                , NULL                   , NULL }
++};
++
+diff -uNr xine-lib-1.1.20.orig/src/vdr/combined_vdr.h xine-lib-1.1.20/src/vdr/combined_vdr.h
+--- xine-lib-1.1.20.orig/src/vdr/combined_vdr.h	1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/vdr/combined_vdr.h	2011-11-13 17:35:47.567072786 +0100
+@@ -0,0 +1,92 @@
++/*
++ * Copyright (C) 2000-2004 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
++ */
++
++#ifndef __COMBINED_VDR_H
++#define __COMBINED_VDR_H
++
++
++
++typedef struct vdr_set_video_window_data_s {
++  int32_t x;
++  int32_t y;
++  int32_t w;
++  int32_t h;
++  int32_t w_ref;
++  int32_t h_ref;
++
++} vdr_set_video_window_data_t;
++
++
++
++typedef struct vdr_frame_size_changed_data_s {
++  int32_t x;
++  int32_t y;
++  int32_t w;
++  int32_t h;
++  double r;
++
++} vdr_frame_size_changed_data_t;
++
++
++
++typedef struct vdr_select_audio_data_s {
++  uint8_t channels;
++
++} vdr_select_audio_data_t;
++
++
++
++inline static int vdr_is_vdr_stream(xine_stream_t *stream)
++{
++  if (!stream
++      || !stream->input_plugin
++      || !stream->input_plugin->input_class)
++  {
++    return 0;
++  }
++
++  {
++    input_class_t *input_class = stream->input_plugin->input_class;
++
++    if (input_class->get_identifier)
++    {
++      const char *identifier = input_class->get_identifier(input_class);
++      if (identifier
++          && 0 == strcmp(identifier, "VDR"))
++      {
++        return 1;
++      }
++    }
++  }
++
++  return 0;
++}
++
++
++
++/* plugin class initialization function */
++void *vdr_input_init_plugin(xine_t *xine, void *data);
++void *vdr_video_init_plugin(xine_t *xine, void *data);
++void *vdr_audio_init_plugin(xine_t *xine, void *data);
++
++
++
++#endif /* __COMBINED_VDR_H */
++
+diff -uNr xine-lib-1.1.20.orig/src/vdr/input_vdr.c xine-lib-1.1.20/src/vdr/input_vdr.c
+--- xine-lib-1.1.20.orig/src/vdr/input_vdr.c	1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/vdr/input_vdr.c	2011-11-13 17:35:47.567072786 +0100
+@@ -0,0 +1,2665 @@
++/*
++ * Copyright (C) 2003-2004 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.

vdr-xine-SUSE.diff Added

xine-configure.diff Added

xine-lib-1.1.20.1-assert.patch Added

xine-lib-1.1.20.1-demuxcheckfor_mad_ffmpeg.patch Added

@@ -0,0 +1,37 @@
+diff -ur xine-lib-1.1.20.orig/src/xine-engine/load_plugins.c xine-lib-1.1.20/src/xine-engine/load_plugins.c
+--- xine-lib-1.1.20.orig/src/xine-engine/load_plugins.c	2011-10-16 20:59:32.000000000 +0200
++++ xine-lib-1.1.20/src/xine-engine/load_plugins.c	2011-11-13 18:08:39.357570472 +0100
+@@ -2508,9 +2508,18 @@
+ 
+   plugin_catalog_t *catalog = self->plugin_catalog;
+   int               list_id;
++  int               havempgdecoder = 0;
++  const char * const * p;
+ 
+   pthread_mutex_lock (&catalog->lock);
+ 
++  _build_list_typed_plugins(&catalog, catalog->plugin_lists[PLUGIN_AUDIO_DECODER - 1]);
++  for (p = catalog->ids; p && *p; p++) {
++    if (strcmp (*p, "mad") == 0 || strcmp (*p, "ffmpegaudio") == 0) {
++      havempgdecoder = 1;
++      break;
++    }
++  }
+   /* calc length of output string and create an array of strings to
+      concatenate */
+   size_t len = 0;
+@@ -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 )
+-	len += strlen(extensions[list_id]) +1;
++      {
++	if(havempgdecoder || !strstr(extensions[list_id], "mp3")) {
++	  len += strlen(extensions[list_id]) +1;
++	} else {
++	  extensions[list_id] = NULL;
++	}
++      }
+     }
+   }
+

xine-lib-1.1.20.1-glitch-free-pulseaudio.patch Added

xine-lib-1.1.20.1-ia64-is-not-alpha.diff Added

xine-lib-1.1.20.1-install-plugins-helper.diff Added

@@ -0,0 +1,266 @@
+diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac
+--- xine-lib-1.1.20.orig/configure.ac	2011-11-13 17:46:57.513129735 +0100
++++ xine-lib-1.1.20/configure.ac	2011-11-13 17:40:51.572377268 +0100
+@@ -2657,6 +2657,28 @@
+ 
+ AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno")
+ 
++dnl ---------------------------------------------
++dnl let distro override plugin install helper path
++dnl ---------------------------------------------
++AC_ARG_WITH(install-plugins-helper,
++ AC_HELP_STRING([--with-install-plugins-helper],
++ [specify path of helper script to call to install plugins]),
++ [
++ case "${withval}" in
++ yes) AC_MSG_ERROR(bad value ${withval} for --with-install-plugins-helper) ;;
++ no) AC_MSG_ERROR(bad value ${withval} for --with-install-plugins-helper) ;;
++ *) XINE_INSTALL_PLUGINS_HELPER="${withval}" ;;
++ esac
++ ],
++ [
++ dnl Default value
++ XINE_INSTALL_PLUGINS_HELPER="`makeexpand "${libexecdir}/xine-install-plugins-helper"`"
++ ]
++)
++AC_MSG_NOTICE(Using $XINE_INSTALL_PLUGINS_HELPER as plugin install helper)
++AC_DEFINE_UNQUOTED(XINE_INSTALL_PLUGINS_HELPER, "$XINE_INSTALL_PLUGINS_HELPER",
++ [plugin install helper script])
++AC_SUBST(XINE_INSTALL_PLUGINS_HELPER)
+ 
+ dnl ---------------------------------------------
+ dnl some include paths ( !!! DO NOT REMOVE !!! )
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.20/src/xine-engine/audio_decoder.c
+--- xine-lib-1.1.20.orig/src/xine-engine/audio_decoder.c	2011-11-13 17:46:57.513129735 +0100
++++ xine-lib-1.1.20/src/xine-engine/audio_decoder.c	2011-10-04 23:42:53.000000000 +0200
+@@ -41,6 +41,7 @@
+ 
+ #include "xine_internal.h"
+ #include "xineutils.h"
++#include "install_plugins_helper.h"
+ 
+ static void *audio_decoder_loop (void *stream_gen) {
+ 
+@@ -344,6 +345,10 @@
+ 
+ _x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED,
+ 				 (stream->audio_decoder_plugin != NULL));
++
++ if(buf->type != buftype_unknown && !stream->audio_decoder_plugin)
++ _x_install_plugins_helper(stream,"decoder-audio", buf->type, _x_buf_audio_name( buf->type ));
++
+ }
+ 
+ 	 if (audio_type != stream->audio_type) {
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.20/src/xine-engine/install_plugins_helper.c
+--- xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.c	2011-11-13 17:46:57.513129735 +0100
++++ xine-lib-1.1.20/src/xine-engine/install_plugins_helper.c	1970-01-01 01:00:00.000000000 +0100
+@@ -0,0 +1,106 @@
++/*
++ * Copyright (C) 2007 Sascha Sommer
++ *
++ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ *
++ * helper functions to query the internet for additional plugins
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++#include <stdio.h>
++#include <unistd.h>
++#include <sys/wait.h>
++
++#include "install_plugins_helper.h"
++
++#define PROCNAME_LEN 100
++
++static const char *
++get_helper(xine_stream_t *stream)
++{
++ const char *helper;
++
++ helper = getenv("XINE_INSTALL_PLUGINS_HELPER");
++ if (helper == NULL)
++ helper = XINE_INSTALL_PLUGINS_HELPER;
++
++ xine_log (stream->xine, XINE_LOG_MSG,
++ _("Using plugin install helper '%s'"), helper);
++
++ return helper;
++}
++
++static void
++get_procname(char* procname, size_t len)
++{
++ char name[100];
++ FILE* fp;
++ size_t pos = 0;
++ snprintf(name, sizeof(name), "/proc/%u/cmdline", getpid());
++
++ fp = fopen(name,"rb");
++ if(fp){
++ while(fp && !feof(fp) && pos < sizeof(name)-1){
++ procname[pos] = fgetc(fp);
++ if(procname[pos] == ' ') /* ignore arguments */
++ break;
++ if(procname[pos] == '/') /* ignore the path to the executable */
++ pos = 0;
++ else
++ ++pos;
++ }
++ fclose(fp);
++ }
++ procname[pos] = '\0';
++}
++
++
++void _x_install_plugins_helper(xine_stream_t* stream,char* plugin_type, uint32_t id, char* plugin_desc)
++{
++ xine_cfg_entry_t cfgentry;
++ char* helper = get_helper(stream);
++ FILE* fp;
++
++ if(helper && xine_config_lookup_entry(stream->xine, "media.plugins_helper", &cfgentry) && cfgentry.num_value
++ && (fp = fopen(helper,"rb") )) {
++ char procname[PROCNAME_LEN];
++//	char* procname = getenv("_"); /* might deliver /opt/kde3/bin/start_kdeinit_wrapper etc... */
++ 	pid_t pid;
++ fclose(fp);
++ get_procname(procname,PROCNAME_LEN);
++ pid = fork();
++ if(pid == 0) {
++	 size_t len = 5 + strlen(XINE_VERSION) + 1 + strlen(procname) + 1 + strlen(plugin_desc) + 1 + strlen(plugin_type) + 1 + 100 + 1;
++	 char* str = calloc(1,len + 1);
++	 if(str){
++ snprintf(str,len,"xine|%s|%s|%s|%s=%u",XINE_VERSION,procname,plugin_desc,plugin_type,id);
++ if(execl(helper,"xine-install-plugins-helper",str, NULL) == -1)
++ xine_log(stream->xine, XINE_LOG_MSG,
++ _("Couldn't start plugins_helper"));
++	 free(str);
++ }
++ }else if(pid < 0){
++ xine_log(stream->xine, XINE_LOG_MSG,
++ _("Couldn't fork"));
++	}else{
++ waitpid(pid, NULL, 0);
++ }
++ }
++}
++
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.20/src/xine-engine/install_plugins_helper.h
+--- xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.h	2011-11-13 17:46:57.513129735 +0100
++++ xine-lib-1.1.20/src/xine-engine/install_plugins_helper.h	1970-01-01 01:00:00.000000000 +0100
+@@ -0,0 +1,35 @@
++/*
++ * Copyright (C) 2007 Sascha Sommer
++ *
++ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ *
++ * helper functions to query the internet for additional codecs
++ */
++
++#ifndef PLUGINS_HELPER_H
++#define PLUGINS_HELPER_H
++
++#include <inttypes.h>
++#include "xine_internal.h"
++
++/*
++ * execute install plugins helper
++ */

xine-lib-1.1.20.1-mjpegplugin.diff Added

@@ -0,0 +1,1252 @@
+diff -uNr xine-lib-1.1.20.orig/configure xine-lib-1.1.20/configure
+--- xine-lib-1.1.20.orig/configure	2011-11-13 02:37:22.000000000 +0100
++++ xine-lib-1.1.20/configure	2011-11-13 17:40:51.568377304 +0100
+@@ -34954,6 +34954,7 @@
+ echo " * video decoder plugins:"
+ echo "   - MPEG 1,2         - Amiga Bitplane"
+ echo "   - Raw RGB          - Raw YUV"
++echo "   - Motion JPEG"
+ if test "x$with_external_ffmpeg" = "xyes"; then
+   echo "   - ffmpeg (external library):"
+ else
+diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac
+--- xine-lib-1.1.20.orig/configure.ac	2011-11-13 17:38:54.705413389 +0100
++++ xine-lib-1.1.20/configure.ac	2011-11-13 17:40:51.572377268 +0100
+@@ -1109,6 +1109,28 @@
+ AC_SUBST([SDL_LIBS])
+ 
+ dnl ---------------------------------------------
++dnl check for libjpeg
++dnl ---------------------------------------------
++
++AC_ARG_ENABLE([jpeg],
++  AC_HELP_STRING([--disable-jpeg], [do not build JPEG support]),
++  [with_jpeg=$enableval], [with_jpeg=yes])
++
++if test "x$with_jpeg" = "xyes"; then
++  AC_CHECK_HEADERS(jpeglib.h,
++  [
++    AC_CHECK_LIB(jpeg,jpeg_start_decompress,
++    [
++      AC_DEFINE(HAVE_JPEG,1,[Define this if you have libjpeg library installed])
++    ])
++  ])
++else
++  no_sdl=yes
++fi
++AM_CONDITIONAL(HAVE_JPEG, [test x"$with_jpeg" == x"yes"])
++
++
++dnl ---------------------------------------------
+ dnl check for Libstk
+ dnl ---------------------------------------------
+ 
+@@ -2845,6 +2867,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
+@@ -3063,6 +3086,9 @@
+ dnl audio decoders
+ echo " * audio decoder plugins:"
+ echo "   - GSM 06.10       - linear PCM"
++if test x"$with_jpeg" == x"yes"; then
++  echo "   - Motion JPEG (libjpeg based)"
++fi
+ if test "x$with_external_ffmpeg" = "xyes"; then
+   echo "   - ffmpeg (external library):"
+   echo "     - Windows Media Audio v1/v2/Pro"
+diff -uNr xine-lib-1.1.20.orig/src/Makefile.am xine-lib-1.1.20/src/Makefile.am
+--- xine-lib-1.1.20.orig/src/Makefile.am	2011-11-13 17:38:54.705413389 +0100
++++ xine-lib-1.1.20/src/Makefile.am	2011-11-13 17:40:51.572377268 +0100
+@@ -27,6 +27,7 @@
+ 	libreal \
+ 	libfaad \
+         libmusepack \
++	mjpeg \
+ 	post \
+ 	combined \
+ 	vdr
+diff -uNr xine-lib-1.1.20.orig/src/Makefile.in xine-lib-1.1.20/src/Makefile.in
+--- xine-lib-1.1.20.orig/src/Makefile.in	2011-11-13 02:37:24.000000000 +0100
++++ xine-lib-1.1.20/src/Makefile.in	2011-11-13 17:40:51.572377268 +0100
+@@ -460,6 +460,7 @@
+ 	libreal \
+ 	libfaad \
+         libmusepack \
++	mjpeg \
+ 	post \
+ 	combined
+ 
+diff -uNr xine-lib-1.1.20.orig/src/mjpeg/Makefile.am xine-lib-1.1.20/src/mjpeg/Makefile.am
+--- xine-lib-1.1.20.orig/src/mjpeg/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/mjpeg/Makefile.am	2011-11-13 17:40:51.572377268 +0100
+@@ -0,0 +1,9 @@
++include $(top_srcdir)/misc/Makefile.common
++
++if HAVE_JPEG
++xineplug_LTLIBRARIES = xineplug_decode_mjpeg.la
++xineplug_decode_mjpeg_la_SOURCES = xine_mjpeg_decoder.c
++xineplug_decode_mjpeg_la_LIBADD = $(XINE_LIB) -ljpeg
++xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG)
++xineplug_decode_mjpeg_la_LDFLAGS =  $(xineplug_ldflags)
++endif
+diff -uNr xine-lib-1.1.20.orig/src/mjpeg/Makefile.in xine-lib-1.1.20/src/mjpeg/Makefile.in
+--- xine-lib-1.1.20.orig/src/mjpeg/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/mjpeg/Makefile.in	2011-11-13 17:40:51.572377268 +0100
+@@ -0,0 +1,751 @@
++# Makefile.in generated by automake 1.10 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++	$(top_srcdir)/misc/Makefile.common
++subdir = src/mjpeg
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
++	$(top_srcdir)/m4/arts.m4 $(top_srcdir)/m4/attributes.m4 \
++	$(top_srcdir)/m4/directx.m4 $(top_srcdir)/m4/dl.m4 \
++	$(top_srcdir)/m4/dvdnav.m4 $(top_srcdir)/m4/gas.m4 \
++	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
++	$(top_srcdir)/m4/ioctl_request.m4 $(top_srcdir)/m4/irixal.m4 \
++	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
++	$(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
++	$(top_srcdir)/m4/libtool15.m4 $(top_srcdir)/m4/nls.m4 \
++	$(top_srcdir)/m4/opengl.m4 $(top_srcdir)/m4/optimizations.m4 \
++	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
++	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/pthreads.m4 \
++	$(top_srcdir)/m4/symbol.m4 $(top_srcdir)/m4/xv.m4 \
++	$(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(xineplugdir)"
++xineplugLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(xineplug_LTLIBRARIES)
++xineplug_decode_mjpeg_la_DEPENDENCIES = $(XINE_LIB)
++am__xineplug_decode_mjpeg_la_SOURCES_DIST = xine_mjpeg_decoder.c
++am_xineplug_decode_mjpeg_la_OBJECTS = xineplug_decode_mjpeg_la-xine_mjpeg_decoder.lo
++xineplug_decode_mjpeg_la_OBJECTS =  \
++	$(am_xineplug_decode_mjpeg_la_OBJECTS)
++xineplug_decode_mjpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
++	$(xineplug_decode_mjpeg_la_CFLAGS) $(CFLAGS) \
++	$(xineplug_decode_mjpeg_la_LDFLAGS) $(LDFLAGS) -o $@
++am_xineplug_decode_mjpeg_la_rpath = -rpath \
++	$(xineplugdir)
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
++SOURCES = $(xineplug_decode_mjpeg_la_SOURCES)
++DIST_SOURCES = $(am__xineplug_decode_mjpeg_la_SOURCES_DIST)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++AAINFO = @AAINFO@
++AALIB_CFLAGS = @AALIB_CFLAGS@
++AALIB_CONFIG = @AALIB_CONFIG@
++AALIB_LIBS = @AALIB_LIBS@

xine-lib-crippled-LOCAL.diff Added

@@ -0,0 +1,87 @@
+Index: src/input/input_dvd.c
+===================================================================
+--- src/input/input_dvd.c.orig
++++ src/input/input_dvd.c
+@@ -1393,7 +1393,12 @@
+ 
+ static int dvd_parse_try_open(dvd_input_plugin_t *this, const char *locator)
+ {
+-  const char *intended_dvd_device;
++  const char        *intended_dvd_device;
++  dvd_input_class_t *class = (dvd_input_class_t *)
++                               this->input_plugin.input_class;
++  xine_sarray_t    **plgs  = class->xine->plugin_catalog->plugin_lists;
++  plugin_node_t     *node;
++  int                i;
+ 
+   /* FIXME: we temporarily special-case "dvd:/" for compatibility;
+    * actually "dvd:/" should play a DVD image stored in /, but for
+@@ -1409,7 +1414,6 @@
+     xine_setenv("DVDCSS_RAW_DEVICE", "", 1);
+   } else {
+     /* use default DVD device */
+-    dvd_input_class_t *class = (dvd_input_class_t*)this->input_plugin.input_class;
+     xine_cfg_entry_t raw_device;
+     if (xine_config_lookup_entry(this->stream->xine,
+ 	"media.dvd.raw_device", &raw_device))
+@@ -1417,6 +1421,23 @@
+     intended_dvd_device = class->dvd_device;
+   }
+ 
++  for (i = 0; (node = xine_sarray_get (plgs[PLUGIN_VIDEO_DECODER-1], i)); i++)
++    if (strcmp (node->info->id, "mpeg2") == 0)
++      break;
++  if (node)
++    for (i = 0; (node = xine_sarray_get (plgs[PLUGIN_SPU_DECODER-1], i)); i++)
++      if (strcmp (node->info->id, "spudec") == 0)
++        break;
++  if (! node) {
++      _x_message (this->stream, XINE_MSG_GENERAL_WARNING,
++                  "This version of Xine lacks support for playing DVD discs "
++		  "for legal reasons.\n"
++		  "Please go to http://www.opensuse.org/XINE#Legal_Matters "
++		  "for further details.",
++		  NULL);
++      return 0;
++  }
++
+   /* attempt to open DVD */
+   if (this->opened) {
+     if (intended_dvd_device == this->current_dvd_device) {
+@@ -1479,8 +1500,11 @@
+ }
+ 
+ static int dvd_plugin_open (input_plugin_t *this_gen) {
+-  dvd_input_plugin_t    *this = (dvd_input_plugin_t*)this_gen;
++  dvd_input_plugin_t    *this  = (dvd_input_plugin_t*)this_gen;
+   dvd_input_class_t     *class = (dvd_input_class_t*)this_gen->input_class;
++  xine_sarray_t        **plgs  = class->xine->plugin_catalog->plugin_lists;
++  plugin_node_t         *node;
++  int                    i;
+ 
+   char                  *locator, *locator_orig;
+   char                  *title_part;
+@@ -1489,6 +1513,23 @@
+ 
+   trace_print("Called\n");
+ 
++  for (i = 0; (node = xine_sarray_get (plgs[PLUGIN_VIDEO_DECODER-1], i)); i++)
++    if (strcmp (node->info->id, "mpeg2") == 0)
++      break;
++  if (node)
++    for (i = 0; (node = xine_sarray_get (plgs[PLUGIN_SPU_DECODER-1], i)); i++)
++      if (strcmp (node->info->id, "spudec") == 0)
++        break;
++  if (! node) {
++      _x_message (this->stream, XINE_MSG_GENERAL_WARNING,
++                  "This version of Xine lacks support for playing DVD discs "
++		  "for legal reasons.\n"
++		  "Please go to http://www.opensuse.org/XINE#Legal_Matters "
++		  "for further details.",
++		  NULL);
++      return 0;
++  }
++
+   /* we already checked the "dvd:/" MRL before */
+   locator_orig = locator = strdup (this->mrl + (sizeof("dvd:") - 1));
+

xine-lib-doc-fix-X11R6.diff Added

@@ -0,0 +1,35 @@
+Index: doc/faq/faq.sgml
+===================================================================
+--- doc/faq/faq.sgml.orig
++++ doc/faq/faq.sgml
+@@ -413,12 +413,12 @@
+ <para>
+ If you want to have Xv support compiled in, make sure you either have
+ a shared Xv library on your system, e.g.
+- <command>ls /usr/X11R6/lib/libXv*</command>
++ <command>ls /usr/lib/libXv*</command>
+ should give you some .so libs, like this:
+ <screen>
+-&nbsp;&nbsp;&nbsp;/usr/X11R6/lib/libXv.a
+-&nbsp;&nbsp;&nbsp;/usr/X11R6/lib/libXv.so
+-&nbsp;&nbsp;&nbsp;/usr/X11R6/lib/libXv.so.1</screen>
++&nbsp;&nbsp;&nbsp;/usr/lib/libXv.a
++&nbsp;&nbsp;&nbsp;/usr/lib/libXv.so
++&nbsp;&nbsp;&nbsp;/usr/lib/libXv.so.1</screen>
+ </para>
+ <para>
+ Alternatively you need to have libtool 1.4 or newer installed, then
+Index: doc/README_xxmc.html
+===================================================================
+--- doc/README_xxmc.html.orig
++++ doc/README_xxmc.html
+@@ -69,8 +69,7 @@
+ installing</h2>
+ Make sure you have the XvMC wrapper installed. The wrapper will try to
+ figure out at run-time what xvmc-hardware specific driver to load. If
+-it fails it will open the file /etc/X11/XvMCConfig
+-or /usr/X11R6/lib/X11/XvMCConfig
++it fails it will open the file /usr/lib/X11/XvMCConfig
+ and try to load the hardware-specific library mentioned in that file.
+ If you downloaded the XvMC wrapper from the unichrome site, the default
+ XvMCConfig will make the XvMC wrapper try to load the Nvidia XvMC

xine-lib-libdvdread_udf.diff Changed

@@ -1,14 +1,7 @@
-# HG changeset patch
-# User Tobias Rautenkranz <mail@tobias.rautenkranz.ch>
-# 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 <sys/stat.h>
 #include <unistd.h>
 #include <inttypes.h>
@@ -18,13 +11,14 @@
 
 #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 @@
 		 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;
 }

xine-lib-v4l-2.6.38.patch Changed

@@ -1,16 +1,16 @@
---- m4/input.m4	2010-03-21 00:29:58.000000000 +0100
-+++ m4/input.m4	2011-11-16 15:59:40.674878245 +0100
-@@ -92,7 +92,7 @@
-     XINE_ARG_ENABLE([v4l], [Enable Video4Linux support])
-     if test x"$enable_v4l" != x"no"; then
-         have_v4l=yes
--        AC_CHECK_HEADERS([linux/videodev.h], , [have_v4l=no])
-+        AC_CHECK_HEADERS([libv4l1-videodev.h], , [have_v4l=no])
-         AC_CHECK_HEADERS([asm/types.h])
-         if test x"$hard_enable_v4l" = x"yes" && test x"$have_v4l" != x"yes"; then
-             AC_MSG_ERROR([Video4Linux support requested, but prerequisite headers not found.])
---- src/input/input_v4l.c	2011-10-05 22:44:39.000000000 +0200
-+++ src/input/input_v4l.c	2011-11-16 15:35:43.075546420 +0100
+--- configure.ac.orig	2011-07-07 10:45:26.462089794 +0200
++++ configure.ac	2011-07-07 10:46:04.415089790 +0200
+@@ -682,7 +682,7 @@
+ have_v4l=no
+ have_v4l2=no
+ if test "x$enable_v4l" != "xno"; then
+-  AC_CHECK_HEADERS([linux/videodev.h], [have_v4l=yes], [])
++  AC_CHECK_HEADERS([libv4l1-videodev.h], [have_v4l=yes], [])
+   AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h sys/videodev2.h], [have_v4l2=yes], [])
+   AC_CHECK_HEADERS([asm/types.h])
+   if test "x$enable_v4l" = "xyes" && test "x$have_v4l$have_v4l2" = "xnono"; then
+--- src/input/input_v4l.c	2010-03-09 23:17:05.000000000 +0100
++++ src/input/input_v4l.c	2011-07-07 10:46:27.694089788 +0200
 @@ -47,7 +47,7 @@
  */
  #define _LINUX_TIME_H

xine-lib-various-noncrippled.diff Added

README.SuSE Added

@@ -0,0 +1,26 @@
+For legal reasons this version of xine has limited functionality. Here is
+a list of what has been disabled:
+
+AC3 and AC4.1 sound decoding. Probably patented. Maybe legal if it is not labeled as XX-Y.
+ASF parsing. Patented.
+Closed Captioning Decoder (EIA-608). Probably patented.
+GSM 610 decoding. Patented.
+MPEG-4 (FFMPEG) codecs. Patented.
+MS Video-1. Used in AVI and ASF. AVI is okay, ASF is not.
+Sorenson video codec. Reverse engineering, no legal expertise.
+Direct Hardware Access. Uncertain legal status.
+
+Freeware Advanced Audio Decoder. No legal expertise.
+Interplay DPCM Audio Decoder. No legal expertise.
+Interplay MVE File Video Decoder. No legal expertise.
+NES Music File Format. No legal expertise.
+Origin's Wing Commander III MVE format. No legal expertise.
+SPU DVD subtitles. No legal expertise.
+
+CSS decoding needs extra library (libdvdcss), which is not part of SuSE Linux
+
+Advanced users can build an RPM package and install also the additional
+"libxine1-codecs" rpm, which contains all protected codecs.
+
+See also
+http://www.opensuse.org/XINE#Legal_Matters

baselibs.conf Changed

precheckin_cripple_tarball.sh Added

@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# The following source parts of xine-lib may not be distributed for legal
+# reasons.
+# Thus we have to cripple the source tree in a way that it still builds.
+
+#
+# Helpers
+#
+
+# $1: files $2: entries $3: prefix $4: postfix
+do_nukeentry() {
+for d in $1 ; do
+ perl -i -e 'undef $/; $_=<>; for $e (qw|'"$2"'|) { s|(?<=[^-a-zA-Z0-9_./])'"$3"'$e'"$4"'(?=[^-a-zA-Z0-9_./])||g }; print' $d
+done
+}
+
+# $1: files $2: entries $3: prefix $4: postfix
+do_nukeline() {
+for d in $1 ; do
+ perl -i -e 'undef $/; $_=<>; for $e (qw|'"$2"'|) { s|^.*(?<=[^-a-zA-Z0-9_./])'"$3"'$e'"$4"'(?=[^-a-zA-Z0-9_./]).*$||mg }; print' $d
+done
+}
+
+# $1: dir $2: files/dirs
+do_remove() {
+pushd "$1" >/dev/null || exit 1
+rm -rf $2
+popd >/dev/null
+}
+
+#
+# Main
+#
+
+# Find source tarball + unpack
+
+tmp="/`mktemp -d`"
+trap 'rm -rf $tmp; echo 1>&2 "$0 failed"' EXIT
+test -d "$tmp" -a -w "$tmp" || exit
+tarsource="`echo xine-lib-*[0-9].tar.bz2`"
+if [ ! -s "$tarsource" ] ; then
+ echo "Error: cannot find source tarball"
+ exit 1
+fi
+tarbase="${tarsource%.tar.bz2}"
+tardest="$tarbase-crippled.tar.bz2"
+
+rm -rf xine-lib-*-crippled.tar.bz2
+echo 1>&2 "Unpacking..."
+tar -C "$tmp" -xjf $tarsource || exit 1
+
+pushd $tmp/$tarbase >/dev/null || exit 1
+
+#
+# Cripple source
+#
+
+echo 1>&2 "Crippling..."
+
+c_subdirs="dxr3 liba52 libdts libfaad libffmpeg libmad libmpeg2 libspucc libspudec libspudvb libw32dll input/vcd libxineadec/gsm610 libxineadec/nosefart combined/ffmpeg"
+c_demuxers="xineplug_dmx_asf.la asfheader.h asfheader.c demux_asf.c xineplug_dmx_mpeg.la demux_mpeg.c xineplug_dmx_mpeg_block.la demux_mpeg_block.c xineplug_dmx_mpeg_ts.la demux_ts.c xineplug_dmx_mpeg_elem.la demux_elem.c xineplug_dmx_mpeg_pes.la demux_mpeg_pes.c xineplug_dmx_yuv4mpeg2.la demux_yuv4mpeg2.c"
+c_input="xineplug_inp_mms.la input_mms.c mms.c mmsh.c ../demuxers/asfheader.c mms.h mmsh.h xineplug_inp_vcdo.la input_vcd.c vcd"
+c_libxineadec="xineplug_decode_gsm610.la xineplug_decode_nsf.la gsm610.c nsf.c gsm610 nosefart"
+
+cp src/libffmpeg/libavcodec/libpostproc/mangle.h src/post/deinterlace/plugins/
+
+do_nukeentry src/Makefile.am "$c_subdirs"
+do_nukeentry configure.ac "$c_subdirs" "src/" "/[a-zA-Z0-9_./]*Makefile"
+do_remove src "$c_subdirs"
+do_nukeentry src/demuxers/Makefile.am "$c_demuxers"
+do_remove src/demuxers "$c_demuxers"
+do_nukeentry src/input/Makefile.am "$c_input"
+do_remove src/input "$c_input"
+do_nukeentry src/libxineadec/Makefile.am "$c_libxineadec"
+do_remove src/libxineadec "$c_libxineadec"
+do_nukeentry src/combined/Makefile.am "ffmpeg"
+do_remove src/combined "ffmpeg"
+do_nukeentry src/post/planar/Makefile.am "pp\.c \S*/libpostproc/libpostprocess\.la"
+do_nukeline src/post/planar/planar.c "pp_init_plugin pp_special_info"
+do_remove src/post/planar "pp.c"
+
+echo 1>&2 "Autotools..."
+autoreconf -fi || exit 1
+
+#
+# Create new (crippled) source tarball
+#
+
+popd >/dev/null
+
+tar --owner=root --group=root -C $tmp -cjf $tardest $tarbase || exit 1
+rm -rf $tmp
+
+echo 1>&2 ""
+echo 1>&2 "Successfully crippled tarball. :-("
+echo 1>&2 ""
+
+rm -rf $tmp
+trap - EXIT
+exit 0
+#EOF

xine-lib-1.1.20.1-crippled.tar.bz2 Added

xine-lib-1.2.1.tar.bz2 -> xine-lib-1.1.20.1.tar.bz2 Changed