rpms/alsa-utils/devel alsactl.conf, NONE, 1.1 alsaunmute, NONE, 1.1 .cvsignore, 1.24, 1.25 alsa-info.sh, 1.2, 1.3 alsa-utils.spec, 1.70, 1.71 alsa.rules, 1.3, 1.4 sources, 1.28, 1.29 alsa-utils-1.0.14-statedir.patch, 1.2, NONE alsacard.c, 1.1, NONE alsaunmute.c, 1.16, NONE salsa.1, 1.1, NONE salsa.c, 1.8, NONE

Jaroslav Kysela perex at fedoraproject.org
Thu Sep 11 09:04:12 UTC 2008 

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26960

Modified Files:
	.cvsignore alsa-info.sh alsa-utils.spec alsa.rules sources 
Added Files:
	alsactl.conf alsaunmute 
Removed Files:
	alsa-utils-1.0.14-statedir.patch alsacard.c alsaunmute.c 
	salsa.1 salsa.c 
Log Message:
alsa-utils: updated 1.0.18rc3 and removed RH specific udev helpers


--- NEW FILE alsactl.conf ---
#
# ALSA library configuration file for alsactl tool
# (/usr/share/alsa tree is not necessary for alsactl)
#

ctl.hw {
	@args [ CARD ]
	@args.CARD {
		type string
		default "0"
	}
	type hw
	card $CARD
}


--- NEW FILE alsaunmute ---
#!/bin/sh

export ALSA_CONFIG_PATH="/etc/alsa/alsactl.conf"
exec /sbin/alsactl init



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	21 Jul 2008 10:11:54 -0000	1.24
+++ .cvsignore	11 Sep 2008 09:03:42 -0000	1.25
@@ -17,3 +17,4 @@
 alsa-utils-1.0.15rc1.tar.bz2
 alsa-utils-1.0.16.tar.bz2
 alsa-utils-1.0.17.tar.bz2
+alsa-utils-1.0.18rc3.tar.bz2


Index: alsa-info.sh
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-info.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-info.sh	21 Jul 2008 10:11:54 -0000	1.2
+++ alsa-info.sh	11 Sep 2008 09:03:42 -0000	1.3
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION=0.4.48
+SCRIPT_VERSION=0.4.51
 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
 
 #################################################################################
@@ -33,7 +33,11 @@
 #Define some simple functions
 
 pbcheck(){
-	[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+	if [[ -z $PASTEBIN ]]; then
+		[[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+	else
+		[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+	fi
 }
 
 update() {
@@ -69,12 +73,6 @@
 }
 
 
-#### FIX ME
-withsecure() {
-	POST_URL="http://alsa-info.pastebin.ca"
-}
-###########
-
 withaplay() {
         echo "!!Aplay/Arecord output" >> $FILE
         echo "!!------------" >> $FILE
@@ -106,6 +104,7 @@
 	CARD_NAME=`grep "^ *$i " /tmp/alsainfo/alsacards.tmp|awk {'print $2'}`
 	echo "!!-------Mixer controls for card $i $CARD_NAME]" >> $FILE
 	echo "" >>$FILE
+	amixer -c$i info>> $FILE 2>&1
 	amixer -c$i>> $FILE 2>&1
         echo "" >> $FILE
 	done
@@ -192,6 +191,8 @@
 #Check modprobe config files for sound related options
 SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')
 
+PASTEBIN=""
+WWWSERVICE="www.alsa-project.org"
 QUESTION="yes"
 PROCEED="yes"
 REPEAT=""
@@ -205,6 +206,10 @@
 	--no-upload)
 		NOUPLOAD="yes"
 		;;
+	--pastebin)
+		PASTEBIN="yes"
+		WWWSERVICE="pastebin"
+		;;
 	--no-dialog)
 		DIALOG=""
 		REPEAT=""
@@ -219,7 +224,7 @@
 if [[ -n "$DIALOG" ]]
 then
 if [ -z "$NOUPLOAD" ]; then
-	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nBy default, this script will AUTOMATICALLY UPLOAD your information to a pastebin site.\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
+	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nBy default, this script will AUTOMATICALLY UPLOAD your information to a $WWWSERVICE site.\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
 else
 	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
 fi
@@ -238,11 +243,11 @@
 if [ -z "$NOUPLOAD" ]; then
 if [[ -n "$TPUT" ]]; then
 tput bold
-echo "By default, the collected information will be AUTOMATICALLY uploaded to a pastebin site."
+echo "By default, the collected information will be AUTOMATICALLY uploaded to a $WWWSERVICE site."
 echo "If you do not wish for this to occur, run the script with the --no-upload argument"
 tput sgr0
 else
-echo "By default, the collected information will be AUTOMATICALLY uploaded to a pastebin site."
+echo "By default, the collected information will be AUTOMATICALLY uploaded to a $WWWSERVICE site."
 echo "If you do not wish for this to occur, run the script with the --no-upload argument"
 fi
 echo ""
@@ -297,7 +302,11 @@
 cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > /tmp/alsainfo/alsa-ac97-regs.tmp 2> /dev/null
 
 #Fetch the info, and put it in $FILE in a nice readable format.
+if [[ -z $PASTEBIN ]]; then
+echo "upload=true&script=true&cardinfo=" > $FILE
+else
 echo "name=$USER&type=33&description=/tmp/alsa-info.txt&expiry=&s=Submit+Post&content=" > $FILE
+fi
 echo "!!################################" >> $FILE
 echo "!!ALSA Information Script v $SCRIPT_VERSION" >> $FILE
 echo "!!################################" >> $FILE
@@ -425,6 +434,16 @@
 	until [ -z "$1" ]
 	do
 	case "$1" in
+		--pastebin)
+		        update
+        		withdevices
+        		withconfigs
+        		withaplay
+        		withamixer
+        		withalsactl
+        		withlsmod
+        		pbcheck
+			;;
 		--update)
 			update
 			exit
