dist-git conversion

#2781)

Makefile

@@ -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 $$/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)

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) {

alsa-plugins.spec

@@ -1,6 +1,6 @@
 Name:           alsa-plugins
 Version:        1.0.16
-Release:        1%{?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,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* Tue Mar 25 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.0.16-4
+- Kind of fix the plugins not to complain about the hints
+
+* Wed Mar 19 2008 Eric Moret <eric.moret@gmail.com> - 1.0.16-3
+- Fixing jack.conf (#435343)
+
+* Sun Mar 09 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.0.16-2
+- Add descriptions to various PCM plugins, so they're visible in aplay -L
+
 * Sat Mar 08 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.0.16-1
 - New upstream, dropping upstreamed patches
 - Do not assert fail when pulseaudio is unavailable (#435148)

jack.conf

@@ -1,13 +1,17 @@
 # The jack plugin configuration
+# $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"
 	}
 }

pcm-oss.conf

@@ -3,4 +3,7 @@
 pcm.oss {
 	type oss
 	device /dev/dsp
+	hint {
+		description "Open Sound System"
+	}
 }

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"
+    }
 }
 

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"
+	}
 }

upmix.conf

@@ -1,6 +1,10 @@
 # upmix plugin configuration
+# $Id$
 
 pcm.upmix51 {
 	type upmix
 	slave.pcm "surround51"
+	hint {
+		description "Upmixer channel expander"
+	}
 }

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"
+	}
 }