From 7cb6a5477918c4ec590d255bd8d55cfee319eeda Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 7 Aug 2007 23:47:01 +0000 Subject: [PATCH 1/6] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 4064ef83a7dd6a60e2bc8136e878bc116f2f9430 Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Wed, 8 Aug 2007 05:45:13 +0000 Subject: [PATCH 2/6] Import alsa-plugins in F-7 branch --- alsa-plugins.spec | 176 ++++++++++++++++++++++++++++++++++++++++++++++ jack.conf | 13 ++++ pcm-oss.conf | 6 ++ pulseaudio.conf | 9 +++ samplerate.conf | 7 ++ sources | 1 + upmix.conf | 6 ++ vdownmix.conf | 11 +++ 8 files changed, 229 insertions(+) create mode 100644 alsa-plugins.spec create mode 100644 jack.conf create mode 100644 pcm-oss.conf create mode 100644 pulseaudio.conf create mode 100644 samplerate.conf create mode 100644 upmix.conf create mode 100644 vdownmix.conf diff --git a/alsa-plugins.spec b/alsa-plugins.spec new file mode 100644 index 0000000..4cb4cfe --- /dev/null +++ b/alsa-plugins.spec @@ -0,0 +1,176 @@ +Name: alsa-plugins +Version: 1.0.14 +Release: 1%{?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+ +Group: System Environment/Libraries +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: pulseaudio.conf +Source4: samplerate.conf +Source5: upmix.conf +Source6: vdownmix.conf +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: alsa-lib-devel + +%description +The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI +functionality to the Linux operating system. + +This package includes plugins for ALSA. + +%package jack +Requires: jack-audio-connection-kit +BuildRequires: jack-audio-connection-kit-devel +Summary: Jack PCM output plugin for ALSA +Group: System Environment/Libraries +License: LGPLv2+ +%description jack +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 +BuildRequires: alsa-lib-devel +Summary: Oss PCM output plugin for ALSA +Group: System Environment/Libraries +License: LGPLv2+ +%description oss +This plugin converts the ALSA API over OSS API. With this plugin, +ALSA native apps can run on OSS drivers. + +This plugin provides the PCM type "oss". + +%package pulseaudio +BuildRequires: pulseaudio-lib-devel +Summary: Alsa to PulseAudio backend +Group: System Environment/Libraries +License: LGPLv2+ +%description pulseaudio +This plugin allows any program that uses the ALSA API to access a PulseAudio +sound daemon. In other words, native ALSA applications can play and record +sound across a network. There are two plugins in the suite, one for PCM and +one for mixer control. + +%package samplerate +BuildRequires: libsamplerate-devel +Summary: External rate converter plugin for ALSA +Group: System Environment/Libraries +License: GPLv2+ +%description samplerate +This plugin is an external rate converter using libsamplerate by Erik de +Castro Lopo. + +%package upmix +BuildRequires: libsamplerate-devel +Summary: Upmixer channel expander plugin for ALSA +Group: System Environment/Libraries +License: LGPLv2+ +%description upmix +The upmix plugin is an easy-to-use plugin for upmixing to 4 or +6-channel stream. The number of channels to be expanded is determined +by the slave PCM or explicitly via channel option. + +%package vdownmix +BuildRequires: libsamplerate-devel +Summary: Downmixer to stereo plugin for ALSA +Group: System Environment/Libraries +License: LGPLv2+ +%description vdownmix +The vdownmix plugin is a downmixer from 4-6 channels to 2-channel +stereo headphone output. This plugin processes the input signals with +a simple spacialization, so the output sounds like a kind of "virtual +surround". + +%prep +%setup -q -n %{name}-%{version} + +%build +%configure --disable-static \ + --without-speex +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm +install -m 644 %SOURCE1 %SOURCE2 %SOURCE3 \ + %SOURCE4 %SOURCE5 %SOURCE6 \ + ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm + +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 + +%files jack +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL doc/README-jack +%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 +%config(noreplace) %{_sysconfdir}/alsa/pcm/pcm-oss.conf +%{_libdir}/alsa-lib/libasound_module_ctl_oss.so +%{_libdir}/alsa-lib/libasound_module_pcm_oss.so + +%files pulseaudio +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL doc/README-pulse +%config(noreplace) %{_sysconfdir}/alsa/pcm/pulseaudio.conf +%{_libdir}/alsa-lib/libasound_module_pcm_pulse.so +%{_libdir}/alsa-lib/libasound_module_ctl_pulse.so + +%files samplerate +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL doc/samplerate.txt +%config(noreplace) %{_sysconfdir}/alsa/pcm/samplerate.conf +%{_libdir}/alsa-lib/libasound_module_rate_samplerate.so +%{_libdir}/alsa-lib/libasound_module_rate_samplerate_best.so +%{_libdir}/alsa-lib/libasound_module_rate_samplerate_linear.so +%{_libdir}/alsa-lib/libasound_module_rate_samplerate_medium.so +%{_libdir}/alsa-lib/libasound_module_rate_samplerate_order.so + +%files upmix +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL doc/upmix.txt +%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 +%config(noreplace) %{_sysconfdir}/alsa/pcm/vdownmix.conf +%{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so + +%changelog +* Mon Jul 23 2007 Eric Moret - 1.0.14-1 +- update to upstream 1.0.14 +- use configure --without-speex instead of patches to remove a52 + +* Tue Mar 13 2007 Matej Cepl - 1.0.14-0.3.rc2 +- Really remove a52 plugin package (including changes in + configure and configure.in) + +* Thu Feb 15 2007 Eric Moret 1.0.14-0.2.rc2 +- Adding configuration files +- Removing a52 plugin package + +* Wed Jan 10 2007 Eric Moret 1.0.14-0.1.rc2 +- Initial package for Fedora diff --git a/jack.conf b/jack.conf new file mode 100644 index 0000000..3252405 --- /dev/null +++ b/jack.conf @@ -0,0 +1,13 @@ +# The jack plugin configuration + +pcm.jack { + type jack + playback_ports { + 0 alsa_pcm:playback_1 + 1 alsa_pcm:playback_1 + } + capture_ports { + 0 alsa_pcm:capture_1 + 1 alsa_pcm:pcapture_1 + } +} diff --git a/pcm-oss.conf b/pcm-oss.conf new file mode 100644 index 0000000..9607478 --- /dev/null +++ b/pcm-oss.conf @@ -0,0 +1,6 @@ +# pcm-oss plugin configuration + +pcm.oss { + type oss + device /dev/dsp +} diff --git a/pulseaudio.conf b/pulseaudio.conf new file mode 100644 index 0000000..1d1a511 --- /dev/null +++ b/pulseaudio.conf @@ -0,0 +1,9 @@ +# pulseaudio plugin configuration + +pcm.pulse { + type pulse +} + +ctl.pulse { + type pulse +} diff --git a/samplerate.conf b/samplerate.conf new file mode 100644 index 0000000..fde187e --- /dev/null +++ b/samplerate.conf @@ -0,0 +1,7 @@ +# samplerate plugin configuration + +pcm.my_rate { + type rate + slave.pcm "hw" + converter "samplerate" +} diff --git a/sources b/sources index e69de29..32b24ee 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +fa678da6b91c9f3c7204bc8d14e5b53f alsa-plugins-1.0.14.tar.bz2 diff --git a/upmix.conf b/upmix.conf new file mode 100644 index 0000000..a077190 --- /dev/null +++ b/upmix.conf @@ -0,0 +1,6 @@ +# upmix plugin configuration + +pcm.upmix51 { + type upmix + slave.pcm "surround51" +} diff --git a/vdownmix.conf b/vdownmix.conf new file mode 100644 index 0000000..426b354 --- /dev/null +++ b/vdownmix.conf @@ -0,0 +1,11 @@ +# vdownmix plugin configuration + +pcm.!surround51 { + type vdownmix + slave.pcm "default" +} + +pcm.!surround40 { + type vdownmix + slave.pcm "default" +} From 593bcf39a5d90bb0193e6f5c2c5a7fa8678e39e3 Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Wed, 15 Aug 2007 04:36:15 +0000 Subject: [PATCH 3/6] Adding pulse as ALSA "default" pcm and ctl when the alsa-plugins-pulseaudio package is installed, fixing #251943. --- alsa-plugins.spec | 6 +++++- pulseaudio.conf | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 4cb4cfe..053c09d 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.14 -Release: 1%{?dist} +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+ @@ -160,6 +160,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Tue Aug 14 2007 Eric Moret - 1.0.14-2 +- Adding pulse as ALSA "default" pcm and ctl when the alsa-plugins-pulseaudio +package is installed, fixing #251943. + * Mon Jul 23 2007 Eric Moret - 1.0.14-1 - update to upstream 1.0.14 - use configure --without-speex instead of patches to remove a52 diff --git a/pulseaudio.conf b/pulseaudio.conf index 1d1a511..16652e2 100644 --- a/pulseaudio.conf +++ b/pulseaudio.conf @@ -1,9 +1,17 @@ # pulseaudio plugin configuration pcm.pulse { - type pulse + type pulse } ctl.pulse { - type pulse + type pulse +} + +pcm.!default { + type pulse +} + +ctl.!default { + type pulse } From 0f455da31e5f0df941827f638089e4bc397ae7b8 Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Wed, 19 Mar 2008 19:59:05 +0000 Subject: [PATCH 4/6] Fix jack.conf --- .cvsignore | 1 + alsa-plugins.spec | 5 ++++- jack.conf | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index e69de29..10f8af9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +alsa-plugins-1.0.14.tar.bz2 diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 053c09d..50a8ce4 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.14 -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+ @@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Wed Mar 19 2008 Eric Moret - 1.0.14-3 +- Fix jack.conf (#435343) + * Tue Aug 14 2007 Eric Moret - 1.0.14-2 - Adding pulse as ALSA "default" pcm and ctl when the alsa-plugins-pulseaudio package is installed, fixing #251943. diff --git a/jack.conf b/jack.conf index 3252405..32c5e59 100644 --- a/jack.conf +++ b/jack.conf @@ -4,10 +4,10 @@ pcm.jack { type jack playback_ports { 0 alsa_pcm:playback_1 - 1 alsa_pcm:playback_1 + 1 alsa_pcm:playback_2 } capture_ports { 0 alsa_pcm:capture_1 - 1 alsa_pcm:pcapture_1 + 1 alsa_pcm:capture_2 } } From 02e778360dab9a7c0e74128741c5c21f895033be Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:52 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 36d8f08..fd9cd5f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 6114413c840c7d3e1e1d2c6530c824b32b898986 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:45:16 +0000 Subject: [PATCH 6/6] 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 fd9cd5f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alsa-plugins -# $Id$ -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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7