diff options
Diffstat (limited to 'package/x11r7')
| -rw-r--r-- | package/x11r7/Config.in | 52 | ||||
| -rw-r--r-- | package/x11r7/xserver_xorg-server/Config.in | 4 | ||||
| -rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 62 |
3 files changed, 85 insertions, 33 deletions
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 0720e3fac..ace438a21 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -1,18 +1,42 @@ menuconfig BR2_PACKAGE_XORG7 -bool "X.org X Window System, X11R7, release 7.4" -default y if BR2_PACKAGE_XSERVER_x11r7 -select BR2_PACKAGE_ZLIB -select BR2_PACKAGE_LIBPNG -select BR2_PACKAGE_EXPAT -select BR2_PACKAGE_FONTCONFIG -help - Support for X11R7 libraries, servers, drivers, and/or - applications in the target. + bool "X.org X Window System, X11R7, release 7.4" + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_FONTCONFIG + help + Support for X11R7 libraries, servers, drivers, and/or + applications in the target. if BR2_PACKAGE_XORG7 - menu "X11R7 Servers" - source package/x11r7/xserver_xorg-server/Config.in - endmenu + +choice + prompt "X Window System server type" + default BR2_PACKAGE_XSERVER_tinyx + help + Select the X Window System server to use + +config BR2_PACKAGE_XSERVER_xorg + bool "Modular X.org" + # depending on BR2_ENABLE_LOCALE gives a recursion error with dbus + depends on BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE + +config BR2_PACKAGE_XSERVER_tinyx + bool "TinyX" + depends on BR2_USE_WCHAR + +endchoice + +config BR2_X11_PREFIX + string + default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg + default "/usr" if BR2_PACKAGE_XSERVER_tinyx + help + X11 apps root location + +menu "X11R7 Servers" + source package/x11r7/xserver_xorg-server/Config.in +endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in source package/x11r7/mesa3d/Config.in @@ -303,7 +327,3 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xkeyboard-config/Config.in endmenu endif - -comment "X11R7 X Window System disabled" - depends on BR2_PACKAGE_TINYX||BR2_PACKAGE_XORG - diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 58bd8d2b4..105c79069 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" select BR2_PACKAGE_XLIB_LIBXFONT select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XLIB_LIBXKBUI select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_XPROTO_COMPOSITEPROTO select BR2_PACKAGE_XPROTO_DAMAGEPROTO @@ -15,13 +14,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAU - select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXPM select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXRES select BR2_PACKAGE_XLIB_LIBXXF86MISC diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 77c8208da..e2af32459 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -12,19 +12,55 @@ XSERVER_XORG_SERVER_INSTALL_STAGING = YES XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO # overrides CFLAGS XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data -XSERVER_XORG_SERVER_DEPENDENCIES = xutil_util-macros xlib_libXfont libdrm xlib_libxkbui openssl \ - xproto_compositeproto xproto_damageproto xproto_fixesproto \ - xproto_glproto xproto_kbproto xproto_randrproto \ - xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXScrnSaver \ - xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm \ - xlib_libXrender xlib_libXres xlib_libXft xlib_libXcursor \ - xlib_libXinerama xlib_libXrandr xlib_libXdamage xlib_libXxf86misc xlib_libXxf86vm \ - xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto \ - xproto_evieext xproto_fontsproto xproto_inputproto xproto_renderproto \ - xproto_resourceproto xproto_videoproto xproto_xcmiscproto \ - xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \ - xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \ - pixman mcookie +XSERVER_XORG_SERVER_DEPENDENCIES = \ + xutil_util-macros \ + xlib_libXfont \ + xlib_libX11 \ + xlib_libXau \ + xlib_libXdmcp \ + xlib_libXScrnSaver \ + xlib_libXext \ + xlib_libXfixes \ + xlib_libXi \ + xlib_libXrender \ + xlib_libXres \ + xlib_libXft \ + xlib_libXcursor \ + xlib_libXinerama \ + xlib_libXrandr \ + xlib_libXdamage \ + xlib_libXxf86misc \ + xlib_libXxf86vm \ + xlib_liblbxutil \ + xlib_libxkbfile \ + xlib_xtrans \ + xdata_xbitmaps \ + xproto_bigreqsproto \ + xproto_compositeproto \ + xproto_damageproto \ + xproto_evieext \ + xproto_fixesproto \ + xproto_fontsproto \ + xproto_glproto \ + xproto_inputproto \ + xproto_kbproto \ + xproto_randrproto \ + xproto_renderproto \ + xproto_resourceproto \ + xproto_videoproto \ + xproto_xcmiscproto \ + xproto_xextproto \ + xproto_xf86bigfontproto \ + xproto_xf86dgaproto \ + xproto_xf86driproto \ + xproto_xf86miscproto \ + xproto_xf86rushproto \ + xproto_xf86vidmodeproto \ + xproto_xproto \ + libdrm \ + pixman \ + openssl \ + mcookie XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ --disable-xnest --disable-xephyr --disable-xvfb \ |