rpms/xine-lib/devel xine-lib-1.1.4-optflags.patch, NONE, 1.1 xine-lib-mk-autotools-patch.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xine-lib.spec, 1.8, 1.9 xine-lib-1.1.3-flac113.patch, 1.1, NONE xine-lib-1.1.3-optflags.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Wed Jan 31 19:59:00 UTC 2007
Author: scop
Update of /cvs/extras/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13176
Modified Files:
.cvsignore sources xine-lib.spec
Added Files:
xine-lib-1.1.4-optflags.patch xine-lib-mk-autotools-patch.sh
Removed Files:
xine-lib-1.1.3-flac113.patch xine-lib-1.1.3-optflags.patch
Log Message:
* Wed Jan 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-1
- 1.1.4, with wavpack and system libmpcdec support.
xine-lib-1.1.4-optflags.patch:
--- NEW FILE xine-lib-1.1.4-optflags.patch ---
--- xine-lib-1.1.4/m4/optimizations.m4~ 2006-06-17 18:20:56.000000000 +0300
+++ xine-lib-1.1.4/m4/optimizations.m4 2007-01-30 23:03:27.000000000 +0200
@@ -107,7 +107,7 @@
DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
- if test x"$sarchopt" != "xno"; then
+ if false ; then
archopt_val=
case "$host_or_hostalias" in
--- xine-lib-1.1.4/configure~ 2007-01-30 23:02:56.000000000 +0200
+++ xine-lib-1.1.4/configure 2007-01-30 23:03:40.000000000 +0200
@@ -47754,7 +47754,7 @@
DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
- if test x"$sarchopt" != "xno"; then
+ if false ; then
archopt_val=
case "$host_or_hostalias" in
--- NEW FILE xine-lib-mk-autotools-patch.sh ---
#!/bin/sh
# be sure to have all build deps + libtool installed before running this
set -e
if [ -z "$1" -o $# -ne 1 ]; then
echo "Usage: $0 <xine-lib-version>"
exit 2
fi
version=$1
rm -rf xine-lib-$version xine-lib-$version-pruned
tar jxf xine-lib-$version-pruned.tar.bz2
cp -a xine-lib-$version xine-lib-$version-pruned
cd xine-lib-$version
./autogen.sh noconfig
rm -rf autom4te.cache *~
cd ..
diff -Nru xine-lib-$version-pruned xine-lib-$version \
| bzip2 --best > xine-lib-$version-autotools.patch.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 17 Dec 2006 11:41:11 -0000 1.4
+++ .cvsignore 31 Jan 2007 19:58:30 -0000 1.5
@@ -1,2 +1,2 @@
-xine-lib-1.1.3-pruned.tar.bz2
-xine-lib-1.1.3-autotools.patch.bz2
+xine-lib-1.1.4-pruned.tar.bz2
+xine-lib-1.1.4-autotools.patch.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 17 Dec 2006 11:41:11 -0000 1.4
+++ sources 31 Jan 2007 19:58:30 -0000 1.5
@@ -1,2 +1,2 @@
-eff682745f198e1881773509f12c70c3 xine-lib-1.1.3-pruned.tar.bz2
-a58fce450d9288224caa413ad8bc1f8d xine-lib-1.1.3-autotools.patch.bz2
+81faabf1e38abed44639dbe4c76719f9 xine-lib-1.1.4-pruned.tar.bz2
+a916758545ed73a369f40648c7bc449c xine-lib-1.1.4-autotools.patch.bz2
Index: xine-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xine-lib.spec 18 Jan 2007 20:34:56 -0000 1.8
+++ xine-lib.spec 31 Jan 2007 19:58:30 -0000 1.9
@@ -1,29 +1,26 @@
# TODO, sometime, maybe:
# - libstk: http://www.libstk.net/
# - pulseaudio
+# - --enable-antialiasing?
%define codecdir %{_libdir}/codecs
Summary: Xine library
Name: xine-lib
-Version: 1.1.3
-Release: 4%{?dist}
+Version: 1.1.4
+Release: 1%{?dist}
License: GPL
Group: System Environment/Libraries
URL: http://xinehq.de/
# The tarball is generated from the upstream tarball using
# the script in SOURCE1. It prunes potentially patented code
-#Source0: http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.gz
+#Source0: http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
Source0: %{name}-%{version}-pruned.tar.bz2
Source1: %{name}-cleanup-sources.sh
-# To recreate the autotools patch: install build deps, extract source0,
-# remove run_configure "$@" from autogen.sh, copy the dir to -patched,
-# run autogen.sh (doesn't work with automake 1.10 as of 1.1.3 so use 1.9),
-# remove autom4te.cache, then diff the dirs. Apply rest of the patches during
-# build so that autotools do not need to be run again.
-Patch0: %{name}-1.1.3-autotools.patch.bz2
-Patch1: %{name}-1.1.3-optflags.patch
-Patch2: %{name}-1.1.3-flac113.patch
+Source2: %{name}-mk-autotools-patch.sh
+# autotools patch created with source2
+Patch0: %{name}-1.1.4-autotools.patch.bz2
+Patch1: %{name}-1.1.4-optflags.patch
Patch3: %{name}-1.1.3-legacy-flac-init.patch
Patch6: %{name}-1.1.1-deepbind-939.patch
Patch7: %{name}-1.1.1-multilib-devel.patch
@@ -45,7 +42,7 @@
# Audio
BuildRequires: libogg-devel libvorbis-devel flac-devel libmodplug-devel
BuildRequires: esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
-BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel
# CDs
BuildRequires: libcdio-devel
# Other
@@ -101,10 +98,10 @@
%prep
%setup -q
%patch0 -p1 -b .autotools
-cp -p m4/optimizations.m4 m4/optimizations.m4.stamp
+touch -r configure.ac aclocal.m4
+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 .flac113
%patch3 -p0 -b .legacy-flac-init
# Patch6 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
@@ -124,6 +121,9 @@
--with-xv-path=%{_libdir} \
--with-w32-path=%{codecdir} \
--with-external-ffmpeg \
+ --with-external-libmpcdec \
+ --with-libflac \
+ --with-wavpack \
--enable-ipv6 \
%if 0%{!?_without_directfb:1}
--enable-directfb \
@@ -149,8 +149,8 @@
rm -rf $RPM_BUILD_ROOT __docs
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang libxine1
-cp -pR $RPM_BUILD_ROOT%{_docdir}/xine __docs
-rm -rf $RPM_BUILD_ROOT%{_docdir}/xine
+cp -pR $RPM_BUILD_ROOT%{_docdir}/xine-lib __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/xine-lib
# Removing useless files
rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine.la __docs/README \
@@ -166,12 +166,14 @@
%post -p /sbin/ldconfig
+
%postun -p /sbin/ldconfig
%files -f libxine1.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING CREDITS ChangeLog* README TODO __docs/README.* __docs/faq
+%doc AUTHORS COPYING CREDITS ChangeLog* README TODO
+%doc __docs/README.* __docs/faq.*
%dir %{codecdir}
%{_datadir}/xine
%{_libdir}/libxine.so.*
@@ -213,6 +215,7 @@
%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
+%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
@@ -232,7 +235,7 @@
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so
%{_libdir}/xine/plugins/%{version}/xineplug_flac.so
-%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so
+%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
%ifarch %ix86
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
@@ -281,6 +284,9 @@
%changelog
+* Wed Jan 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-1
+- 1.1.4, with wavpack and system libmpcdec support.
+
* Thu Jan 18 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.3-4
- rebuild
--- xine-lib-1.1.3-flac113.patch DELETED ---
--- xine-lib-1.1.3-optflags.patch DELETED ---
More information about the scm-commits
mailing list