Remove multimedia subdirectory

Unless it was a group of sub-packages, packages was never regrouped by
category. multimedia/ was an exception to this rule.

This patch move packages/multimedia/ sub-directories to packages/. It
keeps two subdirectories for gstream 0.10 and gstreamer 1.X.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

100 files changed, 45 insertions, 47 deletions

diff --git a/package/Config.in b/package/Config.in
index 8ba3666285..889533cfea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2,8 +2,31 @@ menu "Target packages"
 
 source "package/busybox/Config.in"
 
-# Audio and video applications
-source "package/multimedia/Config.in"
+menu "Audio and video applications"
+source "package/alsa-utils/Config.in"
+source "package/aumix/Config.in"
+source "package/bellagio/Config.in"
+source "package/faad2/Config.in"
+source "package/flac/Config.in"
+source "package/ffmpeg/Config.in"
+source "package/gstreamer/Config.in"
+source "package/gstreamer1/Config.in"
+source "package/lame/Config.in"
+source "package/libvpx/Config.in"
+source "package/madplay/Config.in"
+source "package/mpd/Config.in"
+source "package/mpg123/Config.in"
+source "package/mplayer/Config.in"
+source "package/musepack/Config.in"
+source "package/on2-8170-libs/Config.in"
+source "package/opus-tools/Config.in"
+source "package/pulseaudio/Config.in"
+source "package/tidsp-binaries/Config.in"
+source "package/tstools/Config.in"
+source "package/vorbis-tools/Config.in"
+source "package/wavpack/Config.in"
+source "package/yavta/Config.in"
+endmenu
 
 menu "Compressors and decompressors"
 source "package/bzip2/Config.in"
