[alsa-devel] Debian alsa-tools patches
As previously discussed, I'm posting all Debian patches against alsa-tools that were pending upstreaming.
Please review patch 8, as this one is new and the general state of configure scripts in alsa-tools is less than optimal.
I've left out the patch to correct envy24control's configuration directory, as the additional check for the old dir is not implemented. If anyone wants to pick that up, please contact me or fetch the (trivial) patch from Debian sources.
Thanks, Jordi
From: Elimar Riesebieter riesebie@lxtec.de
Signed-off-by: Jordi Mallach jordi@debian.org --- usx2yloader/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usx2yloader/Makefile.am b/usx2yloader/Makefile.am index 4cc9a70..4dd26a2 100644 --- a/usx2yloader/Makefile.am +++ b/usx2yloader/Makefile.am @@ -11,8 +11,8 @@ usx2yloader_SOURCES = usx2yloader.c
EXTRA_DIST = gitcompile depcomp tascam_fw.usermap tascam_fw.in tascam_fpga.in
-hotplug_files = tascam_fw.usermap tascam_fw tascam_fpga -hotplugdir = /etc/hotplug/usb +hotplug_files = tascam_fw tascam_fpga +hotplugdir = /lib/udev hotplug_SCRIPTS = $(hotplug_files)
At Wed, 15 May 2013 19:19:04 +0200, Jordi Mallach wrote:
From: Elimar Riesebieter riesebie@lxtec.de
Signed-off-by: Jordi Mallach jordi@debian.org
This change is insufficient to make usx2yloader working with udev, no?
Takashi
usx2yloader/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usx2yloader/Makefile.am b/usx2yloader/Makefile.am index 4cc9a70..4dd26a2 100644 --- a/usx2yloader/Makefile.am +++ b/usx2yloader/Makefile.am @@ -11,8 +11,8 @@ usx2yloader_SOURCES = usx2yloader.c
EXTRA_DIST = gitcompile depcomp tascam_fw.usermap tascam_fw.in tascam_fpga.in
-hotplug_files = tascam_fw.usermap tascam_fw tascam_fpga -hotplugdir = /etc/hotplug/usb +hotplug_files = tascam_fw tascam_fpga +hotplugdir = /lib/udev hotplug_SCRIPTS = $(hotplug_files)
-- 1.7.10.4
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
From: Elimar Riesebieter riesebie@lxtec.de
Signed-off-by: Jordi Mallach jordi@debian.org --- as10k1/examples/Makefile | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/as10k1/examples/Makefile b/as10k1/examples/Makefile index 1a36345..6ab8200 100644 --- a/as10k1/examples/Makefile +++ b/as10k1/examples/Makefile @@ -12,6 +12,8 @@ dsp: $(TARGETS) clean: rm -f *~ *.emu10k1
+distclean: clean + install:
distdir:
Signed-off-by: Jordi Mallach jordi@debian.org --- hdsploader/Makefile.am | 2 +- mixartloader/Makefile.am | 2 +- pcxhrloader/Makefile.am | 2 +- usx2yloader/Makefile.am | 2 +- vxloader/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hdsploader/Makefile.am b/hdsploader/Makefile.am index 17cedc7..a7abefb 100644 --- a/hdsploader/Makefile.am +++ b/hdsploader/Makefile.am @@ -3,7 +3,7 @@ MYNAME = hdsploader
bin_PROGRAMS = hdsploader
-AM_CFLAGS = -DDATAPATH="$(datadir)/alsa/firmware/$(MYNAME)" +AM_CFLAGS = -DDATAPATH="/lib/firmware/$(MYNAME)"
hdsploader_SOURCES = hdsploader.c
diff --git a/mixartloader/Makefile.am b/mixartloader/Makefile.am index 1b488c4..2b7ca3b 100644 --- a/mixartloader/Makefile.am +++ b/mixartloader/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = mixartloader
-AM_CFLAGS = -DDATAPATH="$(datadir)/alsa/firmware/$(MYNAME)" +AM_CFLAGS = -DDATAPATH="/lib/firmware/$(MYNAME)"
bin_PROGRAMS = mixartloader
diff --git a/pcxhrloader/Makefile.am b/pcxhrloader/Makefile.am index e6a0107..ab0b07d 100644 --- a/pcxhrloader/Makefile.am +++ b/pcxhrloader/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = pcxhrloader
-AM_CFLAGS = -DDATAPATH="$(datadir)/alsa/firmware/$(MYNAME)" +AM_CFLAGS = -DDATAPATH="/lib/firmware/$(MYNAME)"
bin_PROGRAMS = pcxhrloader
diff --git a/usx2yloader/Makefile.am b/usx2yloader/Makefile.am index 4dd26a2..9ac7ba3 100644 --- a/usx2yloader/Makefile.am +++ b/usx2yloader/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = usx2yloader
-AM_CFLAGS = -DDATAPATH="$(datadir)/alsa/firmware/$(MYNAME)" +AM_CFLAGS = -DDATAPATH="/lib/firmware/$(MYNAME)"
bin_PROGRAMS = usx2yloader
diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am index 415d776..0316722 100644 --- a/vxloader/Makefile.am +++ b/vxloader/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = vxloader
-AM_CFLAGS = -DDATAPATH="$(datadir)/alsa/firmware/$(MYNAME)" +AM_CFLAGS = -DDATAPATH="/lib/firmware/$(MYNAME)"
bin_PROGRAMS = vxloader
At Wed, 15 May 2013 19:19:06 +0200, Jordi Mallach wrote:
Signed-off-by: Jordi Mallach jordi@debian.org
These files are not loaded by udev but by their own hwdep loaders. In other words, they have nothing to do with udev, thus you cannot break the backward compatibility. The firmware files are installed by a different package, thus there is no guarantee that they are located in /lib/firmware/*.
thanks,
Takashi
hdsploader/Makefile.am | 2 +- mixartloader/Makefile.am | 2 +- pcxhrloader/Makefile.am | 2 +- usx2yloader/Makefile.am | 2 +- vxloader/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hdsploader/Makefile.am b/hdsploader/Makefile.am index 17cedc7..a7abefb 100644 --- a/hdsploader/Makefile.am +++ b/hdsploader/Makefile.am @@ -3,7 +3,7 @@ MYNAME = hdsploader
bin_PROGRAMS = hdsploader
-AM_CFLAGS = -DDATAPATH="$(datadir)/alsa/firmware/$(MYNAME)" +AM_CFLAGS = -DDATAPATH="/lib/firmware/$(MYNAME)"
hdsploader_SOURCES = hdsploader.c
diff --git a/mixartloader/Makefile.am b/mixartloader/Makefile.am index 1b488c4..2b7ca3b 100644 --- a/mixartloader/Makefile.am +++ b/mixartloader/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = mixartloader
-AM_CFLAGS = -DDATAPATH="$(datadir)/alsa/firmware/$(MYNAME)" +AM_CFLAGS = -DDATAPATH="/lib/firmware/$(MYNAME)"
bin_PROGRAMS = mixartloader
diff --git a/pcxhrloader/Makefile.am b/pcxhrloader/Makefile.am index e6a0107..ab0b07d 100644 --- a/pcxhrloader/Makefile.am +++ b/pcxhrloader/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = pcxhrloader
-AM_CFLAGS = -DDATAPATH="$(datadir)/alsa/firmware/$(MYNAME)" +AM_CFLAGS = -DDATAPATH="/lib/firmware/$(MYNAME)"
bin_PROGRAMS = pcxhrloader
diff --git a/usx2yloader/Makefile.am b/usx2yloader/Makefile.am index 4dd26a2..9ac7ba3 100644 --- a/usx2yloader/Makefile.am +++ b/usx2yloader/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = usx2yloader
-AM_CFLAGS = -DDATAPATH="$(datadir)/alsa/firmware/$(MYNAME)" +AM_CFLAGS = -DDATAPATH="/lib/firmware/$(MYNAME)"
bin_PROGRAMS = usx2yloader
diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am index 415d776..0316722 100644 --- a/vxloader/Makefile.am +++ b/vxloader/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign
MYNAME = vxloader
-AM_CFLAGS = -DDATAPATH="$(datadir)/alsa/firmware/$(MYNAME)" +AM_CFLAGS = -DDATAPATH="/lib/firmware/$(MYNAME)"
bin_PROGRAMS = vxloader
-- 1.7.10.4
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
From: Elimar Riesebieter riesebie@lxtec.de
The “function” builtin is a bashism that can be simply omitted with no behaviour change, if parentheses are supplied.
Signed-off-by: Jordi Mallach jordi@debian.org --- ld10k1/setup/init_live.in | 64 ++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/ld10k1/setup/init_live.in b/ld10k1/setup/init_live.in index 70d30c8..5e6580f 100644 --- a/ld10k1/setup/init_live.in +++ b/ld10k1/setup/init_live.in @@ -46,7 +46,7 @@ std_playback=playback std_capture=capture #std_capture=capture_noswitch
-function log +log { local level=$1
@@ -57,7 +57,7 @@ function log fi }
-function runlo10k1 +runlo10k1 { log 2 $LO10K1 "$@"
@@ -71,7 +71,7 @@ function runlo10k1 fi }
-function rename +rename { port=$1 name=$2 @@ -81,7 +81,7 @@ function rename runlo10k1 --renam "$port=$name" }
-function connect +connect { from=$1 op=$2 @@ -92,7 +92,7 @@ function connect runlo10k1 --conadd "$from$op$to" }
-function copy +copy { local name=$1 local port=$2 @@ -105,7 +105,7 @@ function copy connect "PIN($name Copy)" '=' "$port" }
-function volume +volume { local name=$1 local port=$2 @@ -120,7 +120,7 @@ function volume connect "PIN($name Volume)" '=' "$port" }
-function master_volume +master_volume { local name=$1 local port=$2 @@ -135,7 +135,7 @@ function master_volume connect "$port" '=' "PIN($name Volume)" }
-function switch +switch { local name=$1 local port=$2 @@ -150,7 +150,7 @@ function switch connect "PIN($name Switch)" '>' "$port" }
-function switch_2x2 +switch_2x2 { local name=$1 local port1=$2 @@ -166,7 +166,7 @@ function switch_2x2 connect "PIN($name Switch,2,3)" '>' "$port2" }
-function switch_5x2 +switch_5x2 { local name=$1 local port1=$2 @@ -182,7 +182,7 @@ function switch_5x2 connect "PIN($name Switch,5,6,7,8,9)" '>' "$port2" }
-function master_switch +master_switch { local name=$1 local port=$2 @@ -197,7 +197,7 @@ function master_switch connect "PIN($name Switch)" '=' "$port" }
-function playback +playback { name=$1 port=$2 @@ -211,7 +211,7 @@ function playback add_output "POUT($name Playback Volume)" }
-function playback_noswitch +playback_noswitch { name=$1 port=$2 @@ -224,7 +224,7 @@ function playback_noswitch add_output "POUT($name Playback Volume)" }
-function capture +capture { name=$1 port=$2 @@ -238,7 +238,7 @@ function capture connect "POUT($name Capture Volume)" '>' "OUT(OUT_PCM_Capture_Left,OUT_PCM_Capture_Right)" }
-function capture_noswitch +capture_noswitch { name=$1 port=$2 @@ -251,7 +251,7 @@ function capture_noswitch connect "POUT($name Capture Volume)" '>' "OUT(OUT_PCM_Capture_Left,OUT_PCM_Capture_Right)" }
-function master +master { local name=$1 local port=$2 @@ -264,48 +264,48 @@ function master master_switch "$name Playback" "POUT($name Playback Volume)" 1 $index }
-function dump_patches +dump_patches { - num=$1 + max=$(( ${1} - 1 )) + line=$(seq -s ' ' 0 $max)
- for (( i=0; $i < $num; i=$i+1 )); do - p=$(( $i + 100)) - runlo10k1 --debug $p + for i in ${line}; do + p=$(( $i + 100)) + runlo10k1 --debug $p done
- exit }
-function add_output +add_output { local port=$1
$add_output_func "$port" }
-function add_output_tone_2 +add_output_tone_2 { local port=$1
connect "$port" '>' "PIN(Tone Control,0,1)" }
-function add_output_simple_2 +add_output_simple_2 { local port=$1
connect "$port" '>' "PIN(Wave Simple Stereo To 51,0,1)" }
-function add_output_prologic_2 +add_output_prologic_2 { local port=$1
connect "$port" '>' "PIN(Wave Prologic,0,1)" }
-function add_output_switched_2 +add_output_switched_2 { local port=$1
@@ -314,7 +314,7 @@ function add_output_switched_2 }
-function simple_stereo_to_51 +simple_stereo_to_51 { local name=$1 local control=$2 @@ -330,7 +330,7 @@ function simple_stereo_to_51 fi }
-function prologic +prologic { local name=$1 local control=$2 @@ -351,7 +351,7 @@ function prologic connect "POUT($name Prologic)" '=' "PIN($name Multi Volume,0,1,2,3,4,5)" }
-function tone +tone { local name=$1 local port=$2 @@ -364,7 +364,7 @@ function tone runlo10k1 -n --ctrl "c-bass0,bass1,bass2,bass3,bass4:$name - Bass,t-$name - Bass:2,v-$name - Bass:1,c-treble0,treble1,treble2,treble3,treble4:$name - Treble,t-$name - Treble:3,v-$name - Treble:1,c-toneonoff:$name - Switch,t-$name - Switch:4" --patch_name "${name}" -a tone.emu10k1 }
-function multi_playback +multi_playback { local name=$1 local port=$2 @@ -383,7 +383,7 @@ function multi_playback connect "POUT($name Multi Volume)" '>' "PIN(Tone Control)" }
-function fxbus +fxbus { local name=$1 local enable_pcm_fx89=$2
Signed-off-by: Jordi Mallach jordi@debian.org --- sb16_csp/cspctl.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sb16_csp/cspctl.1 b/sb16_csp/cspctl.1 index 71c4b52..d2f7b5d 100644 --- a/sb16_csp/cspctl.1 +++ b/sb16_csp/cspctl.1 @@ -13,7 +13,7 @@ is a simple CSP microcode loader for Crative Sound Blaster 16ASP and some Sound .B cspctl can also be used as a post-install function to .I snd-sb16-csp -module to load default codec at module installation. If CSP chip is succesfully detected and initialized, it will be installed as a hardware dependant device +module to load default codec at module installation. If CSP chip is successfully detected and initialized, it will be installed as a hardware dependent device .I hwC0D2 into /dev/snd directory. Currently, following codecs can be loaded to CSP device: .IP "" 4
Jordi,
Just nitpicking but while you're correcting typos, there is another one right in the diff.
Should Crative Sound Blaster not be Creative Sound Blaster? :-)
On Wed, 2013-05-15 at 19:19 +0200, Jordi Mallach wrote:
Signed-off-by: Jordi Mallach jordi@debian.org
sb16_csp/cspctl.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sb16_csp/cspctl.1 b/sb16_csp/cspctl.1 index 71c4b52..d2f7b5d 100644 --- a/sb16_csp/cspctl.1 +++ b/sb16_csp/cspctl.1 @@ -13,7 +13,7 @@ is a simple CSP microcode loader for Crative Sound Blaster 16ASP and some Sound .B cspctl can also be used as a post-install function to .I snd-sb16-csp -module to load default codec at module installation. If CSP chip is succesfully detected and initialized, it will be installed as a hardware dependant device +module to load default codec at module installation. If CSP chip is successfully detected and initialized, it will be installed as a hardware dependent device .I hwC0D2 into /dev/snd directory. Currently, following codecs can be loaded to CSP device: .IP "" 4
El dc 15 de 05 de 2013 a les 21:48 -0400, en/na Olivier Langlois va escriure:
Jordi,
Just nitpicking but while you're correcting typos, there is another one right in the diff.
Should Crative Sound Blaster not be Creative Sound Blaster? :-)
Heh, awesome! :) There's probably a lot more, the ones fixed are common ones detected by a script that has a "common errors" database.
I'll submit yet another patch later on, thanks.
Nitpickers: the world would be a lot more crappy without them! ;)
On Wed, 2013-05-15 at 19:19 +0200, Jordi Mallach wrote:
@@ -13,7 +13,7 @@ is a simple CSP microcode loader for Crative Sound Blaster 16ASP and some Sound
At Thu, 16 May 2013 10:45:36 +0200, Jordi Mallach wrote:
El dc 15 de 05 de 2013 a les 21:48 -0400, en/na Olivier Langlois va escriure:
Jordi,
Just nitpicking but while you're correcting typos, there is another one right in the diff.
Should Crative Sound Blaster not be Creative Sound Blaster? :-)
Heh, awesome! :) There's probably a lot more, the ones fixed are common ones detected by a script that has a "common errors" database.
I'll submit yet another patch later on, thanks.
I already applied with the typo correction Olivier suggested.
thanks,
Takashi
Nitpickers: the world would be a lot more crappy without them! ;)
On Wed, 2013-05-15 at 19:19 +0200, Jordi Mallach wrote:
@@ -13,7 +13,7 @@ is a simple CSP microcode loader for Crative Sound Blaster 16ASP and some Sound
-- Jordi Mallach Pérez -- Debian developer http://www.debian.org/ jordi@sindominio.net jordi@debian.org http://www.sindominio.net/ GnuPG public key information available at http://oskuro.net/
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
When compiled with hardening-flags enabled, ld10k1 fails to build due to a pair of unsafe printf usages that trigger -Werror=format-security.
Signed-off-by: Jordi Mallach jordi@debian.org --- ld10k1/src/ld10k1.c | 2 +- ld10k1/src/lo10k1.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ld10k1/src/ld10k1.c b/ld10k1/src/ld10k1.c index 7359f13..e31c5af 100644 --- a/ld10k1/src/ld10k1.c +++ b/ld10k1/src/ld10k1.c @@ -62,7 +62,7 @@ static void vlog(const char *label, const char *fmt, va_list va) localtime(&tp)); fprintf(out, "%s %s", timestr, label); } else - fprintf(out, label); + fprintf(out, "%s", label); vfprintf(out, fmt, va); fprintf(out, "\n"); fflush(out); diff --git a/ld10k1/src/lo10k1.c b/ld10k1/src/lo10k1.c index 3d04405..962c3ef 100644 --- a/ld10k1/src/lo10k1.c +++ b/ld10k1/src/lo10k1.c @@ -868,7 +868,7 @@ err:
void debug_print(char *str) { - printf(str); + printf("%s", str); }
static int debug(int deb)
Extend the check for PowerPC to the rest of official and unofficial Debian linux-based architectures that lack sys/io.h, based on EGLIBC 2.17. sys/io.h is available, at the time of this writing, on the alpha, i386, ia64, and arm Linux targets.
Signed-off-by: Jordi Mallach jordi@debian.org --- hda-verb/hda-verb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hda-verb/hda-verb.c b/hda-verb/hda-verb.c index bd746ad..2b85923 100644 --- a/hda-verb/hda-verb.c +++ b/hda-verb/hda-verb.c @@ -13,7 +13,11 @@ #include <ctype.h> #include <unistd.h> #include <sys/ioctl.h> -#ifndef __PPC__ +/* EGLIBC 2.17 supports sys/io.h for alpha, i386, ia64, arm, + hurd-i386, and kfreebsd-i386. */ +#if !defined (__powerpc__) && !defined (__sparc__) && !defined (__s390__) && \ + !defined (__mips__) && !defined (__hppa__) && !defined (__m68k__) && \ + !defined (__sh__) #include <sys/io.h> #endif #include <sys/types.h>
At Wed, 15 May 2013 19:19:10 +0200, Jordi Mallach wrote:
Extend the check for PowerPC to the rest of official and unofficial Debian linux-based architectures that lack sys/io.h, based on EGLIBC 2.17. sys/io.h is available, at the time of this writing, on the alpha, i386, ia64, and arm Linux targets.
Signed-off-by: Jordi Mallach jordi@debian.org
hda-verb/hda-verb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hda-verb/hda-verb.c b/hda-verb/hda-verb.c index bd746ad..2b85923 100644 --- a/hda-verb/hda-verb.c +++ b/hda-verb/hda-verb.c @@ -13,7 +13,11 @@ #include <ctype.h> #include <unistd.h> #include <sys/ioctl.h> -#ifndef __PPC__ +/* EGLIBC 2.17 supports sys/io.h for alpha, i386, ia64, arm,
- hurd-i386, and kfreebsd-i386. */
+#if !defined (__powerpc__) && !defined (__sparc__) && !defined (__s390__) && \
- !defined (__mips__) && !defined (__hppa__) && !defined (__m68k__) && \
- !defined (__sh__)
#include <sys/io.h> #endif #include <sys/types.h>
If the change starts looking like this, better to consider what you're really doing :)
Dropping the inclusion of sys/io.h is the right fix.
thanks,
Takashi
Signed-off-by: Jordi Mallach jordi@debian.org --- as10k1/configure.in | 1 + echomixer/configure.in | 1 + envy24control/configure.in | 1 + hda-verb/configure.ac | 2 +- hdajackretask/configure.in | 1 + hdspconf/configure.in | 1 + hdsploader/configure.in | 1 + hdspmixer/configure.in | 1 + hwmixvolume/configure.ac | 1 + ld10k1/configure.in | 1 + mixartloader/configure.in | 1 + pcxhrloader/configure.in | 1 + qlo10k1/configure.in | 1 + rmedigicontrol/configure.in | 1 + sb16_csp/configure.in | 1 + sscape_ctl/configure.in | 1 + us428control/configure.in | 1 + usx2yloader/configure.in | 1 + vxloader/configure.in | 1 + 19 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/as10k1/configure.in b/as10k1/configure.in index 37e9e6c..1855eea 100644 --- a/as10k1/configure.in +++ b/as10k1/configure.in @@ -1,5 +1,6 @@ AC_INIT(as10k1.c) AM_INIT_AUTOMAKE(as10k1, A0.99) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/echomixer/configure.in b/echomixer/configure.in index 9228924..b4c50f1 100644 --- a/echomixer/configure.in +++ b/echomixer/configure.in @@ -1,5 +1,6 @@ AC_INIT(echomixer.c) AM_INIT_AUTOMAKE(echomixer, 1.0.5) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/envy24control/configure.in b/envy24control/configure.in index d42aee8..6a7b23a 100644 --- a/envy24control/configure.in +++ b/envy24control/configure.in @@ -1,5 +1,6 @@ AC_INIT(envy24control.c) AM_INIT_AUTOMAKE(envy24control, 0.6.0) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/hda-verb/configure.ac b/hda-verb/configure.ac index 94ca73b..21349b8 100644 --- a/hda-verb/configure.ac +++ b/hda-verb/configure.ac @@ -1,7 +1,7 @@ AC_INIT(hda-verb.c) AM_INIT_AUTOMAKE(hda-verb, 0.4) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC - AC_OUTPUT(Makefile) diff --git a/hdajackretask/configure.in b/hdajackretask/configure.in index f839af3..050c731 100644 --- a/hdajackretask/configure.in +++ b/hdajackretask/configure.in @@ -1,6 +1,7 @@ AC_INIT([hdajackretask], [0.20120413]) AC_CONFIG_SRCDIR([main-gtk.c]) AM_INIT_AUTOMAKE +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/hdspconf/configure.in b/hdspconf/configure.in index a32ff5f..37a18de 100644 --- a/hdspconf/configure.in +++ b/hdspconf/configure.in @@ -1,5 +1,6 @@ AC_INIT(src/hdspconf.cxx) AM_INIT_AUTOMAKE(hdspconf, 1.4) +AM_MAINTAINER_MODE([enable])
AC_PROG_CXX AC_PROG_MAKE_SET diff --git a/hdsploader/configure.in b/hdsploader/configure.in index 4801124..b530e9c 100644 --- a/hdsploader/configure.in +++ b/hdsploader/configure.in @@ -1,5 +1,6 @@ AC_INIT(hdsploader.c) AM_INIT_AUTOMAKE(hdsploader, 1.2) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/hdspmixer/configure.in b/hdspmixer/configure.in index e47a97d..5e2295b 100644 --- a/hdspmixer/configure.in +++ b/hdspmixer/configure.in @@ -1,5 +1,6 @@ AC_INIT(src/hdspmixer.cxx) AM_INIT_AUTOMAKE(hdspmixer, 1.11) +AM_MAINTAINER_MODE([enable])
AC_PROG_CXX AC_PROG_MAKE_SET diff --git a/hwmixvolume/configure.ac b/hwmixvolume/configure.ac index ad318ad..5572412 100644 --- a/hwmixvolume/configure.ac +++ b/hwmixvolume/configure.ac @@ -1,6 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([hwmixvolume], [0.9]) AM_INIT_AUTOMAKE +AM_MAINTAINER_MODE([enable]) AC_CONFIG_SRCDIR([hwmixvolume]) AC_PROG_INSTALL AC_OUTPUT([Makefile]) diff --git a/ld10k1/configure.in b/ld10k1/configure.in index b04fa34..6249e03 100644 --- a/ld10k1/configure.in +++ b/ld10k1/configure.in @@ -1,6 +1,7 @@ AC_INIT(src/ld10k1.c) AM_INIT_AUTOMAKE(ld10k1, 0.1.8p1) AC_CONFIG_MACRO_DIR([m4]) +AM_MAINTAINER_MODE([enable])
AC_CONFIG_HEADERS(config.h) AC_PROG_CC diff --git a/mixartloader/configure.in b/mixartloader/configure.in index e5d14f8..6ad5ca7 100644 --- a/mixartloader/configure.in +++ b/mixartloader/configure.in @@ -1,5 +1,6 @@ AC_INIT(mixartloader.c) AM_INIT_AUTOMAKE(mixartloader, 1.0) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/pcxhrloader/configure.in b/pcxhrloader/configure.in index 0565dcf..b8ee5d1 100644 --- a/pcxhrloader/configure.in +++ b/pcxhrloader/configure.in @@ -1,5 +1,6 @@ AC_INIT(pcxhrloader.c) AM_INIT_AUTOMAKE(pcxhrloader, 1.0) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/qlo10k1/configure.in b/qlo10k1/configure.in index da6ea97..574754e 100644 --- a/qlo10k1/configure.in +++ b/qlo10k1/configure.in @@ -1,5 +1,6 @@ AC_INIT(src/main.cpp) AM_INIT_AUTOMAKE(qlo10k1, 0.1.2p1) +AM_MAINTAINER_MODE([enable]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS(config.h) AC_PROG_CXX diff --git a/rmedigicontrol/configure.in b/rmedigicontrol/configure.in index bc4c605..bf8c3f4 100644 --- a/rmedigicontrol/configure.in +++ b/rmedigicontrol/configure.in @@ -1,5 +1,6 @@ AC_INIT(rmedigicontrol.c) AM_INIT_AUTOMAKE(rmedigicontrol, 0.3.5a) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/sb16_csp/configure.in b/sb16_csp/configure.in index d0b90ca..5e04236 100644 --- a/sb16_csp/configure.in +++ b/sb16_csp/configure.in @@ -1,5 +1,6 @@ AC_INIT(cspctl.c) AM_INIT_AUTOMAKE(cspctl, 0.2.0) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/sscape_ctl/configure.in b/sscape_ctl/configure.in index 282a56b..98eed8b 100644 --- a/sscape_ctl/configure.in +++ b/sscape_ctl/configure.in @@ -1,5 +1,6 @@ AC_INIT(sscape_ctl.c) AM_INIT_AUTOMAKE(sscape_ctl, 0.1.0) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/us428control/configure.in b/us428control/configure.in index 66aff9e..031ef3e 100644 --- a/us428control/configure.in +++ b/us428control/configure.in @@ -1,5 +1,6 @@ AC_INIT(us428control.cc) AM_INIT_AUTOMAKE(us428control, 0.4.6) +AM_MAINTAINER_MODE([enable]) AC_PROG_CXX AC_PROG_INSTALL AC_HEADER_STDC diff --git a/usx2yloader/configure.in b/usx2yloader/configure.in index e91f28a..800e6e0 100644 --- a/usx2yloader/configure.in +++ b/usx2yloader/configure.in @@ -1,5 +1,6 @@ AC_INIT(usx2yloader.c) AM_INIT_AUTOMAKE(usx2yloader, 0.3) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC diff --git a/vxloader/configure.in b/vxloader/configure.in index e3597ba..2035af3 100644 --- a/vxloader/configure.in +++ b/vxloader/configure.in @@ -1,5 +1,6 @@ AC_INIT(vxloader.c) AM_INIT_AUTOMAKE(vxloader, 1.0) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC
At Wed, 15 May 2013 19:19:03 +0200, Jordi Mallach wrote:
As previously discussed, I'm posting all Debian patches against alsa-tools that were pending upstreaming.
Please review patch 8, as this one is new and the general state of configure scripts in alsa-tools is less than optimal.
I've left out the patch to correct envy24control's configuration directory, as the additional check for the old dir is not implemented. If anyone wants to pick that up, please contact me or fetch the (trivial) patch from Debian sources.
Applied patches 2, 4, 5, 6 & 8.
thanks,
Takashi
participants (3)
-
Jordi Mallach -
Olivier Langlois -
Takashi Iwai