gallium: Disable nouveau by default

	Most piep drivers should be able to build by default, but since
	the nouveau ones depend drm they can't be enabled by default.

diff --git a/configs/default b/configs/default
index 4c8698ccc46a7ab24b9630f6307592a75729a3ba..a90d46f18e11ea4c36b0e8688542071e1dd9350b 100644 (file)
--- a/configs/default
+++ b/configs/default
@@ -92,7 +92,7 @@ EGL_DRIVERS_DIRS = demo
 GALLIUM_DIRS = auxiliary drivers state_trackers
 GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
-GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover trace
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib egl_xlib
 GALLIUM_WINSYS_DRM_DIRS =

diff --git a/configs/linux-dri b/configs/linux-dri
index 8632170408e2bc5982c583ebb16df1d0d04d9bea..c5e30d30608e012d0130477afecd020ab7d3922a 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -60,7 +60,7 @@ EGL_DRIVERS_DIRS = demo glx
 DRIVER_DIRS = dri
 WINDOW_SYSTEM = dri
 GALLIUM_WINSYS_DIRS = drm
-GALLIUM_WINSYS_DRM_DIRS = intel nouveau
+GALLIUM_WINSYS_DRM_DIRS = intel
 GALLIUM_STATE_TRACKERS_DIRS = egl
 
 DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \

diff --git a/configure.ac b/configure.ac
index 451902dd38f1f4dddf5c3a85909cff195ffe8940..d94cfd26fc133b72ae800f3d25087b870f988aed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -427,7 +427,7 @@ dri)
     DRIVER_DIRS=""
     WINDOW_SYSTEM="dri"
     GALLIUM_WINSYS_DIRS="drm $GALLIUM_WINSYS_DIRS"
-    GALLIUM_DRIVER_DIRS="$GALLIUM_DRIVER_DIRS i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50"
+    GALLIUM_DRIVER_DIRS="$GALLIUM_DRIVER_DIRS i915simple i965simple"
     ;;
 osmesa)
     DRIVER_DIRS="osmesa"