From 8bdb1fa46b7922a9e9876b5443bf738d7b67c613 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 9 Mar 2008 15:50:49 +0000 Subject: [PATCH 1/6] - Add descriptions to various PCM plugins, so they're visible in aplay -L --- alsa-plugins.spec | 5 ++++- jack.conf | 4 ++++ pcm-oss.conf | 3 +++ pulse-default.conf | 13 +++++++++++++ samplerate.conf | 4 ++++ upmix.conf | 4 ++++ vdownmix.conf | 7 +++++++ 7 files changed, 39 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 02a915e..de748e4 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.16 -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+ @@ -171,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Sun Mar 09 2008 Lubomir Kundrak - 1.0.16-2 +- Add descriptions to various PCM plugins, so they're visible in aplay -L + * Sat Mar 08 2008 Lubomir Kundrak - 1.0.16-1 - New upstream, dropping upstreamed patches - Do not assert fail when pulseaudio is unavailable (#435148) diff --git a/jack.conf b/jack.conf index 3252405..e5518ee 100644 --- a/jack.conf +++ b/jack.conf @@ -1,4 +1,5 @@ # The jack plugin configuration +# $Id: jack.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $ pcm.jack { type jack @@ -10,4 +11,7 @@ pcm.jack { 0 alsa_pcm:capture_1 1 alsa_pcm:pcapture_1 } + hint { + description "JACK Audio Connection Kit" + } } diff --git a/pcm-oss.conf b/pcm-oss.conf index 9607478..b5aac44 100644 --- a/pcm-oss.conf +++ b/pcm-oss.conf @@ -3,4 +3,7 @@ pcm.oss { type oss device /dev/dsp + hint { + description "Open Sound System" + } } diff --git a/pulse-default.conf b/pulse-default.conf index d18023a..a84bede 100644 --- a/pulse-default.conf +++ b/pulse-default.conf @@ -1,22 +1,35 @@ # PulseAudio plugin configuration +# $Id$ # Let's create a virtual device "pulse" for mixer and PCM pcm.pulse { type pulse + hint { + description "PulseAudio Sound Server" + } } ctl.pulse { type pulse + hint { + description "PulseAudio Sound Server" + } } # Let's make it the default! pcm.!default { type pulse + hint { + description "Default" + } } ctl.!default { type pulse + hint { + description "Default" + } } diff --git a/samplerate.conf b/samplerate.conf index fde187e..8bf7b9a 100644 --- a/samplerate.conf +++ b/samplerate.conf @@ -1,7 +1,11 @@ # samplerate plugin configuration +# $Id: samplerate.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $ pcm.my_rate { type rate slave.pcm "hw" converter "samplerate" + hint { + description "External rate converter" + } } diff --git a/upmix.conf b/upmix.conf index a077190..0092b94 100644 --- a/upmix.conf +++ b/upmix.conf @@ -1,6 +1,10 @@ # upmix plugin configuration +# $Id$ pcm.upmix51 { type upmix slave.pcm "surround51" + hint { + description "Upmixer channel expander" + } } diff --git a/vdownmix.conf b/vdownmix.conf index 426b354..95786b8 100644 --- a/vdownmix.conf +++ b/vdownmix.conf @@ -1,11 +1,18 @@ # vdownmix plugin configuration +# $Id$ pcm.!surround51 { type vdownmix slave.pcm "default" + hint { + description "Downmixer to stereo from surround51" + } } pcm.!surround40 { type vdownmix slave.pcm "default" + hint { + description "Downmixer to stereo from surround40" + } } From 46938bf1c1c368ec06bf783c0d5d76abd8b07186 Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Wed, 19 Mar 2008 20:01:04 +0000 Subject: [PATCH 2/6] Fix jack.conf --- alsa-plugins.spec | 5 ++++- jack.conf | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index de748e4..7faa56e 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.16 -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+ @@ -171,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Wed Mar 19 2008 Eric Moret - 1.0.16-3 +- Fixing jack.conf (#435343) + * Sun Mar 09 2008 Lubomir Kundrak - 1.0.16-2 - Add descriptions to various PCM plugins, so they're visible in aplay -L diff --git a/jack.conf b/jack.conf index e5518ee..e74f5fc 100644 --- a/jack.conf +++ b/jack.conf @@ -1,15 +1,15 @@ # The jack plugin configuration -# $Id: jack.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $ +# $Id: jack.conf,v 1.3 2008/03/19 20:01:04 emoret Exp $ 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 } hint { description "JACK Audio Connection Kit" From 5a158646a78c9fb6d48a8f7d52cb89b7b7e9bb6b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 25 Mar 2008 08:50:07 +0000 Subject: [PATCH 3/6] fix the hint --- alsa-plugins-1.0.16-hints.patch | 123 ++++++++++++++++++++++++++++++++ alsa-plugins.spec | 7 +- 2 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 alsa-plugins-1.0.16-hints.patch diff --git a/alsa-plugins-1.0.16-hints.patch b/alsa-plugins-1.0.16-hints.patch new file mode 100644 index 0000000..314eb32 --- /dev/null +++ b/alsa-plugins-1.0.16-hints.patch @@ -0,0 +1,123 @@ +Ignore hint sections defined by hand. +Those are heplful to get listed in various places, such as aplay -L + +diff -urp alsa-plugins-1.0.16.orig/a52/pcm_a52.c alsa-plugins-1.0.16/a52/pcm_a52.c +--- alsa-plugins-1.0.16.orig/a52/pcm_a52.c 2008-02-05 10:25:00.000000000 +0100 ++++ alsa-plugins-1.0.16/a52/pcm_a52.c 2008-03-09 17:16:37.000000000 +0100 +@@ -581,7 +581,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52) + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; +- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) ++ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "card") == 0) { + if (snd_config_get_string(n, &card) < 0) { +diff -urp alsa-plugins-1.0.16.orig/jack/pcm_jack.c alsa-plugins-1.0.16/jack/pcm_jack.c +--- alsa-plugins-1.0.16.orig/jack/pcm_jack.c 2008-02-05 10:25:00.000000000 +0100 ++++ alsa-plugins-1.0.16/jack/pcm_jack.c 2008-03-09 17:16:48.000000000 +0100 +@@ -403,7 +403,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(jack) + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; +- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) ++ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "playback_ports") == 0) { + if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) { +diff -urp alsa-plugins-1.0.16.orig/maemo/alsa-dsp.c alsa-plugins-1.0.16/maemo/alsa-dsp.c +--- alsa-plugins-1.0.16.orig/maemo/alsa-dsp.c 2008-02-05 10:25:00.000000000 +0100 ++++ alsa-plugins-1.0.16/maemo/alsa-dsp.c 2008-03-09 17:17:01.000000000 +0100 +@@ -664,7 +664,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(alsa_dsp) + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; +- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) ++ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "playback_device_file") == 0) { + if (snd_config_get_type(n) == SND_CONFIG_TYPE_COMPOUND){ +diff -urp alsa-plugins-1.0.16.orig/maemo/dsp-ctl.c alsa-plugins-1.0.16/maemo/dsp-ctl.c +--- alsa-plugins-1.0.16.orig/maemo/dsp-ctl.c 2008-02-05 10:25:00.000000000 +0100 ++++ alsa-plugins-1.0.16/maemo/dsp-ctl.c 2008-03-09 17:17:10.000000000 +0100 +@@ -545,7 +545,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(dsp_ctl) + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; +- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) ++ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "playback_devices") == 0) { + if (snd_config_get_type(n) == SND_CONFIG_TYPE_COMPOUND){ +diff -urp alsa-plugins-1.0.16.orig/mix/pcm_upmix.c alsa-plugins-1.0.16/mix/pcm_upmix.c +--- alsa-plugins-1.0.16.orig/mix/pcm_upmix.c 2008-02-05 10:25:00.000000000 +0100 ++++ alsa-plugins-1.0.16/mix/pcm_upmix.c 2008-03-09 17:17:23.000000000 +0100 +@@ -338,7 +338,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(upmix) + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; +- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) ++ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "slave") == 0) { + sconf = n; +diff -urp alsa-plugins-1.0.16.orig/mix/pcm_vdownmix.c alsa-plugins-1.0.16/mix/pcm_vdownmix.c +--- alsa-plugins-1.0.16.orig/mix/pcm_vdownmix.c 2008-02-05 10:25:00.000000000 +0100 ++++ alsa-plugins-1.0.16/mix/pcm_vdownmix.c 2008-03-09 17:17:32.000000000 +0100 +@@ -295,7 +295,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(vdownmix) + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; +- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) ++ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "slave") == 0) { + sconf = n; +diff -urp alsa-plugins-1.0.16.orig/oss/ctl_oss.c alsa-plugins-1.0.16/oss/ctl_oss.c +--- alsa-plugins-1.0.16.orig/oss/ctl_oss.c 2008-02-05 10:25:00.000000000 +0100 ++++ alsa-plugins-1.0.16/oss/ctl_oss.c 2008-03-09 17:17:38.000000000 +0100 +@@ -357,7 +357,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss) + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; +- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) ++ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "device") == 0) { + if (snd_config_get_string(n, &device) < 0) { +diff -urp alsa-plugins-1.0.16.orig/oss/pcm_oss.c alsa-plugins-1.0.16/oss/pcm_oss.c +--- alsa-plugins-1.0.16.orig/oss/pcm_oss.c 2008-02-05 10:25:00.000000000 +0100 ++++ alsa-plugins-1.0.16/oss/pcm_oss.c 2008-03-09 17:17:45.000000000 +0100 +@@ -364,7 +364,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss) + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; +- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) ++ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "device") == 0) { + if (snd_config_get_string(n, &device) < 0) { +diff -urp alsa-plugins-1.0.16.orig/pulse/ctl_pulse.c alsa-plugins-1.0.16/pulse/ctl_pulse.c +--- alsa-plugins-1.0.16.orig/pulse/ctl_pulse.c 2008-02-05 10:25:00.000000000 +0100 ++++ alsa-plugins-1.0.16/pulse/ctl_pulse.c 2008-03-09 17:17:50.000000000 +0100 +@@ -599,7 +599,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pulse) + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; +- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) ++ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "server") == 0) { + if (snd_config_get_string(n, &server) < 0) { +diff -urp alsa-plugins-1.0.16.orig/pulse/pcm_pulse.c alsa-plugins-1.0.16/pulse/pcm_pulse.c +--- alsa-plugins-1.0.16.orig/pulse/pcm_pulse.c 2008-03-09 17:12:32.000000000 +0100 ++++ alsa-plugins-1.0.16/pulse/pcm_pulse.c 2008-03-09 17:15:41.000000000 +0100 +@@ -705,7 +705,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) + const char *id; + if (snd_config_get_id(n, &id) < 0) + continue; +- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) ++ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "server") == 0) { + if (snd_config_get_string(n, &server) < 0) { diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 7faa56e..567673e 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.16 -Release: 3%{?dist} +Release: 4%{?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+ @@ -15,6 +15,7 @@ Source6: vdownmix.conf Source7: pulse-default.conf Patch3: alsa-plugins-1.0.15-pulsehint.patch Patch4: alsa-plugins-1.0.16-pulseclose.patch +Patch5: alsa-plugins-1.0.16-hints.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -98,6 +99,7 @@ surround". %setup -q -n %{name}-%{version} %patch3 -p1 -b .pulsehint %patch4 -p1 -b .pulseclose +%patch5 -p1 -b .hints %build %configure --disable-static \ @@ -171,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Tue Mar 25 2008 Lubomir Kundrak - 1.0.16-4 +- Kind of fix the plugins not to complain about the hints + * Wed Mar 19 2008 Eric Moret - 1.0.16-3 - Fixing jack.conf (#435343) From d74c2900a6b242ccf019eba703b7ceab41f67a86 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 12:08:43 +0000 Subject: [PATCH 4/6] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 07ae9d99e5ae7fecddae42ade3ef15a4590fb6de Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:53 +0000 Subject: [PATCH 5/6] 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 508979b38b95311dfd9077c8a0484a62902d1bb6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:45:27 +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 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9