* Wed Dec 02 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.17-1

- xine-lib-1.1.17, plugin-abi 1.27

.cvsignore

@@ -1,2 +1,2 @@
-xine-lib-1.1.16.3-autotools.patch.bz2
+xine-lib-1.1.17-pruned.tar.bz2
-xine-lib-1.1.16.3-pruned.tar.bz2
+xine-lib-1.1.17-autotools.patch.bz2

sources

@@ -1,2 +1,2 @@
-e50122a9323107564d58056b35256610  xine-lib-1.1.16.3-autotools.patch.bz2
+4c2655e0c12520b1e6e78a72d59a62ce  xine-lib-1.1.17-pruned.tar.bz2
-0cac86b7d74c1dcaa22f5a8cbc5ef578  xine-lib-1.1.16.3-pruned.tar.bz2
+f4282ee36447d94765d89d06787012be  xine-lib-1.1.17-autotools.patch.bz2

xine-lib-1.1.15-avsync_hack.patch

@@ -1,22 +0,0 @@
-diff -uNr xine-lib-1.1.15.orig/src/xine-engine/audio_out.c xine-lib-1.1.15/src/xine-engine/audio_out.c
---- xine-lib-1.1.15.orig/src/xine-engine/audio_out.c	2008-07-10 18:19:10.000000000 +0200
-+++ xine-lib-1.1.15/src/xine-engine/audio_out.c	2009-01-10 21:57:20.000000000 +0100
-@@ -1151,8 +1151,17 @@
-   
-     /*
-      * calculate gap:
-+     *
-+     * HACK (rwa): If we have no video stream we do not need an AV sync and so
-+     *             we assume a gap of 0. This seems to avoid the skips in the
-+     *             first seconds when playing audio-only via the "glitch-free"
-+     *             pulseaudio server.
-      */
--    gap = in_buf->vpts - hw_vpts;
-+    if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) {
-+	gap = in_buf->vpts - hw_vpts;
-+    } else {
-+	gap = 0;
-+    }
-     lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n",
-              hw_vpts, in_buf->vpts, gap);
- 

xine-lib-1.1.16.3-mod_mimetypes_typo.patch

