Commit 73a84a69 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

xserver_xorg-server: rename server-style configuration options 



The BR2_PACKAGE_XSERVER_xorg and BR2_PACKAGE_XSERVER_tinyx options
used to select the style of X.org server to use are not named
consistently with the rest of the Buildroot options (in capital
letters and prefixed with the package name).

Therefore, we rename those options, and we take care to add the old
option names in the BR2_LEGACY infrastructure.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 208a81be

Config.in.legacy

+16 −0
Original line number Diff line number Diff line
@@ -78,4 +78,20 @@ config BR2_PACKAGE_PTHREAD_STUBS 
	  For consistency reason, the pthread-stubs package has been

	  renamed to xlib_libpthread-stubs.



config BR2_PACKAGE_XSERVER_xorg

	bool "X.org modular server"

	select BR2_LEGACY

	select BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR

	help

	  The option has been renamed

	  BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR.



config BR2_PACKAGE_XSERVER_tinyx

	bool "KDrive / TinyX server"

	select BR2_LEGACY

	select BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE

	help

	  The option has been renamed

	  BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE.



endif

package/efl/libevas/Config.in

+4 −4
Original line number Diff line number Diff line
@@ -79,13 +79,13 @@ config BR2_PACKAGE_LIBEVAS_SDL 
config BR2_PACKAGE_LIBEVAS_SDL_GL

	bool "libevas SDL OpenGL backend"

	depends on BR2_PACKAGE_SDL_X11

	depends on BR2_PACKAGE_XSERVER_xorg # mesa needs big X

	depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X

	help

	  This is the SDL OpenGL engine that uses SDL library

	  and OpenGL to render. This may be hardware accelerated.



comment "SDL OpenGL backend needs modular X.org and X11 support in SDL"

	depends on !(BR2_PACKAGE_SDL_X11 && BR2_PACKAGE_XSERVER_xorg)

	depends on !(BR2_PACKAGE_SDL_X11 && BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR)



config BR2_PACKAGE_LIBEVAS_X11

	bool "libevas X11 backend"
@@ -99,7 +99,7 @@ config BR2_PACKAGE_LIBEVAS_X11 


config BR2_PACKAGE_LIBEVAS_X11_GLX

	bool "libevas X11 GLX backend"

	depends on BR2_PACKAGE_XSERVER_xorg # mesa needs big X

	depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X

	select BR2_PACKAGE_XLIB_LIBX11

	select BR2_PACKAGE_XLIB_LIBXRENDER

	select BR2_PACKAGE_XLIB_LIBXEXT
@@ -121,7 +121,7 @@ config BR2_PACKAGE_LIBEVAS_XCB 


config BR2_PACKAGE_LIBEVAS_XCB_GLX

	bool "libevas XCB GLX backend"

	depends on BR2_PACKAGE_XSERVER_xorg # mesa needs big X

	depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X

	select BR2_PACKAGE_LIBXCB

	select BR2_PACKAGE_XCB_UTIL

	select BR2_PACKAGE_XCB_PROTO

package/x11r7/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ if BR2_PACKAGE_XORG7 
		source package/x11r7/xapp_xwininfo/Config.in

		source package/x11r7/xapp_xwud/Config.in

	endmenu

	if BR2_PACKAGE_XSERVER_xorg

	if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR

	menu "X11R7 Drivers"

		source package/x11r7/xdriver_xf86-input-evdev/Config.in

		source package/x11r7/xdriver_xf86-input-joystick/Config.in

package/x11r7/mesa3d/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config BR2_PACKAGE_MESA3D 
	select BR2_PACKAGE_LIBDRM

	select BR2_PACKAGE_EXPAT

	select BR2_PACKAGE_HOST_LIBXML2_PYTHON

	depends on BR2_PACKAGE_XSERVER_xorg

	depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR

	depends on BR2_INSTALL_LIBSTDCPP

	help

	  Mesa 3D, an open-source implementation of the OpenGL specification.

package/x11r7/xserver_xorg-server/Config.in

+5 −5
Original line number Diff line number Diff line 
config BR2_PACKAGE_XSERVER_XORG_SERVER

	bool "xorg-server"

	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_xorg

	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR

	select BR2_PACKAGE_MCOOKIE

	select BR2_PACKAGE_OPENSSL

	select BR2_PACKAGE_PIXMAN

	select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS

	select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS

	select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS

	select BR2_PACKAGE_XLIB_LIBPCIACCESS if BR2_PACKAGE_XSERVER_xorg

	select BR2_PACKAGE_XLIB_LIBPCIACCESS if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR

	select BR2_PACKAGE_XLIB_LIBX11

	select BR2_PACKAGE_XLIB_LIBXAU

	select BR2_PACKAGE_XLIB_LIBXCURSOR
@@ -61,18 +61,18 @@ if BR2_PACKAGE_XSERVER_XORG_SERVER 


choice

	prompt "X Window System server type"

	default BR2_PACKAGE_XSERVER_tinyx

	default BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE

	help

	  Select the X Window System server to use



config BR2_PACKAGE_XSERVER_xorg

config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR

	bool "Modular X.org"

	depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP



comment "X.org requires largefile and C++ support"

	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)



config BR2_PACKAGE_XSERVER_tinyx

config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE

	bool "KDrive / TinyX"



endchoice