[xine-lib] * Sun Nov 20 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.20-1 - update to 1.1.20 (#753758) - use
Kevin Kofler
kkofler at fedoraproject.org
Sun Nov 20 01:58:20 UTC 2011
commit f955cb1ab13016fa3fb3a680725522905f34c3d1
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun Nov 20 02:58:05 2011 +0100
* Sun Nov 20 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.20-1
- update to 1.1.20 (#753758)
- use .xz tarball
- drop old conditionals
- drop ESD (esound) support on F17+ (native PulseAudio just works)
- drop autotools patch, run autogen.sh in %%prep instead
- drop unused deepbind patch
.gitignore | 1 +
sources | 3 +-
xine-lib-mk-autotools-patch.sh | 34 --------
xine-lib.spec | 167 +++++++++++-----------------------------
4 files changed, 48 insertions(+), 157 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de99961..4d5df15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
xine-lib-1.1.19-autotools.patch.bz2
xine-lib-1.1.19-pruned.tar.bz2
+/xine-lib-1.1.20-pruned.tar.xz
diff --git a/sources b/sources
index 7be858d..cf0f1a3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-1a77122fa938a3f8cb85cef231236c39 xine-lib-1.1.19-autotools.patch.bz2
-552e3e38f1afb77428f6aaa08e13b0d2 xine-lib-1.1.19-pruned.tar.bz2
+0a916dc5456276402ab2002dd68ded50 xine-lib-1.1.20-pruned.tar.xz
diff --git a/xine-lib.spec b/xine-lib.spec
index b47ff84..798ba4e 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -1,7 +1,6 @@
# TODO, sometime, maybe:
# - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
# - drop the opengl video out plugin?
-# - deprecate ESD support?
%define plugin_abi 1.29
%define codecdir %{_libdir}/codecs
@@ -12,61 +11,34 @@
%define have_vidix 0
%endif # ix86
-%if 0%{?fedora}
-%define _disable_gnomevfs --disable-gnomevfs
-%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
-%else
-%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
-%endif # Fedora
-
-%define _enable_xvmc --enable-xvmc
-%if 0%{?rhel} > 5
-%ifarch ppc64
-%undefine _enable_xvmc
-%endif
-%endif
-
-%ifarch %{arm}
+%ifarch %{arm}
%define _without_directfb 1
%endif
-%if 0%{?fedora} > 8 || 0%{?rhel} > 5
-%define _enable_v4l --enable-v4l
-%define _enable_libv4l --enable-libv4l
-%define _without_arts --without-arts
-%define _with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
-%define _with_xcb %{?_without_xcb:0}%{!?_without_xcb:1}
-%endif
-
-%if 0%{?fedora} > 14
+%if 0%{?fedora} > 14
%define _disable_v4l1 1
%endif
-%if 0%{?fedora} > 11 || 0%{?rhel} > 5
-%define pa_in_main 1
+%if 0%{?fedora} > 16
+%define _without_esound 1
%endif
-Summary: A multimedia engine
+Summary: A multimedia engine
Name: xine-lib
-Version: 1.1.19
-Release: 7%{?dist}
+Version: 1.1.20
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
-URL: http://www.xine-project.org/
+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: xine-lib-%{version}-pruned.tar.bz2
+#Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
+Source0: xine-lib-%{version}-pruned.tar.xz
Source1: xine-lib-cleanup-sources.sh
-Source2: xine-lib-mk-autotools-patch.sh
-# autotools patch created with source2
-Patch0: xine-lib-%{version}-autotools.patch.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: xine-lib-1.1.19-no_autopoint.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.17-avsync_hack.patch
# http://bugzilla.redhat.com/477226
@@ -79,71 +51,56 @@ Patch50: xine-lib-1.1.19-xvmclib_header.patch
Provides: xine-lib(plugin-abi) = %{plugin_abi}
%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
-BuildRequires: automake libtool
+BuildRequires: autoconf automake libtool
# X11
BuildRequires: libX11-devel
BuildRequires: libXv-devel
BuildRequires: libXinerama-devel
-%{?_enable_xvmc:BuildRequires: libXvMC-devel}
+BuildRequires: libXvMC-devel
BuildRequires: libGLU-devel
-%if 0%{?_enable_libv4l:1}
BuildRequires: libv4l-devel
-%endif
-%if 0%{?_with_xcb:1}
BuildRequires: libxcb-devel
-%endif # xcb
# Video
BuildRequires: SDL-devel
BuildRequires: libtheora-devel
BuildRequires: libmng-devel
-%if %{with_aalib}
BuildRequires: aalib-devel >= 1.4
-%endif # aalib
BuildRequires: libcaca-devel >= 0.99-0.5.beta14
%if 0%{!?_without_directfb:1}
BuildRequires: directfb-devel
%endif # directfb
-%if 0%{!?_without_imagemagick:1}
BuildRequires: ImageMagick-devel >= 6.2.4.6-1
-%endif # imagemagick
%if 0%{?_with_freetype:1}
BuildRequires: fontconfig-devel
%endif # freetype
# Audio
BuildRequires: alsa-lib-devel >= 0.9.0
+%if 0%{!?_without_esound:1}
BuildRequires: esound-devel
+%endif # esound
BuildRequires: flac-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libmodplug-devel
BuildRequires: libmpcdec-devel
BuildRequires: libvorbis-devel
-%if 0%{?_with_pa:1}
BuildRequires: pulseaudio-lib-devel
-%endif # pa
BuildRequires: speex-devel
-%if 0%{?_without_arts:1}
-Obsoletes: xine-lib-arts < %{version}-%{release}
-%else
-BuildRequires: arts-devel
-%endif
BuildRequires: wavpack-devel
# CDs
BuildRequires: libcdio-devel
# Other
BuildRequires: pkgconfig
BuildRequires: gtk2-devel
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: libsmbclient-devel
-%else
-BuildRequires: samba-common
-%endif
BuildRequires: libdvdnav-devel
BuildRequires: libdvdread-devel
-%if 0%{?pa_in_main}
+# Dropped in Fedora 9
+Obsoletes: xine-lib-arts < %{version}-%{release}
+
+# Included in main package since Fedora 12
Obsoletes: xine-lib-pulseaudio < 1.1.16.3-5
Provides: xine-lib-pulseaudio = %{version}-%{release}
-%endif
%description
This package contains the Xine library. It can be used to play back
@@ -160,21 +117,6 @@ 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}%{?_isa} = %{version}-%{release}
-#Requires: xine-lib(plugin-abi) = %{plugin_abi}
-%description arts
-This package contains the aRts plugin for %{name}.
-
-%package pulseaudio
-Summary: Pulseaudio plugin for %{name}
-Group: System Environment/Libraries
-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
@@ -182,21 +124,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
#Requires: xine-lib(plugin-abi) = %{plugin_abi}
%description extras
This package contains extra plugins for %{name}:
+%if 0%{!?_without_esound:1}
- EsounD
+%endif # esound
- JACK
- GDK-Pixbuf
-%if ! 0%{?_disable_gnomevfs:1}
- - GNOME VFS
-%endif
- SMB
- SDL
-%if %{with_aalib}
- AA-lib
-%endif # aalib
- Libcaca
-%if 0%{!?_without_imagemagick:1}
- Image decoding
-%endif # imagemagick
%if 0%{!?_without_directfb:1}
- DirectFB output
%endif # directfb
@@ -204,14 +141,15 @@ This package contains extra plugins for %{name}:
%prep
%setup -q
-%patch0 -p1 -b .autotools
+%patch0 -p1 -b .no_autopoint
+# 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
+rm -rf autom4te.cache *~
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
-# 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 .xvmclib_header
@@ -236,10 +174,10 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
%if 0%{!?_without_directfb:1}
--enable-directfb \
%endif # directfb
- %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l} \
- %{?_enable_libv4l}%{!?_enable_libv4l:--disable-libv4l} \
- %{?_enable_xvmc}%{!?_enable_xvmc:--disable-xvmc} \
- %{?_disable_gnomevfs} \
+ --enable-v4l \
+ --enable-libv4l \
+ --enable-xvmc \
+ --disable-gnomevfs \
--disable-a52dec \
--disable-mad \
--disable-vcd \
@@ -248,19 +186,19 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
%if 0%{?_with_freetype:1}
%if 0%{?_with_antialiasing:1}
--enable-antialiasing \
- --with-caca \
%endif # antialiasing
--with-freetype \
--with-fontconfig \
%endif # freetype
+ --with-caca \
--with-external-ffmpeg \
--with-xv-path=%{_libdir} \
--with-libflac \
--with-external-libmpcdec \
-%if 0%{?_without_imagemagick:1}
- --without-imagemagick \
-%endif # imagemagick
- %{!?_without_arts:--with-arts} %{?_without_arts} \
+ --without-arts \
+%if 0%{?_without_esound:1}
+ --without-esound \
+%endif
--with-wavpack \
--with-real-codecs-path=%{codecdir} \
--with-w32-path=%{codecdir}
@@ -339,6 +277,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_file.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_none.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_oss.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_bitplane.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
@@ -395,13 +334,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtp.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so
-%if 0%{?_enable_v4l:1}
%if ! 0%{?_disable_v4l1:1}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
%endif
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so
-%endif
%{_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
@@ -410,44 +347,24 @@ rm -rf $RPM_BUILD_ROOT
%if %{have_vidix}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so
%endif # vidix
-%if 0%{?_with_xcb:1}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so
-%endif # xcb
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so
-%if 0%{?_enable_xvmc:1}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so
-%endif
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so
-%if 0%{?_with_pa:1}
-%if ! 0%{?pa_in_main}
-%files pulseaudio
-%defattr(-,root,root,-)
-%endif
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
-%endif
-
-%if 0%{!?_without_arts:1}
-%files arts
-%defattr(-,root,root,-)
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so
-%endif
-
%files extras
%defattr(-,root,root,-)
+%if 0%{!?_without_esound:1}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_esd.so
+%endif # esound
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so
-%if 0%{!?_without_imagemagick:1}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so
-%endif # imagemagick
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so
-%if %{with_aalib}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so
-%endif # aalib
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so
%if 0%{!?_without_directfb:1}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_directfb.so
@@ -470,6 +387,14 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Nov 20 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.20-1
+- update to 1.1.20 (#753758)
+- use .xz tarball
+- drop old conditionals
+- drop ESD (esound) support on F17+ (native PulseAudio just works)
+- drop autotools patch, run autogen.sh in %%prep instead
+- drop unused deepbind patch
+
* Fri Jul 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.19-7
- rebuild for new DirectFB (1.5.0)
More information about the scm-commits
mailing list