[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-utils/debian/patches (7 files)

Thomas Hood jdthood-guest@haydn.debian.org
Tue, 07 Sep 2004 02:24:28 -0600


    Date: Tuesday, September 7, 2004 @ 02:24:28
  Author: jdthood-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-utils/debian/patches

Modified: 20_alsaconf_lspci.dpatch 90_debian_alsaconf_cfgfile.dpatch
          90_debian_alsaconf_idmode.dpatch
          90_debian_alsaconf_notouch.dpatch
          90_debian_alsaconf_paths.dpatch
          91_debian_alsaconf_noclear.dpatch
          92_debian_alsaconf_restore.dpatch

New notouch patch; clean up patches


-----------------------------------+
 20_alsaconf_lspci.dpatch          |    4 -
 90_debian_alsaconf_cfgfile.dpatch |    6 +-
 90_debian_alsaconf_idmode.dpatch  |    6 +-
 90_debian_alsaconf_notouch.dpatch |   78 +++++++++++++++++++++++++++++-------
 90_debian_alsaconf_paths.dpatch   |   16 +++----
 91_debian_alsaconf_noclear.dpatch |    5 --
 92_debian_alsaconf_restore.dpatch |   12 ++---
 7 files changed, 88 insertions(+), 39 deletions(-)


Index: debian/alsa-utils/debian/patches/20_alsaconf_lspci.dpatch
diff -u debian/alsa-utils/debian/patches/20_alsaconf_lspci.dpatch:1.1 debian/alsa-utils/debian/patches/20_alsaconf_lspci.dpatch:1.2
--- debian/alsa-utils/debian/patches/20_alsaconf_lspci.dpatch:1.1	Thu Jul 15 09:48:21 2004
+++ debian/alsa-utils/debian/patches/20_alsaconf_lspci.dpatch	Tue Sep  7 02:24:26 2004
@@ -22,9 +22,9 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/jordi/deb/alsa/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/jordi/deb/alsa/alsa-utils/alsaconf/alsaconf.in	2004-06-09 23:48:42.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in	2004-07-15 17:39:50.000000000 +0200
+diff -urNad /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
+--- /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:17:21.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:17:22.000000000 +0200
 @@ -501,7 +501,7 @@
  /^[<literal space><literal tab>]*PCI: /{
  	gsub(/0x/, "");
Index: debian/alsa-utils/debian/patches/90_debian_alsaconf_cfgfile.dpatch
diff -u debian/alsa-utils/debian/patches/90_debian_alsaconf_cfgfile.dpatch:1.1 debian/alsa-utils/debian/patches/90_debian_alsaconf_cfgfile.dpatch:1.2
--- debian/alsa-utils/debian/patches/90_debian_alsaconf_cfgfile.dpatch:1.1	Mon Sep  6 14:11:53 2004
+++ debian/alsa-utils/debian/patches/90_debian_alsaconf_cfgfile.dpatch	Tue Sep  7 02:24:26 2004
@@ -23,10 +23,10 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:09:12.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:09:44.000000000 +0200
-@@ -164,7 +164,7 @@
+diff -urNad /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
+--- /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:18:05.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:18:05.000000000 +0200
+@@ -159,7 +159,7 @@
    fi
    cfgfile="/etc/modprobe.conf"
  elif [ "$distribution" = "debian" ]; then
Index: debian/alsa-utils/debian/patches/90_debian_alsaconf_idmode.dpatch
diff -u debian/alsa-utils/debian/patches/90_debian_alsaconf_idmode.dpatch:1.1 debian/alsa-utils/debian/patches/90_debian_alsaconf_idmode.dpatch:1.2
--- debian/alsa-utils/debian/patches/90_debian_alsaconf_idmode.dpatch:1.1	Mon Sep  6 14:23:18 2004
+++ debian/alsa-utils/debian/patches/90_debian_alsaconf_idmode.dpatch	Tue Sep  7 02:24:26 2004
@@ -23,10 +23,10 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:15:36.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:16:09.000000000 +0200
-@@ -72,8 +72,8 @@
+diff -urNad /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
+--- /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:17:51.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:17:51.000000000 +0200
+@@ -67,8 +67,8 @@
  use_modinfo_db=0
  do_logging=0
  alsa_uid=0
Index: debian/alsa-utils/debian/patches/90_debian_alsaconf_notouch.dpatch
diff -u debian/alsa-utils/debian/patches/90_debian_alsaconf_notouch.dpatch:1.2 debian/alsa-utils/debian/patches/90_debian_alsaconf_notouch.dpatch:1.3
--- debian/alsa-utils/debian/patches/90_debian_alsaconf_notouch.dpatch:1.2	Tue Sep  7 00:49:03 2004
+++ debian/alsa-utils/debian/patches/90_debian_alsaconf_notouch.dpatch	Tue Sep  7 02:24:26 2004
@@ -23,9 +23,9 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 08:46:29.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 08:47:13.000000000 +0200
+diff -urNad /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
+--- /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:18:16.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:18:17.000000000 +0200
 @@ -154,9 +154,6 @@
    if [ -d /etc/modprobe.d ]; then
      cfgout="/etc/modprobe.d/sound"
@@ -36,7 +36,46 @@
    cfgfile="/etc/modprobe.conf"
  elif [ "$distribution" = "debian" ]; then
    cfgfile="/etc/modutils/alsa-base"
-@@ -536,20 +533,6 @@
+@@ -355,12 +352,24 @@
+ fi
+ 
+ 
++cleanup () {
++    killall -9 aplay arecord >/dev/null 2>&1
++    /sbin/modprobe -r isapnp >/dev/null 2>&1
++    /sbin/modprobe -r isa-pnp >/dev/null 2>&1
++    rm -f "$TMP" "$addcfg" "$FOUND" "$DUMP"
++}
++trap cleanup 0 
+ 
+ TMP=`mktemp -q /tmp/alsaconf.XXXXXX`
+ if [ $? -ne 0 ]; then
+ 	echo "$0: Can't create temp file, exiting..."
+         exit 1
+ fi
++addcfg=`mktemp -q /tmp/alsaconf.XXXXXX`
++if [ $? -ne 0 ]; then
++	echo "$0: Can't create temp file, exiting..."
++        exit 1
++fi
+ FOUND=`mktemp -q /tmp/alsaconf.XXXXXX`
+ if [ $? -ne 0 ]; then
+ 	echo "$0: Can't create temp file, exiting..."
+@@ -371,13 +380,6 @@
+ 	echo "$0: Can't create temp file, exiting..."
+         exit 1
+ fi
+-cleanup () {
+-    killall -9 aplay arecord >/dev/null 2>&1
+-    /sbin/modprobe -r isapnp >/dev/null 2>&1
+-    /sbin/modprobe -r isa-pnp >/dev/null 2>&1
+-    rm -f "$TMP" "$FOUND" "$DUMP"
+-}
+-trap cleanup 0 
+ 
+ # convert ISA PnP id number to string 'ABC'
+ convert_isapnp_id () {
+@@ -536,20 +538,6 @@
  }
  
  #
@@ -57,7 +96,28 @@
  # configure and try test sound
  #
  ac_config_card () {
-@@ -582,16 +565,17 @@
+@@ -558,14 +546,14 @@
+     CARD_OPTS="${*:2}"
+ 
+     if [ -n "$cfgout" ]; then
+-	addcfg="$cfgout"
++        $DIALOG --yesno "
++Configuring $CARD_DRIVER
++Do you want to modify ${cfgfile} and ${cfgout}?" 8 50 || acex 0
+     else
+-	addcfg="$cfgfile"
+-    fi
+-    # Configuration done
+-    $DIALOG --yesno "
++        $DIALOG --yesno "
+ Configuring $CARD_DRIVER
+-Do you want to modify ${addcfg}?" 8 50 || acex 0
++Do you want to modify ${cfgfile}?" 8 50 || acex 0
++    fi
+     clear
+ 
+     # Copy conf.modules and make changes.
+@@ -582,20 +570,12 @@
  	SOUND_CORE="snd"
      fi
  
@@ -65,6 +125,16 @@
 -        remove_ac_block < $cfgfile | remove_sndconfig_block | uniq > $TMP
 -    else
 -	remove_ac_block < $cfgfile | remove_y2_block | uniq > $TMP
+-    fi
+-
+-    if [ -n "$cfgout" ]; then
+-	rm -f "$cfgout"
+-	touch "$cfgout"
+-	addcfg="$cfgout"
+-    else
+-	addcfg="$TMP"
+-	echo "$ACB
+-# --- ALSACONF verion $version ---" >> $addcfg
 +    if [ -r $cfgfile ] ; then
 +        if [ "$distribution" = "redhat" -o "$distribution" = "fedora" ] ; then
 +            remove_ac_block < $cfgfile | remove_sndconfig_block | uniq > $TMP
@@ -73,25 +143,28 @@
 +        fi
      fi
  
-     if [ -n "$cfgout" ]; then
--	rm -f "$cfgout"
--	touch "$cfgout"
- 	addcfg="$cfgout"
-+	: > "$addcfg"
-     else
- 	addcfg="$TMP"
- 	echo "$ACB
-@@ -626,9 +610,11 @@
+     if [ -z "$have_alias" -a "$kernel" = "new" ]; then
+@@ -620,15 +600,17 @@
+     if [ -n "$CARD_OPTS" ]; then
+ 	echo "options $CARD_DRIVER $CARD_OPTS" >> $addcfg
      fi
+-    if [ -z "$cfgout" ]; then
+-	echo "$ACE
+-" >> $addcfg
+-    fi
  
      if [ -n "$cfgout" ]; then
 -	backup_old_config $cfgfile $TMP
 +	[ ! -r "$cfgfile" ] || cmp -s "$TMP" "$cfgfile" || cat "$TMP" > "$cfgfile"
-+	rm -f "$TMP"
++	cmp -s "$addcfg" "$cfgout" || cat "$addcfg" > "$cfgout"
      else
 -	backup_old_config $cfgfile $addcfg
-+        cmp -s "$addcfg" "$cfgfile" || cat "$addcfg" > "$cfgfile"
-+	rm -f "$addcfg"
++	echo "$ACB
++# --- ALSACONF verion $version ---" >> $TMP
++        cat "$addcfg" >> "$TMP"
++	echo "$ACE
++" >> $TMP
++        cmp -s "$TMP" "$cfgfile" || cat "$TMP" > "$cfgfile"
      fi
  
      /sbin/depmod -a 2>/dev/null
Index: debian/alsa-utils/debian/patches/90_debian_alsaconf_paths.dpatch
diff -u debian/alsa-utils/debian/patches/90_debian_alsaconf_paths.dpatch:1.1 debian/alsa-utils/debian/patches/90_debian_alsaconf_paths.dpatch:1.2
--- debian/alsa-utils/debian/patches/90_debian_alsaconf_paths.dpatch:1.1	Mon Sep  6 14:26:14 2004
+++ debian/alsa-utils/debian/patches/90_debian_alsaconf_paths.dpatch	Tue Sep  7 02:24:26 2004
@@ -26,9 +26,9 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:14:13.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:14:53.000000000 +0200
+diff -urNad /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
+--- /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:17:37.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:17:38.000000000 +0200
 @@ -40,13 +40,6 @@
    distribution="unknown"
  fi
@@ -43,7 +43,7 @@
  usage() {
      echo "ALSA configurator version $version"
      echo "usage: alsaconf [options]"
-@@ -506,7 +499,7 @@
+@@ -501,7 +494,7 @@
  /^[<literal space><literal tab>]*PCI: /{
  	gsub(/0x/, "");
  	gsub(/=/, ":");
@@ -52,7 +52,7 @@
  	if (system (x) == 0)
  		printf "%s %s\n", $2, driver >>"'"$FOUND"'"
  }
-@@ -537,7 +530,7 @@
+@@ -532,7 +525,7 @@
  #
  find_device_name () {
      if expr "$1" : '[0-9a-f][0-9a-f][0-9a-f][0-9a-f]:[0-9a-f][0-9a-f][0-9a-f][0-9a-f]' >/dev/null; then
@@ -61,7 +61,7 @@
  	return
      elif expr "$1" : '[A-Z@][A-Z@][A-Z@][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' >/dev/null; then
  	cardname=`grep '^Card [0-9]\+ '\'$1':' $DUMP | head -n 1 | sed -e 's/^Card [0-9]\+ '\''.*:\(.*\)'\'' .*$/\1/'`
-@@ -735,7 +728,7 @@
+@@ -730,7 +723,7 @@
  ac_try_load () {
      test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
      /sbin/modprobe snd-$1 ${*:2} >/dev/null 2>&1
@@ -70,7 +70,7 @@
  	: ;
      else
  	modprobe -r snd-$1 >/dev/null 2>&1
-@@ -774,7 +767,7 @@
+@@ -769,7 +762,7 @@
  ac_try_capture () {
      test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
      /sbin/modprobe snd-$1 ${*:3} >/dev/null 2>&1
@@ -79,7 +79,7 @@
  	: ;
      else
  	modprobe -r snd-$1 >/dev/null 2>&1
-@@ -1130,7 +1123,7 @@
+@@ -1125,7 +1118,7 @@
      # check for TP600E
      #
      if [ ${devs_found[0]} = cs46xx ]; then
@@ -88,7 +88,7 @@
  	    if $DIALOG --yesno "
   Looks like you having a Thinkpad 600E or 770 notebook.
   On this notebook, CS4236 driver should be used
-@@ -1143,7 +1136,7 @@
+@@ -1138,7 +1131,7 @@
  		ac_config_legacy cs4236
  		exit 0
  	    fi
Index: debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch
diff -u debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch:1.3 debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch:1.4
--- debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch:1.3	Tue Sep  7 02:02:55 2004
+++ debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch	Tue Sep  7 02:24:26 2004
@@ -24,14 +24,13 @@
 
 @DPATCH@
 diff -urNad /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:02:58.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:03:32.000000000 +0200
-@@ -317,10 +317,20 @@
+--- /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:15:04.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:15:31.000000000 +0200
+@@ -317,10 +317,19 @@
  " 17 60 || acex 0
  }
  
 +clear() {
-+    # Do a real clear here if you prefer
 +    echo
 +}
 +
Index: debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch
diff -u debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch:1.2 debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch:1.3
--- debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch:1.2	Tue Sep  7 01:36:44 2004
+++ debian/alsa-utils/debian/patches/92_debian_alsaconf_restore.dpatch	Tue Sep  7 02:24:26 2004
@@ -23,10 +23,10 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-06 23:20:16.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in	2004-09-06 23:20:36.000000000 +0200
-@@ -617,6 +617,13 @@
+diff -urNad /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
+--- /home/jdthood/src/pkg-alsa_NEWER/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:10:22.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 10:11:28.000000000 +0200
+@@ -610,6 +610,13 @@
      if [ -n "$CARD_OPTS" ]; then
  	echo "options $CARD_DRIVER $CARD_OPTS" >> $addcfg
      fi
@@ -37,6 +37,6 @@
 +	echo "install $CARD_DRIVER /sbin/modprobe --ignore-install $CARD_DRIVER && /usr/sbin/alsactl restore
 +#remove $CARD_DRIVER /usr/sbin/alsactl store ; /sbin/modprobe --remove --ignore-remove $CARD_DRIVER" >> $addcfg
 +    fi
-     if [ -z "$cfgout" ]; then
- 	echo "$ACE
- " >> $addcfg
+ 
+     if [ -n "$cfgout" ]; then
+ 	[ ! -r "$cfgfile" ] || cmp -s "$TMP" "$cfgfile" || cat "$TMP" > "$cfgfile"