From c7f2643f780f5485375ee31721069418322bd3c1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 16 Jul 2010 14:26:30 +0200 Subject: a lot of lemote finetuning * add PCM to mixer init script * let ipkg check if rootfs is already rw mounted * fix overlapping utilities * enable DPMS in Xorg configuration, remove unused stuff * set DPMS timeout to 60 seconds via startx, disable screen blanking. Mplayer now runs fine without any screen blanking * enable some more features in vim (f.e. :split) * rename mpc package to libmpc * fix uvcvideo loading (v4l2 compat again..) * add new xset package --- package/alsa-utils/Makefile | 2 +- package/alsa-utils/files/alsa-utils.postinst | 4 ++-- package/alsa-utils/files/amixer.init | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'package/alsa-utils') diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 8013ee5aa..e1668520c 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils PKG_VERSION:= 1.0.22 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= f7180316188552ee1e6759a03f1fe98d PKG_DESCR:= ALSA mixer utility PKG_SECTION:= multimedia diff --git a/package/alsa-utils/files/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst index bd4ff3be2..0c381ff14 100644 --- a/package/alsa-utils/files/alsa-utils.postinst +++ b/package/alsa-utils/files/alsa-utils.postinst @@ -1,5 +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" +add_rcconf amixer_volume amixer_volume "80%" +add_rcconf amixer_mixer amixer_mixer "Master PCM" diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init index 7f5f37177..f5c21b8c3 100644 --- a/package/alsa-utils/files/amixer.init +++ b/package/alsa-utils/files/amixer.init @@ -10,11 +10,15 @@ autostart) exec sh $0 start ;; start) - amixer set $amixer_mixer on - amixer set $amixer_mixer $amixer_volume + for mixer in $amixer_mixer; do + amixer set $mixer on + amixer set $mixer $amixer_volume + done ;; stop) - amixer set $amixer_mixer off + for mixer in $amixer_mixer; do + amixer set $mixer off + done ;; restart) sh $0 stop -- cgit v1.2.3