@@ -510,18 +529,23 @@
 			exit 0
 			;;
 		*)
+			echo "alsa-info.sh version $SCRIPT_VERSION"
 			echo ""
 			echo "Available options:"
 			echo "	--with-aplay (includes the output of aplay -l)"
 			echo "	--with-amixer (includes the output of amixer)"
 			echo "	--with-alsactl (includes the output of alsactl)"
-			echo "	--with-configs (includes the output of ~/.asoundrc and /etc/asound.conf if they exist)" 
+			echo "	--with-configs (includes the output of ~/.asoundrc and"
+			echo "	    /etc/asound.conf if they exist)" 
 			echo "	--with-devices (shows the device nodes in /dev/snd/)"
 			echo ""
 			echo "	--update (check server for script updates)"
 			echo "	--no-upload (do not upload contents to remote server)"
+			echo "	--pastebin (use http://pastebin.ca) as remote server"
+			echo "	    instead www.alsa-project.org"
 			echo "	--about (show some information about the script)"
-			echo "	--debug (will run the script as normal, but will not delete $FILE)"
+			echo "	--debug (will run the script as normal, but will not"
+			echo "	     delete $FILE)"
 			cleanup
 			exit 0
 			;;
@@ -539,6 +563,14 @@
 if [[ -n "$DIALOG" ]]
 then
 	if [[ -z $NOUPLOAD ]]; then
