Make Mesa3D optional for X11

PATCH New Paulius Zaleckas 2 participants 2 messages Apr 29, 2010 – May 1, 2010

lore

Share & tools

lore

Paulius Zaleckas

author

2010-04-29 20:24 UTC #0 lore raw

PATCH 1/1 Make Mesa3D optional for X11

From: Darius Augulis <[email protected]>

Signed-off-by Darius Augulis <[email protected]>

Signed-off-by Paulius Zaleckas <[email protected]>

---

 package/x11r7/xapp_xdriinfo/Config.in              |    2 +-
 package/x11r7/xdriver_xf86-video-ati/Config.in     |    1 +
 package/x11r7/xdriver_xf86-video-glint/Config.in   |    1 +
 package/x11r7/xdriver_xf86-video-intel/Config.in   |    1 +
 package/x11r7/xdriver_xf86-video-mach64/Config.in  |    1 +
 package/x11r7/xdriver_xf86-video-mga/Config.in     |    1 +
 .../x11r7/xdriver_xf86-video-openchrome/Config.in  |    1 +
 package/x11r7/xdriver_xf86-video-r128/Config.in    |    1 +
 package/x11r7/xdriver_xf86-video-savage/Config.in  |    1 +
 package/x11r7/xdriver_xf86-video-sis/Config.in     |    1 +
 package/x11r7/xdriver_xf86-video-tdfx/Config.in    |    1 +
 package/x11r7/xdriver_xf86-video-xgi/Config.in     |    1 +
 package/x11r7/xdriver_xf86-video-xgixp/Config.in   |    1 +
 package/x11r7/xserver_xorg-server/Config.in        |    1 -
 .../xserver_xorg-server/xserver_xorg-server.mk     |    8 ++++++--
 15 files changed, 19 insertions(+), 4 deletions(-)

package/x11r7/xapp_xdriinfo/Config.in +1 -1

index 7442690..970bff5 100644
@@ -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

package/x11r7/xdriver_xf86-video-ati/Config.in +1 -0

index d61f11c..107a57b 100644
@@ -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

package/x11r7/xdriver_xf86-video-glint/Config.in +1 -0

index 703e020..782b6da 100644
@@ -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

package/x11r7/xdriver_xf86-video-intel/Config.in +1 -0

index ddbf4ff..9a1d6cf 100644
@@ -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

package/x11r7/xdriver_xf86-video-mach64/Config.in +1 -0

index 8202045..f2464e7 100644
@@ -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

package/x11r7/xdriver_xf86-video-mga/Config.in +1 -0

index 575bca4..40c6f3a 100644
@@ -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

package/x11r7/xdriver_xf86-video-openchrome/Config.in +1 -0

index 2b42fe0..25424ff 100644
@@ -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

package/x11r7/xdriver_xf86-video-r128/Config.in +1 -0

index feb8893..96bd8d7 100644
@@ -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

package/x11r7/xdriver_xf86-video-savage/Config.in +1 -0

index ec311bd..a9c8f6c 100644
@@ -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

package/x11r7/xdriver_xf86-video-sis/Config.in +1 -0

index fd76847..ac2b632 100644
@@ -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

package/x11r7/xdriver_xf86-video-tdfx/Config.in +1 -0

index 08104c9..57bb411 100644
@@ -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

package/x11r7/xdriver_xf86-video-xgi/Config.in +1 -0

index 9a0c215..d0fe665 100644
@@ -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

package/x11r7/xdriver_xf86-video-xgixp/Config.in +1 -0

index e905280..8d466f4 100644
@@ -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

package/x11r7/xserver_xorg-server/Config.in +0 -1

index 6aa4a03..5743168 100644
@@ -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

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +6 -2

index 0dd6127..6c6017b 100644
@@ -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

Peter Korsgaard

2010-05-01 20:21 UTC #1 lore raw

PATCH 1/1 Make Mesa3D optional for X11

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Paulius" == Paulius Zaleckas <[email protected]> writes:

Paulius> From: Darius Augulis <[email protected]> Paulius> Signed-off-by: Darius Augulis <[email protected]> Paulius> Signed-off-by: Paulius Zaleckas <[email protected]>

Paulius> +++ b/package/x11r7/xserver_xorg-server/Config.in Paulius> @@ -2,7 +2,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER

 Paulius>  	bool "xorg-server"
 Paulius>  	select BR2_PACKAGE_LIBDRM
 Paulius>  	select BR2_PACKAGE_MCOOKIE
 Paulius> -	select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
 Paulius>  	select BR2_PACKAGE_OPENSSL
 Paulius>  	select BR2_PACKAGE_PIXMAN
 Paulius>  	select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS

Committed - You forgot to make the 'select BR2_PACKAGE_XPROTO_XF86DRIPROTO' optional on mesa3d in xserver/Config.in, but I fixed that.

Signature · 1 line

Bye, Peter Korsgaard