rules: reorganise the multimedia section a bit

- move multimedia libs from system_libraries to multimedia_libs or
  multimedia_sound.
- reorder with fonts/libs at the top and the alphabetically
- add vaapi subsection

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

19 files changed, 33 insertions, 26 deletions

diff --git a/rules/alsa-lib.in b/rules/alsa-lib.in
index ec5134d32..058453ce6 100644
--- a/rules/alsa-lib.in
+++ b/rules/alsa-lib.in
@@ -1,4 +1,5 @@
-## SECTION=system_libraries
+## SECTION=multimedia_sound
+
 menuconfig ALSA_LIB
 	tristate
 	prompt "alsa libraries                "
diff --git a/rules/giflib.in b/rules/giflib.in
index 335c8cb4d..a374bdda7 100644
--- a/rules/giflib.in
+++ b/rules/giflib.in
@@ -1,10 +1,11 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 menuconfig GIFLIB
 	tristate
 	prompt "giflib                        "
 	help
-	  GIFLIB is a package of portable tools and library routines for working with GIF images.
+	  GIFLIB is a package of portable tools and library routines for
+	  working with GIF images.
 
 if GIFLIB
 
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in
index d5de2f6d0..a885b90d2 100644
--- a/rules/graphics_and_multimedia.in
+++ b/rules/graphics_and_multimedia.in
@@ -33,6 +33,10 @@ config XORG_FONTS_QT4_LINKS
 source "generated/multimedia_xorg_font.in"
 endif
 
+menu "libs                          "
+source "generated/multimedia_libs.in"
+endmenu
+
 source "generated/multimedia_fltk.in"
 
 menu "framebuffer                   "
@@ -70,8 +74,12 @@ menu "tools                         "
 source "generated/multimedia_tools.in"
 endmenu
 
-menu "libs                          "
-source "generated/multimedia_libs.in"
+menu "vaapi                         "
+source "generated/multimedia_vaapi.in"
+endmenu
+
+menu "wayland                       "
+source "generated/multimedia_wayland.in"
 endmenu
 
 menuconfig XORG
@@ -83,7 +91,3 @@ menuconfig XORG
 if XORG
 source "generated/multimedia_xorg.in"
 endif
-
-menu "wayland                       "
-source "generated/multimedia_wayland.in"
-endmenu
diff --git a/rules/icu.in b/rules/icu.in
index 3b0e9a367..eeb59d404 100644
--- a/rules/icu.in
+++ b/rules/icu.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 config ICU
 	tristate
diff --git a/rules/intel-media-driver.in b/rules/intel-media-driver.in
index 110f01313..da71081e4 100644
--- a/rules/intel-media-driver.in
+++ b/rules/intel-media-driver.in
@@ -1,4 +1,4 @@
-## SECTION=multimedia_libs
+## SECTION=multimedia_vaapi
 
 config INTEL_MEDIA_DRIVER
 	tristate
diff --git a/rules/lcms.in b/rules/lcms.in
index f03776c59..743caedbc 100644
--- a/rules/lcms.in
+++ b/rules/lcms.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 menuconfig LCMS
 	tristate
diff --git a/rules/libexif.in b/rules/libexif.in
index a9259d8b4..a1e1f81d3 100644
--- a/rules/libexif.in
+++ b/rules/libexif.in
@@ -1,7 +1,8 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 config LIBEXIF
 	tristate
 	prompt "libexif"
 	help
-	  libexif is a library to support reading and writing EXIF metainformation
+	  libexif is a library to support reading and writing EXIF
+	  metainformation.
diff --git a/rules/libgd.in b/rules/libgd.in
index 7bec08975..fe06c04f5 100644
--- a/rules/libgd.in
+++ b/rules/libgd.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 menuconfig LIBGD
 	tristate
diff --git a/rules/libjpeg.in b/rules/libjpeg.in
index 77ad024df..1f7db2ffe 100644
--- a/rules/libjpeg.in
+++ b/rules/libjpeg.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 menuconfig LIBJPEG
 	tristate
diff --git a/rules/libmng.in b/rules/libmng.in
index e46247ed6..2ccf1bc8a 100644
--- a/rules/libmng.in
+++ b/rules/libmng.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 menuconfig LIBMNG
 	tristate
diff --git a/rules/libnetpbm.in b/rules/libnetpbm.in
index 7796988cb..76ca9a03b 100644
--- a/rules/libnetpbm.in
+++ b/rules/libnetpbm.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 # netpbm configuration
 
 menuconfig LIBNETPBM
diff --git a/rules/libpng.in b/rules/libpng.in
index daa2d7688..56efa91be 100644
--- a/rules/libpng.in
+++ b/rules/libpng.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 config LIBPNG
 	tristate
diff --git a/rules/libva-intel-driver.in b/rules/libva-intel-driver.in
index 5bed81d87..b5f7ba600 100644
--- a/rules/libva-intel-driver.in
+++ b/rules/libva-intel-driver.in
@@ -1,4 +1,4 @@
-## SECTION=multimedia_libs
+## SECTION=multimedia_vaapi
 
 config LIBVA_INTEL_DRIVER
 	tristate
diff --git a/rules/libva-utils.in b/rules/libva-utils.in
index 0c4f1c5fa..b1957c107 100644
--- a/rules/libva-utils.in
+++ b/rules/libva-utils.in
@@ -1,4 +1,4 @@
-## SECTION=multimedia_tools
+## SECTION=multimedia_vaapi
 
 config LIBVA_UTILS
 	tristate
diff --git a/rules/libva.in b/rules/libva.in
index 498ecf066..5d074a5cc 100644
--- a/rules/libva.in
+++ b/rules/libva.in
@@ -1,4 +1,4 @@
-## SECTION=multimedia_libs
+## SECTION=multimedia_vaapi
 
 menuconfig LIBVA
 	tristate
diff --git a/rules/libwebp.in b/rules/libwebp.in
index 1a50e7d42..88da36998 100644
--- a/rules/libwebp.in
+++ b/rules/libwebp.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 menuconfig LIBWEBP
 	tristate
diff --git a/rules/pslib.in b/rules/pslib.in
index 2445564ef..454224509 100644
--- a/rules/pslib.in
+++ b/rules/pslib.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 menuconfig PSLIB
 	tristate
diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
index 5fbe165cb..5c5df7fa8 100644
--- a/rules/pulseaudio.in
+++ b/rules/pulseaudio.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_sound
 
 config PULSEAUDIO
 	tristate
diff --git a/rules/qpdf.in b/rules/qpdf.in
index 387e49166..67dd059ea 100644
--- a/rules/qpdf.in
+++ b/rules/qpdf.in
@@ -1,4 +1,4 @@
-## SECTION=system_libraries
+## SECTION=multimedia_libs
 
 menuconfig QPDF
 	tristate