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>

package/Config.in

@@ -268,8 +268,8 @@ source "package/wipe/Config.in"
 source "package/xfsprogs/Config.in"
 endmenu
 
-# Audio support
+# Audio/Video support
-source "package/audio/Config.in"
+source "package/multimedia/Config.in"
 
 menu "Graphic libraries and applications (graphic/text)"
 comment "text rendering libraries"

package/audio/Config.in

@@ -1,15 +0,0 @@
-menu "Audio libraries and applications"
-source "package/audio/alsa-lib/Config.in"
-source "package/audio/alsa-utils/Config.in"
-source "package/audio/asterisk/Config.in"
-source "package/audio/aumix/Config.in"
-source "package/audio/libid3tag/Config.in"
-source "package/audio/libmad/Config.in"
-source "package/audio/libogg/Config.in"
-source "package/audio/libsndfile/Config.in"
-source "package/audio/libvorbis/Config.in"
-source "package/audio/madplay/Config.in"
-source "package/audio/mpg123/Config.in"
-source "package/audio/speex/Config.in"
-source "package/audio/festival/Config.in"
-endmenu

package/audio/audio.mk

@@ -1 +0,0 @@
-include package/audio/*/*.mk

package/audio/festival/festival.mk

@@ -1,4 +0,0 @@
-include package/audio/festival/speech-tools/speech-tools.mk
-include package/audio/festival/festival/festival.mk
-include package/audio/festival/voices/festvox.mk
-include package/audio/festival/lexicons/festlex.mk

package/multimedia/Config.in

@@ -0,0 +1,15 @@
+menu "Audio and video libraries and applications"
+source "package/multimedia/alsa-lib/Config.in"
+source "package/multimedia/alsa-utils/Config.in"
+source "package/multimedia/asterisk/Config.in"
+source "package/multimedia/aumix/Config.in"
+source "package/multimedia/libid3tag/Config.in"
+source "package/multimedia/libmad/Config.in"
+source "package/multimedia/libogg/Config.in"
+source "package/multimedia/libsndfile/Config.in"
+source "package/multimedia/libvorbis/Config.in"
+source "package/multimedia/madplay/Config.in"
+source "package/multimedia/mpg123/Config.in"
+source "package/multimedia/speex/Config.in"
+source "package/multimedia/festival/Config.in"
+endmenu

package/multimedia/alsa-lib/alsa-lib.mk

@@ -26,7 +26,7 @@ $(DL_DIR)/$(ALSA_LIB_SOURCE):
 
 $(ALSA_LIB_DIR)/.unpacked: $(DL_DIR)/$(ALSA_LIB_SOURCE)
 	$(ALSA_LIB_CAT) $(DL_DIR)/$(ALSA_LIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ALSA_LIB_DIR) package/audio/alsa-lib/ alsa-lib-$(ALSA_LIB_VERSION)\*.patch*
+	toolchain/patch-kernel.sh $(ALSA_LIB_DIR) package/multimedia/alsa-lib/ alsa-lib-$(ALSA_LIB_VERSION)\*.patch*
 	$(CONFIG_UPDATE) $(ALSA_LIB_DIR)
 	touch $@
 

package/multimedia/alsa-utils/alsa-utils.mk

@@ -16,7 +16,7 @@ $(DL_DIR)/$(ALSA_UTILS_SOURCE):
 
 $(ALSA_UTILS_DIR)/.unpacked: $(DL_DIR)/$(ALSA_UTILS_SOURCE)
 	$(ALSA_UTILS_CAT) $(DL_DIR)/$(ALSA_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/audio/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch\*
+	toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch\*
 	$(CONFIG_UPDATE) $(ALSA_UTILS_DIR)
 	touch $@
 

package/multimedia/asterisk/asterisk.mk

@@ -15,7 +15,7 @@ $(DL_DIR)/$(ASTERISK_SOURCE):
 
 $(ASTERISK_DIR)/.source: $(DL_DIR)/$(ASTERISK_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(ASTERISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/audio/asterisk/ asterisk\*.patch
+	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/multimedia/asterisk/ asterisk\*.patch
 	touch $@
 
 $(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source

package/multimedia/festival/Config.in

@@ -8,15 +8,15 @@ help
 if BR2_PACKAGE_FESTIVAL
 
 	menu "speech tools"
-		source "package/audio/festival/speech-tools/Config.in"
+		source "package/multimedia/festival/speech-tools/Config.in"
 	endmenu
 
 	menu "festival lexicons"
-		source "package/audio/festival/lexicons/Config.in"
+		source "package/multimedia/festival/lexicons/Config.in"
 	endmenu
 
 	menu "festival voices"
-		source "package/audio/festival/voices/Config.in"
+		source "package/multimedia/festival/voices/Config.in"
 	endmenu
 
 endif

package/multimedia/festival/festival.mk

@@ -0,0 +1,4 @@
+include package/multimedia/festival/speech-tools/speech-tools.mk
+include package/multimedia/festival/festival/festival.mk
+include package/multimedia/festival/voices/festvox.mk
+include package/multimedia/festival/lexicons/festlex.mk

package/multimedia/festival/festival/festival.mk

@@ -17,5 +17,5 @@ FESTIVAL_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX)
 
 FESTIVAL_DEPENDENCIES = uclibc alsa-lib speech-tools
 
-$(eval $(call AUTOTARGETS,package/audio/festival,festival))
+$(eval $(call AUTOTARGETS,package/multimedia/festival,festival))
 

package/multimedia/festival/speech-tools/speech-tools.mk

@@ -16,5 +16,5 @@ SPEECH_TOOLS_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX)
 
 SPEECH_TOOLS_DEPENDENCIES = uclibc ncurses
 
-$(eval $(call AUTOTARGETS,package/audio/festival,speech-tools))
+$(eval $(call AUTOTARGETS,package/multimedia/festival,speech-tools))
 

package/multimedia/libid3tag/libid3tag.mk

@@ -17,7 +17,7 @@ $(DL_DIR)/$(LIBID3TAG_SOURCE):
 
 $(LIBID3TAG_DIR)/.unpacked: $(DL_DIR)/$(LIBID3TAG_SOURCE)
 	$(LIBID3TAG_CAT) $(DL_DIR)/$(LIBID3TAG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LIBID3TAG_DIR) package/audio/libid3tag/ libid3tag-$(LIBID3TAG_VERSION)\*.patch\*
+	toolchain/patch-kernel.sh $(LIBID3TAG_DIR) package/multimedia/libid3tag/ libid3tag-$(LIBID3TAG_VERSION)\*.patch\*
 	$(CONFIG_UPDATE) $(LIBID3TAG_DIR)
 	touch $@
 

package/multimedia/libmad/libmad.mk

@@ -16,8 +16,8 @@ $(DL_DIR)/$(LIBMAD_SOURCE):
 $(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE)
 	$(LIBMAD_CAT) $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	$(CONFIG_UPDATE) $(LIBMAD_DIR)
-	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/audio/libmad/ libmad-$(LIBMAD_VERSION)\*.patch
+	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/multimedia/libmad/ libmad-$(LIBMAD_VERSION)\*.patch
-	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/audio/libmad/ libmad-$(LIBMAD_VERSION)\*.patch.$(ARCH)
+	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/multimedia/libmad/ libmad-$(LIBMAD_VERSION)\*.patch.$(ARCH)
 	# Prevent automake from running.
 	(cd $(LIBMAD_DIR); touch -c config* aclocal.m4 Makefile*);
 	touch $@

package/multimedia/libogg/libogg.mk

@@ -12,4 +12,4 @@ LIBOGG_INSTALL_TARGET = YES
 
 LIBOGG_DEPENDENCIES = uclibc pkgconfig
 
-$(eval $(call AUTOTARGETS,package/audio,libogg))
+$(eval $(call AUTOTARGETS,package/multimedia,libogg))

package/multimedia/libsndfile/libsndfile.mk

@@ -15,7 +15,7 @@ $(DL_DIR)/$(LIBSNDFILE_SOURCE):
 
 $(LIBSNDFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBSNDFILE_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(LIBSNDFILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LIBSNDFILE_DIR) package/audio/libsndfile/ \*.patch
+	toolchain/patch-kernel.sh $(LIBSNDFILE_DIR) package/multimedia/libsndfile/ \*.patch
 	$(CONFIG_UPDATE) $(LIBSNDFILE_DIR)
 	touch $@
 

package/multimedia/madplay/madplay.mk

@@ -23,7 +23,7 @@ $(DL_DIR)/$(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\*
+	toolchain/patch-kernel.sh $(MADPLAY_DIR) package/multimedia/madplay madplay\*.patch\*
 	$(CONFIG_UPDATE) $(MADPLAY_DIR)
 	touch $@
 

package/multimedia/mpg123/mpg123.mk

@@ -23,7 +23,7 @@ $(DL_DIR)/$(MPG123_SOURCE):
 
 $(MPG123_DIR)/.unpacked: $(DL_DIR)/$(MPG123_SOURCE)
 	$(MPG123_CAT) $(DL_DIR)/$(MPG123_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(MPG123_DIR) package/audio/mpg123/ mpg123-$(MPG123_VERSION)\*.patch
+	toolchain/patch-kernel.sh $(MPG123_DIR) package/multimedia/mpg123/ mpg123-$(MPG123_VERSION)\*.patch
 	$(CONFIG_UPDATE) $(MPG123_DIR)/build
 	touch $@
 

package/multimedia/multimedia.mk

@@ -0,0 +1 @@
+include package/multimedia/*/*.mk

package/multimedia/speex/speex.mk

@@ -22,7 +22,7 @@ ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y)
 	SPEEX_CONF_OPT += --enable-arm5e-asm
 endif
 
-$(eval $(call AUTOTARGETS,package/audio,speex))
+$(eval $(call AUTOTARGETS,package/multimedia,speex))
 
 $(SPEEX_TARGET_BUILD): $(SPEEX_TARGET_CONFIGURE)
 	$(call MESSAGE,"Building")