45 files changed, 24 insertions, 21 deletions
diff --git a/package/Config.in b/package/Config.in
index b8d81ba4b..9568729ba 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -285,27 +285,8 @@ source "package/wipe/Config.in"
 source "package/xfsprogs/Config.in"
 endif
 
-menuconfig BR2_AUDIO_SUPPORT
-	bool "Audio libraries and applications"
-	default y
-	help
-	  Support for audio libraries and applications
-
-if BR2_AUDIO_SUPPORT
-source "package/alsa-lib/Config.in"
-source "package/alsa-utils/Config.in"
-source "package/asterisk/Config.in"
-source "package/aumix/Config.in"
-source "package/libid3tag/Config.in"
-source "package/libmad/Config.in"
-source "package/libogg/Config.in"
-source "package/libsndfile/Config.in"
-source "package/libvorbis/Config.in"
-source "package/madplay/Config.in"
-source "package/mpg123/Config.in"
-source "package/speex/Config.in"
-source "package/festival/Config.in"
-endif
+# Audio support
+source "package/audio/Config.in"
 
 menuconfig BR2_GRAPHIC_SUPPORT
 	bool "Graphic libraries and applications (graphic/text)"
diff --git a/package/audio/Config.in b/package/audio/Config.in
new file mode 100644
index 000000000..370467a2e
--- /dev/null
+++ b/package/audio/Config.in
@@ -0,0 +1,21 @@
+menuconfig BR2_AUDIO_SUPPORT
+	bool "Audio libraries and applications"
+	default y
+	help
+	  Support for audio libraries and applications
+
+if BR2_AUDIO_SUPPORT
+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"
+endif
diff --git a/package/alsa-lib/Config.in b/package/audio/alsa-lib/Config.in
index 3077d36b1..3077d36b1 100644
--- a/package/alsa-lib/Config.in
+++ b/package/audio/alsa-lib/Config.in
diff --git a/package/alsa-lib/alsa-lib.mk b/package/audio/alsa-lib/alsa-lib.mk
index 6b9bda970..6b9bda970 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/audio/alsa-lib/alsa-lib.mk
diff --git a/package/alsa-utils/Config.in b/package/audio/alsa-utils/Config.in
index b7304f397..b7304f397 100644
--- a/package/alsa-utils/Config.in
+++ b/package/audio/alsa-utils/Config.in
diff --git a/package/alsa-utils/alsa-utils.mk b/package/audio/alsa-utils/alsa-utils.mk
index e21078c0c..e21078c0c 100644
--- a/package/alsa-utils/alsa-utils.mk
+++ b/package/audio/alsa-utils/alsa-utils.mk
diff --git a/package/asterisk/Config.in b/package/audio/asterisk/Config.in
index e20eb5ac2..e20eb5ac2 100644
--- a/package/asterisk/Config.in
+++ b/package/audio/asterisk/Config.in
diff --git a/package/asterisk/asterisk.mk b/package/audio/asterisk/asterisk.mk
index da065dccf..da065dccf 100644
--- a/package/asterisk/asterisk.mk
+++ b/package/audio/asterisk/asterisk.mk
diff --git a/package/asterisk/asterisk_no_res_ninit.patch b/package/audio/asterisk/asterisk_no_res_ninit.patch
index 1dff2f305..1dff2f305 100644
--- a/package/asterisk/asterisk_no_res_ninit.patch
+++ b/package/audio/asterisk/asterisk_no_res_ninit.patch
diff --git a/package/audio/audio.mk b/package/audio/audio.mk
new file mode 100644
index 000000000..30f43b1dc
--- /dev/null
+++ b/package/audio/audio.mk
@@ -0,0 +1 @@
+include package/audio/*/*.mk
diff --git a/package/aumix/Config.in b/package/audio/aumix/Config.in
index 3d3208250..3d3208250 100644
--- a/package/aumix/Config.in
+++ b/package/audio/aumix/Config.in
diff --git a/package/aumix/aumix.mk b/package/audio/aumix/aumix.mk
index d30b3a7be..d30b3a7be 100644
--- a/package/aumix/aumix.mk
+++ b/package/audio/aumix/aumix.mk
diff --git a/package/festival/Config.in b/package/audio/festival/Config.in
index 209c95b58..209c95b58 100644
--- a/package/festival/Config.in
+++ b/package/audio/festival/Config.in
diff --git a/package/festival/festival.mk b/package/audio/festival/festival.mk
index 3d80e14d7..3d80e14d7 100644
--- a/package/festival/festival.mk
+++ b/package/audio/festival/festival.mk
diff --git a/package/festival/festival/festival-1.96-beta-doc.patch b/package/audio/festival/festival/festival-1.96-beta-doc.patch
index 583cf6e56..583cf6e56 100644
--- a/package/festival/festival/festival-1.96-beta-doc.patch
+++ b/package/audio/festival/festival/festival-1.96-beta-doc.patch
diff --git a/package/festival/festival/festival-1.96-beta-etcsiteinit.patch b/package/audio/festival/festival/festival-1.96-beta-etcsiteinit.patch
index 8e21acede..8e21acede 100644
--- a/package/festival/festival/festival-1.96-beta-etcsiteinit.patch
+++ b/package/audio/festival/festival/festival-1.96-beta-etcsiteinit.patch
diff --git a/package/festival/festival/festival-1.96-beta-libdir.patch b/package/audio/festival/festival/festival-1.96-beta-libdir.patch
index b076ad947..b076ad947 100644
--- a/package/festival/festival/festival-1.96-beta-libdir.patch
+++ b/package/audio/festival/festival/festival-1.96-beta-libdir.patch
diff --git a/package/festival/festival/festival-1.96-beta-speechtools-dir.patch b/package/audio/festival/festival/festival-1.96-beta-speechtools-dir.patch
index 874d1f662..874d1f662 100644
--- a/package/festival/festival/festival-1.96-beta-speechtools-dir.patch
+++ b/package/audio/festival/festival/festival-1.96-beta-speechtools-dir.patch
diff --git a/package/festival/festival/festival.mk b/package/audio/festival/festival/festival.mk
index 8753d9848..8753d9848 100644
--- a/package/festival/festival/festival.mk
+++ b/package/audio/festival/festival/festival.mk
diff --git a/package/festival/lexicons/Config.in b/package/audio/festival/lexicons/Config.in
index 6d92883b3..6d92883b3 100644
--- a/package/festival/lexicons/Config.in
+++ b/package/audio/festival/lexicons/Config.in
diff --git a/package/festival/lexicons/festlex.mk b/package/audio/festival/lexicons/festlex.mk
index f5fdc9f76..f5fdc9f76 100644
--- a/package/festival/lexicons/festlex.mk
+++ b/package/audio/festival/lexicons/festlex.mk
diff --git a/package/festival/speech-tools/Config.in b/package/audio/festival/speech-tools/Config.in
index d8405bad3..d8405bad3 100644
--- a/package/festival/speech-tools/Config.in
+++ b/package/audio/festival/speech-tools/Config.in
diff --git a/package/festival/speech-tools/speech-tools-1.2.96-beta-install.patch b/package/audio/festival/speech-tools/speech-tools-1.2.96-beta-install.patch
index 3cc47d344..3cc47d344 100644
--- a/package/festival/speech-tools/speech-tools-1.2.96-beta-install.patch
+++ b/package/audio/festival/speech-tools/speech-tools-1.2.96-beta-install.patch
diff --git a/package/festival/speech-tools/speech-tools.mk b/package/audio/festival/speech-tools/speech-tools.mk
index 3f2ba090f..3f2ba090f 100644
--- a/package/festival/speech-tools/speech-tools.mk
+++ b/package/audio/festival/speech-tools/speech-tools.mk
diff --git a/package/festival/voices/Config.in b/package/audio/festival/voices/Config.in
index b0a1cc0b1..b0a1cc0b1 100644
--- a/package/festival/voices/Config.in
+++ b/package/audio/festival/voices/Config.in
diff --git a/package/festival/voices/festvox.mk b/package/audio/festival/voices/festvox.mk
index 8456a4903..8456a4903 100644
--- a/package/festival/voices/festvox.mk
+++ b/package/audio/festival/voices/festvox.mk
diff --git a/package/libid3tag/Config.in b/package/audio/libid3tag/Config.in
index 0f4a1522d..0f4a1522d 100644
--- a/package/libid3tag/Config.in
+++ b/package/audio/libid3tag/Config.in
diff --git a/package/libid3tag/libid3tag.mk b/package/audio/libid3tag/libid3tag.mk
index d299d86ad..d299d86ad 100644
--- a/package/libid3tag/libid3tag.mk
+++ b/package/audio/libid3tag/libid3tag.mk
diff --git a/package/libmad/Config.in b/package/audio/libmad/Config.in
index 867a11a1e..867a11a1e 100644
--- a/package/libmad/Config.in
+++ b/package/audio/libmad/Config.in
diff --git a/package/libmad/libmad-0.15.1b-optimization.patch.avr32 b/package/audio/libmad/libmad-0.15.1b-optimization.patch.avr32
index b74eea322..b74eea322 100644
--- a/package/libmad/libmad-0.15.1b-optimization.patch.avr32
+++ b/package/audio/libmad/libmad-0.15.1b-optimization.patch.avr32
diff --git a/package/libmad/libmad.mk b/package/audio/libmad/libmad.mk
index 9ea27fd4d..9ea27fd4d 100644
--- a/package/libmad/libmad.mk
+++ b/package/audio/libmad/libmad.mk
diff --git a/package/libogg/Config.in b/package/audio/libogg/Config.in
index bbaf08797..bbaf08797 100644
--- a/package/libogg/Config.in
+++ b/package/audio/libogg/Config.in
diff --git a/package/libogg/libogg.mk b/package/audio/libogg/libogg.mk
index 91deabee5..91deabee5 100644
--- a/package/libogg/libogg.mk
+++ b/package/audio/libogg/libogg.mk
diff --git a/package/libsndfile/Config.in b/package/audio/libsndfile/Config.in
index ccc4dad6f..ccc4dad6f 100644
--- a/package/libsndfile/Config.in
+++ b/package/audio/libsndfile/Config.in
diff --git a/package/libsndfile/libsndfile-srconly.patch b/package/audio/libsndfile/libsndfile-srconly.patch
index 1796b80c0..1796b80c0 100644
--- a/package/libsndfile/libsndfile-srconly.patch
+++ b/package/audio/libsndfile/libsndfile-srconly.patch
diff --git a/package/libsndfile/libsndfile.mk b/package/audio/libsndfile/libsndfile.mk
index 5a5fcda7c..5a5fcda7c 100644
--- a/package/libsndfile/libsndfile.mk
+++ b/package/audio/libsndfile/libsndfile.mk
diff --git a/package/libvorbis/Config.in b/package/audio/libvorbis/Config.in
index 17fd4e845..17fd4e845 100644
--- a/package/libvorbis/Config.in
+++ b/package/audio/libvorbis/Config.in
diff --git a/package/libvorbis/libvorbis.mk b/package/audio/libvorbis/libvorbis.mk
index 6e72ad586..6e72ad586 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/audio/libvorbis/libvorbis.mk
diff --git a/package/madplay/Config.in b/package/audio/madplay/Config.in
index a77cc367e..a77cc367e 100644
--- a/package/madplay/Config.in
+++ b/package/audio/madplay/Config.in
diff --git a/package/madplay/madplay.mk b/package/audio/madplay/madplay.mk
index 2d99916b3..2d99916b3 100644
--- a/package/madplay/madplay.mk
+++ b/package/audio/madplay/madplay.mk
diff --git a/package/mpg123/Config.in b/package/audio/mpg123/Config.in
index 69ae4c62a..69ae4c62a 100644
--- a/package/mpg123/Config.in
+++ b/package/audio/mpg123/Config.in
diff --git a/package/mpg123/mpg123-0.59r-cross.patch b/package/audio/mpg123/mpg123-0.59r-cross.patch
index c3fb5830c..c3fb5830c 100644
--- a/package/mpg123/mpg123-0.59r-cross.patch
+++ b/package/audio/mpg123/mpg123-0.59r-cross.patch
diff --git a/package/mpg123/mpg123.mk b/package/audio/mpg123/mpg123.mk
index 76977e280..76977e280 100644
--- a/package/mpg123/mpg123.mk
+++ b/package/audio/mpg123/mpg123.mk
diff --git a/package/speex/Config.in b/package/audio/speex/Config.in
index 424a83001..424a83001 100644
--- a/package/speex/Config.in
+++ b/package/audio/speex/Config.in
diff --git a/package/speex/speex.mk b/package/audio/speex/speex.mk
index 0ffd20325..0ffd20325 100644
--- a/package/speex/speex.mk
+++ b/package/audio/speex/speex.mk