+	if [[ -z $PASTEBIN ]]; then
+	wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt "http://www.alsa-project.org/cardinfo-db/" &>/tmp/alsainfo/wget.tmp || echo "Upload failed; exit"
+	{ for i in 10 20 30 40 50 60 70 80 90; do
+		echo $i
+		sleep 0.2
+	done
+	echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.alsa-project.org ..." 6 70 0
+	else
 	wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt "http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY&encrypt=t&encryptpw=blahblah" &>/tmp/alsainfo/wget.tmp || echo "Upload failed; exit"
 	{ for i in 10 20 30 40 50 60 70 80 90; do
 		echo $i
@@ -546,12 +578,18 @@
 	done
 	echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.pastebin.ca ..." 6 70 0
 	fi
+	fi
 else
 
 	if [[ -z $NOUPLOAD ]]; then
+	if [[ -z $PASTEBIN ]]; then
+	echo -n "Uploading information to www.alsa-project.org ... " 
+	wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt http://www.alsa-project.org/cardinfo-db/ &>/tmp/alsainfo/wget.tmp &
+	else
 	echo -n "Uploading information to www.pastebin.ca ... " 
 	wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY &>/tmp/alsainfo/wget.tmp &
 	fi
+	fi
 fi
 #Progess spinner for wget transfer.
 if [[ -z "$DIALOG" ]]	
@@ -569,9 +607,17 @@
 if [[ -z $NOUPLOAD ]]; then
 	if [[ -n "$TPUT" ]]
 	then
-		FINAL_URL=`tput setaf 1; grep "SUCCESS:" /tmp/alsainfo/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p';tput sgr0`
+		if [[ -z $PASTEBIN ]]; then
+			FINAL_URL=`tput setaf 1; grep "SUCCESS:" /tmp/alsainfo/wget.tmp | cut -d ' ' -f 2 ; tput sgr0`
+		else
+			FINAL_URL=`tput setaf 1; grep "SUCCESS:" /tmp/alsainfo/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p';tput sgr0`
+		fi
 	else
-		FINAL_URL=`grep "SUCCESS:" /tmp/alsainfo/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p'`
+		if [[ -z $PASTEBIN ]]; then
+			FINAL_URL=`grep "SUCCESS:" /tmp/alsainfo/wget.tmp | cut -d ' ' -f 2`
+		else
+			FINAL_URL=`grep "SUCCESS:" /tmp/alsainfo/wget.tmp |sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p'`
+		fi
 	fi
 fi
 #Output the URL of the uploaded file.	
@@ -589,9 +635,9 @@
 then
 	if [[ -n $NOUPLOAD ]]; then
 		if [[ -n $PBERROR ]]; then
-			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occured while contacting the pastebin. Your information was NOT automatically uploaded.\n\nYour ALSA information can be seen by looking in $FILE" 10 100
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occured while contacting the $WWWSERVICE. Your information was NOT automatically uploaded.\n\nYour ALSA information can be seen by looking in $FILE" 10 100
 		else
-			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the pastebin\n\nYour ALSA information can be seen by looking in $FILE" 10 100
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the $WWWSERVICE\n\nYour ALSA information can be seen by looking in $FILE" 10 100
 		fi
 	else
 		dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100 
@@ -605,12 +651,12 @@
 clear
 if [[ -n $NOUPLOAD ]]; then
 	if [[ -n $PBERROR ]]; then
-		echo "An error occured while contacting the pastebin. Your information was NOT automatically uploaded."
+		echo "An error occured while contacting the $WWWSERVICE. Your information was NOT automatically uploaded."
 		echo ""
 		echo "Your ALSA information can be seen by looking in $FILE"
 		echo ""
 	else
-		echo "You requested that your information was NOT automatically uploaded to the pastebin"
+		echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE"
 		echo ""
 		echo "Your ALSA information can be seen by looking in $FILE"
 		echo ""
@@ -621,7 +667,7 @@
 echo "Please inform the person helping you."
 echo ""
 fi
-	#We posted the file to pastebin.ca , so we dont need it anymore. delete it.
+	#We posted the file , so we dont need it anymore. delete it.
 	if [ -z $KEEP_FILES ]
 	then
 		rm $FILE 
@@ -631,6 +677,16 @@
 else
 	if [[ -z $DIALOG ]]
 	then
+		if [[ -z $PASTEBIN ]]; then
+		echo ""
+		echo "Could not automatically upload output to http://www.alsa-project.org"
+		echo "Possible reasons are:"
+		echo "    1. Couldnt find 'wget' in your PATH"
+		echo "    2. Your version of wget is less than 1.8.2"
+		echo ""
+		echo "Please manually upload $FILE to http://www.alsa-project.org/cardinfo-db/ and submit your post."
+		echo ""
+		else
 		echo ""
 		echo "Could not automatically upload output to http://www.pastebin.ca"
 		echo "Possible reasons are:"
@@ -639,10 +695,15 @@
 		echo ""
 		echo "Please manually upload $FILE to http://www.pastebin.ca/upload.php and submit your post."
 		echo ""
+		fi
 	fi
 	if [[ -n $DIALOG ]]
 	then
-		dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.pastebin.ca.\nPossible reasons are:\n\n    1. Couldn't find 'wget' in your PATH\n    2. Your version of wget is less than 1.8.2\n\nPlease manually upload $FILE to http://www.pastebin.ca/upload.php and submit your post." 25 100
+		if [[ -z $PASTEBIN ]]; then
+			dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.alsa-project.org.\nPossible reasons are:\n\n    1. Couldn't find 'wget' in your PATH\n    2. Your version of wget is less than 1.8.2\n\nPlease manually upload $FILE to http://www.alsa-project,org/cardinfo-db/ and submit your post." 25 100
+		else
+			dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.pastebin.ca.\nPossible reasons are:\n\n    1. Couldn't find 'wget' in your PATH\n    2. Your version of wget is less than 1.8.2\n\nPlease manually upload $FILE to http://www.pastebin.ca/upload.php and submit your post." 25 100
+		fi
 	fi
 fi
 #Clean up the temp files


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- alsa-utils.spec	21 Jul 2008 12:14:14 -0000	1.70
+++ alsa-utils.spec	11 Sep 2008 09:03:42 -0000	1.71
@@ -1,22 +1,19 @@
-#define  prever         rc1
-#define  prever_dot     .rc1
+%define  prever         rc3
+%define  prever_dot     .rc3
 
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
-Version: 1.0.17
+Version: 1.0.18
 Release: 1%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
 Source:  ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
-Source2: salsa.c
-Source3: alsacard.c
-Source4: alsaunmute.c
-Source5: salsa.1
+Source4: alsaunmute
 Source6: alsa-info.sh
 Source10: alsa.rules
+Source11: alsactl.conf
 Patch0:  alsa-utils-1.0.17-alsaconf.patch
-Patch1:  alsa-utils-1.0.14-statedir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
@@ -30,14 +27,10 @@
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 %patch0 -p1
-%patch1 -p1 -b .statedir
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin
 %{__make} %{?_smp_mflags}
-%{__cc} $RPM_OPT_FLAGS -o salsa %{SOURCE2} -lasound
-%{__cc} $RPM_OPT_FLAGS -o alsacard %{SOURCE3} -lasound
-%{__cc} $RPM_OPT_FLAGS -o alsaunmute %{SOURCE4} -lasound
 %{__cp} %{SOURCE5} .
 
 %install
@@ -51,20 +44,16 @@
 
 # Install support utilities
 mkdir -p -m755 $RPM_BUILD_ROOT/bin
-install -p -m 755 alsacard alsaunmute %{buildroot}/bin/
-install -p -m 755 salsa %{buildroot}/sbin/
+install -p -m 755 alsaunmute %{buildroot}/bin/
 
 # Link alsactl to /usr/sbin
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
-# Create a place for volume configuration
-mkdir -p $RPM_BUILD_ROOT/etc/alsa
-touch $RPM_BUILD_ROOT/etc/alsa/asound.state
-
-# Install salsa man page
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
-install -p -m 644 salsa.1 %{buildroot}/usr/share/man/man1
+# Create a place for global configuration
+mkdir -p -m 755 $RPM_BUILD_ROOT/etc/alsa
+install -p -m 644 alsactl.conf %{buildroot}/etc/alsa
+touch $RPM_BUILD_ROOT/etc/asound.state
 
 # Install alsa-info.sh script
 install -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/bin/alsa-info
@@ -76,6 +65,7 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README TODO
 %config /etc/udev/rules.d/*
+%config /etc/alsa/*
 /bin/*
 /sbin/*
 %{_bindir}/*
@@ -84,10 +74,19 @@
 %{_datadir}/sounds/
 %{_mandir}/man?/*
 %dir /etc/alsa/
-%ghost /etc/alsa/asound.state
+%ghost /etc/asound.state
 
 
 %changelog
+* Thu Sep 11 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.18-1.rc3
+- updated to 1.0.18rc3
+- updated alsa-info.sh script to 0.4.51
+- removed alsacard utility
+- removed salsa utility
+- changed alsaunmute to use 'alsactl init' now
+- updated ALSA udevd rules to use alsactl
+- moved /etc/alsa/asound.state back to /etc/asound.state
+
 * Mon Jul 21 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.17-1
 - updated to 1.0.17 final
 - updated alsa-info.sh script to 0.4.48


Index: alsa.rules
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa.rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsa.rules	24 Sep 2007 15:06:48 -0000	1.3
+++ alsa.rules	11 Sep 2008 09:03:42 -0000	1.4
@@ -1,2 +1,4 @@
-SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/sbin/salsa"
-SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/sbin/salsa"
\ No newline at end of file
+ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", \
+  ENV{ALSA_CONFIG_PATH}="/etc/alsa/alsactl.conf", RUN+="/sbin/alsactl restore $name"
+ACTION=="remove", SUBSYSTEM=="sound", KERNEL=="controlC*", \
+  ENV{ALSA_CONFIG_PATH}="/etc/alsa/alsactl.conf", RUN+="/sbin/alsactl store $name"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	21 Jul 2008 10:11:54 -0000	1.28
+++ sources	11 Sep 2008 09:03:42 -0000	1.29
@@ -1 +1 @@
-14ccd0c900bf663afb36eac6f92d41d6  alsa-utils-1.0.17.tar.bz2
+31ff44de50e6725974b3d2e032ab214d  alsa-utils-1.0.18rc3.tar.bz2


--- alsa-utils-1.0.14-statedir.patch DELETED ---


--- alsacard.c DELETED ---


--- alsaunmute.c DELETED ---


--- salsa.1 DELETED ---


--- salsa.c DELETED ---

More information about the fedora-extras-commits mailing list