rpms/xine-lib/devel xine-lib-1.1.9.1-aoclose-429182.patch, NONE, 1.1 xine-lib.spec, 1.30, 1.31

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.9.1-aoclose-429182.patch 
Log Message:
Sync with F-8.

xine-lib-1.1.9.1-aoclose-429182.patch:

--- NEW FILE xine-lib-1.1.9.1-aoclose-429182.patch ---
http://thread.gmane.org/gmane.comp.video.xine.devel/17682

diff -up xine-lib-1.1.9.1/src/xine-engine/audio_out.c~ xine-lib-1.1.9.1/src/xine-engine/audio_out.c
--- xine-lib-1.1.9.1/src/xine-engine/audio_out.c~	2008-01-01 15:30:09.000000000 +0200
+++ xine-lib-1.1.9.1/src/xine-engine/audio_out.c	2008-01-20 11:46:40.000000000 +0200
@@ -1612,11 +1612,13 @@ static void ao_close(xine_audio_port_t *
     xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_out: no streams left, closing driver\n");
 
     if (this->audio_loop_running) {
+#if 0
       if (this->clock->speed == XINE_SPEED_PAUSE ||
           (this->clock->speed != XINE_FINE_SPEED_NORMAL && !this->slow_fast_audio)) {
         /* discard buffers, otherwise we'll wait forever */
         ao_set_property(this_gen, AO_PROP_DISCARD_BUFFERS, 1);
       }
+#endif
       /* make sure there are no more buffers on queue */
       fifo_wait_empty(this->out_fifo);
     }


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xine-lib.spec	12 Jan 2008 11:21:23 -0000	1.30
+++ xine-lib.spec	23 Jan 2008 17:04:56 -0000	1.31
@@ -33,7 +33,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.9.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -46,6 +46,7 @@
 # autotools patch created with source2
 Patch0:         %{name}-%{version}-autotools.patch.bz2
 Patch1:         %{name}-1.1.4-optflags.patch
+Patch2:         %{name}-1.1.9.1-aoclose-429182.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
 Patch7:         %{name}-1.1.5-multilib-devel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -161,6 +162,7 @@
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch1 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
+%patch2 -p1 -b .aoclose
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 %patch7 -p0 -b .multilib-devel
@@ -168,6 +170,9 @@
 # Avoid standard rpaths on lib64 archs:
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
+# Quick and dirty fix for #429487, check if still needed in > 1.1.9.1:
+sed -i -e 's/^\(Version:\s*\).*/\1%{version}/i' misc/libxine.pc.in
+
 
 %build
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
@@ -386,6 +391,12 @@
 
 
 %changelog
+* Mon Jan 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-3
+- Fix version number in libxine.pc (#429487).
+
+* Sun Jan 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-2
+- Disable upstream "discard buffers on ao close" 1.1.9 changeset (#429182).
+
 * Sat Jan 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-1
 - 1.1.9.1 (security update).