diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 20605b4..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -alsa-tools-1.0.4.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d2b74f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +alsa-tools-1.0.15-pruned.tar.bz2 +envy24control.png +envy24control.desktop +echomixer.png +echomixer.desktop diff --git a/Makefile b/Makefile deleted file mode 100644 index 5bbb11d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alsa-tools -# $Id$ -NAME := alsa-tools -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/alsa-tools.spec b/alsa-tools.spec index 96de15b..66e6f7d 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -1,83 +1,124 @@ -Summary: The ALSA Tools -Name: alsa-tools -Version: 1.0.4 -Release: 0.fdr.1.1 -Epoch: 0 -License: GPL -Group: Applications/Multimedia -URL: http://www.alsa-project.org/ -Source0: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk+-devel alsa-driver fltk-devel automake -BuildRequires: alsa-lib-devel >= 0:1.0.4 +# If you want to skip building the firmware subpackage, define the macro +# _without_firmware to 1. This is not the actual firmware itself +# (see alsa-firmware), it is some complementary tools. +# Do *NOT* set it to zero or have a commented out define here, or it will not +# work. (RPM spec file voodoo) + +%ifarch ppc ppc64 +# sb16_csp doesn't build on PPC; see bug #219010 +%{?!_without_tools: %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sscape_ctl us428control } +%else +%{?!_without_tools: %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control } +%endif + +%{?!_without_firmware: %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader } + +# The source tarball has been pruned to remove the "ac3dec" directory, due +# to legal concerns that the contents might be subject to patent claims + +# Note that the Version is intended to coincide with the version of ALSA +# included with the Fedora kernel, rather than necessarily the very latest +# upstream version of alsa-tools + +Summary: Specialist tools for ALSA +Name: alsa-tools +Version: 1.0.16 +Release: 1%{?dist} + +# Checked at least one source file from all the sub-projects contained in +# the source tarball and they are consistent GPLv2+ - TJ 2007-11-15 +License: GPLv2+ +Group: Applications/Multimedia +URL: http://www.alsa-project.org/ +Source0: %{name}-%{version}-pruned.tar.bz2 + +# The icons below were created by Tim Jackson from screenshots of the +# apps in question. They suck, a lot. Better alternatives welcome! +Source1: envy24control.desktop +Source2: envy24control.png +Source3: echomixer.desktop +Source4: echomixer.png +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: alsa-lib-devel >= %{version} +%if 0%{!?_without_tools:1} +BuildRequires: gtk+-devel +BuildRequires: gtk2-devel +BuildRequires: fltk-devel Buildrequires: desktop-file-utils - -%package firmware -Summary: Alsa-Tool to upload the firmware (needed for some soundcards) -Group: Applications/System -Requires: hotplug alsa-firmware - - -# ----------------------------------------------------------------------------- +%endif %description -This package contains several tools which can be used together with -ALSA-Drivers and -Libs. Some of this tools are only needed for special -Sound-Cards or -Chips. +This package contains several specialist tools for use with ALSA, including +a number of programs that provide access to special hardware facilities on +certain sound cards. -Some Noteable: - -* ac3dec - A free AC-3 stream decoder +* as10k1 - AS10k1 Assembler +%ifnarch ppc ppc64 * cspctl - Sound Blaster 16 ASP/CSP control program +%endif +* echomixer - Mixer for Echo Audio (indigo) devices +* envy24control - Control tool for Envy24 (ice1712) based soundcards +* hdspmixer - Mixer for the RME Hammerfall DSP cards +* rmedigicontrol - Control panel for RME Hammerfall cards * sbiload - An OPL2/3 FM instrument loader for ALSA sequencer * sscape_ctl - ALSA SoundScape control utility +* us428control - Control tool for Tascam 428 + + +%package firmware +Summary: ALSA tools for uploading firmware to some soundcards +Group: Applications/System +Requires: udev alsa-firmware + %description firmware -This package contains several tools which will flash the firmware into the -Soundcards. The following tools are available: +This package contains tools for flashing firmware into certain sound cards. +The following tools are available: -hdsploader - for the RME Hammerfall DSP cards -mixartloader - for Digigram miXart soundcards -vxloader - for Digigram VX soundcards -usx2yloader - Second Phase Firmware loader for Tascam USX2Y USB soundcards +* hdsploader - for RME Hammerfall DSP cards +* mixartloader - for Digigram miXart soundcards +* vxloader - for Digigram VX soundcards +* usx2yloader - second phase firmware loader for Tascam USX2Y USB soundcards -# ----------------------------------------------------------------------------- - %prep %setup -q -n %{name}-%{version} -# ----------------------------------------------------------------------------- %build mv seq/sbiload . ; rmdir seq -for i in * +for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do cd $i ; %configure %{__make} %{?_smp_mflags} || exit 1 cd .. done -# ----------------------------------------------------------------------------- %install %{__rm} -rf $RPM_BUILD_ROOT -[ -f debugfiles.list ] && rm debugfiles.list -[ -f debugsources.list ] && rm debugsources.list -for i in * +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/{pixmaps,applications} + +for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do - case $i in - hdspconf) - (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 - ;; - hdspmixer) - (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 - ;; - usx2yloader) - (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1 - ;; - *) (cd $i ; %makeinstall) || exit 1 + case $i in + echomixer) + (cd $i ; %makeinstall ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 + ;; + envy24control) + (cd $i ; %makeinstall ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1 + ;; + hdspconf) + (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 + ;; + hdspmixer) + (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 + ;; + usx2yloader) + (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1 + ;; + *) (cd $i ; %makeinstall) || exit 1 esac if [[ -s "${i}"/README ]] then @@ -94,54 +135,60 @@ do mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" fi cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" + fi + if [[ -s ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop ]] ; then + desktop-file-install --vendor fedora \ + --add-category "X-Fedora" \ + --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop fi - - done -for f in ${RPM_BUILD_ROOT}%{_datadir}/applications/*.desktop; do - desktop-file-install --vendor fedora \ - --add-category "X-Fedora" \ - --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $f -done - -# ----------------------------------------------------------------------------- - %clean %{__rm} -rf $RPM_BUILD_ROOT -# ----------------------------------------------------------------------------- - +%if 0%{!?_without_tools:1} %files %defattr(-,root,root,-) -%doc %{_docdir}/%{name}-%{version}/ac3dec +%dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/as10k1 +%doc %{_docdir}/%{name}-%{version}/echomixer %doc %{_docdir}/%{name}-%{version}/envy24control %doc %{_docdir}/%{name}-%{version}/hdspconf %doc %{_docdir}/%{name}-%{version}/hdspmixer %doc %{_docdir}/%{name}-%{version}/rmedigicontrol %doc %{_docdir}/%{name}-%{version}/sbiload -%doc %{_docdir}/%{name}-%{version}/sb16_csp -%{_bindir}/ac3dec %{_bindir}/as10k1 -%{_bindir}/cspctl +%{_bindir}/echomixer %{_bindir}/envy24control -%{_bindir}/extract_ac3 %{_bindir}/hdspconf %{_bindir}/hdspmixer %{_bindir}/rmedigicontrol %{_bindir}/sbiload %{_bindir}/sscape_ctl %{_bindir}/us428control +%{_datadir}/applications/fedora-echomixer.desktop +%{_datadir}/applications/fedora-envy24control.desktop %{_datadir}/applications/fedora-hdspconf.desktop %{_datadir}/applications/fedora-hdspmixer.desktop -%{_datadir}/man/man1/cspctl.1.gz %{_datadir}/man/man1/envy24control.1.gz +%{_datadir}/pixmaps/echomixer.png +%{_datadir}/pixmaps/envy24control.png %{_datadir}/pixmaps/hdspconf.png %{_datadir}/pixmaps/hdspmixer.png +%{_datadir}/sounds/ +# sb16_csp stuff which is excluded for PPCx +%ifnarch ppc ppc64 +%doc %{_docdir}/%{name}-%{version}/sb16_csp +%{_bindir}/cspctl +%{_datadir}/man/man1/cspctl.1.gz +%endif + +%endif + +%if 0%{!?_without_firmware:1} %files firmware %defattr(-,root,root,-) %doc %{_docdir}/%{name}-%{version}/hdsploader @@ -150,15 +197,79 @@ done %doc %{_docdir}/%{name}-%{version}/vxloader %{_sysconfdir}/hotplug/usb/tascam_fpga %{_sysconfdir}/hotplug/usb/tascam_fw -%{_sysconfdir}/hotplug/usb/tascam_fw.usermap +%attr(0644,root,root) %{_sysconfdir}/hotplug/usb/tascam_fw.usermap %{_bindir}/hdsploader %{_bindir}/mixartloader %{_bindir}/usx2yloader %{_bindir}/vxloader - -# ----------------------------------------------------------------------------- +%endif %changelog +* Mon Jul 14 2008 Tim Jackson - 1.0.16-1 +- Update to version 1.0.16 + +* Mon May 19 2008 Tim Jackson - 1.0.15-5 +- Make it build cleanly on ppc and ppc64 by excluding sb16_csp + +* Sun May 18 2008 Tim Jackson - 1.0.15-4 +- Really enable firmware subpackage + +* Sun May 18 2008 Tim Jackson - 1.0.15-3 +- Enable firmware subpackage - the accompanying alsa-firmware package is + finally in Fedora + +* Sat Jan 05 2008 Tim Jackson - 1.0.15-2 +- Update License tag to GPLv2+ +- ExcludeArch ppc64 (bug #219010) + +* Sat Jan 05 2008 Tim Jackson - 1.0.15-1 +- Update to upstream 1.0.15 +- Add icon for envy24control +- Build echomixer + +* Sat Dec 09 2006 Tim Jackson - 1.0.12-4 +- ExcludeArch ppc (#219010) + +* Sun Nov 26 2006 Tim Jackson - 1.0.12-3 +- Add gtk2-devel BR + +* Sun Nov 26 2006 Tim Jackson - 1.0.12-2 +- Own our docdir explicitly + +* Sat Nov 25 2006 Tim Jackson - 1.0.12-1 +- Update to 1.0.12 +- Resubmit to Fedora Extras 6 +- Replace hotplug requirement with udev + +* Mon Feb 13 2006 Thorsten Leemhuis +- Rebuild for Fedora Extras 5 + +* Tue Dec 06 2005 Thorsten Leemhuis - 1.0.10-1 +- Update to 1.0.10 + +* Fri May 06 2005 Thorsten Leemhuis - 1.0.9-1 +- Update to 1.0.9 +- Use disttag +- Remove gcc4 patch + +* Fri May 06 2005 Thorsten Leemhuis - 1.0.8-3 +- prune ac3dec from sources + +* Thu May 05 2005 Thorsten Leemhuis - 1.0.8-2 +- don't build ac3dec -- use a52dec instead + +* Wed Apr 06 2005 Thorsten Leemhuis - 1.0.8-1 +- Update to 1.0.8 + +* Sun Mar 29 2005 Thorsten Leemhuis - 0:1.0.6-2 +- Add "--without tools" and "--with firmware" options +- Drop unneeded BR: automake + +* Sun Jan 02 2005 Thorsten Leemhuis - 0:1.0.6-0.fdr.1 +- Update to 1.0.6 for FC3 +- add new files in {_datadir}/sounds/ +- add patch0 for as10k1 + * Sat Apr 03 2004 Thorsten Leemhuis - 0:1.0.4-0.fdr.1 - Update to 1.0.4 @@ -187,5 +298,3 @@ done * Wed Aug 13 2003 Dams 0:tools-0.fdr.1 - Initial build. - - diff --git a/sources b/sources index d31da0f..7db2377 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ -c901a79e60a42f82f07f7a77cb45691a alsa-tools-1.0.4.tar.bz2 +be1974e6953b07a8c03c0627e52a3399 alsa-tools-1.0.16-pruned.tar.bz2 +57af85a810ed770885aec2a5b35648e6 echomixer.desktop +38db1b88c44adb5591f87173061d7d98 echomixer.png +4c10f8d250a86bdb3ea138488aec8fc4 envy24control.desktop +3a1a195f2b9641f68651e3d312e5476f envy24control.png