rpms/xine-lib/EL-5 xine-lib.spec,1.10,1.11
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Sep 10 15:36:22 UTC 2007
Author: scop
Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21472
Modified Files:
xine-lib.spec
Log Message:
* Mon Sep 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-2.1
- Adjust default -extras feature set for EPEL-5.
Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xine-lib.spec 10 Sep 2007 15:17:50 -0000 1.10
+++ xine-lib.spec 10 Sep 2007 15:35:50 -0000 1.11
@@ -9,20 +9,32 @@
%define codecdir %{_libdir}/codecs
%ifarch %{ix86}
-%define have_vidix 1
+ %define have_vidix 1
%else
-%define have_vidix 0
+ %define have_vidix 0
%endif
%if 0%{?fedora} >= 8
-%define with_xcb 1
+ %define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1}
%else
-%define with_xcb 0
+ %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0}
%endif
+%if 0%{?fedora}
+ %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
+ %define with_caca %{?_without_caca:0}%{!?_without_caca:1}
+ %define with_jack %{?_without_jack:0}%{!?_without_jack:1}
+ %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+%else
+ %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
+ %define with_caca %{?_with_caca:1}%{!?_with_caca:0}
+ %define with_jack %{?_with_jack:1}%{!?_with_jack:0}
+ %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+%endif
+%define with_dfb %{?_without_directfb:0}%{!?_without_directfb:1}
Summary: Xine library
Name: xine-lib
Version: 1.1.8
-Release: 2%{?dist}
+Release: 2%{?dist}.1
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -43,25 +55,34 @@
BuildRequires: libGLU-devel
%if %{with_xcb}
BuildRequires: libxcb-devel
-%endif
+%endif # xcb
# Video
BuildRequires: SDL-devel libtheora-devel libmng-devel
+%if %{with_aalib}
BuildRequires: aalib-devel >= 1.4
+%endif # aalib
+%if %{with_caca}
BuildRequires: libcaca-devel >= 0.99
-%if 0%{!?_without_directfb:1}
+%endif # caca
+%if %{with_dfb}
BuildRequires: directfb-devel
-%endif
+%endif # dfb
%if 0%{!?_without_imagemagick:1}
BuildRequires: ImageMagick-devel >= 6.2.4.6-1
-%endif
+%endif # imagemagick
%if 0%{?_with_freetype:1}
BuildRequires: fontconfig-devel
-%endif
+%endif # freetype
# 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 wavpack-devel libmpcdec-devel
+BuildRequires: wavpack-devel libmpcdec-devel
+%if %{with_pa}
BuildRequires: pulseaudio-lib-devel
+%endif # pa
+%if %{with_jack}
+BuildRequires: jack-audio-connection-kit-devel
+%endif # jack
# CDs
BuildRequires: libcdio-devel
# Other
@@ -93,11 +114,9 @@
It can play back various media. It also decodes multimedia files from local
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. Non-default rpmbuild options:
---without imagemagick: Disable ImageMagick support
---without directfb: Disable DirectFB support
---with freetype: Enable FreeType/Fontconfig support
---with antialiasing: Enable font antialiasing (with FreeType/FontConfig)
+of the most uncommon formats, too. --with/--without rpmbuild options
+(some default values depend on target distribution): aalib, caca, directfb,
+imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, xcb.
%description devel
This package contains development files for xine-lib.
@@ -108,23 +127,31 @@
%description extras
This package contains extra plugins for xine-lib:
- EsounD
+%if %{with_jack}
- JACK
+%endif # jack
+%if %{with_pa}
- Pulseaudio
+%endif # pa
- GDK-Pixbuf
- GNOME VFS
- SMB
- SDL
+%if %{with_aalib}
- AA-lib
+%endif # aalib
+%if %{with_caca}
- Libcaca
+%endif # caca
%if 0%{!?_without_imagemagick:1}
- Image decoding
-%endif
-%if 0%{!?_without_directfb:1}
+%endif # imagemagick
+%if %{with_dfb}
- DirectFB output
-%endif
+%endif # dfb
%if %{with_xcb}
- XCB output
-%endif
+%endif # xcb
%prep
@@ -150,9 +177,9 @@
%configure \
--disable-dependency-tracking \
--enable-ipv6 \
-%if 0%{!?_without_directfb:1}
+%if %{with_dfb}
--enable-directfb \
-%endif # directfb
+%endif # dfb
--disable-a52dec \
--disable-mad \
--disable-dvdnavtest --with-external-dvdnav \
@@ -241,7 +268,7 @@
%{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so
%{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so
-%endif
+%endif # vidix
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
@@ -252,7 +279,7 @@
%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so
%ifarch %ix86
%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
-%endif
+%endif # ix86
%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so
%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so
@@ -262,7 +289,7 @@
%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so
%ifarch %ix86
%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so
-%endif
+%endif # ix86
%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so
%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so
@@ -300,7 +327,7 @@
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
%if %{have_vidix}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
-%endif
+%endif # vidix
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so
@@ -315,25 +342,33 @@
%files extras
%defattr(-,root,root,-)
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
+%if %{with_jack}
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
+%endif # jack
+%if %{with_pa}
%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
+%endif # pa
%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
%if 0%{!?_without_imagemagick:1}
%{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
-%endif
+%endif # imagemagick
%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
+%if %{with_aalib}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
+%endif # aalib
+%if %{with_caca}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
-%if 0%{!?_without_directfb:1}
+%endif # caca
+%if %{with_dfb}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
-%endif
+%endif # dfb
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
%if %{with_xcb}
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
-%endif
+%endif # xcb
%files devel
@@ -349,6 +384,9 @@
%changelog
+* Mon Sep 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-2.1
+- Adjust default -extras feature set for EPEL-5.
+
* Sun Sep 09 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.8-2
- remove the dependency from -extras to -arts, and use Obsoletes to
provide an upgrade path
More information about the fedora-extras-commits
mailing list