Merge from bittboy/buildroot@db180c0

package/alsa-utils/Config.in

@@ -0,0 +1,94 @@
+comment "alsa-utils needs a toolchain w/ threads"
+	depends on BR2_USE_MMU # fork
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+menuconfig BR2_PACKAGE_ALSA_UTILS
+	bool "alsa-utils"
+	depends on BR2_USE_MMU # fork
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
+	select BR2_PACKAGE_ALSA_LIB
+	help
+	  This package contains the command line utilities for the ALSA
+	  project.
+
+	  http://www.alsa-project.org/
+
+if BR2_PACKAGE_ALSA_UTILS
+
+config BR2_PACKAGE_ALSA_UTILS_ALSACONF
+	bool "alsaconf"
+
+config BR2_PACKAGE_ALSA_UTILS_ACONNECT
+	bool "aconnect"
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+
+config BR2_PACKAGE_ALSA_UTILS_ALSACTL
+	bool "alsactl"
+	default y
+
+config BR2_PACKAGE_ALSA_UTILS_ALSALOOP
+	bool "alsaloop"
+
+config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
+	bool "alsamixer"
+	default y
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_ALSA_LIB_MIXER
+
+comment "alsamixer needs a toolchain w/ wchar"
+	depends on !BR2_USE_WCHAR
+
+config BR2_PACKAGE_ALSA_UTILS_ALSAUCM
+	bool "alsaucm"
+
+config BR2_PACKAGE_ALSA_UTILS_ALSATPLG
+	bool "alsatplg"
+
+config BR2_PACKAGE_ALSA_UTILS_AMIDI
+	bool "amidi"
+	select BR2_PACKAGE_ALSA_LIB_RAWMIDI
+
+config BR2_PACKAGE_ALSA_UTILS_AMIXER
+	bool "amixer"
+	select BR2_PACKAGE_ALSA_LIB_MIXER
+
+config BR2_PACKAGE_ALSA_UTILS_APLAY
+	bool "aplay/arecord"
+	select BR2_PACKAGE_ALSA_LIB_PCM
+
+config BR2_PACKAGE_ALSA_UTILS_APLAYMIDI
+	bool "aplaymidi"
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+
+config BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI
+	bool "arecordmidi"
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+
+config BR2_PACKAGE_ALSA_UTILS_ASEQDUMP
+	bool "aseqdump"
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+
+config BR2_PACKAGE_ALSA_UTILS_ASEQNET
+	bool "aseqnet"
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+
+config BR2_PACKAGE_ALSA_UTILS_BAT
+	bool "bat"
+	help
+	  ALSABAT (ALSA Basic Audio Tester) is a simple command-line
+	  utility intended to help automate audio driver and sound
+	  server testing with little human interaction.
+
+	  Note that analysis support in alsabat requires fftw single
+	  precision.
+
+config BR2_PACKAGE_ALSA_UTILS_IECSET
+	bool "iecset"
+	select BR2_PACKAGE_ALSA_LIB_PCM
+
+config BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST
+	bool "speaker-test"
+	select BR2_PACKAGE_ALSA_LIB_PCM
+
+endif

package/alsa-utils/alsa-utils.hash

@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 5ddf2cbddb4bd1a4a2a6492a09c25898b08c3ad64893c3655be14194cf0a213a  alsa-utils-1.1.9.tar.bz2
+sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING

package/alsa-utils/alsa-utils.mk

