summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/graphics_and_multimedia.in6
-rw-r--r--rules/libogg.in2
-rw-r--r--rules/libtheora.in8
-rw-r--r--rules/libvorbis.in2
-rw-r--r--rules/tslib.in2
5 files changed, 9 insertions, 11 deletions
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in
index 207814663..057e4a585 100644
--- a/rules/graphics_and_multimedia.in
+++ b/rules/graphics_and_multimedia.in
@@ -62,10 +62,8 @@ menu "tools "
source "generated/multimedia_tools.in"
endmenu
-source "generated/multimedia_tslib.in"
-
-menu "xiph codecs "
-source "generated/multimedia_xiph.in"
+menu "libs "
+source "generated/multimedia_libs.in"
endmenu
menuconfig XORG
diff --git a/rules/libogg.in b/rules/libogg.in
index 1e2f70509..a0afdb997 100644
--- a/rules/libogg.in
+++ b/rules/libogg.in
@@ -1,4 +1,4 @@
-## SECTION=multimedia_xiph
+## SECTION=multimedia_libs
config LIBOGG
tristate
diff --git a/rules/libtheora.in b/rules/libtheora.in
index ab8c7297d..689a3480e 100644
--- a/rules/libtheora.in
+++ b/rules/libtheora.in
@@ -1,10 +1,10 @@
-## SECTION=multimedia_xiph
+## SECTION=multimedia_libs
menuconfig LIBTHEORA
tristate
- select LIBOGG if LIBTHEORA__OGG
- select LIBVORBIS if LIBTHEORA__VORBIS
- select SDL if LIBTHEORA__SDL
+ select LIBOGG if LIBTHEORA__OGG
+ select LIBVORBIS if LIBTHEORA__VORBIS
+ select SDL if LIBTHEORA__SDL
prompt "libtheora "
help
Theora is an open video codec being developed by the Xiph.org Foundation
diff --git a/rules/libvorbis.in b/rules/libvorbis.in
index 246af016e..8b588b75e 100644
--- a/rules/libvorbis.in
+++ b/rules/libvorbis.in
@@ -1,4 +1,4 @@
-## SECTION=multimedia_xiph
+## SECTION=multimedia_libs
config LIBVORBIS
tristate
diff --git a/rules/tslib.in b/rules/tslib.in
index 67d010944..92669b1a3 100644
--- a/rules/tslib.in
+++ b/rules/tslib.in
@@ -1,4 +1,4 @@
-## SECTION=multimedia_tslib
+## SECTION=multimedia_libs
menuconfig TSLIB
tristate