SPECS: xine-lib.spec - caca support needs libcaca 0.99 (available ...

[qboosh]

Author: qboosh                       Date: Mon Dec  4 19:38:10 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- caca support needs libcaca 0.99 (available from libcaca.spec:DEVEL)
- s/polypaudio/pulseaudio/, with Obsoletes (enabled by default, not tested yet)

---- Files affected:
SPECS:
   xine-lib.spec (1.187 -> 1.188) 

---- Diffs:

================================================================
Index: SPECS/xine-lib.spec
diff -u SPECS/xine-lib.spec:1.187 SPECS/xine-lib.spec:1.188
--- SPECS/xine-lib.spec:1.187	Mon Dec  4 17:00:53 2006
+++ SPECS/xine-lib.spec	Mon Dec  4 20:38:04 2006
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO
-# - update for pulseaudio
 # - --with-external-ffmpeg
 #
 # Conditional build:
@@ -16,7 +15,7 @@
 %bcond_without	gdkpixbuf	# don't build gdk-pixbuf decode plugin
 %bcond_without	gnome		# don't build gnome_vfs input plugin
 %bcond_without	opengl		# don't build OpenGL video output plugin
-%bcond_with	polypaudio	# build polypaudio output plugin
+%bcond_without	pulseaudio	# build pulseaudio output plugin
 %bcond_without	samba		# don't build SMB input plugin
 %bcond_with	sdl		# don't build SDL video output plugin
 %bcond_without	stk		# don't build stk video output plugin
@@ -60,7 +59,7 @@
 BuildRequires:	gettext-devel
 %{?with_gnome:BuildRequires:	gnome-vfs2-devel}
 %{?with_gdkpixbuf:BuildRequires:	gtk+2-devel >= 2.0}
-%{?with_caca:BuildRequires:	libcaca-devel}
+%{?with_caca:BuildRequires:	libcaca-devel >= 0.99}
 BuildRequires:	libcdio-devel >= 0.72
 %{?with_dvd:BuildRequires:	libdvdnav-devel >= 0.1.9}
 %{?with_dxr3:BuildRequires:	libfame-devel >= 0.8.10}
@@ -73,8 +72,7 @@
 BuildRequires:	libtool >= 0:1.4.2-9
 BuildRequires:	libvorbis-devel
 BuildRequires:	pkgconfig
-%{?with_polypaudio:BuildRequires:	polypaudio-devel < 0.8}
-%{?with_polypaudio:BuildRequires:	polypaudio-devel >= 0.6}
+%{?with_pulseaudio:BuildRequires:	pulseaudio-devel >= 0.9}
 #%{?with_dxr3:BuildRequires:	rte-devel} # only 0.4 supported
 BuildRequires:	speex-devel >= 1:1.1.6
 BuildRequires:	vcdimager-devel >= 0.7.21
@@ -368,22 +366,23 @@
 %description -n xine-output-audio-oss -l pt_BR
 Plugin de audio para o xine, com suporte a oss.
 
-%package -n xine-output-audio-polypaudio
-Summary:	XINE - polypaudio support
-Summary(pl):	XINE - obsługa polypaudio
-Summary(pt_BR):	XINE - suporte a polypaudio
+%package -n xine-output-audio-pulseaudio
+Summary:	XINE - pulseaudio support
+Summary(pl):	XINE - obsługa pulseaudio
+Summary(pt_BR):	XINE - suporte a pulseaudio
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	xine-plugin-audio = %{epoch}:%{version}-%{release}
+Obsoletes:	xine-output-audio-polypaudio
 
-%description -n xine-output-audio-polypaudio
-XINE audio output plugins with polypaudio support.
+%description -n xine-output-audio-pulseaudio
+XINE audio output plugins with pulseaudio support.
 
-%description -n xine-output-audio-polypaudio -l pl
-Wtyczka wyjścia dźwięku do XINE z obsługą polypaudio.
+%description -n xine-output-audio-pulseaudio -l pl
+Wtyczka wyjścia dźwięku do XINE z obsługą pulseaudio.
 
-%description -n xine-output-audio-polypaudio -l pt_BR
-Plugin de audio para o xine, com suporte a polypaudio.
+%description -n xine-output-audio-pulseaudio -l pt_BR
+Plugin de audio para o xine, com suporte a pulseaudio.
 
 %package -n xine-output-video-aa
 Summary:	XINE - Ascii Art support
@@ -728,7 +727,7 @@
 	--enable-ipv6 \
 	%{?with_aalib:--with-aalib-prefix=/usr} \
 	--with-external-dvdnav \
-	%{!?with_polypaudio:--disable-polypaudio} \
+	%{!?with_pulseaudio:--disable-pulseaudio} \
 	--with-w32-path=/usr/lib/codecs \
 	--disable-optimizations # we use own RPM_OPT_FLAGS optimalizations
 
@@ -926,10 +925,10 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_oss.so
 
-%if %{with polypaudio}
-%files -n xine-output-audio-polypaudio
+%if %{with pulseaudio}
+%files -n xine-output-audio-pulseaudio
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_polypaudio.so
+%attr(755,root,root) %{_pluginsdir}/xineplug_ao_out_pulseaudio.so
 %endif
 
 %if %{with aalib}
@@ -1049,6 +1048,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.188  2006/12/04 19:38:04  qboosh
+- caca support needs libcaca 0.99 (available from libcaca.spec:DEVEL)
+- s/polypaudio/pulseaudio/, with Obsoletes (enabled by default, not tested yet)
+
 Revision 1.187  2006/12/04 16:00:53  shadzik
 - reverse caca and sdl bcond (they seem to build fine, but don't provide .so libraries = packaging fails)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xine-lib.spec?r1=1.187&r2=1.188&f=u