rpms/xine-lib/EL-6 xine-lib-1.1.17-avsync_hack.patch, NONE, 1.1 xine-lib-1.1.18.1-no_autopoint.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.23, 1.24 xine-lib-mk-autotools-patch.sh, 1.4, 1.5 xine-lib.spec, 1.78, 1.79 xine-lib-1.1.15-avsync_hack.patch, 1.1, NONE xine-lib-1.1.16.3-mod_mimetypes_typo.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Mon Jun 21 12:32:46 UTC 2010
- Previous message: File evolution-mapi-0.30.2.1.tar.bz2 uploaded to lookaside cache by mcrha
- Next message: rpms/xine-lib/F-12 xine-lib-1.1.17-avsync_hack.patch, NONE, 1.1 xine-lib-1.1.18.1-no_autopoint.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.23, 1.24 xine-lib-mk-autotools-patch.sh, 1.4, 1.5 xine-lib.spec, 1.78, 1.79 xine-lib-1.1.15-avsync_hack.patch, 1.1, NONE xine-lib-1.1.16.3-mod_mimetypes_typo.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/xine-lib/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17685
Modified Files:
.cvsignore sources xine-lib-mk-autotools-patch.sh
xine-lib.spec
Added Files:
xine-lib-1.1.17-avsync_hack.patch
xine-lib-1.1.18.1-no_autopoint.patch
Removed Files:
xine-lib-1.1.15-avsync_hack.patch
xine-lib-1.1.16.3-mod_mimetypes_typo.patch
Log Message:
* Sun Mar 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18.1-1
- xine-lib-1.1.18.1
xine-lib-1.1.17-avsync_hack.patch:
audio_out.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE xine-lib-1.1.17-avsync_hack.patch ---
diff -up xine-lib-1.1.17/src/xine-engine/audio_out.c.avsync_hack xine-lib-1.1.17/src/xine-engine/audio_out.c
--- xine-lib-1.1.17/src/xine-engine/audio_out.c.avsync_hack 2009-11-30 19:33:30.000000000 -0600
+++ xine-lib-1.1.17/src/xine-engine/audio_out.c 2009-12-02 09:07:37.622805780 -0600
@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) {
/*
* 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);
xine-lib-1.1.18.1-no_autopoint.patch:
autogen.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE xine-lib-1.1.18.1-no_autopoint.patch ---
diff -up xine-lib-1.1.17/autogen.sh.no_autopoint xine-lib-1.1.17/autogen.sh
--- xine-lib-1.1.17/autogen.sh.no_autopoint 2009-10-09 09:33:31.000000000 -0500
+++ xine-lib-1.1.17/autogen.sh 2009-12-02 09:15:48.534555467 -0600
@@ -229,10 +229,10 @@ run_aclocal () {
echo
fi
- echo $_echo_n " + Running autopoint: $_echo_c"
+ #echo $_echo_n " + Running autopoint: $_echo_c"
- autopoint
- echo "done."
+ #autopoint
+ #echo "done."
echo $_echo_n " + Running aclocal: $_echo_c"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-6/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 3 Apr 2009 17:07:18 -0000 1.21
+++ .cvsignore 21 Jun 2010 12:32:45 -0000 1.22
@@ -1,2 +1,2 @@
-xine-lib-1.1.16.3-autotools.patch.bz2
-xine-lib-1.1.16.3-pruned.tar.bz2
+xine-lib-1.1.18.1-autotools.patch.bz2
+xine-lib-1.1.18.1-pruned.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-6/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources 3 Apr 2009 17:07:18 -0000 1.23
+++ sources 21 Jun 2010 12:32:45 -0000 1.24
@@ -1,2 +1,2 @@
-e50122a9323107564d58056b35256610 xine-lib-1.1.16.3-autotools.patch.bz2
-0cac86b7d74c1dcaa22f5a8cbc5ef578 xine-lib-1.1.16.3-pruned.tar.bz2
+e2c45d451fd9d8ad3be680237ff5bcdf xine-lib-1.1.18.1-autotools.patch.bz2
+55de212f416d9d366cad7520ccd7a539 xine-lib-1.1.18.1-pruned.tar.bz2
Index: xine-lib-mk-autotools-patch.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-6/xine-lib-mk-autotools-patch.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xine-lib-mk-autotools-patch.sh 10 Feb 2009 23:03:37 -0000 1.4
+++ xine-lib-mk-autotools-patch.sh 21 Jun 2010 12:32:46 -0000 1.5
@@ -23,6 +23,7 @@ tar jxf xine-lib-$version-pruned.tar.bz2
cp -a xine-lib-$version xine-lib-$version-pruned
pushd xine-lib-$version
+patch -p1 < ../xine-lib-${version}-no_autopoint.patch
# extra work for to omit old libtool-related crud
rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
./autogen.sh noconfig
Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-6/xine-lib.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- xine-lib.spec 30 Nov 2009 14:10:33 -0000 1.78
+++ xine-lib.spec 21 Jun 2010 12:32:46 -0000 1.79
@@ -1,10 +1,9 @@
# TODO, sometime, maybe:
# - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
# - drop the opengl video out plugin?
-# http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
# - deprecate ESD support?
-%define plugin_abi 1.26
+%define plugin_abi 1.28
%define codecdir %{_libdir}/codecs
%ifarch %{ix86}
@@ -14,13 +13,15 @@
%endif # ix86
%if 0%{?fedora}
- %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
- %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
- %define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1}
+%define _enable_v4l --enable-v4l --enable-libv4l
+%define _disable_gnomevfs --disable-gnomevfs
+%define with_aalib %{?_without_aalib:0}%{!?_without_aalib: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_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
- %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0}
+%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
+%define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+%define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0}
%endif # Fedora
%if 0%{?fedora} > 8 || 0%{?rhel} > 5
@@ -33,41 +34,45 @@
Summary: A multimedia engine
Name: xine-lib
-Version: 1.1.16.3
-Release: 5%{?dist}
+Version: 1.1.18.1
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://www.xine-project.org/
# The tarball is generated from the upstream tarball using
# the script in SOURCE1. It prunes potentially patented code
#Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
-Source0: %{name}-%{version}-pruned.tar.bz2
-Source1: %{name}-cleanup-sources.sh
-Source2: %{name}-mk-autotools-patch.sh
+Source0: xine-lib-%{version}-pruned.tar.bz2
+Source1: xine-lib-cleanup-sources.sh
+Source2: xine-lib-mk-autotools-patch.sh
# autotools patch created with source2
-Patch0: %{name}-%{version}-autotools.patch.bz2
+Patch0: xine-lib-%{version}-autotools.patch.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: %{name}-1.1.4-optflags.patch
-Patch6: %{name}-1.1.1-deepbind-939.patch
+Patch1: xine-lib-1.1.4-optflags.patch
+# used to help
+Patch2: xine-lib-%{version}-no_autopoint.patch
+Patch6: xine-lib-1.1.1-deepbind-939.patch
# http://bugzilla.redhat.com/470568
-Patch8: xine-lib-1.1.15-avsync_hack.patch
+Patch8: xine-lib-1.1.17-avsync_hack.patch
# http://bugzilla.redhat.com/477226
Patch9: xine-lib-1.1.16.2-multilib.patch
## upstreamable patches
-Patch50: xine-lib-1.1.16.3-mod_mimetypes_typo.patch
## upstream patches
-Provides: xine-lib(plugin-abi) = %{plugin_abi}
-%if "%{?_isa}" != "%{nil}"
-Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
-%endif
+Provides: xine-lib(plugin-abi) = %{plugin_abi}
+%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
+
+BuildRequires: automake libtool
# X11
BuildRequires: libX11-devel
BuildRequires: libXv-devel
BuildRequires: libXinerama-devel
BuildRequires: libXvMC-devel
BuildRequires: libGLU-devel
+%if 0%{?_enable_v4l:1}
+BuildRequires: libv4l-devel
+%endif
%if %{with_xcb}
BuildRequires: libxcb-devel
%endif # xcb
@@ -110,7 +115,6 @@ BuildRequires: wavpack-devel
BuildRequires: libcdio-devel
# Other
BuildRequires: pkgconfig
-BuildRequires: gnome-vfs2-devel
BuildRequires: gtk2-devel
%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: libsmbclient-devel
@@ -133,39 +137,32 @@ common multimedia formats available - an
%package devel
Summary: Xine library development files
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
Requires: zlib-devel
-
%description devel
This package contains development files for %{name}.
%package arts
Summary: aRts plugin for %{name}
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
#Requires: xine-lib(plugin-abi) = %{plugin_abi}
-# -arts was split off the -extras subpackage at 1.1.7-3
-Obsoletes: xine-lib-extras < 1.1.7-3
-
%description arts
This package contains the aRts plugin for %{name}.
%package pulseaudio
Summary: Pulseaudio plugin for %{name}
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description pulseaudio
This package contains the pulseaudio plugin for %{name}.
-
%package extras
Summary: Additional plugins for %{name}
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
#Requires: xine-lib(plugin-abi) = %{plugin_abi}
-
%description extras
This package contains extra plugins for %{name}:
- EsounD
@@ -196,12 +193,14 @@ touch -r m4/optimizations.m4.stamp m4/op
# 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
-
%patch8 -p1 -b .avsync_hack
%patch9 -p1 -b .multilib
-%patch50 -p1 -b .mod_mimetypes_typo
-# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
+# autotools patch + touch'ing above seems to miss something, aclocal
+# runs on make anyway, let's use the ./autogen.sh hammer for now.
+./autogen.sh noconfig
+
+#Avoid standard rpaths on lib64 archs: (autotools patch handles this too)
#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -217,6 +216,8 @@ export SDL_CFLAGS="$(sdl-config --cflags
%if 0%{!?_without_directfb:1}
--enable-directfb \
%endif # directfb
+ %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l --disable-libv4l} \
+ %{?_disable_gnomevfs} \
--disable-a52dec \
--disable-mad \
--disable-vcd \
@@ -314,7 +315,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so
-%ifarch %ix86
+%ifarch %{ix86}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so
%endif # ix86
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_real.so
@@ -324,6 +325,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucc.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucmml.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spudvb.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spuhdmv.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_sputext.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so
@@ -367,6 +369,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_none.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
@@ -408,7 +411,6 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{!?_without_imagemagick:1}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so
%endif # imagemagick
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_gnome_vfs.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so
%if %{with_aalib}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so
@@ -435,6 +437,24 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Mar 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18.1-1
+- xine-lib-1.1.18.1
+
+* Sun Mar 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18-2
+- rebuild (ImageMagick)
+
+* Wed Feb 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18-1
+- xine-lib-1.1.18, plugin-abi 1.28 (#567913)
+
+* Sat Dec 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.17-3
+- bump flac_decoder priority (rh#301861,xine#225)
+
+* Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 1.1.17-2
+- Remove gnome-vfs2 plugin, it's mostly useless
+
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.17-1
+- xine-lib-1.1.17, plugin-abi 1.27
+
* Sun Nov 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.3-5
- move -pulseaudio into main pkg (f12+)
- update URL
--- xine-lib-1.1.15-avsync_hack.patch DELETED ---
--- xine-lib-1.1.16.3-mod_mimetypes_typo.patch DELETED ---
- Previous message: File evolution-mapi-0.30.2.1.tar.bz2 uploaded to lookaside cache by mcrha
- Next message: rpms/xine-lib/F-12 xine-lib-1.1.17-avsync_hack.patch, NONE, 1.1 xine-lib-1.1.18.1-no_autopoint.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.23, 1.24 xine-lib-mk-autotools-patch.sh, 1.4, 1.5 xine-lib.spec, 1.78, 1.79 xine-lib-1.1.15-avsync_hack.patch, 1.1, NONE xine-lib-1.1.16.3-mod_mimetypes_typo.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list