Update to latest upstream release candidate.

Update patches.

7 files changed, 15 insertions, 15 deletions

diff --git a/configs/aix b/configs/aix
index 313d4c4fdb3..ebbf5837455 100644
--- a/configs/aix
+++ b/configs/aix
@@ -13,7 +13,6 @@ CXXFLAGS = -O -DAIXV3 -DPTHREADS
 
 # Misc tools and flags
 MKLIB_OPTIONS =
-COPY_LIBS = cp -f -h
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
diff --git a/configs/default b/configs/default
index 23d7aedfbf5..e805925701a 100644
--- a/configs/default
+++ b/configs/default
@@ -10,7 +10,7 @@ CONFIG_NAME = default
 # Version info
 MESA_MAJOR=6
 MESA_MINOR=5
-MESA_TINY=1
+MESA_TINY=2
 
 # external projects.  This should be useless now that we use libdrm.
 DRM_SOURCE_PATH=$(TOP)/../drm
@@ -27,8 +27,7 @@ MKLIB_OPTIONS =
 MKDEP = makedepend
 MKDEP_OPTIONS = -fdepend
 MAKE = make
-INSTALL = install
-COPY_LIBS = cp -f -d
+INSTALL = $(TOP)/bin/minstall
 
 # Python and flags (generally only needed by the developers)
 PYTHON2 = python
diff --git a/configs/freebsd b/configs/freebsd
index 38806ab946d..db7dd3b78a0 100644
--- a/configs/freebsd
+++ b/configs/freebsd
@@ -9,9 +9,6 @@ CC = cc
 CXX = c++
 MAKE = gmake
 
-# cp -d not supported on FreeBSD (see bug 4435)
-COPY_LIBS = cp -f
-
 OPT_FLAGS  = -O2
 PIC_FLAGS  = -fPIC
 
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 104e242289c..68877c612e7 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -14,22 +14,24 @@ OPT_FLAGS = -O
 EXPAT_INCLUDES = -I/usr/local/include
 X11_INCLUDES = -I/usr/X11R6/include
 DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
 
-CFLAGS = -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math \
+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
 	$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
 
-CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
 
 ASM_SOURCES = 
 
 # Library/program dependencies
+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread $(LIBDRM_LIB)
 
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11
 
 
 # Directories
diff --git a/configs/linux-dri b/configs/linux-dri
index 1c3b404cf3a..7e822e2eb61 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -22,7 +22,8 @@ ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
 
 X11_INCLUDES = -I/usr/X11R6/include
 
@@ -64,5 +65,5 @@ WINDOW_SYSTEM=dri
 
 # 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 s3v \
+DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \
 	savage sis tdfx trident unichrome ffb
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index 68acb2f2b16..cb327fa60f9 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -24,7 +24,7 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
 
-X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I xcb-glx`
+X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`
 
 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 
@@ -37,10 +37,11 @@ ASM_SOURCES =
 # Library/program dependencies
 EXTRA_LIB_PATH=`pkg-config --libs-only-L x11`
 
+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
-                $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs xcb-glx`
+                $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`
 
 
 # This is now 0 by default since it seems to confuse the hell out of people
diff --git a/configs/linux-indirect b/configs/linux-indirect
index b764515786d..bd33345ed70 100644
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -23,6 +23,7 @@ ARCH_FLAGS ?=
 
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
+	-DGLX_INDIRECT_RENDERING \
 	-DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
 
 X11_INCLUDES = -I/usr/X11R6/include