rpms/xine-lib/devel .cvsignore, 1.15, 1.16 sources, 1.16, 1.17 xine-lib.spec, 1.39, 1.40 xine-lib-1.1.11.1-mkv.patch, 1.1, NONE xine-lib-1.1.11.1-qt.patch, 1.1, NONE xine-pulse-rework2.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17025

Modified Files:
	.cvsignore sources xine-lib.spec 
Removed Files:
	xine-lib-1.1.11.1-mkv.patch xine-lib-1.1.11.1-qt.patch 
	xine-pulse-rework2.patch 
Log Message:
* 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Mar 2008 18:50:26 -0000	1.15
+++ .cvsignore	16 Apr 2008 21:05:40 -0000	1.16
@@ -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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Mar 2008 18:50:26 -0000	1.16
+++ sources	16 Apr 2008 21:05:40 -0000	1.17
@@ -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


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xine-lib.spec	9 Apr 2008 19:36:16 -0000	1.39
+++ xine-lib.spec	16 Apr 2008 21:05:40 -0000	1.40
@@ -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 @@
 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 @@
 # 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 @@
 %{_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 @@
 %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.


--- xine-lib-1.1.11.1-mkv.patch DELETED ---


--- xine-lib-1.1.11.1-qt.patch DELETED ---


--- xine-pulse-rework2.patch DELETED ---