[rpms/xine-lib] epel9-next: * Fri Jan 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.1-1

[Rex Dieter <rdieter@fedoraproject.org>]

            A new commit has been pushed.

            Repo   : rpms/xine-lib
            Branch : epel9-next
            Commit : 831b4c0a6ce959d76279ed2f9d4d79153c2895ee
            Author : Rex Dieter <rdieter@fedoraproject.org>
            Date   : 2009-01-23T14:32:05+00:00
            Stats  : +39/-7 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/xine-lib/c/831b4c0a6ce959d76279ed2f9d4d79153c2895ee?branch=epel9-next

            Log:
            * Fri Jan 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.1-1
- xine-lib-1.1.16.1
- include avsync patch (#470568)

---
diff --git a/.cvsignore b/.cvsignore
index 606b324..34a3b02 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-xine-lib-1.1.16-autotools.patch.bz2
-xine-lib-1.1.16-pruned.tar.bz2
+xine-lib-1.1.16.1-autotools.patch.bz2
+xine-lib-1.1.16.1-pruned.tar.bz2

diff --git a/sources b/sources
index f89d6ad..9a7e9c8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fe8148f2a0ec7b2e75ad509e8086e33f  xine-lib-1.1.16-autotools.patch.bz2
-512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-pruned.tar.bz2
+e3e061f93f36eae910b66cb0c973dbb8  xine-lib-1.1.16.1-autotools.patch.bz2
+aa1265b1007086c0906ec8134cfeacf6  xine-lib-1.1.16.1-pruned.tar.bz2

diff --git a/xine-lib-1.1.15-avsync_hack.patch b/xine-lib-1.1.15-avsync_hack.patch
new file mode 100644
index 0000000..f33aba4
--- /dev/null
+++ b/xine-lib-1.1.15-avsync_hack.patch
@@ -0,0 +1,22 @@
+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);
+ 

diff --git a/xine-lib.spec b/xine-lib.spec
index 04f68fc..c8a0f1a 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -33,8 +33,8 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.16
-Release:        2%{?dist}
+Version:        1.1.16.1
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,7 +50,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
+# FIXME for 1.1.16.1 ?
 Patch7:         %{name}-1.1.16-old-caca.patch
+# http://bugzilla.redhat.com/470568
+Patch8:         xine-lib-1.1.15-avsync_hack.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
@@ -73,7 +76,7 @@ BuildRequires:  aalib-devel >= 1.4
 %if 0%{?old_caca}
 BuildRequires:  libcaca-devel >= 0.99
 %else
-BuildRequires:  libcaca-devel >= 0.99-0.5.beta16
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta14
 %endif
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
@@ -192,10 +195,13 @@ 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
+
 %if 0%{?old_caca}
 %patch7 -p0 -b .old-caca
 %endif
 
+%patch8 -p1 -b .avsync_hack
+
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -428,6 +434,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.1-1
+- xine-lib-1.1.16.1
+- include avsync patch (#470568)
+
 * Sun Jan 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16-2
 - drop deepbind patch (#480504)
 - caca support (EPEL)