rpms/xine-lib/F-10 xine-lib-1.1.15-avsync_hack.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 sources, 1.19, 1.20 xine-lib.spec, 1.53, 1.54

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16886

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/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Jan 2009 20:22:35 -0000	1.18
+++ .cvsignore	23 Jan 2009 19:24:55 -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/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	7 Jan 2009 20:22:35 -0000	1.19
+++ sources	23 Jan 2009 19:24:55 -0000	1.20
@@ -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/F-10/xine-lib.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xine-lib.spec	18 Jan 2009 21:40:56 -0000	1.53
+++ xine-lib.spec	23 Jan 2009 19:24:55 -0000	1.54
@@ -19,12 +19,10 @@
 
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
-    %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
     %define     with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
-    %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif # Fedora
@@ -35,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/
@@ -52,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}
@@ -72,13 +73,11 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if %{with_caca}
 %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
-%endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
 %endif # directfb
@@ -125,7 +124,7 @@
 disk drives, and displays multimedia streamed over the Internet. It
 interprets many of the most common multimedia formats available - and some
 of the most uncommon formats, too.  --with/--without rpmbuild options
-(some default values depend on target distribution): aalib, caca, directfb,
+(some default values depend on target distribution): aalib, directfb,
 imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb.
 
 %package        devel
@@ -177,9 +176,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if %{with_caca}
   - Libcaca
-%endif # caca
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
 %endif # imagemagick
@@ -198,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
 
@@ -226,6 +226,7 @@
 %if 0%{?_with_freetype:1}
 %if 0%{?_with_antialiasing:1}
     --enable-antialiasing \
+    --with-caca \
 %endif # antialiasing
     --with-freetype \
     --with-fontconfig \
@@ -411,9 +412,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if %{with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
-%endif # caca
 %if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so
@@ -435,8 +434,13 @@
 
 
 %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)
 
 * Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
 - patch for old libcaca in F9-