summaryrefslogtreecommitdiff
path: root/package/alsa-utils
diff options
context:
space:
mode:
Diffstat (limited to 'package/alsa-utils')
-rw-r--r--package/alsa-utils/Makefile30
-rw-r--r--package/alsa-utils/files/alsa-utils.postinst4
-rw-r--r--package/alsa-utils/files/amixer.init9
-rwxr-xr-xpackage/alsa-utils/files/raspberry-pi.sh16
-rw-r--r--package/alsa-utils/patches/alsa-utils-exp10-workaround.patch33
5 files changed, 39 insertions, 53 deletions
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 972228cc2..493c7d49f 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -1,16 +1,17 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${TOPDIR}/rules.mk
+include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= alsa-utils
-PKG_VERSION:= 1.0.24.2
+PKG_VERSION:= 1.2.15.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 8238cd57cb301d1c36bcf0ecb59ce6b2
-PKG_DESCR:= ALSA mixer utility
-PKG_SECTION:= multimedia
-PKG_DEPENDS:= alsa-lib libpthread
+PKG_HASH:= 7aaaafbfb01942113ec0c31e51f705910e81079205088ca2f8f137a3869e1a3a
+PKG_DESCR:= mixer/player/record utilities
+PKG_SECTION:= mm/audio
+PKG_DEPENDS:= alsa-lib
PKG_BUILDDEP:= alsa-lib
+PKG_NEEDS:= threads
PKG_URL:= http://www.alsa-project.org/
PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/
@@ -21,23 +22,30 @@ PKGFB_WITH_ALSAMIXER:= ncurses
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE
CONFIGURE_ARGS+= --disable-xmlto
ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)
CONFIGURE_ARGS+= --enable-alsamixer
+TARGET_LDFLAGS+= -ltinfo
else
CONFIGURE_ARGS+= --disable-alsamixer
endif
-post-install:
+alsa-utils-install:
${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin
- ${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin
+ ${CP} ${WRKINST}/usr/bin/{aplay,amixer,arecord,amidi,aconnect} ${IDIR_ALSA_UTILS}/usr/bin
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+ $(INSTALL_DIR) $(IDIR_ALSA_UTILS)/etc/amixer.d
+ $(INSTALL_BIN) ./files/raspberry-pi.sh \
+ $(IDIR_ALSA_UTILS)/etc/amixer.d
+endif
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
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/alsa-utils/files/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst
index 0c381ff14..886cfb1d3 100644
--- a/package/alsa-utils/files/alsa-utils.postinst
+++ b/package/alsa-utils/files/alsa-utils.postinst
@@ -1,5 +1,3 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf amixer
-add_rcconf amixer_volume amixer_volume "80%"
-add_rcconf amixer_mixer amixer_mixer "Master PCM"
+add_rcconf amixer NO
diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init
index f5c21b8c3..58813a96c 100644
--- a/package/alsa-utils/files/amixer.init
+++ b/package/alsa-utils/files/amixer.init
@@ -7,18 +7,15 @@ case $1 in
autostop) ;;
autostart)
test x"${amixer:-NO}" = x"NO" && exit 0
+ test x"$amixer" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
exec sh $0 start
;;
start)
- for mixer in $amixer_mixer; do
- amixer set $mixer on
- amixer set $mixer $amixer_volume
+ for shell in $(ls /etc/amixer.d/*.sh 2>/dev/null); do
+ ./$shell >/dev/null
done
;;
stop)
- for mixer in $amixer_mixer; do
- amixer set $mixer off
- done
;;
restart)
sh $0 stop
diff --git a/package/alsa-utils/files/raspberry-pi.sh b/package/alsa-utils/files/raspberry-pi.sh
new file mode 100755
index 000000000..cbe7a85cb
--- /dev/null
+++ b/package/alsa-utils/files/raspberry-pi.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+/usr/bin/amixer -c 1 sset "Mic Boost" 0
+/usr/bin/amixer -c 1 sset "Input Mux" "Line In"
+/usr/bin/amixer -c 1 sset "Mic" nocap
+/usr/bin/amixer -c 1 sset "Line" cap
+/usr/bin/amixer -c 1 sset "Sidetone" 0
+/usr/bin/amixer -c 1 sset "Output Mixer Line Bypass" off
+/usr/bin/amixer -c 1 sset "Output Mixer Mic Sidetone" on
+/usr/bin/amixer -c 1 sset "Store DC Offset" off
+/usr/bin/amixer -c 1 sset "Output Mixer HiFi" on
+/usr/bin/amixer -c 1 sset "ADC High Pass Filter" on
+/usr/bin/amixer -c 1 sset "Playback Deemphasis" on
+/usr/bin/amixer -c 1 sset "Master Playback ZC" off
+/usr/bin/amixer -c 1 sset Master 80%
+/usr/bin/amixer -c 1 sset Capture 80%
diff --git a/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch b/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch
deleted file mode 100644
index f4a520a5c..000000000
--- a/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From da14c5ab2a6e030c5c56c979b8eb3ca071890876 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Mon, 14 Mar 2011 09:19:18 +0100
-Subject: [PATCH] alsamixer: fix build on uClibc
-
-exp10 is a glibc extension, which isn't supported on uClibc. Luckily,
-exp10() is trivial to compute based on exp(), so add a wrapper for
-the uClibc case.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- alsamixer/volume_mapping.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c
-index 9cacad8..1c0d7c4 100644
---- a/alsamixer/volume_mapping.c
-+++ b/alsamixer/volume_mapping.c
-@@ -37,6 +37,11 @@
- #include <stdbool.h>
- #include "volume_mapping.h"
-
-+#ifdef __UCLIBC__
-+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
-+#define exp10(x) (exp((x) * log(10)))
-+#endif /* __UCLIBC__ */
-+
- #define MAX_LINEAR_DB_SCALE 24
-
- static inline bool use_linear_dB_scale(long dBmin, long dBmax)
---
-1.7.2.3
-
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-11 06:10:06 +0000