45 files changed, 24 insertions, 21 deletions
diff --git a/package/Config.in b/package/Config.in
index b8d81ba4bd..9568729ba0 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 0000000000..370467a2e7
--- /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 3077d36b13..3077d36b13 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 6b9bda970f..6b9bda970f 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 b7304f3972..b7304f3972 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 e21078c0c7..e21078c0c7 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 e20eb5ac22..e20eb5ac22 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 da065dccf4..da065dccf4 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 1dff2f3051..1dff2f3051 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 0000000000..30f43b1dca
--- /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 3d3208250c..3d3208250c 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 d30b3a7be7..d30b3a7be7 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 209c95b58d..209c95b58d 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 3d80e14d72..3d80e14d72 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 583cf6e561..583cf6e561 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 8e21acede6..8e21acede6 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 b076ad9477..b076ad9477 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 874d1f662d..874d1f662d 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 8753d98488..8753d98488 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 6d92883b32..6d92883b32 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 f5fdc9f763..f5fdc9f763 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 d8405bad32..d8405bad32 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 3cc47d3445..3cc47d3445 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 3f2ba090f4..3f2ba090f4 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 b0a1cc0b1c..b0a1cc0b1c 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 8456a4903d..8456a4903d 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 0f4a1522d0..0f4a1522d0 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 d299d86ad7..d299d86ad7 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 867a11a1e7..867a11a1e7 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 b74eea3225..b74eea3225 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 9ea27fd4da..9ea27fd4da 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 bbaf087975..bbaf087975 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 91deabee55..91deabee55 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 ccc4dad6f7..ccc4dad6f7 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 1796b80c0c..1796b80c0c 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 5a5fcda7ca..5a5fcda7ca 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 17fd4e845f..17fd4e845f 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 6e72ad586f..6e72ad586f 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 a77cc367ee..a77cc367ee 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 2d99916b38..2d99916b38 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 69ae4c62a5..69ae4c62a5 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 c3fb5830ce..c3fb5830ce 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 76977e2800..76977e2800 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 424a830019..424a830019 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 0ffd203258..0ffd203258 100644
--- a/package/speex/speex.mk
+++ b/package/audio/speex/speex.mk