Remove multimedia subdirectory

Unless it was a group of sub-packages, packages was never regrouped by
category. multimedia/ was an exception to this rule.

This patch move packages/multimedia/ sub-directories to packages/. It
keeps two subdirectories for gstream 0.10 and gstreamer 1.X.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

2 files changed, 144 insertions, 0 deletions

diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in
new file mode 100644
index 0000000000..4bc12049e8
--- /dev/null
+++ b/package/alsa-utils/Config.in
@@ -0,0 +1,81 @@
+config BR2_PACKAGE_ALSA_UTILS
+	bool "alsa-utils"
+	depends on BR2_LARGEFILE
+	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/
+
+comment "alsa-utils requires a toolchain with LARGEFILE and threads support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+
+if BR2_PACKAGE_ALSA_UTILS
+menu "ALSA utils selection"
+
+config BR2_PACKAGE_ALSA_UTILS_ALSACONF
+	bool "alsaconf"
+
+config BR2_PACKAGE_ALSA_UTILS_ALSACTL
+	bool "alsactl"
+	default y
+
+config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
+	bool "alsamixer"
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_NCURSES_TARGET_PANEL
+	select BR2_PACKAGE_NCURSES_TARGET_FORM
+	select BR2_PACKAGE_NCURSES_TARGET_MENU
+	select BR2_PACKAGE_ALSA_LIB_MIXER
+	depends on BR2_USE_WCHAR
+	default y
+
+comment "alsamixer requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
+
+config BR2_PACKAGE_ALSA_UTILS_AMIDI
+	select BR2_PACKAGE_ALSA_LIB_RAWMIDI
+	bool "amidi"
+
+config BR2_PACKAGE_ALSA_UTILS_AMIXER
+	select BR2_PACKAGE_ALSA_LIB_MIXER
+	bool "amixer"
+
+config BR2_PACKAGE_ALSA_UTILS_APLAY
+	select BR2_PACKAGE_ALSA_LIB_PCM
+	bool "aplay/arecord"
+
+config BR2_PACKAGE_ALSA_UTILS_IECSET
+	select BR2_PACKAGE_ALSA_LIB_PCM
+	bool "iecset"
+
+config BR2_PACKAGE_ALSA_UTILS_ACONNECT
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+	bool "aconnect"
+
+config BR2_PACKAGE_ALSA_UTILS_APLAYMIDI
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+	bool "aplaymidi"
+
+config BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+	bool "arecordmidi"
+
+config BR2_PACKAGE_ALSA_UTILS_ASEQDUMP
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+	bool "aseqdump"
+
+config BR2_PACKAGE_ALSA_UTILS_ASEQNET
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+	bool "aseqnet"
+
+config BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST
+	select BR2_PACKAGE_ALSA_LIB_PCM
+	bool "speaker-test"
+
+endmenu
+
+endif
+
diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk
new file mode 100644
index 0000000000..b951112c58
--- /dev/null
+++ b/package/alsa-utils/alsa-utils.mk
@@ -0,0 +1,63 @@
+################################################################################
+#
+# alsa-utils
+#
+################################################################################
+
+ALSA_UTILS_VERSION = 1.0.26
+ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
+ALSA_UTILS_SITE = http://alsa.cybermirror.org/utils
+ALSA_UTILS_LICENSE = GPLv2
+ALSA_UTILS_LICENSE_FILES = COPYING
+ALSA_UTILS_INSTALL_STAGING = YES
+ALSA_UTILS_DEPENDENCIES = host-gettext alsa-lib \
+	$(if $(BR2_PACKAGE_NCURSES),ncurses)
+
+ALSA_UTILS_CONF_ENV = \
+	ac_cv_prog_ncurses5_config=$(STAGING_DIR)/bin/ncurses5-config
+
+ALSA_UTILS_CONF_OPT = \
+	--disable-xmlto \
+	--with-curses=ncurses
+
+ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y)
+ALSA_UTILS_CONF_OPT += --disable-alsamixer --disable-alsatest
+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_ALSAMIXER) += usr/bin/alsamixer
+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_IECSET) += usr/bin/iecset
+ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ACONNECT) += usr/bin/aconnect
+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; \
+	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
+
+define ALSA_UTILS_UNINSTALL_TARGET_CMDS
+	rm -f $(addprefix $(TARGET_DIR)/,$(ALSA_UTILS_TARGETS_) $(ALSA_UTILS_TARGETS_y))
+endef
+
+$(eval $(autotools-package))