NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Mesa3D optional for X11

Browse Source 
[Peter: XF86DRIPROTO should only be selected if mesa is enabled]
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Darius Augulis 2010-04-29 23:24:18 +03:00 committed by Peter Korsgaard
parent 20c59892f9
commit 494149b989
15 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/x11r7/xapp_xdriinfo/Config.in
View File

@ -2,6 +2,6 @@ config BR2_PACKAGE_XAPP_XDRIINFO
bool "xdriinfo"
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_MESA3D
depends on BR2_PACKAGE_MESA3D
help
query configuration information of DRI drivers

1
package/x11r7/xdriver_xf86-video-ati/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
bool "xf86-video-ati"
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO

1
package/x11r7/xdriver_xf86-video-glint/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT
bool "xf86-video-glint"
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO

1
package/x11r7/xdriver_xf86-video-intel/Config.in
View File

@ -7,5 +7,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XLIB_LIBPCIACCESS
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
help
Intel video driver

1
package/x11r7/xdriver_xf86-video-mach64/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64
bool "xf86-video-mach64"
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO

1
package/x11r7/xdriver_xf86-video-mga/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA
bool "xf86-video-mga"
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO

1
package/x11r7/xdriver_xf86-video-openchrome/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
bool "xf86-video-openchrome"
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXVMC
select BR2_PACKAGE_XPROTO_GLPROTO

1
package/x11r7/xdriver_xf86-video-r128/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
bool "xf86-video-r128"
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO

1
package/x11r7/xdriver_xf86-video-savage/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
bool "xf86-video-savage"
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO

1
package/x11r7/xdriver_xf86-video-sis/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
bool "xf86-video-sis"
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO

1
package/x11r7/xdriver_xf86-video-tdfx/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
bool "xf86-video-tdfx"
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO

1
package/x11r7/xdriver_xf86-video-xgi/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGI
bool "xf86-video-xgi"
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO

1
package/x11r7/xdriver_xf86-video-xgixp/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGIXP
bool "xf86-video-xgixp"
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO

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

@ -2,7 +2,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
bool "xorg-server"
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MCOOKIE
select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_PIXMAN
select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
@ -43,7 +42,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_XEXTPROTO
select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
select BR2_PACKAGE_XPROTO_XF86DGAPROTO
select BR2_PACKAGE_XPROTO_XF86DRIPROTO
select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
select BR2_PACKAGE_XPROTO_XPROTO

8
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@ -50,7 +50,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xproto_xextproto \
xproto_xf86bigfontproto \
xproto_xf86dgaproto \
xproto_xf86driproto \
xproto_xf86rushproto \
xproto_xf86vidmodeproto \
xproto_xproto \
@ -65,7 +64,6 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1"
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
@ -77,6 +75,12 @@ else
XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev
endif
ifeq ($(BR2_PACKAGE_MESA3D),y)
XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-dri
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR),y)
XSERVER_XORG_SERVER_CONF_OPT += --enable-null-root-cursor
else