@@ -0,0 +1,101 @@
+################################################################################
+#
+# alsa-utils
+#
+################################################################################
+
+ALSA_UTILS_VERSION = 1.1.9
+ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
+ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
+ALSA_UTILS_LICENSE = GPL-2.0
+ALSA_UTILS_LICENSE_FILES = COPYING
+ALSA_UTILS_INSTALL_STAGING = YES
+ALSA_UTILS_DEPENDENCIES = host-pkgconf alsa-lib \
+	$(if $(BR2_PACKAGE_NCURSES),ncurses) \
+	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
+	$(TARGET_NLS_DEPENDENCIES)
+# Regenerate aclocal.m4 to pick the patched
+# version of alsa.m4 from alsa-lib
+ALSA_UTILS_AUTORECONF = YES
+ALSA_UTILS_GETTEXTIZE = YES
+
+ALSA_UTILS_CONF_ENV = \
+	ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) \
+	LIBS=$(TARGET_NLS_LIBS)
+
+ALSA_UTILS_CONF_OPTS = \
+	--disable-xmlto \
+	--disable-rst2man \
+	--with-curses=$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncursesw,ncurses)
+
+ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSALOOP),y)
+ALSA_UTILS_CONF_OPTS += --enable-alsaloop
+else
+ALSA_UTILS_CONF_OPTS += --disable-alsaloop
+endif
+
+ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y)
+ALSA_UTILS_CONF_OPTS += --disable-alsamixer --disable-alsatest
+endif
+
+ifeq ($(BR2_PACKAGE_ALSA_UTILS_BAT),y)
+ALSA_UTILS_CONF_OPTS += --enable-bat
+# Analysis support requires fftw single precision
+ALSA_UTILS_DEPENDENCIES += $(if $(BR2_PACKAGE_FFTW_SINGLE),fftw-single)
+else
+ALSA_UTILS_CONF_OPTS += --disable-bat
+endif
+
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACONF) += usr/sbin/alsaconf
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACTL) += usr/sbin/alsactl
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSALOOP) += usr/bin/alsaloop
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER) += usr/bin/alsamixer
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSATPLG) += usr/bin/alsatplg
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIDI) += usr/bin/amidi
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIXER) += usr/bin/amixer
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAY) += usr/bin/aplay usr/bin/arecord
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_BAT) += usr/bin/alsabat
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_IECSET) += usr/bin/iecset
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ACONNECT) += usr/bin/aconnect
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSAUCM) += usr/bin/alsaucm
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAYMIDI) += usr/bin/aplaymidi
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI) += usr/bin/arecordmidi
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQDUMP) += usr/bin/aseqdump
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQNET) += usr/bin/aseqnet
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST) += usr/bin/speaker-test
+
+define ALSA_UTILS_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/var/lib/alsa
+	for i in $(ALSA_UTILS_TARGETS_y); do \
+		$(INSTALL) -D -m 755 $(STAGING_DIR)/$$i $(TARGET_DIR)/$$i || exit 1; \
+	done
+	if [ -x "$(TARGET_DIR)/usr/bin/speaker-test" ]; then \
+		mkdir -p $(TARGET_DIR)/usr/share/alsa/speaker-test; \
+		mkdir -p $(TARGET_DIR)/usr/share/sounds/alsa; \
+		cp -rdpf $(STAGING_DIR)/usr/share/alsa/speaker-test/* $(TARGET_DIR)/usr/share/alsa/speaker-test/; \
+		cp -rdpf $(STAGING_DIR)/usr/share/sounds/alsa/* $(TARGET_DIR)/usr/share/sounds/alsa/; \
+	fi
+	if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \
+		mkdir -p $(TARGET_DIR)/usr/share/; \
+		rm -rf $(TARGET_DIR)/usr/share/alsa/; \
+		cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \
+	fi
+endef
+
+ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSACTL)$(BR2_INIT_SYSTEMD),yy)
+ALSA_UTILS_DEPENDENCIES += systemd
+ALSA_UTILS_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
+define ALSA_UTILS_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 $(@D)/alsactl/alsa-restore.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service
+	$(INSTALL) -D -m 0644 $(@D)/alsactl/alsa-state.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/sound.target.wants
+	ln -sf ../../../../lib/systemd/system/alsa-restore.service \
+		$(TARGET_DIR)/etc/systemd/system/sound.target.wants/alsa-restore.service
+	ln -sf ../../../../lib/systemd/system/alsa-state.service \
+		$(TARGET_DIR)/etc/systemd/system/sound.target.wants/alsa-state.service
+endef
+endif
+
+$(eval $(autotools-package))