Merge commit 'origin/master' into gallium-no-texture-blanket

Conflicts:
	src/gallium/drivers/svga/svga_screen_texture.c

8 files changed, 4 insertions, 17 deletions

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 30637877f3..510d658b11 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -83,7 +83,6 @@ PROGRAM_DIRS = @PROGRAM_DIRS@
 
 # Driver specific build vars
 DRI_DIRS = @DRI_DIRS@ 
-WINDOW_SYSTEM = @WINDOW_SYSTEM@
 EGL_DISPLAYS = @EGL_DISPLAYS@
 
 # Dependencies
diff --git a/configs/default b/configs/default
index ad6d93c92f..4fe64cc6c9 100644
--- a/configs/default
+++ b/configs/default
@@ -9,7 +9,7 @@ CONFIG_NAME = default
 
 # Version info
 MESA_MAJOR=7
-MESA_MINOR=8
+MESA_MINOR=9
 MESA_TINY=0
 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
 
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index da63e3b78c..2c697e1c6e 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -44,12 +44,9 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
 SRC_DIRS = glx gallium mesa glu glut/glx glew glw
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
 
 DRM_SOURCE_PATH=$(TOP)/../drm
 
-# ffb and gamma are missing because they have not been converted to use the new
-# interface.
 DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
 	   unichrome savage sis
 
diff --git a/configs/linux-dri b/configs/linux-dri
index 634546c64c..b75273946d 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -58,13 +58,12 @@ PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 EGL_DRIVERS_DIRS = glx
 
 DRIVER_DIRS = dri
-WINDOW_SYSTEM = dri
 GALLIUM_WINSYS_DIRS = drm
 GALLIUM_WINSYS_DRM_DIRS = vmware intel i965
 GALLIUM_STATE_TRACKERS_DIRS = egl
 
 DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
-	savage sis tdfx unichrome ffb swrast
+	savage sis tdfx unichrome swrast
 
 INTEL_LIBS = `pkg-config --libs libdrm_intel`
 INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index ceab05d5db..656cf6140d 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -16,7 +16,7 @@ LIB_DIR = lib64
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib64
 
-# ffb, gamma, and sis are missing because they have not be converted to use
+# sis is missing because it has not been converted to use
 # the new interface.  i810 are missing because there is no x86-64
 # system where they could *ever* be used.
 #
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index 691f8e4918..1ed980aa36 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -51,9 +51,5 @@ SRC_DIRS = glx gallium mesa glu glut/glx glew glw
 PROGRAM_DIRS = xdemos
 
 DRIVER_DIRS = dri
-WINDOW_SYSTEM=dri
-
-# gamma are missing because they have not been converted to use the new
-# interface.
 DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \
-	savage sis tdfx unichrome ffb 
+	savage sis tdfx unichrome
diff --git a/configs/linux-egl b/configs/linux-egl
index 6494a68aeb..a8910018fc 100644
--- a/configs/linux-egl
+++ b/configs/linux-egl
@@ -51,9 +51,6 @@ SRC_DIRS = gallium mesa gallium/winsys glu egl
 PROGRAM_DIRS = egl
 
 DRIVER_DIRS = dri
-WINDOW_SYSTEM = dri
 GALLIUM_WINSYS_DIRS = egl_drm
 
-# gamma are missing because they have not been converted to use the new
-# interface.
 DRI_DIRS = intel 
diff --git a/configs/linux-indirect b/configs/linux-indirect
index 0914fba19b..1c7dd857db 100644
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -50,4 +50,3 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 SRC_DIRS = glx glu glut/glx glew glw
 DRIVER_DIRS =
 PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri