rpms/xine-lib/EL-5 xine-lib.spec,1.11,1.12

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv869/EL-5

Modified Files:
	xine-lib.spec 
Log Message:
* Sat Sep 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-3
- Move XCB plugins to the main package.
- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
  time in preparation for the first EPEL build.



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xine-lib.spec	10 Sep 2007 15:35:50 -0000	1.11
+++ xine-lib.spec	19 Sep 2007 19:04:25 -0000	1.12
@@ -23,18 +23,19 @@
     %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}
+    %define     with_wpack  %{?_without_wavpack:0}%{!?_without_wavpack: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}
+    %define     with_wpack  %{?_with_wavpack:1}%{!?_with_wavpack:0}
 %endif
-%define         with_dfb    %{?_without_directfb:0}%{!?_without_directfb:1}
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        2%{?dist}.1
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -64,9 +65,9 @@
 %if %{with_caca}
 BuildRequires:  libcaca-devel >= 0.99
 %endif # caca
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
-%endif # dfb
+%endif # directfb
 %if 0%{!?_without_imagemagick:1}
 BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
 %endif # imagemagick
@@ -76,7 +77,10 @@
 # Audio
 BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
 BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
-BuildRequires:  wavpack-devel libmpcdec-devel
+BuildRequires:  libmpcdec-devel
+%if %{with_wpack}
+BuildRequires:  wavpack-devel
+%endif # wpack
 %if %{with_pa}
 BuildRequires:  pulseaudio-lib-devel
 %endif # pa
@@ -116,7 +120,8 @@
 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,
-imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, xcb.
+imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio,
+wavpack, xcb.
 
 %description devel
 This package contains development files for xine-lib.
@@ -146,12 +151,9 @@
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
 %endif # imagemagick
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
   - DirectFB output
-%endif # dfb
-%if %{with_xcb}
-  - XCB output
-%endif # xcb
+%endif # directfb
 
 
 %prep
@@ -177,9 +179,9 @@
 %configure \
     --disable-dependency-tracking \
     --enable-ipv6 \
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
     --enable-directfb \
-%endif # dfb
+%endif # directfb
     --disable-a52dec \
     --disable-mad \
     --disable-dvdnavtest --with-external-dvdnav \
@@ -201,7 +203,9 @@
     --without-imagemagick \
 %endif # imagemagick
     --with-arts \
+%if %{with_wpack}
     --with-wavpack \
+%endif
     --with-real-codecs-path=%{codecdir} \
     --with-w32-path=%{codecdir}
 
@@ -328,13 +332,16 @@
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
 %endif # vidix
+%if %{with_xcb}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so
+%endif # xcb
 %{_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
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so
 %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so
 
-
 %files arts
 %defattr(-,root,root,-)
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
@@ -360,16 +367,11 @@
 %if %{with_caca}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
 %endif # caca
-%if %{with_dfb}
+%if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
-%endif # dfb
+%endif # directfb
 %{_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 # xcb
-
 
 %files devel
 %defattr(-,root,root,-)
@@ -384,8 +386,10 @@
 
 
 %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.
+* Sat Sep 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-3
+- Move XCB plugins to the main package.
+- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
+  time in preparation for the first EPEL build.
 
 * 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