From 635b1494f8c4ea66dddb8199a00f595559e0ac73 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:32:46 +0000 Subject: [PATCH 1/8] Initialize branch F-10 for alsa-plugins --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 2ac0c407445dcc7f93189c0ce01a9645adacd364 Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Mon, 29 Dec 2008 07:49:11 +0000 Subject: [PATCH 2/8] Upgrade to 1.0.18 final --- .cvsignore | 4 +--- alsa-plugins.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index dbb252e..deef702 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -alsa-plugins-1.0.16.tar.bz2 -alsa-plugins-1.0.17.tar.bz2 -alsa-plugins-1.0.18rc3.tar.bz2 +alsa-plugins-1.0.18.tar.bz2 diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 29e9483..9aa69a2 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,15 +1,12 @@ -%define prever rc3 -%define prever_dot .%{prever} - Name: alsa-plugins Version: 1.0.18 -Release: 1%{?prever_dot}%{?dist} +Release: 2 Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries URL: http://www.alsa-project.org/ -Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}%{?prever}.tar.bz2 +Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 Source1: jack.conf Source2: pcm-oss.conf Source4: samplerate.conf @@ -184,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so %changelog +* Sun Dec 28 2008 Eric Moret - 1.0.18-2 +- Updated to 1.0.18 final + * Thu Sep 11 2008 Jaroslav Kysela - 1.0.18-1.rc3 - Updated to 1.0.18rc3 - Added usbstream subpackage diff --git a/sources b/sources index 7f05f9a..7438920 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3b7bcd92d1bb380d7de13e61af996e9 alsa-plugins-1.0.18rc3.tar.bz2 +4a798b47ba10c17aed66dff234d31b24 alsa-plugins-1.0.18.tar.bz2 From 2ddfc4edb3ad868213b31453818315003702e9be Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Mon, 29 Dec 2008 09:00:34 +0000 Subject: [PATCH 3/8] Adding back dist tag --- alsa-plugins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 9aa69a2..1048f96 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.18 -Release: 2 +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ License: GPLv2+ and LGPLv2+ From 3e0574d2dba8e0729ec159177802b5f39856eaf0 Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Tue, 8 Sep 2009 03:14:26 +0000 Subject: [PATCH 4/8] Updated to 1.0.21 --- .cvsignore | 2 +- alsa-plugins.spec | 130 ++++++++++++++++++++++++++++++++++++++++------ maemo.conf | 13 +++++ sources | 2 +- 4 files changed, 130 insertions(+), 17 deletions(-) create mode 100644 maemo.conf diff --git a/.cvsignore b/.cvsignore index deef702..d4ca659 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alsa-plugins-1.0.18.tar.bz2 +alsa-plugins-1.0.21.tar.bz2 diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 1048f96..28ee1fe 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,5 +1,5 @@ Name: alsa-plugins -Version: 1.0.18 +Version: 1.0.21 Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ @@ -9,10 +9,13 @@ URL: http://www.alsa-project.org/ Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 Source1: jack.conf Source2: pcm-oss.conf +Source3: speex.conf Source4: samplerate.conf Source5: upmix.conf Source6: vdownmix.conf Source7: pulse-default.conf +Source8: arcamav.conf +Source9: maemo.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -24,6 +27,7 @@ functionality to the Linux operating system. This package includes plugins for ALSA. %package jack +Requires: alsa-utils Requires: jack-audio-connection-kit BuildRequires: jack-audio-connection-kit-devel Summary: Jack PCM output plugin for ALSA @@ -33,13 +37,10 @@ License: LGPLv2+ This plugin converts the ALSA API over JACK (Jack Audio Connection Kit, http://jackit.sf.net) API. ALSA native applications can work transparently together with jackd for both playback and capture. - - ALSA apps (playback) -> ALSA-lib -> JACK plugin -> JACK daemon - ALSA apps (capture) <- ALSA-lib <- JACK plugin <- JACK daemon - This plugin provides the PCM type "jack" %package oss +Requires: alsa-utils BuildRequires: alsa-lib-devel Summary: Oss PCM output plugin for ALSA Group: System Environment/Libraries @@ -51,8 +52,9 @@ ALSA native apps can run on OSS drivers. This plugin provides the PCM type "oss". %package pulseaudio -BuildRequires: pulseaudio-lib-devel +Requires: alsa-utils Requires: pulseaudio +BuildRequires: pulseaudio-lib-devel Summary: Alsa to PulseAudio backend Group: System Environment/Libraries License: LGPLv2+ @@ -63,6 +65,7 @@ sound across a network. There are two plugins in the suite, one for PCM and one for mixer control. %package samplerate +Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: External rate converter plugin for ALSA Group: System Environment/Libraries @@ -72,6 +75,7 @@ This plugin is an external rate converter using libsamplerate by Erik de Castro Lopo. %package upmix +Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Upmixer channel expander plugin for ALSA Group: System Environment/Libraries @@ -82,6 +86,7 @@ The upmix plugin is an easy-to-use plugin for upmixing to 4 or by the slave PCM or explicitly via channel option. %package vdownmix +Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Downmixer to stereo plugin for ALSA Group: System Environment/Libraries @@ -100,12 +105,43 @@ License: LGPLv2+ The usbstream plugin is for snd-usb-us122l driver. It converts PCM stream to USB specific stream. +%package arcamav +Summary: Arcam AV amplifier plugin for ALSA +Group: System Environment/Libraries +License: LGPLv2+ +%description arcamav +This plugin exposes the controls for an Arcam AV amplifier +(see: http://www.arcam.co.uk/) as an ALSA mixer device. + +%package speex +Requires: speex +BuildRequires: speex-devel +Summary: Rate Converter Plugin Using Speex Resampler +Group: System Environment/Libraries +License: LGPLv2+ +%description speex +The rate plugin is an external rate converter using the Speex resampler +(aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides +pre-processing of a mono stream like denoise using libspeex DSP API. + +%package maemo +BuildRequires: alsa-lib-devel = %{version} +BuildRequires: dbus-devel +Summary: Maemo plugin for ALSA +Group: System Environment/Libraries +License: LGPLv2+ +%description maemo +This plugin converts the ALSA API over PCM task nodes protocol. In this way, +ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. + %prep %setup -q -n %{name}-%{version}%{?prever} %build %configure --disable-static \ - --without-speex + --with-speex=lib \ + --enable-maemo-plugin \ + --enable-maemo-resource-manager make %{?_smp_mflags} %install @@ -113,18 +149,21 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm -install -m 644 %SOURCE1 %SOURCE2 \ - %SOURCE4 %SOURCE5 %SOURCE6 \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm +install -m 644 %SOURCE1 \ + %SOURCE2 \ + %SOURCE3 \ + %SOURCE4 \ + %SOURCE5 \ + %SOURCE6 \ + %SOURCE8 \ + %SOURCE9 \ + ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm +# pulseaudio configuration file install -m 644 %SOURCE7 \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa + ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; -# Removing the maemo plugins -find $RPM_BUILD_ROOT \( -name libasound_module_ctl_dsp_ctl.so -o \ - -name libasound_module_pcm_alsa_dsp.so \) -exec rm {} \; - %clean rm -rf $RPM_BUILD_ROOT @@ -135,12 +174,14 @@ rm -rf $RPM_BUILD_ROOT %files jack %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/README-jack +%dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/jack.conf %{_libdir}/alsa-lib/libasound_module_pcm_jack.so %files oss %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/README-pcm-oss +%dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/pcm-oss.conf %{_libdir}/alsa-lib/libasound_module_ctl_oss.so %{_libdir}/alsa-lib/libasound_module_pcm_oss.so @@ -156,6 +197,7 @@ rm -rf $RPM_BUILD_ROOT %files samplerate %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/samplerate.txt +%dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/samplerate.conf %{_libdir}/alsa-lib/libasound_module_rate_samplerate.so %{_libdir}/alsa-lib/libasound_module_rate_samplerate_best.so @@ -166,12 +208,14 @@ rm -rf $RPM_BUILD_ROOT %files upmix %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/upmix.txt +%dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/upmix.conf %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so %files vdownmix %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/vdownmix.txt +%dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/vdownmix.conf %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so @@ -180,7 +224,63 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING COPYING.GPL %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so +%files arcamav +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL doc/README-arcam-av +%config(noreplace) %{_sysconfdir}/alsa/pcm/arcamav.conf +%{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so + +%files speex +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt +%config(noreplace) %{_sysconfdir}/alsa/pcm/speex.conf +%{_libdir}/alsa-lib/libasound_module_pcm_speex.so +%{_libdir}/alsa-lib/libasound_module_rate_speexrate.so +%{_libdir}/alsa-lib/libasound_module_rate_speexrate_best.so +%{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so + +%files maemo +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL doc/README-maemo +%config(noreplace) %{_sysconfdir}/alsa/pcm/maemo.conf +%{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so +%{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so + + %changelog +* Mon Sep 7 2009 Eric Moret - 1.0.21-2 +- Added missing dbus-devel dependency to maemo subpackage + +* Mon Sep 7 2009 Eric Moret - 1.0.21-1 +- Updated to 1.0.21 +- Patch clean up +- Added maemo subpackage + +* Tue Aug 4 2009 Lennart Poettering - 1.0.20-5 +- Add a couple of more clean up patches for the pulse plugin + +* Fri Jul 31 2009 Lennart Poettering - 1.0.20-4 +- Add a couple of clean up patches for the pulse plugin + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jun 24 2009 Eric Moret - 1.0.20-2 +- Added speex subpackage +- Removed ascii-art from jack's plugin description + +* Fri May 8 2009 Eric Moret - 1.0.20-1 +- Updated to 1.0.20 +- Added arcam-av subpackage + +* Fri Apr 24 2009 Eric Moret - 1.0.19-1 +- Updated to 1.0.19 +- Added Requires: alsa-utils to address #483322 +- Added dir {_sysconfdir}/alsa/pcm to address #483322 + +* Mon Feb 23 2009 Fedora Release Engineering - 1.0.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Dec 28 2008 Eric Moret - 1.0.18-2 - Updated to 1.0.18 final diff --git a/maemo.conf b/maemo.conf new file mode 100644 index 0000000..737890f --- /dev/null +++ b/maemo.conf @@ -0,0 +1,13 @@ +# PCM +pcm.!default { + type alsa_dsp + playback_device_file ["/dev/dsptask/pcm2"] + recording_device_file ["/dev/dsptask/pcm_rec"] +} + +# Mixer +ctl.!default { + type dsp_ctl + playback_devices ["/dev/dsptask/pcm2"] + recording_devices ["/dev/dsptask/pcm_rec"] +} diff --git a/sources b/sources index 7438920..c947667 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a798b47ba10c17aed66dff234d31b24 alsa-plugins-1.0.18.tar.bz2 +392d016c0948c54978c0505f24271e01 alsa-plugins-1.0.21.tar.bz2 From 95423d9d55a6a37eb6f58118247a39a8df789dda Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Tue, 8 Sep 2009 03:50:30 +0000 Subject: [PATCH 5/8] Adding arcamav.conf and speex.conf --- arcamav.conf | 10 ++++++++++ speex.conf | 11 +++++++++++ 2 files changed, 21 insertions(+) create mode 100644 arcamav.conf create mode 100644 speex.conf diff --git a/arcamav.conf b/arcamav.conf new file mode 100644 index 0000000..534663a --- /dev/null +++ b/arcamav.conf @@ -0,0 +1,10 @@ +# arcam-av plugin configuration +# $Id$ + +ctl.arcam_av { + type arcam_av + port /dev/ttyS0 + hint { + description "Arcam-AV Amplifier" + } +} diff --git a/speex.conf b/speex.conf new file mode 100644 index 0000000..71e6ef2 --- /dev/null +++ b/speex.conf @@ -0,0 +1,11 @@ +# samplerate plugin configuration +# $Id: speex.conf,v 1.1 2009/07/03 00:50:10 emoret Exp $ + +pcm.my_rate { + type rate + slave.pcm "hw" + converter "speexrate" + hint { + description "Rate Converter Plugin Using Speex Resampler" + } +} From a9a04ef81b1f3ccb328c5e502d9a9856df36525f Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Tue, 8 Sep 2009 03:54:54 +0000 Subject: [PATCH 6/8] Up release --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 28ee1fe..f1192f7 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ License: GPLv2+ and LGPLv2+ @@ -248,6 +248,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 7 2009 Eric Moret - 1.0.21-3 +- Added arcamav.conf and speex.conf missing in F-10 branch + * Mon Sep 7 2009 Eric Moret - 1.0.21-2 - Added missing dbus-devel dependency to maemo subpackage From 3550b5509a88f28e73c2e22bc7fc75947e4f4d54 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:51 +0000 Subject: [PATCH 7/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 36d8f08..b654d76 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alsa-plugins -# $Id$ +# $Id: Makefile,v 1.1 2007/08/07 23:46:58 kevin Exp $ NAME := alsa-plugins 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 1dca100832232a2dcb5ece1aade2bb8faa460ed8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:45:21 +0000 Subject: [PATCH 8/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b654d76..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alsa-plugins -# $Id: Makefile,v 1.1 2007/08/07 23:46:58 kevin Exp $ -NAME := alsa-plugins -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 $$d/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/Root && { 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/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10