diff --git a/package/multimedia/alsa-utils/Config.in b/package/alsa-utils/Config.in
index 4bc12049e8..4bc12049e8 100644
--- a/package/multimedia/alsa-utils/Config.in
+++ b/package/alsa-utils/Config.in
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk
index b951112c58..b951112c58 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/alsa-utils/alsa-utils.mk
diff --git a/package/multimedia/aumix/Config.in b/package/aumix/Config.in
index 3d3208250c..3d3208250c 100644
--- a/package/multimedia/aumix/Config.in
+++ b/package/aumix/Config.in
diff --git a/package/multimedia/aumix/aumix-2.8-fix-incorrect-makefile-am.patch b/package/aumix/aumix-2.8-fix-incorrect-makefile-am.patch
index 8d55218bbb..8d55218bbb 100644
--- a/package/multimedia/aumix/aumix-2.8-fix-incorrect-makefile-am.patch
+++ b/package/aumix/aumix-2.8-fix-incorrect-makefile-am.patch
diff --git a/package/multimedia/aumix/aumix.mk b/package/aumix/aumix.mk
index de0902a4ab..de0902a4ab 100644
--- a/package/multimedia/aumix/aumix.mk
+++ b/package/aumix/aumix.mk
diff --git a/package/multimedia/bellagio/Config.in b/package/bellagio/Config.in
index 3292ef5fd0..3292ef5fd0 100644
--- a/package/multimedia/bellagio/Config.in
+++ b/package/bellagio/Config.in
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch b/package/bellagio/bellagio-0.9.3-drop-werror.patch
index 39baf421bb..39baf421bb 100644
--- a/package/multimedia/bellagio/bellagio-0.9.3-drop-werror.patch
+++ b/package/bellagio/bellagio-0.9.3-drop-werror.patch
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch b/package/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
index 5e4243d5e1..5e4243d5e1 100644
--- a/package/multimedia/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
+++ b/package/bellagio/bellagio-0.9.3-dynamicloader-linking.patch
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch b/package/bellagio/bellagio-0.9.3-parallel-build.patch
index 767bbeb2aa..767bbeb2aa 100644
--- a/package/multimedia/bellagio/bellagio-0.9.3-parallel-build.patch
+++ b/package/bellagio/bellagio-0.9.3-parallel-build.patch
diff --git a/package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch b/package/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
index f52a2c33f4..f52a2c33f4 100644
--- a/package/multimedia/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
+++ b/package/bellagio/bellagio-0.9.3-segfault-on-removeFromWaitResource.patch
diff --git a/package/multimedia/bellagio/bellagio.mk b/package/bellagio/bellagio.mk
index 993015cf2b..993015cf2b 100644
--- a/package/multimedia/bellagio/bellagio.mk
+++ b/package/bellagio/bellagio.mk
diff --git a/package/multimedia/faad2/Config.in b/package/faad2/Config.in
index 5b7fc1ca11..5b7fc1ca11 100644
--- a/package/multimedia/faad2/Config.in
+++ b/package/faad2/Config.in
diff --git a/package/multimedia/faad2/faad2.mk b/package/faad2/faad2.mk
index 8c4fc1aae2..8c4fc1aae2 100644
--- a/package/multimedia/faad2/faad2.mk
+++ b/package/faad2/faad2.mk
diff --git a/package/multimedia/ffmpeg/Config.in b/package/ffmpeg/Config.in
index d11233e947..d11233e947 100644
--- a/package/multimedia/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
diff --git a/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch b/package/ffmpeg/ffmpeg-sdlconfig.patch
index 64371b29f3..64371b29f3 100644
--- a/package/multimedia/ffmpeg/ffmpeg-sdlconfig.patch
+++ b/package/ffmpeg/ffmpeg-sdlconfig.patch
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index b102af12c2..b102af12c2 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
diff --git a/package/multimedia/flac/Config.in b/package/flac/Config.in
index 357e24f728..357e24f728 100644
--- a/package/multimedia/flac/Config.in
+++ b/package/flac/Config.in
diff --git a/package/multimedia/flac/flac-no-altivec.patch b/package/flac/flac-no-altivec.patch
index c6a535b000..c6a535b000 100644
--- a/package/multimedia/flac/flac-no-altivec.patch
+++ b/package/flac/flac-no-altivec.patch
diff --git a/package/multimedia/flac/flac.mk b/package/flac/flac.mk
index cace0d9c74..cace0d9c74 100644
--- a/package/multimedia/flac/flac.mk
+++ b/package/flac/flac.mk
diff --git a/package/gstreamer/Config.in b/package/gstreamer/Config.in
new file mode 100644
index 0000000000..039d657676
--- /dev/null
+++ b/package/gstreamer/Config.in
@@ -0,0 +1,11 @@
+# Gstreamer 0.10.x & Plugins
+source "package/gstreamer/gstreamer/Config.in"
+source "package/gstreamer/gst-plugins-base/Config.in"
+source "package/gstreamer/gst-plugins-good/Config.in"
+source "package/gstreamer/gst-plugins-bad/Config.in"
+source "package/gstreamer/gst-plugins-ugly/Config.in"
+source "package/gstreamer/gst-ffmpeg/Config.in"
+source "package/gstreamer/gst-dsp/Config.in"
+source "package/gstreamer/gst-fsl-plugins/Config.in"
+source "package/gstreamer/gst-omapfb/Config.in"
+source "package/gstreamer/gst-plugin-x170/Config.in"
diff --git a/package/multimedia/gst-dsp/Config.in b/package/gstreamer/gst-dsp/Config.in
index 590931af76..590931af76 100644
--- a/package/multimedia/gst-dsp/Config.in
+++ b/package/gstreamer/gst-dsp/Config.in
diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/gstreamer/gst-dsp/gst-dsp.mk
index 1fd6976074..1fd6976074 100644
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ b/package/gstreamer/gst-dsp/gst-dsp.mk
diff --git a/package/multimedia/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in
index 537101e695..537101e695 100644
--- a/package/multimedia/gst-ffmpeg/Config.in
+++ b/package/gstreamer/gst-ffmpeg/Config.in
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index fc59c3025b..fc59c3025b 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
diff --git a/package/multimedia/gst-fsl-plugins/Config.in b/package/gstreamer/gst-fsl-plugins/Config.in
index 42467341a6..42467341a6 100644
--- a/package/multimedia/gst-fsl-plugins/Config.in
+++ b/package/gstreamer/gst-fsl-plugins/Config.in
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch
index 19753bc787..19753bc787 100644
--- a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0001-gplay-add-missing-include.patch
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch
index 8af3644f49..8af3644f49 100644
--- a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0002-Fix-bashism-in-configure-script.patch
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch
index 8fce239e50..8fce239e50 100644
--- a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins-0003-Use-proper-objdump.patch
diff --git a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
index ccdb521284..ccdb521284 100644
--- a/package/multimedia/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
diff --git a/package/multimedia/gst-omapfb/Config.in b/package/gstreamer/gst-omapfb/Config.in
index e603cb1976..e603cb1976 100644
--- a/package/multimedia/gst-omapfb/Config.in
+++ b/package/gstreamer/gst-omapfb/Config.in
diff --git a/package/multimedia/gst-omapfb/gst-omapfb.mk b/package/gstreamer/gst-omapfb/gst-omapfb.mk
index bfcaa5d2ef..bfcaa5d2ef 100644
--- a/package/multimedia/gst-omapfb/gst-omapfb.mk
+++ b/package/gstreamer/gst-omapfb/gst-omapfb.mk
diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/gstreamer/gst-plugin-x170/Config.in
index 142367b128..142367b128 100644
--- a/package/multimedia/gst-plugin-x170/Config.in
+++ b/package/gstreamer/gst-plugin-x170/Config.in
diff --git a/package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch b/package/gstreamer/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
index 9c32e46cce..9c32e46cce 100644
--- a/package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
+++ b/package/gstreamer/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
diff --git a/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
index e14d460a41..e14d460a41 100644
--- a/package/multimedia/gst-plugin-x170/gst-plugin-x170.mk
+++ b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in
index 3c5c16198b..3c5c16198b 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/gstreamer/gst-plugins-bad/Config.in
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch b/package/gstreamer/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch
index b2057484cd..b2057484cd 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch
+++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch b/package/gstreamer/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
index 2c98c3e102..2c98c3e102 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
+++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
index df90cf9b5b..df90cf9b5b 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/gstreamer/gst-plugins-base/Config.in
index 7370bd6b0e..7370bd6b0e 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/gstreamer/gst-plugins-base/Config.in
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch b/package/gstreamer/gst-plugins-base/gst-plugins-base-tremor.patch
index fa8785bed4..fa8785bed4 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch
+++ b/package/gstreamer/gst-plugins-base/gst-plugins-base-tremor.patch
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
index c82aad0183..c82aad0183 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/gstreamer/gst-plugins-good/Config.in
index c604a41a02..c604a41a02 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/gstreamer/gst-plugins-good/Config.in
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch b/package/gstreamer/gst-plugins-good/gst-plugins-good-linux36.patch
index 5d7cd932ed..5d7cd932ed 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch
+++ b/package/gstreamer/gst-plugins-good/gst-plugins-good-linux36.patch
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch b/package/gstreamer/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch
index 62c3bb24e6..62c3bb24e6 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch
+++ b/package/gstreamer/gst-plugins-good/gst-plugins-good-v4l2-fix-compilation-against-newer-kernel-headers.patch
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
index eba0571964..eba0571964 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
diff --git a/package/multimedia/gst-plugins-ugly/Config.in b/package/gstreamer/gst-plugins-ugly/Config.in
index c0046e422f..c0046e422f 100644
--- a/package/multimedia/gst-plugins-ugly/Config.in
+++ b/package/gstreamer/gst-plugins-ugly/Config.in
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
index 009c168d92..009c168d92 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
diff --git a/package/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer.mk
new file mode 100644
index 0000000000..bc886c78a2
--- /dev/null
+++ b/package/gstreamer/gstreamer.mk
@@ -0,0 +1 @@
+include package/gstreamer/*/*.mk
diff --git a/package/multimedia/gstreamer/Config.in b/package/gstreamer/gstreamer/Config.in
index 5188b8fdb7..5188b8fdb7 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/gstreamer/gstreamer/Config.in
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer/gstreamer.mk
index f0fdea4524..f0fdea4524 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/gstreamer/gstreamer/gstreamer.mk
diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in
new file mode 100644
index 0000000000..f9d2363963
--- /dev/null
+++ b/package/gstreamer1/Config.in
@@ -0,0 +1,7 @@
+# Gstreamer 1.x & Plugins
+source "package/gstreamer1/gstreamer1/Config.in"
+source "package/gstreamer1/gst1-plugins-base/Config.in"
+source "package/gstreamer1/gst1-plugins-good/Config.in"
+source "package/gstreamer1/gst1-plugins-bad/Config.in"
+source "package/gstreamer1/gst1-plugins-ugly/Config.in"
+source "package/gstreamer1/gst-omx/Config.in"
diff --git a/package/multimedia/gst-omx/Config.in b/package/gstreamer1/gst-omx/Config.in
index b6ea116c66..b6ea116c66 100644
--- a/package/multimedia/gst-omx/Config.in
+++ b/package/gstreamer1/gst-omx/Config.in
diff --git a/package/multimedia/gst-omx/gst-omx-config-files.patch b/package/gstreamer1/gst-omx/gst-omx-config-files.patch
index f4845217ec..f4845217ec 100644
--- a/package/multimedia/gst-omx/gst-omx-config-files.patch
+++ b/package/gstreamer1/gst-omx/gst-omx-config-files.patch
diff --git a/package/multimedia/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk
index 4b92584534..4b92584534 100644
--- a/package/multimedia/gst-omx/gst-omx.mk
+++ b/package/gstreamer1/gst-omx/gst-omx.mk
diff --git a/package/multimedia/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index f30f2b395e..f30f2b395e 100644
--- a/package/multimedia/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
index ebf4567b00..ebf4567b00 100644
--- a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad-use-gettext-0.18.patch
diff --git a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index 385522ec07..385522ec07 100644
--- a/package/multimedia/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
diff --git a/package/multimedia/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in
index e02d23ac8b..e02d23ac8b 100644
--- a/package/multimedia/gst1-plugins-base/Config.in
+++ b/package/gstreamer1/gst1-plugins-base/Config.in
diff --git a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index d3aebdad84..d3aebdad84 100644
--- a/package/multimedia/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
diff --git a/package/multimedia/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index 8031a6354b..8031a6354b 100644
--- a/package/multimedia/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
diff --git a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
index 29b89830db..29b89830db 100644
--- a/package/multimedia/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
diff --git a/package/multimedia/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in
index 0fb3e9213e..0fb3e9213e 100644
--- a/package/multimedia/gst1-plugins-ugly/Config.in
+++ b/package/gstreamer1/gst1-plugins-ugly/Config.in
diff --git a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
index e666d61138..e666d61138 100644
--- a/package/multimedia/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
diff --git a/package/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1.mk
new file mode 100644
index 0000000000..5b748e33fb
--- /dev/null
+++ b/package/gstreamer1/gstreamer1.mk
@@ -0,0 +1 @@
+include package/gstreamer1/*/*.mk
diff --git a/package/multimedia/gstreamer1/Config.in b/package/gstreamer1/gstreamer1/Config.in
index 69a87f3394..69a87f3394 100644
--- a/package/multimedia/gstreamer1/Config.in
+++ b/package/gstreamer1/gstreamer1/Config.in
diff --git a/package/multimedia/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
index 79b2b560b0..79b2b560b0 100644
--- a/package/multimedia/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
diff --git a/package/multimedia/lame/Config.in b/package/lame/Config.in
index 2b144a0537..2b144a0537 100644
--- a/package/multimedia/lame/Config.in
+++ b/package/lame/Config.in
diff --git a/package/multimedia/lame/lame.mk b/package/lame/lame.mk
index 38a39a3d0c..38a39a3d0c 100644
--- a/package/multimedia/lame/lame.mk
+++ b/package/lame/lame.mk
diff --git a/package/multimedia/libvpx/Config.in b/package/libvpx/Config.in
index 1332c564a8..1332c564a8 100644
--- a/package/multimedia/libvpx/Config.in
+++ b/package/libvpx/Config.in
diff --git a/package/multimedia/libvpx/libvpx.mk b/package/libvpx/libvpx.mk
index 480f1c4602..480f1c4602 100644
--- a/package/multimedia/libvpx/libvpx.mk
+++ b/package/libvpx/libvpx.mk
diff --git a/package/multimedia/madplay/Config.in b/package/madplay/Config.in
index a77cc367ee..a77cc367ee 100644
--- a/package/multimedia/madplay/Config.in
+++ b/package/madplay/Config.in
diff --git a/package/multimedia/madplay/madplay-0.15.2b-switch-to-new-alsa-api.patch b/package/madplay/madplay-0.15.2b-switch-to-new-alsa-api.patch
index 60d7bd3799..60d7bd3799 100644
--- a/package/multimedia/madplay/madplay-0.15.2b-switch-to-new-alsa-api.patch
+++ b/package/madplay/madplay-0.15.2b-switch-to-new-alsa-api.patch
diff --git a/package/multimedia/madplay/madplay.mk b/package/madplay/madplay.mk
index 19ab13f69d..19ab13f69d 100644
--- a/package/multimedia/madplay/madplay.mk
+++ b/package/madplay/madplay.mk
diff --git a/package/multimedia/mpd/Config.in b/package/mpd/Config.in
index 2ca55cc3cf..2ca55cc3cf 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/mpd/Config.in
diff --git a/package/multimedia/mpd/S95mpd b/package/mpd/S95mpd
index a4f1271cea..a4f1271cea 100644
--- a/package/multimedia/mpd/S95mpd
+++ b/package/mpd/S95mpd
diff --git a/package/multimedia/mpd/mpd.conf b/package/mpd/mpd.conf
index 5956b75e24..5956b75e24 100644
--- a/package/multimedia/mpd/mpd.conf
+++ b/package/mpd/mpd.conf
diff --git a/package/multimedia/mpd/mpd.mk b/package/mpd/mpd.mk
index 95e18f7d53..95e18f7d53 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
diff --git a/package/multimedia/mpg123/Config.in b/package/mpg123/Config.in
index 18ac41cfca..18ac41cfca 100644
--- a/package/multimedia/mpg123/Config.in
+++ b/package/mpg123/Config.in
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
index e9d074fc75..e9d074fc75 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/mpg123/mpg123.mk
diff --git a/package/multimedia/mplayer/Config.in b/package/mplayer/Config.in
index e36fc4681f..e36fc4681f 100644
--- a/package/multimedia/mplayer/Config.in
+++ b/package/mplayer/Config.in
diff --git a/package/multimedia/mplayer/mplayer-1.1-disable-install-strip.patch b/package/mplayer/mplayer-1.1-disable-install-strip.patch
index 644d292eb9..644d292eb9 100644
--- a/package/multimedia/mplayer/mplayer-1.1-disable-install-strip.patch
+++ b/package/mplayer/mplayer-1.1-disable-install-strip.patch
diff --git a/package/multimedia/mplayer/mplayer-1.1-fix-cc-parsing.patch b/package/mplayer/mplayer-1.1-fix-cc-parsing.patch
index a3ba03ff23..a3ba03ff23 100644
--- a/package/multimedia/mplayer/mplayer-1.1-fix-cc-parsing.patch
+++ b/package/mplayer/mplayer-1.1-fix-cc-parsing.patch
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
index a13efed76f..a13efed76f 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
deleted file mode 100644
index 2fcac56599..0000000000
--- a/package/multimedia/Config.in
+++ /dev/null
@@ -1,44 +0,0 @@
-menu "Audio and video applications"
-source "package/multimedia/alsa-utils/Config.in"
-source "package/multimedia/aumix/Config.in"
-source "package/multimedia/bellagio/Config.in"
-source "package/multimedia/faad2/Config.in"
-source "package/multimedia/flac/Config.in"
-source "package/multimedia/ffmpeg/Config.in"
-
-# Gstreamer 0.10.x & Plugins
-source "package/multimedia/gstreamer/Config.in"
-source "package/multimedia/gst-plugins-base/Config.in"
-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/gst-ffmpeg/Config.in"
-source "package/multimedia/gst-dsp/Config.in"
-source "package/multimedia/gst-fsl-plugins/Config.in"
-source "package/multimedia/gst-omapfb/Config.in"
-source "package/multimedia/gst-plugin-x170/Config.in"
-
-# Gstreamer 1.x & Plugins
-source "package/multimedia/gstreamer1/Config.in"
-source "package/multimedia/gst1-plugins-base/Config.in"
-source "package/multimedia/gst1-plugins-good/Config.in"
-source "package/multimedia/gst1-plugins-bad/Config.in"
-source "package/multimedia/gst1-plugins-ugly/Config.in"
-source "package/multimedia/gst-omx/Config.in"
-
-source "package/multimedia/lame/Config.in"
-source "package/multimedia/libvpx/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/on2-8170-libs/Config.in"
-source "package/opus-tools/Config.in"
-source "package/multimedia/pulseaudio/Config.in"
-source "package/multimedia/tidsp-binaries/Config.in"
-source "package/tstools/Config.in"
-source "package/multimedia/vorbis-tools/Config.in"
-source "package/multimedia/wavpack/Config.in"
-source "package/yavta/Config.in"
-endmenu
diff --git a/package/multimedia/multimedia.mk b/package/multimedia/multimedia.mk
deleted file mode 100644
index 843f30e032..0000000000
--- a/package/multimedia/multimedia.mk
+++ /dev/null
@@ -1 +0,0 @@
-include package/multimedia/*/*.mk
diff --git a/package/multimedia/musepack/Config.in b/package/musepack/Config.in
index 2a966a473c..2a966a473c 100644
--- a/package/multimedia/musepack/Config.in
+++ b/package/musepack/Config.in
diff --git a/package/multimedia/musepack/musepack-shared.patch b/package/musepack/musepack-shared.patch
index d8c788db7c..d8c788db7c 100644
--- a/package/multimedia/musepack/musepack-shared.patch
+++ b/package/musepack/musepack-shared.patch
diff --git a/package/multimedia/musepack/musepack.mk b/package/musepack/musepack.mk
index ce2d17ea05..ce2d17ea05 100644
--- a/package/multimedia/musepack/musepack.mk
+++ b/package/musepack/musepack.mk
diff --git a/package/multimedia/on2-8170-libs/Config.in b/package/on2-8170-libs/Config.in
index 8c2d963810..8c2d963810 100644
--- a/package/multimedia/on2-8170-libs/Config.in
+++ b/package/on2-8170-libs/Config.in
diff --git a/package/multimedia/on2-8170-libs/on2-8170-libs.mk b/package/on2-8170-libs/on2-8170-libs.mk
index 7cdb9918af..7cdb9918af 100644
--- a/package/multimedia/on2-8170-libs/on2-8170-libs.mk
+++ b/package/on2-8170-libs/on2-8170-libs.mk
diff --git a/package/multimedia/pulseaudio/Config.in b/package/pulseaudio/Config.in
index bd0ec5f201..bd0ec5f201 100644
--- a/package/multimedia/pulseaudio/Config.in
+++ b/package/pulseaudio/Config.in
diff --git a/package/multimedia/pulseaudio/S50pulseaudio b/package/pulseaudio/S50pulseaudio
index 4c6877eb16..4c6877eb16 100755
--- a/package/multimedia/pulseaudio/S50pulseaudio
+++ b/package/pulseaudio/S50pulseaudio
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index 195eb19e71..195eb19e71 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
diff --git a/package/multimedia/tidsp-binaries/Config.in b/package/tidsp-binaries/Config.in
index 48f85a5d98..48f85a5d98 100644
--- a/package/multimedia/tidsp-binaries/Config.in
+++ b/package/tidsp-binaries/Config.in
diff --git a/package/multimedia/tidsp-binaries/tidsp-binaries.mk b/package/tidsp-binaries/tidsp-binaries.mk
index fd799fb68a..fd799fb68a 100644
--- a/package/multimedia/tidsp-binaries/tidsp-binaries.mk
+++ b/package/tidsp-binaries/tidsp-binaries.mk
diff --git a/package/multimedia/vorbis-tools/Config.in b/package/vorbis-tools/Config.in
index 6092e01acc..6092e01acc 100644
--- a/package/multimedia/vorbis-tools/Config.in
+++ b/package/vorbis-tools/Config.in
diff --git a/package/multimedia/vorbis-tools/vorbis-tools.mk b/package/vorbis-tools/vorbis-tools.mk
index 56b1f944a9..56b1f944a9 100644
--- a/package/multimedia/vorbis-tools/vorbis-tools.mk
+++ b/package/vorbis-tools/vorbis-tools.mk
diff --git a/package/multimedia/wavpack/Config.in b/package/wavpack/Config.in
index 1ef3e420da..1ef3e420da 100644
--- a/package/multimedia/wavpack/Config.in
+++ b/package/wavpack/Config.in
diff --git a/package/multimedia/wavpack/wavpack.mk b/package/wavpack/wavpack.mk
index a7c703feae..a7c703feae 100644
--- a/package/multimedia/wavpack/wavpack.mk
+++ b/package/wavpack/wavpack.mk