diff options
174 files changed, 388 insertions, 182 deletions
@@ -44,8 +44,24 @@ Prio A 20081109 mkl: [x] directfb - [ ] xorg + [x] xorg [x] gtk + [ ] bluez + [ ] crosstools + [ ] debug + [ ] gdb + [ ] gtk + [ ] host-gtk + [ ] hosttools + [ ] libc + [ ] ltp + [ ] net-sec + [ ] networking + [ ] ntp + [ ] sdl + [ ] tests + [ ] wireless + [ ] xorg still have to be migrated diff --git a/rules/freetype.in b/rules/freetype.in index 889506fd9..6489c202a 100644 --- a/rules/freetype.in +++ b/rules/freetype.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_support_libs + config FREETYPE tristate prompt "freetype" diff --git a/rules/libdrm.in b/rules/libdrm.in index 298a2c2ec..fa86ef92d 100644 --- a/rules/libdrm.in +++ b/rules/libdrm.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_support_libs + config LIBDRM tristate prompt "libdrm" diff --git a/rules/libpciaccess.in b/rules/libpciaccess.in index d47210e30..24e8ff290 100644 --- a/rules/libpciaccess.in +++ b/rules/libpciaccess.in @@ -1,4 +1,5 @@ -# +## SECTION=multimedia_xorg_lib + menuconfig LIBPCIACCESS tristate prompt "libpciaccess " diff --git a/rules/libpthread-stubs.in b/rules/libpthread-stubs.in index 76e799682..01a9db048 100644 --- a/rules/libpthread-stubs.in +++ b/rules/libpthread-stubs.in @@ -1,2 +1,4 @@ +## SECTION=multimedia_xorg_lib + config LIBPTHREAD_STUBS tristate diff --git a/rules/libxcb.in b/rules/libxcb.in index e604f3834..1131b5753 100644 --- a/rules/libxcb.in +++ b/rules/libxcb.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config LIBXCB tristate prompt "libxcb" diff --git a/rules/mesalib.in b/rules/mesalib.in index d11492be9..14f5ec7e7 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_support_libs + config MESALIB tristate prompt "MesaLib" diff --git a/rules/pixman.in b/rules/pixman.in index 0a2b4657d..6268d1d15 100644 --- a/rules/pixman.in +++ b/rules/pixman.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config PIXMAN tristate prompt "pixman" diff --git a/rules/xcb-proto.in b/rules/xcb-proto.in index 4a6845d38..9c943562d 100644 --- a/rules/xcb-proto.in +++ b/rules/xcb-proto.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XCB_PROTO tristate help diff --git a/rules/xcursor-transparent-theme.in b/rules/xcursor-transparent-theme.in index 1ef3aacac..83e7f2807 100644 --- a/rules/xcursor-transparent-theme.in +++ b/rules/xcursor-transparent-theme.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_cursor + config XCURSOR_TRANSPARENT_THEME tristate depends on XORG_CURSOR diff --git a/rules/xorg-app-mkfontdir.in b/rules/xorg-app-mkfontdir.in index 78f6a0e26..619a8b91e 100644 --- a/rules/xorg-app-mkfontdir.in +++ b/rules/xorg-app-mkfontdir.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_MKFONTDIR tristate depends on XORG_APP diff --git a/rules/xorg-app-mkfontscale.in b/rules/xorg-app-mkfontscale.in index 46f4d43f3..431351205 100644 --- a/rules/xorg-app-mkfontscale.in +++ b/rules/xorg-app-mkfontscale.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_MKFONTSCALE tristate depends on XORG_APP diff --git a/rules/xorg-app-rgb.in b/rules/xorg-app-rgb.in index c4cb9e680..364cb7344 100644 --- a/rules/xorg-app-rgb.in +++ b/rules/xorg-app-rgb.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_RGB tristate depends on XORG_APP diff --git a/rules/xorg-app-setxkbmap.in b/rules/xorg-app-setxkbmap.in index 05575660c..d2e502e76 100644 --- a/rules/xorg-app-setxkbmap.in +++ b/rules/xorg-app-setxkbmap.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_SETXKBMAP tristate depends on XORG_APP diff --git a/rules/xorg-app-xauth.in b/rules/xorg-app-xauth.in index 19b829a2e..0bdd52b33 100644 --- a/rules/xorg-app-xauth.in +++ b/rules/xorg-app-xauth.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_XAUTH tristate depends on XORG_APP diff --git a/rules/xorg-app-xdm.in b/rules/xorg-app-xdm.in index 090d0e53c..794eebb86 100644 --- a/rules/xorg-app-xdm.in +++ b/rules/xorg-app-xdm.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_XDM tristate depends on XORG_APP diff --git a/rules/xorg-app-xeyes.in b/rules/xorg-app-xeyes.in index 59c9354d3..d57394bbb 100644 --- a/rules/xorg-app-xeyes.in +++ b/rules/xorg-app-xeyes.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_XEYES tristate depends on XORG_APP diff --git a/rules/xorg-app-xhost.in b/rules/xorg-app-xhost.in index 6b9729d87..2b9b8ce54 100644 --- a/rules/xorg-app-xhost.in +++ b/rules/xorg-app-xhost.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_XHOST tristate depends on XORG_APP diff --git a/rules/xorg-app-xinit.in b/rules/xorg-app-xinit.in index fa4c9c243..c39aa7377 100644 --- a/rules/xorg-app-xinit.in +++ b/rules/xorg-app-xinit.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_XINIT tristate depends on XORG_APP diff --git a/rules/xorg-app-xkbcomp.in b/rules/xorg-app-xkbcomp.in index b053fcff4..399fc3d8e 100644 --- a/rules/xorg-app-xkbcomp.in +++ b/rules/xorg-app-xkbcomp.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_XKBCOMP tristate depends on XORG_APP diff --git a/rules/xorg-app-xrdb.in b/rules/xorg-app-xrdb.in index 9290ab8f2..32e2e5510 100644 --- a/rules/xorg-app-xrdb.in +++ b/rules/xorg-app-xrdb.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_XRDB tristate depends on XORG_APP diff --git a/rules/xorg-app-xset.in b/rules/xorg-app-xset.in index 6c7f2072b..b96e37566 100644 --- a/rules/xorg-app-xset.in +++ b/rules/xorg-app-xset.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_XSET tristate depends on XORG_APP diff --git a/rules/xorg-app-xsetroot.in b/rules/xorg-app-xsetroot.in index cb4367bf3..ef01662a0 100644 --- a/rules/xorg-app-xsetroot.in +++ b/rules/xorg-app-xsetroot.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_XSETROOT tristate depends on XORG_APP diff --git a/rules/xorg-app-xvinfo.in b/rules/xorg-app-xvinfo.in index b2480d71a..61bd2cc7a 100644 --- a/rules/xorg-app-xvinfo.in +++ b/rules/xorg-app-xvinfo.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_app + config XORG_APP_XVINFO tristate depends on XORG_APP diff --git a/rules/xorg-app.in b/rules/xorg-app.in index 412d7b6de..34832c779 100644 --- a/rules/xorg-app.in +++ b/rules/xorg-app.in @@ -1,20 +1,9 @@ +## SECTION=multimedia_xorg + # xorg application configuration menuconfig XORG_APP bool "xorg applications " -source "rules/xorg-app-xdm.in" -source "rules/xorg-app-xhost.in" -source "rules/xorg-app-xeyes.in" -source "rules/xorg-app-mkfontdir.in" -source "rules/xorg-app-mkfontscale.in" -source "rules/xorg-app-xinit.in" -source "rules/xorg-app-xsetroot.in" -source "rules/xorg-app-rgb.in" -source "rules/xorg-app-xvinfo.in" -source "rules/xorg-app-xkbcomp.in" -source "rules/xorg-app-setxkbmap.in" -source "rules/xorg-app-xset.in" -source "rules/xorg-app-xrdb.in" -source "rules/xorg-app-xauth.in" +source "generated/multimedia_xorg_app.in" diff --git a/rules/xorg-cursor.in b/rules/xorg-cursor.in index 5cf89868c..5d52e8d3e 100644 --- a/rules/xorg-cursor.in +++ b/rules/xorg-cursor.in @@ -1,10 +1,12 @@ +## SECTION=multimedia_xorg + menuconfig XORG_CURSOR tristate prompt "xorg cursor themes " select XORG_LIB_X11_CURSOR select XORG_LIB_XCURSOR -source "rules/xcursor-transparent-theme.in" +source "generated/multimedia_xorg_cursor.in" choice prompt "default cursor theme" diff --git a/rules/xorg-data-xbitmaps.in b/rules/xorg-data-xbitmaps.in index ea0a3a32f..9f155fd47 100644 --- a/rules/xorg-data-xbitmaps.in +++ b/rules/xorg-data-xbitmaps.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_data + config XORG_DATA_XBITMAPS tristate prompt "xbitmaps" diff --git a/rules/xorg-data-xkbdata.in b/rules/xorg-data-xkbdata.in index 49a758583..505637150 100644 --- a/rules/xorg-data-xkbdata.in +++ b/rules/xorg-data-xkbdata.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_data + config XORG_DATA_XKBDATA tristate depends on XORG_APP diff --git a/rules/xorg-data.in b/rules/xorg-data.in index 4c5dde988..ae3042c89 100644 --- a/rules/xorg-data.in +++ b/rules/xorg-data.in @@ -1,8 +1,6 @@ -# xorg data configuration +## SECTION=multimedia_xorg menu "xorg data " - -source "rules/xorg-data-xbitmaps.in" -source "rules/xorg-data-xkbdata.in" - +source "generated/multimedia_xorg_data.in" endmenu + diff --git a/rules/xorg-driver-input-evdev.in b/rules/xorg-driver-input-evdev.in index 8d43dee72..cc846a681 100644 --- a/rules/xorg-driver-input-evdev.in +++ b/rules/xorg-driver-input-evdev.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_input + config XORG_DRIVER_INPUT_EVDEV tristate prompt "evdev" diff --git a/rules/xorg-driver-input-keyboard.in b/rules/xorg-driver-input-keyboard.in index 58bc44942..105dc7eb5 100644 --- a/rules/xorg-driver-input-keyboard.in +++ b/rules/xorg-driver-input-keyboard.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_input + config XORG_DRIVER_INPUT_KEYBOARD tristate prompt "Keyboard" diff --git a/rules/xorg-driver-input-mouse.in b/rules/xorg-driver-input-mouse.in index 2a101ad2c..6df58e9cf 100644 --- a/rules/xorg-driver-input-mouse.in +++ b/rules/xorg-driver-input-mouse.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_input + config XORG_DRIVER_INPUT_MOUSE tristate depends on XORG_DRIVER_INPUT diff --git a/rules/xorg-driver-input-tslib.in b/rules/xorg-driver-input-tslib.in index d557dbdbe..d0eefc5d0 100644 --- a/rules/xorg-driver-input-tslib.in +++ b/rules/xorg-driver-input-tslib.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_input + config XORG_DRIVER_INPUT_TSLIB tristate depends on XORG_DRIVER_INPUT diff --git a/rules/xorg-driver-input-void.in b/rules/xorg-driver-input-void.in index 0e89669dc..faa55a16c 100644 --- a/rules/xorg-driver-input-void.in +++ b/rules/xorg-driver-input-void.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_input + config XORG_DRIVER_INPUT_VOID tristate depends on XORG_DRIVER_INPUT diff --git a/rules/xorg-driver-video-apm.in b/rules/xorg-driver-video-apm.in index d2e24a0fd..19c3f77ec 100644 --- a/rules/xorg-driver-video-apm.in +++ b/rules/xorg-driver-video-apm.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_video + config XORG_DRIVER_VIDEO_APM tristate depends on XORG_DRIVER_VIDEO diff --git a/rules/xorg-driver-video-ati.in b/rules/xorg-driver-video-ati.in index f729eda79..11e34cdef 100644 --- a/rules/xorg-driver-video-ati.in +++ b/rules/xorg-driver-video-ati.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_video + # configuration for xorg-driver-video-ati menuconfig XORG_DRIVER_VIDEO_ATI diff --git a/rules/xorg-driver-video-dummy.in b/rules/xorg-driver-video-dummy.in index 6cf76fa69..7224685a7 100644 --- a/rules/xorg-driver-video-dummy.in +++ b/rules/xorg-driver-video-dummy.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_video + config XORG_DRIVER_VIDEO_DUMMY tristate depends on XORG_DRIVER_VIDEO diff --git a/rules/xorg-driver-video-fbdev.in b/rules/xorg-driver-video-fbdev.in index d98be1a78..2433e6c77 100644 --- a/rules/xorg-driver-video-fbdev.in +++ b/rules/xorg-driver-video-fbdev.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_video + config XORG_DRIVER_VIDEO_FBDEV tristate depends on XORG_DRIVER_VIDEO diff --git a/rules/xorg-driver-video-i810.in b/rules/xorg-driver-video-i810.in index 740a9142b..056f8a82b 100644 --- a/rules/xorg-driver-video-i810.in +++ b/rules/xorg-driver-video-i810.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_video + # configuration for xorg-driver-video-i810 menuconfig XORG_DRIVER_VIDEO_I810 diff --git a/rules/xorg-driver-video-nsc.in b/rules/xorg-driver-video-nsc.in index 7ace8ac0c..8884680c8 100644 --- a/rules/xorg-driver-video-nsc.in +++ b/rules/xorg-driver-video-nsc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_video + # configuration for xorg-driver-video-nsc # this driver is only a module to be used in # the main xorg server diff --git a/rules/xorg-driver-video-v4l.in b/rules/xorg-driver-video-v4l.in index 518b45e14..0b0c5560d 100644 --- a/rules/xorg-driver-video-v4l.in +++ b/rules/xorg-driver-video-v4l.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_video + # configuration for xorg-driver-video-v4l config XORG_DRIVER_VIDEO_V4L diff --git a/rules/xorg-driver-video-vesa.in b/rules/xorg-driver-video-vesa.in index cea5ccba9..239226e7f 100644 --- a/rules/xorg-driver-video-vesa.in +++ b/rules/xorg-driver-video-vesa.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_video + # configuration for xorg-driver-video-vesa config XORG_DRIVER_VIDEO_VESA diff --git a/rules/xorg-driver-video-vga.in b/rules/xorg-driver-video-vga.in index b38d85de1..0bbfb3e0c 100644 --- a/rules/xorg-driver-video-vga.in +++ b/rules/xorg-driver-video-vga.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_driver_video + # configuration for xorg-driver-video-vga config XORG_DRIVER_VIDEO_VGA diff --git a/rules/xorg-driver.in b/rules/xorg-driver.in index 1520461eb..1de4ead5b 100644 --- a/rules/xorg-driver.in +++ b/rules/xorg-driver.in @@ -1,23 +1,12 @@ -# xorg driver configuration +## SECTION=multimedia_xorg menuconfig XORG_DRIVER_INPUT bool "xorg input drivers " -source "rules/xorg-driver-input-evdev.in" -source "rules/xorg-driver-input-keyboard.in" -source "rules/xorg-driver-input-mouse.in" -source "rules/xorg-driver-input-tslib.in" -source "rules/xorg-driver-input-void.in" +source "generated/multimedia_xorg_driver_input.in" menuconfig XORG_DRIVER_VIDEO bool "xorg video drivers " -source "rules/xorg-driver-video-apm.in" -source "rules/xorg-driver-video-ati.in" -source "rules/xorg-driver-video-dummy.in" -source "rules/xorg-driver-video-fbdev.in" -source "rules/xorg-driver-video-i810.in" -source "rules/xorg-driver-video-v4l.in" -source "rules/xorg-driver-video-vga.in" -source "rules/xorg-driver-video-vesa.in" -source "rules/xorg-driver-video-nsc.in" +source "generated/multimedia_xorg_driver_video.in" + diff --git a/rules/xorg-font-100dpi-trans.in b/rules/xorg-font-100dpi-trans.in index 57238988a..07c637681 100644 --- a/rules/xorg-font-100dpi-trans.in +++ b/rules/xorg-font-100dpi-trans.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font + comment "" depends on MENU_XORG_FONTS depends on INVISIBLE diff --git a/rules/xorg-font-100dpi.in b/rules/xorg-font-100dpi.in index d234c19fb..74d400052 100644 --- a/rules/xorg-font-100dpi.in +++ b/rules/xorg-font-100dpi.in @@ -1,10 +1,9 @@ +## SECTION=multimedia_xorg_font + menuconfig XORG_FONT_100DPI prompt "xorg 100 dpi fonts " bool depends on MENU_XORG_FONTS -source "rules/xorg-font-adobe-100dpi.in" -source "rules/xorg-font-adobe-utopia-100dpi.in" -source "rules/xorg-font-bh-100dpi.in" -source "rules/xorg-font-bh-lucidatypewriter-100dpi.in" -source "rules/xorg-font-bitstream-100dpi.in" +source "generated/multimedia_xorg_font_100dpi.in" + diff --git a/rules/xorg-font-75dpi-trans.in b/rules/xorg-font-75dpi-trans.in index 2cf0200fa..ee079eb9e 100644 --- a/rules/xorg-font-75dpi-trans.in +++ b/rules/xorg-font-75dpi-trans.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font + comment "" depends on MENU_XORG_FONTS depends on INVISIBLE diff --git a/rules/xorg-font-75dpi.in b/rules/xorg-font-75dpi.in index 8b0dcdd3d..c96404eaf 100644 --- a/rules/xorg-font-75dpi.in +++ b/rules/xorg-font-75dpi.in @@ -1,11 +1,9 @@ +## SECTION=multimedia_xorg_font + menuconfig XORG_FONT_75DPI depends on MENU_XORG_FONTS bool prompt "xorg 75 dpi fonts " -source "rules/xorg-font-adobe-75dpi.in" -source "rules/xorg-font-adobe-utopia-75dpi.in" -source "rules/xorg-font-bh-75dpi.in" -source "rules/xorg-font-bh-lucidatypewriter-75dpi.in" -source "rules/xorg-font-bitstream-75dpi.in" +source "generated/multimedia_xorg_font_75dpi.in" diff --git a/rules/xorg-font-adobe-100dpi.in b/rules/xorg-font-adobe-100dpi.in index 3e510a770..e890885d6 100644 --- a/rules/xorg-font-adobe-100dpi.in +++ b/rules/xorg-font-adobe-100dpi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_100dpi + config XORG_FONT_ADOBE_100DPI tristate select XORG_FONTS diff --git a/rules/xorg-font-adobe-75dpi.in b/rules/xorg-font-adobe-75dpi.in index 56fa7734a..afb9af1f4 100644 --- a/rules/xorg-font-adobe-75dpi.in +++ b/rules/xorg-font-adobe-75dpi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_75dpi + config XORG_FONT_ADOBE_75DPI tristate default y diff --git a/rules/xorg-font-adobe-utopia-100dpi.in b/rules/xorg-font-adobe-utopia-100dpi.in index 12f64e32d..8409fdf9f 100644 --- a/rules/xorg-font-adobe-utopia-100dpi.in +++ b/rules/xorg-font-adobe-utopia-100dpi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_100dpi + config XORG_FONT_ADOBE_UTOPIA_100DPI tristate select XORG_FONTS diff --git a/rules/xorg-font-adobe-utopia-75dpi.in b/rules/xorg-font-adobe-utopia-75dpi.in index 99283e43d..3d787368c 100644 --- a/rules/xorg-font-adobe-utopia-75dpi.in +++ b/rules/xorg-font-adobe-utopia-75dpi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_75dpi + config XORG_FONT_ADOBE_UTOPIA_75DPI tristate select XORG_FONTS diff --git a/rules/xorg-font-adobe-utopia-type1.in b/rules/xorg-font-adobe-utopia-type1.in index 42e241673..265685f1d 100644 --- a/rules/xorg-font-adobe-utopia-type1.in +++ b/rules/xorg-font-adobe-utopia-type1.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_type1 + config XORG_FONT_ADOBE_UTOPIA_TYPE1 bool select XORG_FONTS diff --git a/rules/xorg-font-alias.in b/rules/xorg-font-alias.in index 9d1d74c14..9db36d8dc 100644 --- a/rules/xorg-font-alias.in +++ b/rules/xorg-font-alias.in @@ -1,2 +1,4 @@ +## SECTION=multimedia_xorg_font_utils + config XORG_FONT_ALIAS bool diff --git a/rules/xorg-font-arabic-misc.in b/rules/xorg-font-arabic-misc.in index 95445fc5c..82302a960 100644 --- a/rules/xorg-font-arabic-misc.in +++ b/rules/xorg-font-arabic-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_other + config XORG_FONT_ARABIC_MISC bool select XORG_FONTS diff --git a/rules/xorg-font-base-trans.in b/rules/xorg-font-base-trans.in index 5d506eafe..8094b6fdf 100644 --- a/rules/xorg-font-base-trans.in +++ b/rules/xorg-font-base-trans.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font + menu "xorg base fonts(transcoded) " depends on MENU_XORG_FONTS diff --git a/rules/xorg-font-base.in b/rules/xorg-font-base.in index fcccb639c..bd3029746 100644 --- a/rules/xorg-font-base.in +++ b/rules/xorg-font-base.in @@ -1,17 +1,8 @@ +## SECTION=multimedia_xorg_font + menu "xorg base fonts " depends on MENU_XORG_FONTS -source "rules/xorg-font-misc-misc.in" -source "rules/xorg-font-cursor-misc.in" -source "rules/xorg-font-daewoo-misc.in" -source "rules/xorg-font-dec-misc.in" -source "rules/xorg-font-encodings.in" -source "rules/xorg-font-isas-misc.in" -source "rules/xorg-font-jis-misc.in" -source "rules/xorg-font-micro-misc.in" -source "rules/xorg-font-mutt-misc.in" -source "rules/xorg-font-schumacher-misc.in" -source "rules/xorg-font-sony-misc.in" -source "rules/xorg-font-sun-misc.in" +source "generated/multimedia_xorg_font_base.in" endmenu diff --git a/rules/xorg-font-bh-100dpi.in b/rules/xorg-font-bh-100dpi.in index 5d95589f4..cb2874000 100644 --- a/rules/xorg-font-bh-100dpi.in +++ b/rules/xorg-font-bh-100dpi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_100dpi + config XORG_FONT_BH_100DPI tristate select XORG_FONTS diff --git a/rules/xorg-font-bh-75dpi.in b/rules/xorg-font-bh-75dpi.in index fc41aacd7..c20cd3954 100644 --- a/rules/xorg-font-bh-75dpi.in +++ b/rules/xorg-font-bh-75dpi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_75dpi + config XORG_FONT_BH_75DPI tristate select XORG_FONTS diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.in b/rules/xorg-font-bh-lucidatypewriter-100dpi.in index 9fb3baa45..b0fc101c2 100644 --- a/rules/xorg-font-bh-lucidatypewriter-100dpi.in +++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_100dpi + config XORG_FONT_BH_LUCIDATYPEWRITER_100DPI tristate select XORG_FONTS diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.in b/rules/xorg-font-bh-lucidatypewriter-75dpi.in index b6658620a..b26fe80aa 100644 --- a/rules/xorg-font-bh-lucidatypewriter-75dpi.in +++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_75dpi + config XORG_FONT_BH_LUCIDATYPEWRITER_75DPI tristate select XORG_FONTS diff --git a/rules/xorg-font-bh-ttf.in b/rules/xorg-font-bh-ttf.in index 3c15c0af0..8cf397fd0 100644 --- a/rules/xorg-font-bh-ttf.in +++ b/rules/xorg-font-bh-ttf.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_ttf + config XORG_FONT_BH_TTF bool select XORG_FONTS diff --git a/rules/xorg-font-bitstream-100dpi.in b/rules/xorg-font-bitstream-100dpi.in index 93be54b44..93f16d0bf 100644 --- a/rules/xorg-font-bitstream-100dpi.in +++ b/rules/xorg-font-bitstream-100dpi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_100dpi + config XORG_FONT_BITSTREAM_100DPI tristate select XORG_FONTS diff --git a/rules/xorg-font-bitstream-75dpi.in b/rules/xorg-font-bitstream-75dpi.in index b0862cc5d..5940cdfc0 100644 --- a/rules/xorg-font-bitstream-75dpi.in +++ b/rules/xorg-font-bitstream-75dpi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_75dpi + config XORG_FONT_BITSTREAM_75DPI tristate select XORG_FONTS diff --git a/rules/xorg-font-bitstream-speedo.in b/rules/xorg-font-bitstream-speedo.in index 88e88054c..ebd43d8a8 100644 --- a/rules/xorg-font-bitstream-speedo.in +++ b/rules/xorg-font-bitstream-speedo.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_speedo + config XORG_FONT_BITSTREAM_SPEEDO bool select XORG_FONTS diff --git a/rules/xorg-font-bitstream-type1.in b/rules/xorg-font-bitstream-type1.in index 4306a288d..58a2ff117 100644 --- a/rules/xorg-font-bitstream-type1.in +++ b/rules/xorg-font-bitstream-type1.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_type1 + config XORG_FONT_BITSTREAM_TYPE1 bool select XORG_FONTS diff --git a/rules/xorg-font-cronyx-cyrillic.in b/rules/xorg-font-cronyx-cyrillic.in index 7e67c6033..ddda75492 100644 --- a/rules/xorg-font-cronyx-cyrillic.in +++ b/rules/xorg-font-cronyx-cyrillic.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_cyrillic + config XORG_FONT_CRONYX_CYRILLIC bool select XORG_FONTS diff --git a/rules/xorg-font-cursor-misc.in b/rules/xorg-font-cursor-misc.in index 0eaf18a79..64f5e4616 100644 --- a/rules/xorg-font-cursor-misc.in +++ b/rules/xorg-font-cursor-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_CURSOR_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-daewoo-misc.in b/rules/xorg-font-daewoo-misc.in index 1332eb8d9..2d9c17aa4 100644 --- a/rules/xorg-font-daewoo-misc.in +++ b/rules/xorg-font-daewoo-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_DAEWOO_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-dec-misc.in b/rules/xorg-font-dec-misc.in index 0f392ef81..3ad499a09 100644 --- a/rules/xorg-font-dec-misc.in +++ b/rules/xorg-font-dec-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_DEC_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-encodings.in b/rules/xorg-font-encodings.in index a59616868..5bfd31279 100644 --- a/rules/xorg-font-encodings.in +++ b/rules/xorg-font-encodings.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_ENCODINGS tristate select XORG_FONTS diff --git a/rules/xorg-font-ibm-type1.in b/rules/xorg-font-ibm-type1.in index 69e4374f9..9e6fda056 100644 --- a/rules/xorg-font-ibm-type1.in +++ b/rules/xorg-font-ibm-type1.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_type1 + config XORG_FONT_IBM_TYPE1 bool select XORG_FONTS diff --git a/rules/xorg-font-intl.in b/rules/xorg-font-intl.in index 13a22ed6c..1235e38ed 100644 --- a/rules/xorg-font-intl.in +++ b/rules/xorg-font-intl.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font + menu "international fonts for X " depends on MENU_XORG_FONTS @@ -49,15 +51,10 @@ config XORG_FONT_INTL_ASIAN further asian languages. comment "cyrillic fonts" -source "rules/xorg-font-misc-cyrillic.in" -source "rules/xorg-font-cronyx-cyrillic.in" -source "rules/xorg-font-screen-cyrillic.in" -source "rules/xorg-font-winitzki-cyrillic.in" +source "generated/multimedia_xorg_font_cyrillic.in" comment "other language fonts " -source "rules/xorg-font-arabic-misc.in" -source "rules/xorg-font-misc-ethiopic.in" -source "rules/xorg-font-misc-meltho.in" +source "generated/multimedia_xorg_font_other.in" endmenu diff --git a/rules/xorg-font-isas-misc.in b/rules/xorg-font-isas-misc.in index 4f78a92b4..8ee7df025 100644 --- a/rules/xorg-font-isas-misc.in +++ b/rules/xorg-font-isas-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_ISAS_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-jis-misc.in b/rules/xorg-font-jis-misc.in index b79f75b9c..59f72497c 100644 --- a/rules/xorg-font-jis-misc.in +++ b/rules/xorg-font-jis-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_JIS_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-micro-misc.in b/rules/xorg-font-micro-misc.in index 4f0dce621..14c935ace 100644 --- a/rules/xorg-font-micro-misc.in +++ b/rules/xorg-font-micro-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_MICRO_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-misc-cyrillic.in b/rules/xorg-font-misc-cyrillic.in index 2121970dd..ce2992473 100644 --- a/rules/xorg-font-misc-cyrillic.in +++ b/rules/xorg-font-misc-cyrillic.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_cyrillic + config XORG_FONT_MISC_CYRILLIC bool select XORG_FONTS diff --git a/rules/xorg-font-misc-ethiopic.in b/rules/xorg-font-misc-ethiopic.in index 53cf67893..85d63bb8b 100644 --- a/rules/xorg-font-misc-ethiopic.in +++ b/rules/xorg-font-misc-ethiopic.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_other + config XORG_FONT_MISC_ETHIOPIC bool select XORG_FONTS diff --git a/rules/xorg-font-misc-meltho.in b/rules/xorg-font-misc-meltho.in index 6d97cbbfb..9f86cee2c 100644 --- a/rules/xorg-font-misc-meltho.in +++ b/rules/xorg-font-misc-meltho.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_other + config XORG_FONT_MISC_MELTHO bool select XORG_FONTS diff --git a/rules/xorg-font-misc-misc.in b/rules/xorg-font-misc-misc.in index 4d89ab428..f5b75ccd3 100644 --- a/rules/xorg-font-misc-misc.in +++ b/rules/xorg-font-misc-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_MISC_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-mutt-misc.in b/rules/xorg-font-mutt-misc.in index 5c6105c6a..f837ccac4 100644 --- a/rules/xorg-font-mutt-misc.in +++ b/rules/xorg-font-mutt-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_MUTT_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-schumacher-misc.in b/rules/xorg-font-schumacher-misc.in index c57161b5c..f51c09d4f 100644 --- a/rules/xorg-font-schumacher-misc.in +++ b/rules/xorg-font-schumacher-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_SCHUMACHER_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-screen-cyrillic.in b/rules/xorg-font-screen-cyrillic.in index d897b3fa1..e7f649d10 100644 --- a/rules/xorg-font-screen-cyrillic.in +++ b/rules/xorg-font-screen-cyrillic.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_cyrillic + config XORG_FONT_SCREEN_CYRILLIC bool select XORG_FONTS diff --git a/rules/xorg-font-sony-misc.in b/rules/xorg-font-sony-misc.in index 060836c7c..0f0640b53 100644 --- a/rules/xorg-font-sony-misc.in +++ b/rules/xorg-font-sony-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_SONY_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-speedo.in b/rules/xorg-font-speedo.in index 06b17729f..c319915f2 100644 --- a/rules/xorg-font-speedo.in +++ b/rules/xorg-font-speedo.in @@ -1,7 +1,10 @@ +## SECTION=multimedia_xorg_font + menuconfig XORG_FONT_SPEEDO depends on MENU_XORG_FONTS select XORG_LIB_XFONT_SPEEDO_FONTS bool prompt "xorg speedo fonts " -source "rules/xorg-font-bitstream-speedo.in" +source "generated/multimedia_xorg_font_speedo.in" + diff --git a/rules/xorg-font-sun-misc.in b/rules/xorg-font-sun-misc.in index 59bf24f5f..7c3356878 100644 --- a/rules/xorg-font-sun-misc.in +++ b/rules/xorg-font-sun-misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_base + config XORG_FONT_SUN_MISC tristate select XORG_FONTS diff --git a/rules/xorg-font-ttf-bitstream-vera.in b/rules/xorg-font-ttf-bitstream-vera.in index e9aca6af9..31236962b 100644 --- a/rules/xorg-font-ttf-bitstream-vera.in +++ b/rules/xorg-font-ttf-bitstream-vera.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_ttf + config XORG_FONT_TTF_BITSTREAM_VERA bool select XORG_FONTS diff --git a/rules/xorg-font-ttf.in b/rules/xorg-font-ttf.in index a555ad0ef..976d2044c 100644 --- a/rules/xorg-font-ttf.in +++ b/rules/xorg-font-ttf.in @@ -1,8 +1,10 @@ +## SECTION=multimedia_xorg_font + menuconfig XORG_FONT_TTF depends on MENU_XORG_FONTS select XORG_LIB_XFONT_FREETYPE bool prompt "xorg true/open type fonts " -source "rules/xorg-font-bh-ttf.in" -source "rules/xorg-font-ttf-bitstream-vera.in" +source "generated/multimedia_xorg_font_ttf.in" + diff --git a/rules/xorg-font-type1.in b/rules/xorg-font-type1.in index 696a1e13b..bdd30ad65 100644 --- a/rules/xorg-font-type1.in +++ b/rules/xorg-font-type1.in @@ -1,10 +1,10 @@ +## SECTION=multimedia_xorg_font + menuconfig XORG_FONT_TYPE1 depends on MENU_XORG_FONTS select XORG_LIB_XFONT_TYPE1_FONTS bool prompt "xorg scalable fonts " -source "rules/xorg-font-adobe-utopia-type1.in" -source "rules/xorg-font-bitstream-type1.in" -source "rules/xorg-font-ibm-type1.in" -source "rules/xorg-font-xfree86-type1.in" +source "generated/multimedia_xorg_font_type1.in" + diff --git a/rules/xorg-font-util-alias.in b/rules/xorg-font-util-alias.in index 86d9671cd..daa22db69 100644 --- a/rules/xorg-font-util-alias.in +++ b/rules/xorg-font-util-alias.in @@ -1,7 +1,8 @@ +## SECTION=multimedia_xorg_font + menu "xorg font utils and aliases " depends on MENU_XORG_FONTS -source "rules/xorg-font-util.in" -source "rules/xorg-font-alias.in" +source "generated/multimedia_xorg_font_utils.in" endmenu diff --git a/rules/xorg-font-util.in b/rules/xorg-font-util.in index ed7eba6ab..914791b6b 100644 --- a/rules/xorg-font-util.in +++ b/rules/xorg-font-util.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_utils + config XORG_FONT_UTIL tristate prompt "Util " diff --git a/rules/xorg-font-winitzki-cyrillic.in b/rules/xorg-font-winitzki-cyrillic.in index 6df0dc159..2b4c2e6fa 100644 --- a/rules/xorg-font-winitzki-cyrillic.in +++ b/rules/xorg-font-winitzki-cyrillic.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_cyrillic + config XORG_FONT_WINITZKI_CYRILLIC bool select XORG_FONTS diff --git a/rules/xorg-font-xfree86-type1.in b/rules/xorg-font-xfree86-type1.in index 29f840898..711fc0394 100644 --- a/rules/xorg-font-xfree86-type1.in +++ b/rules/xorg-font-xfree86-type1.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_font_type1 + config XORG_FONT_XFREE86_TYPE1 bool select XORG_FONTS diff --git a/rules/xorg-font.in b/rules/xorg-font.in index ab3a84545..226468bf7 100644 --- a/rules/xorg-font.in +++ b/rules/xorg-font.in @@ -13,6 +13,8 @@ menuconfig MENU_XORG_FONTS 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 @@ -23,17 +25,7 @@ config XORG_FONTS select HOST_XORG_APP_BDFTOPCF select HOST_XORG_FONT_UTIL -#source "rules/xorg-fonts.in" +source "generated/multimedia_xorg_font.in" +endif -source "rules/xorg-font-util-alias.in" -source "rules/xorg-font-base.in" -source "rules/xorg-font-base-trans.in" -source "rules/xorg-font-100dpi.in" -source "rules/xorg-font-100dpi-trans.in" -source "rules/xorg-font-75dpi.in" -source "rules/xorg-font-75dpi-trans.in" -source "rules/xorg-font-type1.in" -source "rules/xorg-font-speedo.in" -source "rules/xorg-font-ttf.in" -source "rules/xorg-font-intl.in" diff --git a/rules/xorg-lib-AppleWM.in b/rules/xorg-lib-AppleWM.in index c47124c8e..9e1c02bf6 100644 --- a/rules/xorg-lib-AppleWM.in +++ b/rules/xorg-lib-AppleWM.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_APPLEWM tristate select XORG_PROTO_APPLEWM diff --git a/rules/xorg-lib-FS.in b/rules/xorg-lib-FS.in index 1c26481b4..a1bb14f1e 100644 --- a/rules/xorg-lib-FS.in +++ b/rules/xorg-lib-FS.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_FS tristate prompt "libFS" diff --git a/rules/xorg-lib-ICE.in b/rules/xorg-lib-ICE.in index c9eb62740..4e74348e4 100644 --- a/rules/xorg-lib-ICE.in +++ b/rules/xorg-lib-ICE.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_ICE tristate prompt "libICE" diff --git a/rules/xorg-lib-SM.in b/rules/xorg-lib-SM.in index d12eb61e5..09fb240b0 100644 --- a/rules/xorg-lib-SM.in +++ b/rules/xorg-lib-SM.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_SM tristate prompt "libSM" diff --git a/rules/xorg-lib-WindowsWM.in b/rules/xorg-lib-WindowsWM.in index ded24a31f..956ff98bb 100644 --- a/rules/xorg-lib-WindowsWM.in +++ b/rules/xorg-lib-WindowsWM.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_WINDOWSWM tristate select XORG_LIB_X11 diff --git a/rules/xorg-lib-X11.in b/rules/xorg-lib-X11.in index 34e3dfea3..c57890f62 100644 --- a/rules/xorg-lib-X11.in +++ b/rules/xorg-lib-X11.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + menuconfig XORG_LIB_X11 tristate prompt "libX11 " diff --git a/rules/xorg-lib-XScrnSaver.in b/rules/xorg-lib-XScrnSaver.in index d06788ab0..71013e8c8 100644 --- a/rules/xorg-lib-XScrnSaver.in +++ b/rules/xorg-lib-XScrnSaver.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XSCRNSAVER tristate prompt "libXScrnSaver" diff --git a/rules/xorg-lib-XTrap.in b/rules/xorg-lib-XTrap.in index cadae92ef..dbeea2236 100644 --- a/rules/xorg-lib-XTrap.in +++ b/rules/xorg-lib-XTrap.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XTRAP tristate prompt "libXTrap" diff --git a/rules/xorg-lib-Xau.in b/rules/xorg-lib-Xau.in index a9aae7743..ccd00a1a8 100644 --- a/rules/xorg-lib-Xau.in +++ b/rules/xorg-lib-Xau.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + menuconfig XORG_LIB_XAU tristate select XORG_PROTO_X diff --git a/rules/xorg-lib-Xaw.in b/rules/xorg-lib-Xaw.in index 989494465..babf88a22 100644 --- a/rules/xorg-lib-Xaw.in +++ b/rules/xorg-lib-Xaw.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + menuconfig XORG_LIB_XAW tristate select XORG_LIB_X11 diff --git a/rules/xorg-lib-Xcomposite.in b/rules/xorg-lib-Xcomposite.in index 575da4ce8..6495209e9 100644 --- a/rules/xorg-lib-Xcomposite.in +++ b/rules/xorg-lib-Xcomposite.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XCOMPOSITE tristate prompt "libXcomposite" diff --git a/rules/xorg-lib-Xcursor.in b/rules/xorg-lib-Xcursor.in index a4e093729..15e8bbcc1 100644 --- a/rules/xorg-lib-Xcursor.in +++ b/rules/xorg-lib-Xcursor.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XCURSOR tristate select XORG_LIB_XRENDER diff --git a/rules/xorg-lib-Xdamage.in b/rules/xorg-lib-Xdamage.in index c0682e4a4..bf3f3fcfc 100644 --- a/rules/xorg-lib-Xdamage.in +++ b/rules/xorg-lib-Xdamage.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XDAMAGE tristate prompt "libXdamage" diff --git a/rules/xorg-lib-Xdmcp.in b/rules/xorg-lib-Xdmcp.in index 86c1a206e..fc57d8b26 100644 --- a/rules/xorg-lib-Xdmcp.in +++ b/rules/xorg-lib-Xdmcp.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XDMCP tristate prompt "libXdmcp" diff --git a/rules/xorg-lib-Xevie.in b/rules/xorg-lib-Xevie.in index 195217612..6148a6c29 100644 --- a/rules/xorg-lib-Xevie.in +++ b/rules/xorg-lib-Xevie.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XEVIE tristate prompt "libXevie" diff --git a/rules/xorg-lib-Xext.in b/rules/xorg-lib-Xext.in index 9fd8792b8..53695cc4b 100644 --- a/rules/xorg-lib-Xext.in +++ b/rules/xorg-lib-Xext.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XEXT tristate prompt "libXext" diff --git a/rules/xorg-lib-Xfixes.in b/rules/xorg-lib-Xfixes.in index 927b611d0..b24860d4e 100644 --- a/rules/xorg-lib-Xfixes.in +++ b/rules/xorg-lib-Xfixes.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XFIXES tristate prompt "libXfixes" diff --git a/rules/xorg-lib-Xfont.in b/rules/xorg-lib-Xfont.in index e8420cce0..136a809bf 100644 --- a/rules/xorg-lib-Xfont.in +++ b/rules/xorg-lib-Xfont.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + # These are always required: # Requires: xproto fontsproto # Requires.private: fontenc diff --git a/rules/xorg-lib-Xfontcache.in b/rules/xorg-lib-Xfontcache.in index be36838df..a8b5abf11 100644 --- a/rules/xorg-lib-Xfontcache.in +++ b/rules/xorg-lib-Xfontcache.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XFONTCACHE tristate select XORG_PROTO_FONTCACHE diff --git a/rules/xorg-lib-Xft.in b/rules/xorg-lib-Xft.in index a3052ecdd..07d6cfc2e 100644 --- a/rules/xorg-lib-Xft.in +++ b/rules/xorg-lib-Xft.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XFT tristate select FREETYPE diff --git a/rules/xorg-lib-Xi.in b/rules/xorg-lib-Xi.in index 4d257ff4a..ae48b717a 100644 --- a/rules/xorg-lib-Xi.in +++ b/rules/xorg-lib-Xi.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XI tristate prompt "libXi" diff --git a/rules/xorg-lib-Xinerama.in b/rules/xorg-lib-Xinerama.in index 58b963583..353ae9254 100644 --- a/rules/xorg-lib-Xinerama.in +++ b/rules/xorg-lib-Xinerama.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XINERAMA tristate prompt "libXinerama" diff --git a/rules/xorg-lib-Xmu.in b/rules/xorg-lib-Xmu.in index 47278af9b..0ab0b55c5 100644 --- a/rules/xorg-lib-Xmu.in +++ b/rules/xorg-lib-Xmu.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XMU tristate prompt "libXmu" diff --git a/rules/xorg-lib-Xp.in b/rules/xorg-lib-Xp.in index 740250b63..dd1e51f12 100644 --- a/rules/xorg-lib-Xp.in +++ b/rules/xorg-lib-Xp.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XP tristate prompt "libXp" diff --git a/rules/xorg-lib-Xpm.in b/rules/xorg-lib-Xpm.in index 9e96413ce..bd6980438 100644 --- a/rules/xorg-lib-Xpm.in +++ b/rules/xorg-lib-Xpm.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XPM tristate prompt "libXpm" diff --git a/rules/xorg-lib-XprintAppUtil.in b/rules/xorg-lib-XprintAppUtil.in index 4b4ab1cf9..7bb80087a 100644 --- a/rules/xorg-lib-XprintAppUtil.in +++ b/rules/xorg-lib-XprintAppUtil.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XPRINTAPPUTIL tristate select XORG_LIB_X11 diff --git a/rules/xorg-lib-XprintUtil.in b/rules/xorg-lib-XprintUtil.in index 83a5fe791..83d36ff5f 100644 --- a/rules/xorg-lib-XprintUtil.in +++ b/rules/xorg-lib-XprintUtil.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XPRINTUTIL tristate prompt "libXprintUtil" diff --git a/rules/xorg-lib-Xrandr.in b/rules/xorg-lib-Xrandr.in index 765ea4400..ecb5ef579 100644 --- a/rules/xorg-lib-Xrandr.in +++ b/rules/xorg-lib-Xrandr.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XRANDR tristate prompt "libXrandr" diff --git a/rules/xorg-lib-Xrender.in b/rules/xorg-lib-Xrender.in index d27776bb2..a85620080 100644 --- a/rules/xorg-lib-Xrender.in +++ b/rules/xorg-lib-Xrender.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XRENDER tristate prompt "libXrender" diff --git a/rules/xorg-lib-Xres.in b/rules/xorg-lib-Xres.in index e956ac56b..520186833 100644 --- a/rules/xorg-lib-Xres.in +++ b/rules/xorg-lib-Xres.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XRES tristate prompt "libXres" diff --git a/rules/xorg-lib-Xt.in b/rules/xorg-lib-Xt.in index 3c9930bde..7f696792b 100644 --- a/rules/xorg-lib-Xt.in +++ b/rules/xorg-lib-Xt.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XT tristate prompt "libXt" diff --git a/rules/xorg-lib-Xtst.in b/rules/xorg-lib-Xtst.in index 41866c856..d694202fb 100644 --- a/rules/xorg-lib-Xtst.in +++ b/rules/xorg-lib-Xtst.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XTST tristate prompt "libXtst" diff --git a/rules/xorg-lib-Xv.in b/rules/xorg-lib-Xv.in index 3000095b5..d3f6aa2c8 100644 --- a/rules/xorg-lib-Xv.in +++ b/rules/xorg-lib-Xv.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + # xv.pc says: # Requires: xproto videoproto # Requires.private: x11 xext diff --git a/rules/xorg-lib-XvMC.in b/rules/xorg-lib-XvMC.in index cd4830db7..2eb31da43 100644 --- a/rules/xorg-lib-XvMC.in +++ b/rules/xorg-lib-XvMC.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XVMC tristate prompt "libXvMC" diff --git a/rules/xorg-lib-Xxf86dga.in b/rules/xorg-lib-Xxf86dga.in index 79fb4584b..c0c016f87 100644 --- a/rules/xorg-lib-Xxf86dga.in +++ b/rules/xorg-lib-Xxf86dga.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XXF86DGA tristate prompt "libXxf86dga" diff --git a/rules/xorg-lib-Xxf86misc.in b/rules/xorg-lib-Xxf86misc.in index 7aa62bccf..f3d99cef0 100644 --- a/rules/xorg-lib-Xxf86misc.in +++ b/rules/xorg-lib-Xxf86misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XXF86MISC tristate prompt "libXxf86misc" diff --git a/rules/xorg-lib-Xxf86vm.in b/rules/xorg-lib-Xxf86vm.in index 77f7a3b15..ae748c037 100644 --- a/rules/xorg-lib-Xxf86vm.in +++ b/rules/xorg-lib-Xxf86vm.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XXF86VM tristate prompt "libXxf86vm" diff --git a/rules/xorg-lib-dmx.in b/rules/xorg-lib-dmx.in index d90ce045b..b075ea8aa 100644 --- a/rules/xorg-lib-dmx.in +++ b/rules/xorg-lib-dmx.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_DMX tristate select XORG_LIB_X11 diff --git a/rules/xorg-lib-fontenc.in b/rules/xorg-lib-fontenc.in index 7fb433d7f..674116474 100644 --- a/rules/xorg-lib-fontenc.in +++ b/rules/xorg-lib-fontenc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_FONTENC tristate select ZLIB diff --git a/rules/xorg-lib-lbxutil.in b/rules/xorg-lib-lbxutil.in index 1a3cb279d..cc0372f18 100644 --- a/rules/xorg-lib-lbxutil.in +++ b/rules/xorg-lib-lbxutil.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_LBXUTIL tristate prompt "lbxutil" diff --git a/rules/xorg-lib-oldX.in b/rules/xorg-lib-oldX.in index e9984f3c4..9942d9b8c 100644 --- a/rules/xorg-lib-oldX.in +++ b/rules/xorg-lib-oldX.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_OLDX tristate prompt "liboldX" diff --git a/rules/xorg-lib-xkbfile.in b/rules/xorg-lib-xkbfile.in index 5875a8334..4e2bedb38 100644 --- a/rules/xorg-lib-xkbfile.in +++ b/rules/xorg-lib-xkbfile.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XKBFILE tristate prompt "libxkbfile" diff --git a/rules/xorg-lib-xkbui.in b/rules/xorg-lib-xkbui.in index ebc030c4b..5584bef7f 100644 --- a/rules/xorg-lib-xkbui.in +++ b/rules/xorg-lib-xkbui.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XKBUI tristate prompt "libxkbui" diff --git a/rules/xorg-lib-xtrans.in b/rules/xorg-lib-xtrans.in index 3ff522130..c9e214c8f 100644 --- a/rules/xorg-lib-xtrans.in +++ b/rules/xorg-lib-xtrans.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_lib + config XORG_LIB_XTRANS tristate prompt "xtrans" diff --git a/rules/xorg-lib.in b/rules/xorg-lib.in index dd1ff32b6..812fe7b53 100644 --- a/rules/xorg-lib.in +++ b/rules/xorg-lib.in @@ -1,54 +1,8 @@ +## SECTION=multimedia_xorg + # xorg lib configuration menu "xorg libs " - -source "rules/pixman.in" -source "rules/libpciaccess.in" -source "rules/libpthread-stubs.in" -source "rules/libxcb.in" -source "rules/xorg-lib-AppleWM.in" -source "rules/xorg-lib-FS.in" -source "rules/xorg-lib-ICE.in" -source "rules/xorg-lib-SM.in" -source "rules/xorg-lib-WindowsWM.in" -source "rules/xorg-lib-X11.in" -source "rules/xorg-lib-XScrnSaver.in" -source "rules/xorg-lib-XTrap.in" -source "rules/xorg-lib-Xau.in" -source "rules/xorg-lib-Xaw.in" -source "rules/xorg-lib-Xcomposite.in" -source "rules/xorg-lib-Xcursor.in" -source "rules/xorg-lib-Xdamage.in" -source "rules/xorg-lib-Xdmcp.in" -source "rules/xorg-lib-Xevie.in" -source "rules/xorg-lib-Xext.in" -source "rules/xorg-lib-Xfixes.in" -source "rules/xorg-lib-Xfont.in" -source "rules/xorg-lib-Xfontcache.in" -source "rules/xorg-lib-Xft.in" -source "rules/xorg-lib-Xi.in" -source "rules/xorg-lib-Xinerama.in" -source "rules/xorg-lib-Xmu.in" -source "rules/xorg-lib-Xp.in" -source "rules/xorg-lib-Xpm.in" -source "rules/xorg-lib-XprintAppUtil.in" -source "rules/xorg-lib-XprintUtil.in" -source "rules/xorg-lib-Xrandr.in" -source "rules/xorg-lib-Xrender.in" -source "rules/xorg-lib-Xres.in" -source "rules/xorg-lib-Xt.in" -source "rules/xorg-lib-Xtst.in" -source "rules/xorg-lib-Xv.in" -source "rules/xorg-lib-XvMC.in" -source "rules/xorg-lib-Xxf86dga.in" -source "rules/xorg-lib-Xxf86misc.in" -source "rules/xorg-lib-Xxf86vm.in" -source "rules/xorg-lib-dmx.in" -source "rules/xorg-lib-fontenc.in" -source "rules/xorg-lib-lbxutil.in" -source "rules/xorg-lib-oldX.in" -source "rules/xorg-lib-xkbfile.in" -source "rules/xorg-lib-xkbui.in" -source "rules/xorg-lib-xtrans.in" - +source "generated/multimedia_xorg_lib.in" endmenu + diff --git a/rules/xorg-proto-applewm.in b/rules/xorg-proto-applewm.in index 6fbb1f48e..44b4f864e 100644 --- a/rules/xorg-proto-applewm.in +++ b/rules/xorg-proto-applewm.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_APPLEWM tristate help diff --git a/rules/xorg-proto-bigreqs.in b/rules/xorg-proto-bigreqs.in index ded92b6d5..bd66187d9 100644 --- a/rules/xorg-proto-bigreqs.in +++ b/rules/xorg-proto-bigreqs.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_BIGREQS bool help diff --git a/rules/xorg-proto-composite.in b/rules/xorg-proto-composite.in index 083954161..d92a89735 100644 --- a/rules/xorg-proto-composite.in +++ b/rules/xorg-proto-composite.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_COMPOSITE tristate help diff --git a/rules/xorg-proto-damage.in b/rules/xorg-proto-damage.in index 5022b98e6..b72b1d4e5 100644 --- a/rules/xorg-proto-damage.in +++ b/rules/xorg-proto-damage.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_DAMAGE tristate help diff --git a/rules/xorg-proto-dmx.in b/rules/xorg-proto-dmx.in index fb68cb373..61e5bf96c 100644 --- a/rules/xorg-proto-dmx.in +++ b/rules/xorg-proto-dmx.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_DMX tristate help diff --git a/rules/xorg-proto-evieext.in b/rules/xorg-proto-evieext.in index b890772d4..5807ee026 100644 --- a/rules/xorg-proto-evieext.in +++ b/rules/xorg-proto-evieext.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_EVIEEXT tristate help diff --git a/rules/xorg-proto-fixes.in b/rules/xorg-proto-fixes.in index 5643a48b4..7a4507660 100644 --- a/rules/xorg-proto-fixes.in +++ b/rules/xorg-proto-fixes.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_FIXES tristate help diff --git a/rules/xorg-proto-fontcache.in b/rules/xorg-proto-fontcache.in index 726eee6a9..7d0d18307 100644 --- a/rules/xorg-proto-fontcache.in +++ b/rules/xorg-proto-fontcache.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_FONTCACHE tristate help diff --git a/rules/xorg-proto-fonts.in b/rules/xorg-proto-fonts.in index 5ea18887f..65ea9aa24 100644 --- a/rules/xorg-proto-fonts.in +++ b/rules/xorg-proto-fonts.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_FONTS tristate help diff --git a/rules/xorg-proto-gl.in b/rules/xorg-proto-gl.in index 9c9e56a7e..ae8a4be52 100644 --- a/rules/xorg-proto-gl.in +++ b/rules/xorg-proto-gl.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_GL tristate help diff --git a/rules/xorg-proto-input.in b/rules/xorg-proto-input.in index 826d7ade8..793ace534 100644 --- a/rules/xorg-proto-input.in +++ b/rules/xorg-proto-input.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_INPUT tristate help diff --git a/rules/xorg-proto-kb.in b/rules/xorg-proto-kb.in index f84f3589b..de850dbe5 100644 --- a/rules/xorg-proto-kb.in +++ b/rules/xorg-proto-kb.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_KB tristate help diff --git a/rules/xorg-proto-print.in b/rules/xorg-proto-print.in index 18f1a8ee4..656b7ec1c 100644 --- a/rules/xorg-proto-print.in +++ b/rules/xorg-proto-print.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_PRINT tristate help diff --git a/rules/xorg-proto-randr.in b/rules/xorg-proto-randr.in index 629790ccd..16ee63c0d 100644 --- a/rules/xorg-proto-randr.in +++ b/rules/xorg-proto-randr.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_RANDR tristate help diff --git a/rules/xorg-proto-record.in b/rules/xorg-proto-record.in index 18e0cd0f2..0caabe649 100644 --- a/rules/xorg-proto-record.in +++ b/rules/xorg-proto-record.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_RECORD bool help diff --git a/rules/xorg-proto-render.in b/rules/xorg-proto-render.in index d3bdbf17d..ad3c3db4d 100644 --- a/rules/xorg-proto-render.in +++ b/rules/xorg-proto-render.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_RENDER bool help diff --git a/rules/xorg-proto-resource.in b/rules/xorg-proto-resource.in index 4343218ff..3717ee32e 100644 --- a/rules/xorg-proto-resource.in +++ b/rules/xorg-proto-resource.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_RESOURCE bool help diff --git a/rules/xorg-proto-scrnsaver.in b/rules/xorg-proto-scrnsaver.in index e282779e4..4b1124f2d 100644 --- a/rules/xorg-proto-scrnsaver.in +++ b/rules/xorg-proto-scrnsaver.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_SCRNSAVER tristate help diff --git a/rules/xorg-proto-trap.in b/rules/xorg-proto-trap.in index 3850db9e2..f26cd4376 100644 --- a/rules/xorg-proto-trap.in +++ b/rules/xorg-proto-trap.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_TRAP tristate help diff --git a/rules/xorg-proto-video.in b/rules/xorg-proto-video.in index 938f40347..2fbb3fc84 100644 --- a/rules/xorg-proto-video.in +++ b/rules/xorg-proto-video.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_VIDEO tristate help diff --git a/rules/xorg-proto-windowswm.in b/rules/xorg-proto-windowswm.in index 92fdbe7c5..36a747f8e 100644 --- a/rules/xorg-proto-windowswm.in +++ b/rules/xorg-proto-windowswm.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_WINDOWSWM tristate help diff --git a/rules/xorg-proto-x.in b/rules/xorg-proto-x.in index 327346d81..516adcb16 100644 --- a/rules/xorg-proto-x.in +++ b/rules/xorg-proto-x.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_X tristate help diff --git a/rules/xorg-proto-xcmisc.in b/rules/xorg-proto-xcmisc.in index 0627d4f41..ebe0b214e 100644 --- a/rules/xorg-proto-xcmisc.in +++ b/rules/xorg-proto-xcmisc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_XCMISC tristate help diff --git a/rules/xorg-proto-xext.in b/rules/xorg-proto-xext.in index 3d07ce2e8..70efd0f21 100644 --- a/rules/xorg-proto-xext.in +++ b/rules/xorg-proto-xext.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_XEXT tristate help diff --git a/rules/xorg-proto-xf86bigfont.in b/rules/xorg-proto-xf86bigfont.in index a33ffb6a0..b1fd6b825 100644 --- a/rules/xorg-proto-xf86bigfont.in +++ b/rules/xorg-proto-xf86bigfont.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_XF86BIGFONT tristate help diff --git a/rules/xorg-proto-xf86dga.in b/rules/xorg-proto-xf86dga.in index ea2e1b74e..ede33e257 100644 --- a/rules/xorg-proto-xf86dga.in +++ b/rules/xorg-proto-xf86dga.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_XF86DGA tristate help diff --git a/rules/xorg-proto-xf86dri.in b/rules/xorg-proto-xf86dri.in index 09a987244..923b6a4f7 100644 --- a/rules/xorg-proto-xf86dri.in +++ b/rules/xorg-proto-xf86dri.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_XF86DRI tristate help diff --git a/rules/xorg-proto-xf86misc.in b/rules/xorg-proto-xf86misc.in index e307985ea..c5a833c06 100644 --- a/rules/xorg-proto-xf86misc.in +++ b/rules/xorg-proto-xf86misc.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_XF86MISC tristate help diff --git a/rules/xorg-proto-xf86rush.in b/rules/xorg-proto-xf86rush.in index ad9313f70..1ba9a1721 100644 --- a/rules/xorg-proto-xf86rush.in +++ b/rules/xorg-proto-xf86rush.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_XF86RUSH tristate help diff --git a/rules/xorg-proto-xf86vidmode.in b/rules/xorg-proto-xf86vidmode.in index 08b135d03..0fa64d529 100644 --- a/rules/xorg-proto-xf86vidmode.in +++ b/rules/xorg-proto-xf86vidmode.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_XF86VIDMODE tristate help diff --git a/rules/xorg-proto-xinerama.in b/rules/xorg-proto-xinerama.in index e430b06e2..8020ba561 100644 --- a/rules/xorg-proto-xinerama.in +++ b/rules/xorg-proto-xinerama.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_XINERAMA tristate help diff --git a/rules/xorg-proto-xproxymanagement.in b/rules/xorg-proto-xproxymanagement.in index c58b03f23..3b7b1d2ba 100644 --- a/rules/xorg-proto-xproxymanagement.in +++ b/rules/xorg-proto-xproxymanagement.in @@ -1,3 +1,5 @@ +## SECTION=multimedia_xorg_proto + config XORG_PROTO_XPROXYMANAGEMENT tristate help diff --git a/rules/xorg-proto.in b/rules/xorg-proto.in index 76c720159..adf43ad48 100644 --- a/rules/xorg-proto.in +++ b/rules/xorg-proto.in @@ -1,36 +1,6 @@ +## SECTION=multimedia_xorg + # xorg proto configuration -source "rules/xcb-proto.in" -source "rules/xorg-proto-applewm.in" -source "rules/xorg-proto-bigreqs.in" -source "rules/xorg-proto-composite.in" -source "rules/xorg-proto-damage.in" -source "rules/xorg-proto-dmx.in" -source "rules/xorg-proto-evieext.in" -source "rules/xorg-proto-fixes.in" -source "rules/xorg-proto-fontcache.in" -source "rules/xorg-proto-fonts.in" -source "rules/xorg-proto-gl.in" -source "rules/xorg-proto-input.in" -source "rules/xorg-proto-kb.in" -source "rules/xorg-proto-print.in" -source "rules/xorg-proto-randr.in" -source "rules/xorg-proto-record.in" -source "rules/xorg-proto-render.in" -source "rules/xorg-proto-resource.in" -source "rules/xorg-proto-scrnsaver.in" -source "rules/xorg-proto-video.in" -source "rules/xorg-proto-windowswm.in" -source "rules/xorg-proto-x.in" -source "rules/xorg-proto-xcmisc.in" -source "rules/xorg-proto-xext.in" -source "rules/xorg-proto-xf86bigfont.in" -source "rules/xorg-proto-xf86dga.in" -source "rules/xorg-proto-xf86dri.in" -source "rules/xorg-proto-xf86misc.in" -source "rules/xorg-proto-xf86rush.in" -source "rules/xorg-proto-xf86vidmode.in" -source "rules/xorg-proto-xinerama.in" -source "rules/xorg-proto-xproxymanagement.in" -source "rules/xorg-proto-trap.in" +source "generated/multimedia_xorg_proto.in" diff --git a/rules/xorg-support-libs.in b/rules/xorg-support-libs.in index 19b9c1c62..4a845040c 100644 --- a/rules/xorg-support-libs.in +++ b/rules/xorg-support-libs.in @@ -1,7 +1,6 @@ -menu "Xorg Support Libraries " - -source "rules/freetype.in" -source "rules/libdrm.in" -source "rules/mesalib.in" +## SECTION=multimedia_xorg +menu "Xorg Support Libraries " +source "generated/multimedia_xorg_support_libs.in" endmenu + diff --git a/rules/xorg.in b/rules/xorg.in index 739977399..ebcf97ff8 100644 --- a/rules/xorg.in +++ b/rules/xorg.in @@ -7,13 +7,8 @@ menuconfig XORG if XORG source "rules/xorg-options.in" source "rules/xorg-server.in" -source "rules/xorg-driver.in" -source "rules/xorg-app.in" -source "rules/xorg-cursor.in" -source "rules/xorg-proto.in" -source "rules/xorg-lib.in" -source "rules/xorg-data.in" -source "rules/xorg-support-libs.in" +source "generated/multimedia_xorg.in" endif source "rules/xorg-font.in" + |