43 files changed, 20 insertions, 17 deletions
diff --git a/package/Config.in b/package/Config.in
index 0bc4dd43c2..6caca9da4f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -267,6 +267,26 @@ endmenu
 
 menu "Libraries"
 
+menu "Audio/Sound"
+source "package/alsa-lib/Config.in"
+source "package/audiofile/Config.in"
+source "package/libao/Config.in"
+source "package/libcdaudio/Config.in"
+source "package/libcue/Config.in"
+source "package/libcuefile/Config.in"
+source "package/libid3tag/Config.in"
+source "package/libmad/Config.in"
+source "package/libmpd/Config.in"
+source "package/libreplaygain/Config.in"
+source "package/libsamplerate/Config.in"
+source "package/libsndfile/Config.in"
+source "package/libvorbis/Config.in"
+source "package/portaudio/Config.in"
+source "package/speex/Config.in"
+source "package/taglib/Config.in"
+source "package/tremor/Config.in"
+endmenu
+
 menu "Compression and decompression"
 source "package/libarchive/Config.in"
 source "package/lzo/Config.in"
diff --git a/package/multimedia/alsa-lib/Config.in b/package/alsa-lib/Config.in
index 98b83139d7..98b83139d7 100644
--- a/package/multimedia/alsa-lib/Config.in
+++ b/package/alsa-lib/Config.in
diff --git a/package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch b/package/alsa-lib/alsa-lib-avr32-bad-inline.patch
index 568ba40a4e..568ba40a4e 100644
--- a/package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch
+++ b/package/alsa-lib/alsa-lib-avr32-bad-inline.patch
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 2d27c960ca..2d27c960ca 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
diff --git a/package/multimedia/audiofile/Config.in b/package/audiofile/Config.in
index 4f9952c315..4f9952c315 100644
--- a/package/multimedia/audiofile/Config.in
+++ b/package/audiofile/Config.in
diff --git a/package/multimedia/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
index a49cc3e649..a49cc3e649 100644
--- a/package/multimedia/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
diff --git a/package/multimedia/libao/Config.in b/package/libao/Config.in
index 3c99ab968d..3c99ab968d 100644
--- a/package/multimedia/libao/Config.in
+++ b/package/libao/Config.in
diff --git a/package/multimedia/libao/libao.mk b/package/libao/libao.mk
index 617b1ee8f6..617b1ee8f6 100644
--- a/package/multimedia/libao/libao.mk
+++ b/package/libao/libao.mk
diff --git a/package/multimedia/libcdaudio/Config.in b/package/libcdaudio/Config.in
index 02df01e4fc..02df01e4fc 100644
--- a/package/multimedia/libcdaudio/Config.in
+++ b/package/libcdaudio/Config.in
diff --git a/package/multimedia/libcdaudio/libcdaudio.mk b/package/libcdaudio/libcdaudio.mk
index 8ceb87a4d1..8ceb87a4d1 100644
--- a/package/multimedia/libcdaudio/libcdaudio.mk
+++ b/package/libcdaudio/libcdaudio.mk
diff --git a/package/multimedia/libcue/Config.in b/package/libcue/Config.in
index e5e2e16265..e5e2e16265 100644
--- a/package/multimedia/libcue/Config.in
+++ b/package/libcue/Config.in
diff --git a/package/multimedia/libcue/libcue-1.4.0-__unused-fix.patch b/package/libcue/libcue-1.4.0-__unused-fix.patch
index 8a58919325..8a58919325 100644
--- a/package/multimedia/libcue/libcue-1.4.0-__unused-fix.patch
+++ b/package/libcue/libcue-1.4.0-__unused-fix.patch
diff --git a/package/multimedia/libcue/libcue.mk b/package/libcue/libcue.mk
index b815c0fbb8..b815c0fbb8 100644
--- a/package/multimedia/libcue/libcue.mk
+++ b/package/libcue/libcue.mk
diff --git a/package/multimedia/libcuefile/Config.in b/package/libcuefile/Config.in
index 416b3e1495..416b3e1495 100644
--- a/package/multimedia/libcuefile/Config.in
+++ b/package/libcuefile/Config.in
diff --git a/package/multimedia/libcuefile/libcuefile.mk b/package/libcuefile/libcuefile.mk
index 7e1c8430ed..7e1c8430ed 100644
--- a/package/multimedia/libcuefile/libcuefile.mk
+++ b/package/libcuefile/libcuefile.mk
diff --git a/package/multimedia/libid3tag/Config.in b/package/libid3tag/Config.in
index 869b9f7f6c..869b9f7f6c 100644
--- a/package/multimedia/libid3tag/Config.in
+++ b/package/libid3tag/Config.in
diff --git a/package/multimedia/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
index def2dbc848..def2dbc848 100644
--- a/package/multimedia/libid3tag/libid3tag.mk
+++ b/package/libid3tag/libid3tag.mk
diff --git a/package/multimedia/libmad/Config.in b/package/libmad/Config.in
index 4d4f9301a6..4d4f9301a6 100644
--- a/package/multimedia/libmad/Config.in
+++ b/package/libmad/Config.in
diff --git a/package/multimedia/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch b/package/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch
index 095858717e..095858717e 100644
--- a/package/multimedia/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch
+++ b/package/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch
diff --git a/package/multimedia/libmad/libmad-0.15.1b-optimization.patch.avr32 b/package/libmad/libmad-0.15.1b-optimization.patch.avr32
index b74eea3225..b74eea3225 100644
--- a/package/multimedia/libmad/libmad-0.15.1b-optimization.patch.avr32
+++ b/package/libmad/libmad-0.15.1b-optimization.patch.avr32
diff --git a/package/multimedia/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch b/package/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch
index e5040830f9..e5040830f9 100644
--- a/package/multimedia/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch
+++ b/package/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch
diff --git a/package/multimedia/libmad/libmad.mk b/package/libmad/libmad.mk
index a469fece12..a469fece12 100644
--- a/package/multimedia/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
diff --git a/package/multimedia/libmad/mad.pc b/package/libmad/mad.pc
index 14af388661..14af388661 100644
--- a/package/multimedia/libmad/mad.pc
+++ b/package/libmad/mad.pc
diff --git a/package/multimedia/libmpd/Config.in b/package/libmpd/Config.in
index 9259c19ee9..9259c19ee9 100644
--- a/package/multimedia/libmpd/Config.in
+++ b/package/libmpd/Config.in
diff --git a/package/multimedia/libmpd/libmpd.mk b/package/libmpd/libmpd.mk
index 9fd12f5a2b..9fd12f5a2b 100644
--- a/package/multimedia/libmpd/libmpd.mk
+++ b/package/libmpd/libmpd.mk
diff --git a/package/multimedia/libreplaygain/Config.in b/package/libreplaygain/Config.in
index d0045b2f22..d0045b2f22 100644
--- a/package/multimedia/libreplaygain/Config.in
+++ b/package/libreplaygain/Config.in
diff --git a/package/multimedia/libreplaygain/libreplaygain.mk b/package/libreplaygain/libreplaygain.mk
index 47bf586424..47bf586424 100644
--- a/package/multimedia/libreplaygain/libreplaygain.mk
+++ b/package/libreplaygain/libreplaygain.mk
diff --git a/package/multimedia/libsamplerate/Config.in b/package/libsamplerate/Config.in
index b394fdb0ac..b394fdb0ac 100644
--- a/package/multimedia/libsamplerate/Config.in
+++ b/package/libsamplerate/Config.in
diff --git a/package/multimedia/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk
index d03a5d9926..d03a5d9926 100644
--- a/package/multimedia/libsamplerate/libsamplerate.mk
+++ b/package/libsamplerate/libsamplerate.mk
diff --git a/package/multimedia/libsndfile/Config.in b/package/libsndfile/Config.in
index 9afe4966c0..9afe4966c0 100644
--- a/package/multimedia/libsndfile/Config.in
+++ b/package/libsndfile/Config.in
diff --git a/package/multimedia/libsndfile/libsndfile-srconly.patch b/package/libsndfile/libsndfile-srconly.patch
index 417e34072a..417e34072a 100644
--- a/package/multimedia/libsndfile/libsndfile-srconly.patch
+++ b/package/libsndfile/libsndfile-srconly.patch
diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk
index 5480618877..5480618877 100644
--- a/package/multimedia/libsndfile/libsndfile.mk
+++ b/package/libsndfile/libsndfile.mk
diff --git a/package/multimedia/libvorbis/Config.in b/package/libvorbis/Config.in
index e322dd256d..e322dd256d 100644
--- a/package/multimedia/libvorbis/Config.in
+++ b/package/libvorbis/Config.in
diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index 68444144a7..68444144a7 100644
--- a/package/multimedia/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 89c5041ee1..895dde6b3a 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -1,7 +1,5 @@
 menu "Audio and video libraries and applications"
