5 files changed, 42 insertions, 21 deletions
diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in
deleted file mode 100644
index 64fc5ab94..000000000
--- a/package/alsa-utils/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_ALSA_UTILS
-	prompt "alsa-utils........................ ALSA utilities / mixer"
-	tristate
-	default n
-	help
-	  
-	  http://www.alsa-project.org/
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 1b0dc7eee..63ce6faf5 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -4,11 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-utils
-PKG_VERSION:=		1.0.20
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		6837e673ef19da96d8bd2f9e18cd9574
+PKG_VERSION:=		1.0.22
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		f7180316188552ee1e6759a03f1fe98d
 PKG_DESCR:=		ALSA mixer utility
-PKG_SECTION:=		libs
+PKG_SECTION:=		utils
+PKG_DEPENDS:=		alsa-lib libpthread
+PKG_BUILDDEP+=		alsa-lib
 PKG_URL:=		http://www.alsa-project.org
 PKG_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \
 			ftp://ftp.alsa-project.org/pub/utils/
@@ -19,10 +21,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-alsamixer
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin 
diff --git a/package/alsa-utils/files/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst
index f18dbf62a..bd4ff3be2 100644
--- a/package/alsa-utils/files/alsa-utils.postinst
+++ b/package/alsa-utils/files/alsa-utils.postinst
@@ -1,4 +1,5 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf amixer
-
+add_rcconf amixer_volume amixer_volume "75%"
+add_rcconf amixer_mixer amixer_mixer "Master"
diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init
index d7f388892..7f5f37177 100644
--- a/package/alsa-utils/files/amixer.init
+++ b/package/alsa-utils/files/amixer.init
@@ -10,14 +10,11 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	amixer set Master on
-	amixer set PCM on
-	amixer set Master 75%
-	amixer set PCM 75%
+	amixer set $amixer_mixer on
+	amixer set $amixer_mixer $amixer_volume
 	;;
 stop)
-	amixer set Master off
-	amixer set PCM off
+	amixer set $amixer_mixer off
 	;;
 restart)
 	sh $0 stop
diff --git a/package/alsa-utils/patches/patch-alsactl_Makefile_in b/package/alsa-utils/patches/patch-alsactl_Makefile_in
new file mode 100644
index 000000000..bc9f90dd5
--- /dev/null
+++ b/package/alsa-utils/patches/patch-alsactl_Makefile_in
@@ -0,0 +1,31 @@
+--- alsa-utils-1.0.21.orig/alsactl/Makefile.in	2009-08-31 17:14:23.000000000 +0200
++++ alsa-utils-1.0.21/alsactl/Makefile.in	2009-12-28 17:27:46.140625000 +0100
+@@ -573,7 +573,7 @@ distdir: $(DISTFILES)
+ 	done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS)
++all-am: Makefile $(PROGRAMS) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)"; do \
+@@ -623,7 +623,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-man
++install-data-am:
+ 
+ install-exec-am: install-sbinPROGRAMS
+ 
+@@ -672,8 +672,8 @@ uninstall-man: uninstall-man1 uninstall-
+ 	uninstall-man1 uninstall-man7 uninstall-sbinPROGRAMS
+ 
+ 
+-%.7: %.xml
+-	xmlto man $?
++#%.7: %.xml
++#	xmlto man $?
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: