jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-03 16:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11r7: move X.org server style option

Browse Source 
The selection between "modular" server and "Kdrive" server really
belongs as a sub-option of the X.org server itself, rather than as a
global x11r7 option. So we move it under the X.org server option.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2013-01-06 11:29:13 +00:00 committed by Peter Korsgaard
parent a1cfe20df6
commit 940fcba1a5
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/x11r7/Config.in
View File

@ -13,24 +13,6 @@ menuconfig BR2_PACKAGE_XORG7
if BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7
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"
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
bool "TinyX"
endchoice
menu "X11R7 Servers" menu "X11R7 Servers"
source package/x11r7/xserver_xorg-server/Config.in source package/x11r7/xserver_xorg-server/Config.in
endmenu endmenu

18
package/x11r7/xserver_xorg-server/Config.in
View File

@ -59,6 +59,24 @@ comment "xorg-xserver is BROKEN on AVR32"
if BR2_PACKAGE_XSERVER_XORG_SERVER if BR2_PACKAGE_XSERVER_XORG_SERVER
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"
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
bool "TinyX"
endchoice
config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR
bool "Null root cursor" bool "Null root cursor"
help help