diff options
Diffstat (limited to 'package/alsa-utils')
| -rw-r--r-- | package/alsa-utils/Makefile | 21 | ||||
| -rw-r--r-- | package/alsa-utils/files/alsa-utils.postinst | 4 | ||||
| -rw-r--r-- | package/alsa-utils/files/amixer.init | 10 |
3 files changed, 27 insertions, 8 deletions
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 63ce6faf5..e1668520c 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -5,26 +5,41 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils PKG_VERSION:= 1.0.22 -PKG_RELEASE:= 2 +PKG_RELEASE:= 4 PKG_MD5SUM:= f7180316188552ee1e6759a03f1fe98d PKG_DESCR:= ALSA mixer utility -PKG_SECTION:= utils +PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libpthread PKG_BUILDDEP+= alsa-lib +ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) +PKG_BUILDDEP+= ncurses +endif 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/ +PKG_FLAVOURS:= WITH_ALSAMIXER +PKGFS_WITH_ALSAMIXER:= libncurses +PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) +CONFIGURE_ARGS+= --enable-alsamixer +else CONFIGURE_ARGS+= --disable-alsamixer +endif post-install: - ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin + ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin/ ${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin/ +ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) + ${INSTALL_BIN} ${WRKINST}/usr/bin/alsamixer \ + ${IDIR_ALSA_UTILS}/usr/bin/ +endif include ${TOPDIR}/mk/pkg-bottom.mk 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 |