diff options
68 files changed, 236 insertions, 118 deletions
diff --git a/rules/Kconfig b/rules/Kconfig index 47ebe785b..7a4385c23 100644 --- a/rules/Kconfig +++ b/rules/Kconfig @@ -3,7 +3,7 @@ # Copyright (C) Robert Schwebel <r.schwebel@pengutronix.de> 2002-2008 # -source "rules/ptxdist-version.in" +source "generated/ptxdist_version.in" config _ptxconfig_MAGIC__ bool @@ -15,35 +15,27 @@ menu "PTXdist Options " source "generated/ptxdist_options.in" endmenu -menu "Host Side Tools " +menu "Host Tools " source "generated/hosttools.in" source "generated/hosttools_noprompt.in" endmenu -menu "Host Side Tools (cross stuff) " +menu "Cross Tools " source "generated/crosstools.in" endmenu -menu "Debugging Tools " +menu "Debug Tools " source "generated/debug_tools.in" endmenu comment "------------------------------------" menu "Root Filesystem " -source "rules/rootfs.in" -source "rules/rootfs_init_d_files.in" -source "rules/rootfs_rc_d_links.in" -source "rules/rootfs_configfiles.in" +source "generated/rootfs.in" endmenu menu "Core (libc, locales) " -source "rules/platforms.in" -source "rules/klibc.in" -source "rules/libc.in" -source "rules/gcclibs.in" -source "rules/locales.in" -source "rules/timezone.in" +source "generated/core.in" endmenu comment "------------------------------------" @@ -76,10 +68,6 @@ menu "Applications " source "generated/applications.in" endmenu -menu "Tools " -source "generated/tools.in" -endmenu - menu "Editors " source "generated/editors.in" endmenu @@ -92,42 +80,6 @@ menu "Middleware " source "generated/middleware.in" endmenu -menu "Graphics Libraries " - -source "rules/xorg.in" -source "rules/sdl-menu.in" - -comment "X Applications" -source "rules/fltk.in" -source "rules/hpanel.in" -source "rules/wxWindows.in" -source "rules/realvnc.in" -source "rules/xli.in" -source "rules/xterm.in" - -comment "X Window Managers" -source "rules/blackbox.in" -source "rules/pekwm.in" - -comment "Framebuffer" -source "rules/fbtest.in" -source "rules/fbutils.in" -source "rules/fbgrab.in" -source "rules/usplash.in" - -comment "Other Stuff" -source "rules/fontconfig.in" -source "rules/i855resolution.in" -source "rules/i915resolution.in" -source "rules/libgd.in" -source "rules/libjpeg.in" -source "rules/libpng.in" -source "rules/qtopia.in" -source "rules/qtopia-examples.in" -source "rules/tslib.in" -source "rules/xawtv.in" -endmenu - menu "Scientific Apps " source "generated/scientific.in" endmenu @@ -148,6 +100,103 @@ menu "Games " source "generated/games.in" endmenu +# ---------------------------------------------------------------------------- + menu "Graphics & Multimedia " -source "generated/multimedia.in" + +menu "directfb & friends " +source "generated/multimedia_directfb.in" +endmenu + +menuconfig MENU_XORG_FONTS + bool + prompt "fonts " + select XORG_LIB_XFONT_PCF_FONTS if XORG_SERVER + default y if XORG_SERVER + help + These fonts can be used with an x-server, standalone directfb or + gtk ontop of directfb. + +if MENU_XORG_FONTS + +config XORG_FONTS + depends on MENU_XORG_FONTS + bool + select XORG_FONT_UTIL + select XORG_FONT_ALIAS + select HOST_XORG_APP_MKFONTDIR + select HOST_XORG_APP_MKFONTSCALE + select HOST_XORG_APP_BDFTOPCF + select HOST_XORG_FONT_UTIL + +source "generated/multimedia_xorg_font.in" +endif + +menu "fltk " +source "generated/multimedia_fltk.in" endmenu + +menu "framebuffer " +source "generated/multimedia_framebuffer.in" +endmenu + +menu "gstreamer " +source "generated/multimedia_gstreamer.in" +endmenu + +menu "gtk+ & friends " +source "generated/multimedia_gtk.in" +endmenu + +menu "mplayer " +source "generated/multimedia_mplayer.in" +endmenu + +menu "qt " +source "generated/qt.in" +endmenu + +menu "sdl " +source "generated/multimedia_sdl.in" +endmenu + +menu "sound " +source "generated/multimedia_sound.in" +endmenu + +menu "tools " +source "generated/multimedia_tools.in" +endmenu + +menu "tslib " +source "generated/multimedia_tslib.in" +endmenu + +menu "xiph codecs " +source "generated/multimedia_xiph.in" +endmenu + +menuconfig XORG + bool + prompt "xorg " + help + Enable this entry if you want the whole world of X. + +if XORG +source "generated/multimedia_xorg.in" +endif + +menu "xorg applications " +source "generated/x_apps.in" +endmenu + +menu "xorg window managers " +source "generated/x_windowmanagers.in" +endmenu + +menu "wxwidgets " +source "generated/multimedia_wxwidgets.in" +endmenu + +endmenu + diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in index 0cee15027..aad9d41a9 100644 --- a/rules/alsa-utils.in +++ b/rules/alsa-utils.in @@ -1,4 +1,5 @@ -## SECTION=applications +## SECTION=multimedia_sound + menuconfig ALSA_UTILS tristate prompt "alsa utils " diff --git a/rules/blackbox.in b/rules/blackbox.in index 1a34e63da..d28e38d67 100644 --- a/rules/blackbox.in +++ b/rules/blackbox.in @@ -1,3 +1,5 @@ +## SECTION=x_windowmanagers + config BLACKBOX tristate prompt "blackbox window manager [BROKEN]" diff --git a/rules/busybox.in b/rules/busybox.in index d537edea6..65e925b95 100644 --- a/rules/busybox.in +++ b/rules/busybox.in @@ -1,4 +1,5 @@ ## SECTION=shell_and_console + menuconfig BUSYBOX tristate prompt "busybox " diff --git a/rules/cross-nasm.in b/rules/cross-nasm.in index 5a66eccd0..29343e249 100644 --- a/rules/cross-nasm.in +++ b/rules/cross-nasm.in @@ -2,4 +2,4 @@ config CROSS_NASM bool - prompt "x86 NASM" + prompt "x86 nasm" diff --git a/rules/directfb-menu.in b/rules/directfb-menu.in deleted file mode 100644 index 1bb4f7b3b..000000000 --- a/rules/directfb-menu.in +++ /dev/null @@ -1,6 +0,0 @@ -## SECTION=multimedia - -menu "directfb & friends " -source "generated/multimedia_directfb.in" -endmenu - diff --git a/rules/directfb.in b/rules/directfb.in index f4c5fa282..54c045586 100644 --- a/rules/directfb.in +++ b/rules/directfb.in @@ -31,20 +31,20 @@ config DIRECTFB_TRACE bool "build with trace support" config DIRECTFB_IMAGE_GIF - bool "build GIF image provider" + bool "build gif image provider" config DIRECTFB_IMAGE_PNG - bool "build PNG image provider" + bool "build png image provider" config DIRECTFB_IMAGE_JPEG - bool "build JPEG image provider" + bool "build jpeg image provider" config DIRECTFB_FONT_FREETYPE - bool "build FreeType2 font provider" + bool "build freetype2 font provider" config DIRECTFB_WM_UNIQUE - bool "enable Unique (WM Module)" + bool "enable unique (wm module)" select DIRECTFB_IMAGE_PNG menu "input driver " diff --git a/rules/fbgrab.in b/rules/fbgrab.in index 2f9819f72..53c957a96 100644 --- a/rules/fbgrab.in +++ b/rules/fbgrab.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_framebuffer + config FBGRAB select LIBPNG tristate diff --git a/rules/fbtest.in b/rules/fbtest.in index 17d070a50..3325dd6a0 100644 --- a/rules/fbtest.in +++ b/rules/fbtest.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_framebuffer + config FBTEST tristate prompt "fbtest" diff --git a/rules/fbutils.in b/rules/fbutils.in index 319da56a3..d1712ea64 100644 --- a/rules/fbutils.in +++ b/rules/fbutils.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_framebuffer + menuconfig FBUTILS tristate select GCCLIBS_CXX diff --git a/rules/figlet.in b/rules/figlet.in index 92557f48e..503330a8b 100644 --- a/rules/figlet.in +++ b/rules/figlet.in @@ -1,4 +1,5 @@ -## SECTION=tools +## SECTION=shell_and_console + config FIGLET tristate prompt "figlet" diff --git a/rules/fltk.in b/rules/fltk.in index 660ec4a0c..73e7de331 100644 --- a/rules/fltk.in +++ b/rules/fltk.in @@ -1,6 +1,8 @@ +## SECTION=multimedia_fltk + menuconfig FLTK tristate - prompt "fltk gui toolkit " + prompt "fltk " select XORG_LIB_X11 select XORG_LIB_XEXT help diff --git a/rules/fontconfig.in b/rules/fontconfig.in index 9afcdc76b..dbb716c09 100644 --- a/rules/fontconfig.in +++ b/rules/fontconfig.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_tools + menuconfig FONTCONFIG tristate prompt "fontconfig " diff --git a/rules/gcclibs.in b/rules/gcclibs.in index 11270e8a1..433df3788 100644 --- a/rules/gcclibs.in +++ b/rules/gcclibs.in @@ -1,6 +1,4 @@ -# -# rules/gcclibs.in -# +## SECTION=core menu "gcc libraries " diff --git a/rules/gettext.in b/rules/gettext.in index f1825e43a..fefb8ddf6 100644 --- a/rules/gettext.in +++ b/rules/gettext.in @@ -1,7 +1,7 @@ ## SECTION=system_libraries menuconfig GETTEXT tristate - prompt "gettext (GNU) " + prompt "gettext (gnu) " select LIBICONV if ARCH_MINGW help The gettext program translates a natural language @@ -12,7 +12,7 @@ if GETTEXT config GETTEXT_LIBINTL bool - prompt "Install GNU libintl" + prompt "install gnu libintl" help libintl is the GNU internationalization runtime library. diff --git a/rules/gnupg.in b/rules/gnupg.in index 145c24219..65eeb90fc 100644 --- a/rules/gnupg.in +++ b/rules/gnupg.in @@ -1,7 +1,7 @@ ## SECTION=applications config GNUPG tristate - prompt "GnuPG" + prompt "gnupg" help GnuPG - The GNU Privacy Guard suite of programs diff --git a/rules/gst-plugins-bad.in b/rules/gst-plugins-bad.in index 46b1d75f8..729fd6590 100644 --- a/rules/gst-plugins-bad.in +++ b/rules/gst-plugins-bad.in @@ -1,4 +1,5 @@ -## SECTION=multimedia +## SECTION=multimedia_gstreamer + menuconfig GST_PLUGINS_BAD tristate select GLIB diff --git a/rules/gst-plugins-base.in b/rules/gst-plugins-base.in index 2c169ec79..4b2e85d59 100644 --- a/rules/gst-plugins-base.in +++ b/rules/gst-plugins-base.in @@ -1,4 +1,5 @@ -## SECTION=multimedia +## SECTION=multimedia_gstreamer + menuconfig GST_PLUGINS_BASE tristate select GLIB diff --git a/rules/gst-plugins-fsl_vpu.in b/rules/gst-plugins-fsl_vpu.in index c553354c4..7589e48e6 100644 --- a/rules/gst-plugins-fsl_vpu.in +++ b/rules/gst-plugins-fsl_vpu.in @@ -1,8 +1,8 @@ -## SECTION=multimedia +## SECTION=multimedia_gstreamer config GST_PLUGINS_FSL_VPU tristate - prompt "Freescale VPU Gstreamer plugin" + prompt "freescale vpu plugin" select LIBFSL_VPU select GST_PLUGINS_BASE help diff --git a/rules/gst-plugins-good.in b/rules/gst-plugins-good.in index 6ae3faa63..2189bf06b 100644 --- a/rules/gst-plugins-good.in +++ b/rules/gst-plugins-good.in @@ -1,4 +1,5 @@ -## SECTION=multimedia +## SECTION=multimedia_gstreamer + menuconfig GST_PLUGINS_GOOD tristate select GLIB diff --git a/rules/gstreamer.in b/rules/gstreamer.in index f383eceb0..ae5825ca8 100644 --- a/rules/gstreamer.in +++ b/rules/gstreamer.in @@ -1,4 +1,5 @@ -## SECTION=multimedia +## SECTION=multimedia_gstreamer + menuconfig GSTREAMER tristate prompt "gstreamer " diff --git a/rules/gtk-menu.in b/rules/gtk-menu.in deleted file mode 100644 index 21a8f2565..000000000 --- a/rules/gtk-menu.in +++ /dev/null @@ -1,6 +0,0 @@ -## SECTION=multimedia - -menu "gtk+ & friends " -source "generated/multimedia_gtk.in" -endmenu - diff --git a/rules/host-gettext.in b/rules/host-gettext.in index d765bb0b0..102d3df02 100644 --- a/rules/host-gettext.in +++ b/rules/host-gettext.in @@ -1,7 +1,7 @@ ## SECTION=hosttools config HOST_GETTEXT - bool "gettext (GNU)" + bool "gettext (gnu)" # select HOST_LIBICONV if ARCH_MINGW help The gettext program translates a natural language diff --git a/rules/hpanel.in b/rules/hpanel.in index 5b722dc89..206ee916c 100644 --- a/rules/hpanel.in +++ b/rules/hpanel.in @@ -1,3 +1,5 @@ +## SECTION=x_apps + config HPANEL tristate depends on XORG_SERVER diff --git a/rules/i855resolution.in b/rules/i855resolution.in index 6aceda8b9..010db9fcf 100644 --- a/rules/i855resolution.in +++ b/rules/i855resolution.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_tools + config I855RESOLUTION tristate prompt "i855resolution" diff --git a/rules/i915resolution.in b/rules/i915resolution.in index f88d65cf2..d6b850a96 100644 --- a/rules/i915resolution.in +++ b/rules/i915resolution.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_tools + config I915RESOLUTION tristate prompt "i915resolution" diff --git a/rules/klibc.in b/rules/klibc.in index 7105be5ea..7e0edf4ec 100644 --- a/rules/klibc.in +++ b/rules/klibc.in @@ -1,3 +1,5 @@ +## SECTION=core + # # rules/klibc.in # diff --git a/rules/libc.in b/rules/libc.in index 364af3068..e0da0e6b6 100644 --- a/rules/libc.in +++ b/rules/libc.in @@ -1,4 +1,6 @@ -menu "C library " +## SECTION=core + +menu "c library " choice prompt "c library " diff --git a/rules/libfsl-vpu.in b/rules/libfsl-vpu.in index 7f114b49a..d6eea6eaa 100644 --- a/rules/libfsl-vpu.in +++ b/rules/libfsl-vpu.in @@ -1,4 +1,4 @@ -## SECTION=multimedia +## SECTION=multimedia_gstreamer config LIBFSL_VPU tristate diff --git a/rules/libgd.in b/rules/libgd.in index 2ca091dc3..75e93d696 100644 --- a/rules/libgd.in +++ b/rules/libgd.in @@ -1,3 +1,5 @@ +## SECTION=system_libraries + menuconfig LIBGD tristate prompt "libgd " diff --git a/rules/libid3tag.in b/rules/libid3tag.in index 1dbdc89e2..8d771c7db 100644 --- a/rules/libid3tag.in +++ b/rules/libid3tag.in @@ -1,4 +1,5 @@ -## SECTION=multimedia +## SECTION=multimedia_sound + config LIBID3TAG tristate select ZLIB diff --git a/rules/libjpeg.in b/rules/libjpeg.in index 8ad5e7e1b..30cea58f3 100644 --- a/rules/libjpeg.in +++ b/rules/libjpeg.in @@ -1,3 +1,5 @@ +## SECTION=system_libraries + config LIBJPEG tristate prompt "libjpeg" diff --git a/rules/libmad.in b/rules/libmad.in index c18b76715..ebac7c0d9 100644 --- a/rules/libmad.in +++ b/rules/libmad.in @@ -1,4 +1,5 @@ -## SECTION=multimedia +## SECTION=multimedia_sound + menuconfig LIBMAD tristate prompt "libmad " diff --git a/rules/libogg.in b/rules/libogg.in index 86b7c636e..1e2f70509 100644 --- a/rules/libogg.in +++ b/rules/libogg.in @@ -1,4 +1,5 @@ -## SECTION=multimedia +## SECTION=multimedia_xiph + config LIBOGG tristate prompt "libogg" diff --git a/rules/libpng.in b/rules/libpng.in index be8f8b82c..23c50e4ef 100644 --- a/rules/libpng.in +++ b/rules/libpng.in @@ -1,3 +1,5 @@ +## SECTION=system_libraries + config LIBPNG tristate prompt "libpng" diff --git a/rules/libtheora.in b/rules/libtheora.in index d9f07232e..f51f8328f 100644 --- a/rules/libtheora.in +++ b/rules/libtheora.in @@ -1,4 +1,5 @@ -## SECTION=multimedia +## SECTION=multimedia_xiph + menuconfig LIBTHEORA tristate select LIBOGG if LIBTHEORA__OGG diff --git a/rules/libvorbis.in b/rules/libvorbis.in index 68bc6c5a0..246af016e 100644 --- a/rules/libvorbis.in +++ b/rules/libvorbis.in @@ -1,4 +1,5 @@ -## SECTION=multimedia +## SECTION=multimedia_xiph + config LIBVORBIS tristate select LIBOGG diff --git a/rules/locales.in b/rules/locales.in index db3e55c45..71c01279f 100644 --- a/rules/locales.in +++ b/rules/locales.in @@ -1,3 +1,5 @@ +## SECTION=core + menuconfig LOCALES tristate prompt "system locales " diff --git a/rules/madplay.in b/rules/madplay.in index e243f1b51..81b7ab53e 100644 --- a/rules/madplay.in +++ b/rules/madplay.in @@ -1,4 +1,5 @@ -## SECTION=multimedia +## SECTION=multimedia_sound + config MADPLAY tristate prompt "madplay " diff --git a/rules/mc.in b/rules/mc.in index 88244d551..bbf024d07 100644 --- a/rules/mc.in +++ b/rules/mc.in @@ -1,4 +1,5 @@ -## SECTION=applications +## SECTION=shell_and_console + menuconfig MC tristate select GLIB diff --git a/rules/memedit.in b/rules/memedit.in index b0f8b8373..85a4782d8 100644 --- a/rules/memedit.in +++ b/rules/memedit.in @@ -1,4 +1,5 @@ -## SECTION=tools +## SECTION=shell_and_console + config MEMEDIT tristate select READLINE diff --git a/rules/memstat.in b/rules/memstat.in index 53a93abbd..2ebb757b9 100644 --- a/rules/memstat.in +++ b/rules/memstat.in @@ -1,4 +1,5 @@ -## SECTION=tools +## SECTION=shell_and_console + config MEMSTAT tristate prompt "memstat" diff --git a/rules/mplayer.in b/rules/mplayer.in index 14b516d0a..40c12f402 100644 --- a/rules/mplayer.in +++ b/rules/mplayer.in @@ -1,4 +1,5 @@ -## SECTION=applications +## SECTION=multimedia_mplayer + menuconfig MPLAYER tristate select LIBJPEG if MPLAYER_VO_JPEG diff --git a/rules/pekwm.in b/rules/pekwm.in index a4294f0f6..e3731da89 100644 --- a/rules/pekwm.in +++ b/rules/pekwm.in @@ -1,3 +1,5 @@ +## SECTION=x_windowmanagers + config PEKWM tristate select XORG_LIB_SM diff --git a/rules/platforms.in b/rules/platforms.in index efaa15a8c..473e078de 100644 --- a/rules/platforms.in +++ b/rules/platforms.in @@ -1,3 +1,5 @@ +## SECTION=core + config KERNEL bool diff --git a/rules/qtopia-examples.in b/rules/qtopia-examples.in index 5c191a187..416b60664 100644 --- a/rules/qtopia-examples.in +++ b/rules/qtopia-examples.in @@ -1,3 +1,5 @@ +## SECTION=qt + menuconfig QTOPIA_EXAMPLES tristate select QTOPIA diff --git a/rules/qtopia.in b/rules/qtopia.in index 304fee823..8eca1b95b 100644 --- a/rules/qtopia.in +++ b/rules/qtopia.in @@ -1,3 +1,5 @@ +## SECTION=qt + menuconfig QTOPIA tristate select TSLIB if QTOPIA_MOUSE_TSLIB diff --git a/rules/rawrec.in b/rules/rawrec.in index 166fdd60e..ce6603894 100644 --- a/rules/rawrec.in +++ b/rules/rawrec.in @@ -1,4 +1,5 @@ -## SECTION=applications +## SECTION=multimedia_sound + menuconfig RAWREC tristate prompt "rawrec/rawplay " diff --git a/rules/realvnc.in b/rules/realvnc.in index 8671a8d28..a9aec219c 100644 --- a/rules/realvnc.in +++ b/rules/realvnc.in @@ -1,3 +1,5 @@ +## SECTION=x_apps + menuconfig REALVNC tristate prompt "realvnc [BROKEN] " diff --git a/rules/rootfs.in b/rules/rootfs.in index c955faf1a..6b995555c 100644 --- a/rules/rootfs.in +++ b/rules/rootfs.in @@ -1,3 +1,5 @@ +## SECTION=rootfs + # ---------------------------------------------------------------------------- menu "populate rootfs " # ---------------------------------------------------------------------------- diff --git a/rules/rootfs_configfiles.in b/rules/rootfs_configfiles.in index f6dc4ced2..812ff5740 100644 --- a/rules/rootfs_configfiles.in +++ b/rules/rootfs_configfiles.in @@ -1,3 +1,5 @@ +## SECTION=rootfs + # ---------------------------------------------------------------------------- menu "config files " # ---------------------------------------------------------------------------- diff --git a/rules/rootfs_init_d_files.in b/rules/rootfs_init_d_files.in index a1db7cb8c..9a9d1ffff 100644 --- a/rules/rootfs_init_d_files.in +++ b/rules/rootfs_init_d_files.in @@ -1,3 +1,5 @@ +## SECTION=rootfs + # ---------------------------------------------------------------------------- menu "start scripts (/etc/init.d) " # ---------------------------------------------------------------------------- diff --git a/rules/rootfs_rc_d_links.in b/rules/rootfs_rc_d_links.in index b227b6b54..fa1f844bf 100644 --- a/rules/rootfs_rc_d_links.in +++ b/rules/rootfs_rc_d_links.in @@ -1,3 +1,5 @@ +## SECTION=rootfs + # ---------------------------------------------------------------------------- menu "startscript links (/etc/rc.d) " # ---------------------------------------------------------------------------- diff --git a/rules/sdl-menu.in b/rules/sdl-menu.in deleted file mode 100644 index c9901f577..000000000 --- a/rules/sdl-menu.in +++ /dev/null @@ -1,7 +0,0 @@ -menu "SDL " - -source "rules/sdl.in" -source "rules/sdl_image.in" -source "rules/sdl_mixer.in" - -endmenu diff --git a/rules/sdl.in b/rules/sdl.in index 8d23a0fc6..6facfd6c5 100644 --- a/rules/sdl.in +++ b/rules/sdl.in @@ -1,4 +1,4 @@ -# sdl configuration +## SECTION=multimedia_sdl menuconfig SDL tristate diff --git a/rules/sdl_image.in b/rules/sdl_image.in index 22dba0d94..9bb18502c 100644 --- a/rules/sdl_image.in +++ b/rules/sdl_image.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_sdl + menuconfig SDL_IMAGE tristate select SDL diff --git a/rules/sdl_mixer.in b/rules/sdl_mixer.in index 31fcd9eba..261e79c36 100644 --- a/rules/sdl_mixer.in +++ b/rules/sdl_mixer.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_sdl + config SDL_MIXER tristate prompt "SDL mixer" diff --git a/rules/setmixer.in b/rules/setmixer.in index 2b3b65c63..51b938ea1 100644 --- a/rules/setmixer.in +++ b/rules/setmixer.in @@ -1,4 +1,5 @@ -## SECTION=applications +## SECTION=multimedia_sound + config SETMIXER tristate prompt "setmixer" diff --git a/rules/sjinn.in b/rules/sjinn.in index ecb49626d..baae09312 100644 --- a/rules/sjinn.in +++ b/rules/sjinn.in @@ -1,6 +1,6 @@ ## SECTION=communication config SJINN tristate - prompt "SJINN" + prompt "sjinn" help rs232 comm tool diff --git a/rules/timezone.in b/rules/timezone.in index 143405c2b..9d277897f 100644 --- a/rules/timezone.in +++ b/rules/timezone.in @@ -1,3 +1,5 @@ +## SECTION=core + comment "Time zone support doesn't work with OSELAS.Toolchain-1.1.0" comment "and prio versions, hence marked as broken for now" diff --git a/rules/tslib.in b/rules/tslib.in index 489e9aa29..67d010944 100644 --- a/rules/tslib.in +++ b/rules/tslib.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_tslib + menuconfig TSLIB tristate prompt "tslib (touch library) " diff --git a/rules/usplash.in b/rules/usplash.in index 06bc4fa6f..8bda78284 100644 --- a/rules/usplash.in +++ b/rules/usplash.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_framebuffer + config USPLASH tristate select LIBX86 diff --git a/rules/wxWindows.in b/rules/wxWindows.in index 59d3aab36..fd42d8077 100644 --- a/rules/wxWindows.in +++ b/rules/wxWindows.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_wxwidgets + menuconfig WXWINDOWS tristate prompt "wxWidgets [BROKEN] " diff --git a/rules/xawtv.in b/rules/xawtv.in index 1a6fa7d95..e40abf862 100644 --- a/rules/xawtv.in +++ b/rules/xawtv.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_tools + config XAWTV tristate prompt "xawtv" diff --git a/rules/xli.in b/rules/xli.in index 9e23b3c68..512e64932 100644 --- a/rules/xli.in +++ b/rules/xli.in @@ -1,3 +1,5 @@ +## SECTION=x_apps + config XLI tristate select LIBPNG diff --git a/rules/xorg-options.in b/rules/xorg-options.in index 4892a6ade..79577b08b 100644 --- a/rules/xorg-options.in +++ b/rules/xorg-options.in @@ -1,4 +1,6 @@ -menu "overall X11 options " +## SECTION=multimedia_xorg + +menu "options " # disabled, its incomplete # @@ -34,7 +36,7 @@ menu "overall X11 options " config XORG_KEYBOARD_MAPPING_SUPPORT bool - prompt "Support keyboard mappings" + prompt "support keyboard mappings" default n select XORG_DRIVER_INPUT_KEYBOARD select XORG_APP_XKBCOMP @@ -47,7 +49,7 @@ config XORG_KEYBOARD_MAPPING_SUPPORT config XORG_DEFAULT_DATA_DIR string - prompt "Default location for X' data files" + prompt "default location for x' data files" default "/usr/lib" help Define here the default path, where X searches for its data files @@ -57,7 +59,7 @@ config XORG_DEFAULT_DATA_DIR config XORG_OPTIONS_TRANS_UNIX bool - prompt "UNIX domain socket transport" + prompt "unix domain socket transport" depends on XORG_LIB_X11 default y help @@ -66,7 +68,7 @@ config XORG_OPTIONS_TRANS_UNIX config XORG_OPTIONS_TRANS_TCP bool - prompt "TCP socket transport" + prompt "tcp socket transport" depends on XORG_LIB_X11 default y help @@ -75,7 +77,7 @@ config XORG_OPTIONS_TRANS_TCP config XORG_OPTIONS_TRANS_IPV6 bool - prompt "IPv6 support" + prompt "ipv6 support" default n help Enable this if your X server needs IPv6 support. If the starting X @@ -84,3 +86,4 @@ config XORG_OPTIONS_TRANS_IPV6 useless in this case) endmenu + diff --git a/rules/xorg-server.in b/rules/xorg-server.in index c6c7d8547..619d23574 100644 --- a/rules/xorg-server.in +++ b/rules/xorg-server.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg + # xorg server configuration # # Note: Some of the listed dependencies are hardcoded in the configure script diff --git a/rules/xterm.in b/rules/xterm.in index 0cbb7366e..f8f1e9e7c 100644 --- a/rules/xterm.in +++ b/rules/xterm.in @@ -1,3 +1,5 @@ +## SECTION=x_apps + config XTERM tristate select XORG_LIB_XAW |