package/audio: rename audio category to multimedia

Prepare for the merge of audio and video packages. Many packages cannot
properly be assigned to either audio or video, because they have support
for both (libogg, mplayer, vlc).

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>

2 files changed, 0 insertions, 90 deletions

diff --git a/package/audio/madplay/Config.in b/package/audio/madplay/Config.in
deleted file mode 100644
index a77cc367e..000000000
--- a/package/audio/madplay/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config BR2_PACKAGE_MADPLAY
-	bool "madplay"
-	select BR2_PACKAGE_LIBMAD
-	select BR2_PACKAGE_LIBID3TAG
-	help
-	  Command-line front-end to libmad, a high-quality MPEG audio decoder.
-	  It currently supports MPEG-1 and the MPEG-2 extension to lower
-	  sampling frequencies, as well as the de facto MPEG 2.5 format. All
-	  three audio layers — Layer I, Layer II, and Layer III (i.e. MP3) —
-	  are fully implemented.
-
-	  http://www.underbit.com/products/mad/
-
-config BR2_PACKAGE_MADPLAY_ALSA
-	bool
-	default y
-	depends on BR2_PACKAGE_MADPLAY && BR2_PACKAGE_ALSA_LIB
diff --git a/package/audio/madplay/madplay.mk b/package/audio/madplay/madplay.mk
deleted file mode 100644
index 94809942c..000000000
--- a/package/audio/madplay/madplay.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#############################################################
-#
-# madplay
-#
-#############################################################
-MADPLAY_VERSION:=0.15.2b
-MADPLAY_SOURCE:=madplay-$(MADPLAY_VERSION).tar.gz
-MADPLAY_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad
-MADPLAY_CAT:=$(ZCAT)
-MADPLAY_DIR:=$(BUILD_DIR)/madplay-$(MADPLAY_VERSION)
-MADPLAY_BIN:=madplay
-MADPLAY_TARGET_BIN:=usr/bin/$(MADPLAY_BIN)
-
-# Check if ALSA is built, then we should configure after alsa-lib so
-# ./configure can find alsa-lib.
-ifeq ($(strip $(BR2_PACKAGE_MADPLAY_ALSA)),y)
-MADPLAY_USE_ALSA:=--with-alsa
-MADPLAY_ALSA_DEP:=alsa-lib
-endif
-
-$(DL_DIR)/$(MADPLAY_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(MADPLAY_SITE)/$(MADPLAY_SOURCE)
-
-$(MADPLAY_DIR)/.unpacked: $(DL_DIR)/$(MADPLAY_SOURCE)
-	$(MADPLAY_CAT) $(DL_DIR)/$(MADPLAY_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(MADPLAY_DIR) package/audio/madplay madplay\*.patch\*
-	$(CONFIG_UPDATE) $(MADPLAY_DIR)
-	touch $@
-
-$(MADPLAY_DIR)/.configured: $(MADPLAY_DIR)/.unpacked
-	(cd $(MADPLAY_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_ARGS) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) $(BR2_MADPLAY_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		./configure \
-		--target=$(REAL_GNU_TARGET_NAME) \
-		--host=$(REAL_GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		$(MADPLAY_USE_ALSA) \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
-	)
-	touch $@
-
-$(MADPLAY_DIR)/$(MADPLAY_BIN): $(MADPLAY_DIR)/.configured
-	$(MAKE) -C $(MADPLAY_DIR)
-
-$(TARGET_DIR)/$(MADPLAY_TARGET_BIN): $(MADPLAY_DIR)/$(MADPLAY_BIN)
-	$(INSTALL) -D $(MADPLAY_DIR)/$(MADPLAY_BIN) $(TARGET_DIR)/$(MADPLAY_TARGET_BIN)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MADPLAY_TARGET_BIN)
-
-madplay: uclibc $(MADPLAY_ALSA_DEP) libmad libid3tag $(TARGET_DIR)/$(MADPLAY_TARGET_BIN)
-
-madplay-clean:
-	rm -f $(TARGET_DIR)/$(MADPLAY_TARGET_BIN)
-	-$(MAKE) -C $(MADPLAY_DIR) clean
-
-madplay-dirclean:
-	rm -rf $(MADPLAY_DIR)
-
-madplay-source: $(DL_DIR)/$(MADPLAY_SOURCE)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_MADPLAY)),y)
-TARGETS+=madplay
-endif