Author: qboosh Date: Wed Feb 2 20:20:56 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- restored liblo10k1-static
- dropped obsolete flags setting
- build hwmixvolume
---- Files affected:
packages/alsa-tools:
alsa-tools.spec (1.40 -> 1.41)
---- Diffs:
================================================================
Index: packages/alsa-tools/alsa-tools.spec
diff -u packages/alsa-tools/alsa-tools.spec:1.40
packages/alsa-tools/alsa-tools.spec:1.41
--- packages/alsa-tools/alsa-tools.spec:1.40 Mon Jan 31 21:04:46 2011
+++ packages/alsa-tools/alsa-tools.spec Wed Feb 2 21:20:51 2011
@@ -3,6 +3,7 @@
# TODO: make description true (i.e. separate GUIs)
# echomixer,envy24control,rmedigicontrol use GTK+ 2
# hdspconf,hdspmixer use FLTK
+# hwmixvolume uses pyalsa>=1.0.22,pygtk 2
# qlo10k1 uses Qt 3
#
# Conditional build:
@@ -21,7 +22,7 @@
Patch1: %{name}-sh.patch
Patch2: %{name}-csp.patch
URL: http://www.alsa-project.org/
-BuildRequires: alsa-lib-devel >= 1.0.3
+BuildRequires: alsa-lib-devel >= 1.0.24
BuildRequires: autoconf
BuildRequires: automake >= 1.3
BuildRequires: flex
@@ -33,12 +34,13 @@
BuildRequires: pkgconfig
BuildRequires: qt-devel
BuildRequires: sed >= 4.0
+Requires: alsa-lib >= 1.0.24
# for lo10k1, qlo10k1
Requires: liblo10k1 = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# ac3dec skipped - see ac3dec.spec
-%define progs as10k1 echomixer envy24control hdspconf hdsploader
hdspmixer ld10k1 mixartloader pcxhrloader rmedigicontrol sb16_csp seq/sbiload
sscape_ctl us428control usx2yloader vxloader
+%define progs as10k1 echomixer envy24control hdspconf hdsploader
hdspmixer hwmixvolume ld10k1 mixartloader pcxhrloader rmedigicontrol sb16_csp
seq/sbiload sscape_ctl us428control usx2yloader vxloader
%description
This packages contains command line utilities for the ALSA (Advanced
@@ -119,11 +121,10 @@
%{__libtoolize}
%{__aclocal}
%{__autoconf}
- grep -q AC_CONFIG_HEADER configure.* && %{__autoheader}
+ grep -q 'A[CM]_CONFIG_HEADER' configure.* && %{__autoheader}
%{__automake}
- CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
- CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
- %configure
+ %configure \
+ `[ "$dir" != ld10k1 ] || echo --enable-static ]`
%{__make}
cd $odir
done
@@ -138,8 +139,6 @@
%{__autoconf}
%{__autoheader}
%{__automake}
-CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
%configure \
--with-qtdir=%{_prefix} \
--disable-ld10k1test \
@@ -163,7 +162,7 @@
install $odir/as10k1/examples/*.emu10k1
$RPM_BUILD_ROOT%{_datadir}/ld10k1/effects
%if %{without hotplug}
-rm -r $RPM_BUILD_ROOT%{_sysconfdir}/hotplug
+%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/hotplug
%endif
%clean
@@ -206,9 +205,9 @@
%{_includedir}/lo10k1
%{_aclocaldir}/ld10k1.m4
-#%files -n liblo10k1-static
-#%defattr(644,root,root,755)
-#%{_libdir}/liblo10k1.a
+%files -n liblo10k1-static
+%defattr(644,root,root,755)
+%{_libdir}/liblo10k1.a
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -216,6 +215,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.41 2011/02/02 20:20:51 qboosh
+- restored liblo10k1-static
+- dropped obsolete flags setting
+- build hwmixvolume
+
Revision 1.40 2011/01/31 20:04:46 arekm
- up to 1.0.24.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/alsa-tools/alsa-tools.spec?r1=1.40&r2=1.41&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
