rpms/xine-lib/devel xine-lib-1.1.15-avsync_hack.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 sources, 1.20, 1.21 xine-lib.spec, 1.60, 1.61
Rex Dieter
rdieter at fedoraproject.org
Fri Jan 23 14:32:35 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4996
Modified Files:
.cvsignore sources xine-lib.spec
Added Files:
xine-lib-1.1.15-avsync_hack.patch
Log Message:
* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1
- xine-lib-1.1.16.1
- include avsync patch (#470568)
xine-lib-1.1.15-avsync_hack.patch:
--- NEW FILE xine-lib-1.1.15-avsync_hack.patch ---
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);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 7 Jan 2009 19:18:46 -0000 1.18
+++ .cvsignore 23 Jan 2009 14:32:05 -0000 1.19
@@ -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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 7 Jan 2009 19:56:48 -0000 1.20
+++ sources 23 Jan 2009 14:32:05 -0000 1.21
@@ -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
Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xine-lib.spec 18 Jan 2009 22:33:17 -0000 1.60
+++ xine-lib.spec 23 Jan 2009 14:32:05 -0000 1.61
@@ -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 @@
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 @@
%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 @@
# 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 @@
%changelog
+* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1
+- xine-lib-1.1.16.1
+- include avsync patch (#470568)
+
* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
- drop deepbind patch (#480504)
- caca support (EPEL)
More information about the fedora-extras-commits
mailing list