* Wed Apr 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1

- 1.1.12 (plugin ABI 1.21); qt, mkv, and pulseaudio patches applied upstream.

.cvsignore

@@ -1,2 +1,2 @@
-xine-lib-1.1.11.1-pruned.tar.bz2
-xine-lib-1.1.11.1-autotools.patch.bz2
+xine-lib-1.1.12-pruned.tar.bz2
+xine-lib-1.1.12-autotools.patch.bz2

sources

@@ -1,2 +1,2 @@
-b6a4fe9dd2ec80452870a8bfbb3974f0  xine-lib-1.1.11.1-pruned.tar.bz2
-c257bf0b964d25592f1c612149ae2c7a  xine-lib-1.1.11.1-autotools.patch.bz2
+3f918af93f52e486fb8fd4dfec04f98f  xine-lib-1.1.12-pruned.tar.bz2
+771565628e4dfcfc8657b1256b9f41ef  xine-lib-1.1.12-autotools.patch.bz2

xine-lib-1.1.11.1-mkv.patch

@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1207353205 -3600
-# Node ID ff20b8db74eabc74b7b95da4c1b44fc5d7f2ec8c
-# Parent 05ebc886fd30158b59a26e03cf2f6f3a52114b24
-Fix a regression in the Matroska demuxer.
-One '&'...
-
---- a/src/demuxers/ebml.c	Fri Apr 04 18:35:33 2008 +0100
-+++ b/src/demuxers/ebml.c	Sat Apr 05 00:53:25 2008 +0100
-@@ -327,7 +327,7 @@ char *ebml_alloc_read_ascii (ebml_parser
-   if (text)
-   {
-     text[elem->len] = '\0';
--    if (ebml_read_ascii (ebml, &elem, text))
-+    if (ebml_read_ascii (ebml, elem, text))
-       return text;
-     free (text);
-   }
-

xine-lib-1.1.11.1-qt.patch

@@ -1,23 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1206976103 -3600
-# Node ID d8e1305c13820b82d896f7bc77d196b9c9645dd6
-# Parent 2cc583bdc498fd6c95b8a21c10e81a0cef4d63c6
-Revert a change which broke Quicktime atom parsing.
-
---- a/src/demuxers/demux_qt.c	Sun Mar 30 19:48:58 2008 +0100
-+++ b/src/demuxers/demux_qt.c	Mon Mar 31 16:08:23 2008 +0100
-@@ -895,11 +895,6 @@ static qt_error parse_trak_atom (qt_trak
-   for (i = ATOM_PREAMBLE_SIZE; i < trak_atom_size - 4; i++) {
-     current_atom_size = _X_BE_32(&trak_atom[i - 4]);	
-     current_atom = _X_BE_32(&trak_atom[i]);
--
--    if (current_atom_size > trak_atom_size - i) {
--      last_error = QT_NOT_A_VALID_FILE;
--      goto free_trak;
--    }
- 
-     if (current_atom == TKHD_ATOM) {
-       trak->flags = _X_BE_16(&trak_atom[i + 6]);
-

xine-lib.spec

@@ -8,7 +8,7 @@
 #    http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html
 # - external dvdnav - not compatible as of 1.1.11 and 4.1.1
 
-%define         abiver      1.20
+%define         abiver      1.21
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -31,8 +31,8 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.11.1
-Release:        3%{?dist}
+Version:        1.1.12
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -48,12 +48,6 @@ Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream patches
-# lennart said this was upstreamed already.  :)
-Patch100:       http://0pointer.de/public/xine-pulse-rework2.patch
-Patch101:       %{name}-1.1.11.1-mkv.patch
-Patch102:       %{name}-1.1.11.1-qt.patch
-
 Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
 BuildRequires:  libX11-devel
@@ -183,10 +177,6 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 
-%patch100 -p1 -b .pulse-rework2
-%patch101 -p1 -b .mkv
-%patch102 -p1 -b .qt
-
 # Avoid standard rpaths on lib64 archs:
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -348,6 +338,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_fb.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_none.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_opengl.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_raw.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so
@@ -398,15 +389,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc __docs/hackersguide/*
 %{_bindir}/xine-config
+%{_bindir}/xine-list*
 %{_datadir}/aclocal/xine.m4
 %{_includedir}/xine.h
 %{_includedir}/xine/
 %{_libdir}/libxine.so
 %{_libdir}/pkgconfig/libxine.pc
 %{_mandir}/man1/xine-config.1*
+%{_mandir}/man1/xine-list*.1*
 
 
 %changelog
+* Wed Apr 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1
+- 1.1.12 (plugin ABI 1.21); qt, mkv, and pulseaudio patches applied upstream.
+
 * Wed Apr  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-3
 - Apply upstream fixes for Quicktime (#441705) and Matroska regressions
   introduced in 1.1.11.1.