-source "package/multimedia/alsa-lib/Config.in"
 source "package/multimedia/alsa-utils/Config.in"
-source "package/multimedia/audiofile/Config.in"
 source "package/multimedia/aumix/Config.in"
 source "package/multimedia/bellagio/Config.in"
 source "package/multimedia/faad2/Config.in"
@@ -16,28 +14,13 @@ source "package/multimedia/gst-plugins-good/Config.in"
 source "package/multimedia/gst-plugins-bad/Config.in"
 source "package/multimedia/gst-plugins-ugly/Config.in"
 source "package/multimedia/lame/Config.in"
-source "package/multimedia/libao/Config.in"
-source "package/multimedia/libcdaudio/Config.in"
-source "package/multimedia/libcue/Config.in"
-source "package/multimedia/libcuefile/Config.in"
-source "package/multimedia/libid3tag/Config.in"
-source "package/multimedia/libmad/Config.in"
-source "package/multimedia/libmpd/Config.in"
-source "package/multimedia/libreplaygain/Config.in"
-source "package/multimedia/libsamplerate/Config.in"
-source "package/multimedia/libsndfile/Config.in"
-source "package/multimedia/libvorbis/Config.in"
 source "package/multimedia/madplay/Config.in"
 source "package/multimedia/mpd/Config.in"
 source "package/multimedia/mpg123/Config.in"
 source "package/multimedia/mplayer/Config.in"
 source "package/multimedia/musepack/Config.in"
