packages: mpg123/mpg123.spec - enigmatic port bcond renamed to portaudio - ...
qboosh
qboosh at pld-linux.org
Mon Sep 6 20:20:51 CEST 2010
Author: qboosh Date: Mon Sep 6 18:20:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- enigmatic port bcond renamed to portaudio
- cleanup
- don't build unwanted modules
---- Files affected:
packages/mpg123:
mpg123.spec (1.107 -> 1.108)
---- Diffs:
================================================================
Index: packages/mpg123/mpg123.spec
diff -u packages/mpg123/mpg123.spec:1.107 packages/mpg123/mpg123.spec:1.108
--- packages/mpg123/mpg123.spec:1.107 Thu Aug 12 16:14:30 2010
+++ packages/mpg123/mpg123.spec Mon Sep 6 20:20:45 2010
@@ -1,15 +1,15 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_with mmx # use MMX-only code to decode stream instead of runtime detection
-%bcond_with esd # disable esound supprot
-%bcond_without alsa # disable alsa support
-%bcond_with arts # enable aRts support
-%bcond_without jack # disable jack support
-%bcond_without nas # diasble nas support
-%bcond_without openal # disable openal support
-%bcond_without sdl # disable sdl support
-%bcond_without port # disable portaudio support
+%bcond_with mmx # use MMX-only code to decode stream instead of runtime detection
+%bcond_with esd # disable esound supprot
+%bcond_without alsa # disable alsa support
+%bcond_with arts # enable aRts support
+%bcond_without jack # disable jack support
+%bcond_without nas # diasble nas support
+%bcond_without openal # disable openal support
+%bcond_without sdl # disable sdl support
+%bcond_without portaudio # disable portaudio support
%bcond_without pulseaudio # disable pulseaudio support
%ifarch pentium3 pentium4 athlon
@@ -44,7 +44,7 @@
BuildRequires: libtool >= 2:1.5
%{?with_nas:BuildRequires: nas-devel}
BuildRequires: pkgconfig
-%{?with_port:BuildRequires: portaudio-devel >= 18}
+%{?with_portaudio:BuildRequires: portaudio-devel >= 18}
%{?with_pulseaudio:BuildRequires: pulseaudio-devel}
Requires: libmpg123 = %{version}-%{release}
Suggests: %{name}-alsa = %{version}-%{release}
@@ -235,8 +235,6 @@
%patch0 -p1
%patch1 -p1
-rm -rf libltdl
-
%build
%{__libtoolize}
%{__aclocal}
@@ -245,9 +243,10 @@
%{__automake}
# select "0" optimization, which doesn't add any -O to CFLAGS
%configure \
- --enable-ltdl-install=no \
+ --disable-ltdl-install \
--enable-modules \
--enable-static \
+ --with-audio=%{?with_alsa:alsa,}oss%{?with_esd:,esd}%{?with_jack:,jack}%{?with_portaudio:,portaudio}%{?with_pulseaudio:,pulse}%{?with_sdl:,sdl}%{?with_nas:,nas}%{?with_arts:,arts}%{?with_openal:,openal} \
%{?with_mmx:--with-cpu=mmx} \
--with-default-audio=%{?with_alsa:alsa,}oss \
--with-optimization=0
@@ -259,7 +258,7 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/mpg123/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mpg123/*.{la,a}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -315,7 +314,7 @@
%attr(755,root,root) %{_libdir}/mpg123/output_openal.so
%endif
-%if %{with port}
+%if %{with portaudio}
%files portaudio
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/mpg123/output_portaudio.so
@@ -356,6 +355,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.108 2010/09/06 18:20:45 qboosh
+- enigmatic port bcond renamed to portaudio
+- cleanup
+- don't build unwanted modules
+
Revision 1.107 2010/08/12 14:14:30 witekfl
- 1.12.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mpg123/mpg123.spec?r1=1.107&r2=1.108&f=u
More information about the pld-cvs-commit
mailing list