rpms/xine-lib/devel xine-lib.spec,1.24,1.25

[Ville Skytta (scop)]

Author: scop

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

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/devel/xine-lib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xine-lib.spec	9 Sep 2007 14:50:02 -0000	1.24
+++ xine-lib.spec	19 Sep 2007 19:04:27 -0000	1.25
@@ -9,20 +9,33 @@
 
 %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}
+    %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
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -43,25 +56,37 @@
 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
+%endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
-%endif
+%endif # directfb
 %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:  libmpcdec-devel
+%if %{with_wpack}
+BuildRequires:  wavpack-devel
+%endif # wpack
+%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 +118,10 @@
 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,
+wavpack, xcb.
 
 %description devel
 This package contains development files for xine-lib.
@@ -108,23 +132,28 @@
 %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
+%endif # imagemagick
 %if 0%{!?_without_directfb:1}
   - DirectFB output
-%endif
-%if %{with_xcb}
-  - XCB output
-%endif
+%endif # directfb
 
 
 %prep
@@ -174,7 +203,9 @@
     --without-imagemagick \
 %endif # imagemagick
     --with-arts \
+%if %{with_wpack}
     --with-wavpack \
+%endif
     --with-real-codecs-path=%{codecdir} \
     --with-w32-path=%{codecdir}
 
@@ -241,7 +272,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 +283,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 +293,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,14 +331,17 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
-%endif
+%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
@@ -315,26 +349,29 @@
 %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
+%endif # caca
 %if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so
-%endif
+%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
-
 
 %files devel
 %defattr(-,root,root,-)
@@ -349,6 +386,11 @@
 
 
 %changelog
+* 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
   provide an upgrade path