From 01285f20d9f1c51d251bc143dd1c9f2ad026f87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Thu, 13 Nov 2008 13:22:13 +0100
Subject: [PATCH 1/3] Move conditional inclusion of locale.h further down.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without this patch, ENABLE_NLS is checked before ever being defined
(aconfig.h is not yet included), and thus locale.h would never be
included even when NLS is enabled.

Signed-off-by: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
---
 speaker-test/speaker-test.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c
index 57a7cbc..b8cd5c8 100644
--- a/speaker-test/speaker-test.c
+++ b/speaker-test/speaker-test.c
@@ -44,9 +44,6 @@
 #include <getopt.h>
 #include <inttypes.h>
 #include <ctype.h>
-#ifdef ENABLE_NLS
-#include <locale.h>
-#endif
 #include <byteswap.h>
 
 #define ALSA_PCM_NEW_HW_PARAMS_API
@@ -59,6 +56,10 @@
 #include "gettext.h"
 #include "version.h"
 
+#ifdef ENABLE_NLS
+#include <locale.h>
+#endif
+
 enum {
   TEST_PINK_NOISE = 1,
   TEST_SINE,

From 6596a405f6b9f00dcbab9548a1e0afce04b99421 Mon Sep 17 00:00:00 2001
From: "grdscarabe@grdscarabe.net" <grdscarabe@grdscarabe.net>
Date: Thu, 13 Nov 2008 13:22:55 +0100
Subject: [PATCH 2/3] Create a special fd redirection for menu choice.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without this patch, dialog errors gets interpreted as the choice,
causing errors related to loading "snd-***" module.

The problem was reported as Gentoo bug #96467 (
https://bugs.gentoo.org/show_bug.cgi?id=96467 ).

Signed-off-by: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
---
 alsaconf/alsaconf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
index 47d6da5..806ddb6 100644
--- a/alsaconf/alsaconf.in
+++ b/alsaconf/alsaconf.in
@@ -1411,7 +1411,7 @@ if [ x$devs_found != x ]; then
          Following card(s) are found on your system.
          Choose a soundcard to configure:
 ")
-    $DIALOG --title "$title" --menu "$msg" 17 76 8 "${devs_found[@]}" 2> $FOUND || acex 0
+    $DIALOG --title "$title" --menu "$msg" 17 76 8 "${devs_found[@]}" --output-fd 3 3> $FOUND || acex 0
     card=`head -n 1 $FOUND`
     if [ "$card" = "legacy" ]; then
 	ac_config_legacy

From 2c79b79b4780cae2192ecfc4ba5615d6b0d13f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Thu, 13 Nov 2008 13:23:04 +0100
Subject: [PATCH 3/3] Nowadays Gentoo also uses update-modules, so update
 alsaconf.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was originally reported as Gentoo bug #193303 (
https://bugs.gentoo.org/show_bug.cgi?id=193303 ).

Original patch by Jack Kelly <endgame.dos@gmail.com>

Signed-off-by: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
---
 alsaconf/alsaconf.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
index 806ddb6..6e9ff75 100644
--- a/alsaconf/alsaconf.in
+++ b/alsaconf/alsaconf.in
@@ -908,13 +908,12 @@ BEGIN { in_sound=0; }
 
     farewell
     clear
-    if [ "$distribution" = "gentoo" ]; then
-      xecho "Running modules-update..."
-      modules-update
-    elif [ "$distribution" = "debian" ]; then
-      xecho "Running update-modules..."
-      update-modules
-    fi
+    case "$distribution" in
+    gentoo | debian)
+	xecho "Running update-modules..."
+	update-modules
+	;;
+    esac
     if [ -x $rcalsasound ] ; then
       echo Loading driver...
       $rcalsasound restart