@@ -1,20 +0,0 @@
-diff -up xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo xine-lib-1.1.16.3/src/demuxers/demux_mod.c
---- xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo	2009-03-25 14:28:40.000000000 -0500
-+++ xine-lib-1.1.16.3/src/demuxers/demux_mod.c	2009-04-10 10:15:04.000000000 -0500
-@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_
-          "audio/x-s3m: s3m: ScreamTracker 3 Module;"
-          "audio/s3m: s3m: ScreamTracker 3 Module;"
-          "application/playerpro: 669: 669 Tracker Module;"
--         "application/adrift; amf: ADRIFT Module File;"
--         "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;"
--         "audio/x-amf; amf: ADRIFT Module File;"
--         "audio/x-xm; xm: FastTracker II Audio;"
--         "audio/xm; xm: FastTracker II Audio;";
-+         "application/adrift: amf: ADRIFT Module File;"
-+         "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;"
-+         "audio/x-amf: amf: ADRIFT Module File;"
-+         "audio/x-xm: xm: FastTracker II Audio;"
-+         "audio/xm: xm: FastTracker II Audio;";
- }
- 
- static void class_dispose (demux_class_t *this_gen) {

xine-lib-mk-autotools-patch.sh

@@ -23,6 +23,7 @@ tar jxf xine-lib-$version-pruned.tar.bz2
 cp -a xine-lib-$version xine-lib-$version-pruned
 
 pushd xine-lib-$version
+patch -p1 < ../xine-lib-${version}-no_autopoint.patch
 # extra work for to omit old libtool-related crud
 rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
 ./autogen.sh noconfig

xine-lib.spec

@@ -1,10 +1,9 @@
 # TODO, sometime, maybe:
 # - libstk:  http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
 # - drop the opengl video out plugin?
-#   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
 # - deprecate ESD support?
 
-%define         plugin_abi  1.26
+%define         plugin_abi  1.27
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -33,35 +32,36 @@
 
 Summary:        A multimedia engine 
 Name:           xine-lib
-Version:        1.1.16.3
+Version:        1.1.17
-Release:        5%{?dist}
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.xine-project.org/ 
 # The tarball is generated from the upstream tarball using
 # the script in SOURCE1. It prunes potentially patented code
 #Source0:        http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
-Source0:        %{name}-%{version}-pruned.tar.bz2
+Source0:        xine-lib-%{version}-pruned.tar.bz2
-Source1:        %{name}-cleanup-sources.sh
+Source1:        xine-lib-cleanup-sources.sh
-Source2:        %{name}-mk-autotools-patch.sh
+Source2:        xine-lib-mk-autotools-patch.sh
 # autotools patch created with source2
-Patch0:         %{name}-%{version}-autotools.patch.bz2
+Patch0:         xine-lib-%{version}-autotools.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:         %{name}-1.1.4-optflags.patch
+Patch1:         xine-lib-1.1.4-optflags.patch
-Patch6:         %{name}-1.1.1-deepbind-939.patch
+# used to help 
+Patch2:         xine-lib-1.1.17-no_autopoint.patch
+Patch6:         xine-lib-1.1.1-deepbind-939.patch
 # http://bugzilla.redhat.com/470568
-Patch8:         xine-lib-1.1.15-avsync_hack.patch
+Patch8:         xine-lib-1.1.17-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
 Patch9:         xine-lib-1.1.16.2-multilib.patch
 ## upstreamable patches
-Patch50:        xine-lib-1.1.16.3-mod_mimetypes_typo.patch
 ## upstream patches
 
-Provides:       xine-lib(plugin-abi) = %{plugin_abi}
+Provides:         xine-lib(plugin-abi) = %{plugin_abi}
-%if "%{?_isa}" != "%{nil}"
+%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
-Provides:       xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
+
-%endif
+BuildRequires:  automake libtool
 # X11
 BuildRequires:  libX11-devel
 BuildRequires:  libXv-devel
@@ -133,39 +133,32 @@ common multimedia formats available - and some uncommon formats, too.
 %package        devel
 Summary:        Xine library development files
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       zlib-devel
-
 %description    devel
 This package contains development files for %{name}.
 
 %package        arts
 Summary:        aRts plugin for %{name} 
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 #Requires:      xine-lib(plugin-abi) = %{plugin_abi}
-# -arts was split off the -extras subpackage at 1.1.7-3
-Obsoletes:      xine-lib-extras < 1.1.7-3
-
 %description    arts
 This package contains the aRts plugin for %{name}.
 
 %package        pulseaudio
 Summary:        Pulseaudio plugin for %{name} 
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
-
 %description    pulseaudio
 This package contains the pulseaudio plugin for %{name}.
 
-
 %package        extras
 Summary:        Additional plugins for %{name} 
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 #Requires:      xine-lib(plugin-abi) = %{plugin_abi}
-
 %description    extras
 This package contains extra plugins for %{name}:
   - EsounD
@@ -196,12 +189,14 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # needed at least when compiling with external ffmpeg and internal faad livna bug#939.
 # see also http://bugzilla.redhat.com/480504 for side-effects
 #patch6 -p1 -b .deepbind
-
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
-%patch50 -p1 -b .mod_mimetypes_typo
 
-# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
+# autotools patch + touch'ing above seems to miss something, aclocal
+# runs on make anyway, let's use the ./autogen.sh hammer for now.
+./autogen.sh noconfig
+
+#Avoid standard rpaths on lib64 archs: (autotools patch handles this too)
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
 
@@ -314,7 +309,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so
-%ifarch %ix86
+%ifarch %{ix86}
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so
 %endif # ix86
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_real.so
@@ -324,6 +319,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucc.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucmml.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spudvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spuhdmv.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_sputext.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so
@@ -435,6 +431,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 02 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.17-1
+- xine-lib-1.1.17, plugin-abi 1.27
+
 * Sun Nov 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.3-5
 - move -pulseaudio into main pkg (f12+)
 - update URL