-source "package/multimedia/portaudio/Config.in"
 source "package/multimedia/pulseaudio/Config.in"
-source "package/multimedia/speex/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
-source "package/multimedia/taglib/Config.in"
-source "package/multimedia/tremor/Config.in"
 source "package/multimedia/vorbis-tools/Config.in"
 source "package/multimedia/wavpack/Config.in"
 endmenu
diff --git a/package/multimedia/portaudio/Config.in b/package/portaudio/Config.in
index f91acc0a28..f91acc0a28 100644
--- a/package/multimedia/portaudio/Config.in
+++ b/package/portaudio/Config.in
diff --git a/package/multimedia/portaudio/portaudio.mk b/package/portaudio/portaudio.mk
index a82473593f..a82473593f 100644
--- a/package/multimedia/portaudio/portaudio.mk
+++ b/package/portaudio/portaudio.mk
diff --git a/package/multimedia/speex/Config.in b/package/speex/Config.in
index 424a830019..424a830019 100644
--- a/package/multimedia/speex/Config.in
+++ b/package/speex/Config.in
diff --git a/package/multimedia/speex/speex.mk b/package/speex/speex.mk
index c9d9ed3ef0..c9d9ed3ef0 100644
--- a/package/multimedia/speex/speex.mk
+++ b/package/speex/speex.mk
diff --git a/package/multimedia/taglib/Config.in b/package/taglib/Config.in
index d172c34ade..d172c34ade 100644
--- a/package/multimedia/taglib/Config.in
+++ b/package/taglib/Config.in
diff --git a/package/multimedia/taglib/taglib.mk b/package/taglib/taglib.mk
index da2db0cf2e..da2db0cf2e 100644
--- a/package/multimedia/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
diff --git a/package/multimedia/tremor/Config.in b/package/tremor/Config.in
index 2e58e09857..2e58e09857 100644
--- a/package/multimedia/tremor/Config.in
+++ b/package/tremor/Config.in
diff --git a/package/multimedia/tremor/tremor.mk b/package/tremor/tremor.mk
index b836010989..b836010989 100644
--- a/package/multimedia/tremor/tremor.mk
+++ b/package/tremor/tremor.mk