Commit diff of 6.5.1-0.2 so we've got a record of it here.mesa-6.5.1-0.2

14 files changed, 12 insertions, 50 deletions

diff --git a/configs/debian b/configs/debian
index 4f668ea2439..793fb606852 100644
--- a/configs/debian
+++ b/configs/debian
@@ -7,7 +7,7 @@ CXX = c++
 
 DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DUSE_XSHM -DPTHREADS `pkg-config --cflags x11 xext`
 
-DEBIAN_COMMON_CFLAGS = -ansi -pedantic -Wall -fPIC -std=c99
+DEBIAN_COMMON_CFLAGS = -std=c99 -pedantic -Wall -fPIC
 
 DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall -fPIC
 
diff --git a/configs/debian-debug-i386 b/configs/debian-debug-i386
deleted file mode 100644
index b9e0eebbd3f..00000000000
--- a/configs/debian-debug-i386
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(TOP)/configs/debian-debug
-
-CONFIG_NAME = debian-debug-i386
-
-DEBIAN_OPT_CFLAGS = -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff --git a/configs/debian-debug_i386 b/configs/debian-debug_i386
index b9e0eebbd3f..67f19ccf30a 100644
--- a/configs/debian-debug_i386
+++ b/configs/debian-debug_i386
@@ -2,6 +2,6 @@ include $(TOP)/configs/debian-debug
 
 CONFIG_NAME = debian-debug-i386
 
-DEBIAN_OPT_CFLAGS = -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+DEBIAN_OPT_CFLAGS = -march=i686 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff --git a/configs/debian-dri b/configs/debian-dri
index 519f20d4b83..c024d236e36 100644
--- a/configs/debian-dri
+++ b/configs/debian-dri
@@ -31,11 +31,15 @@ WINDOW_SYSTEM=dri
 DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
 
 ifeq ($(DEB_HOST_ARCH),i386)
-DRI_DIRS += i810 i915 sis ffb unichrome
+DRI_DIRS += i810 i915 i965 sis unichrome
 endif
 
 ifeq ($(DEB_HOST_ARCH),amd64)
-DRI_DIRS += i915
+DRI_DIRS += i915 i965 unichrome
+endif
+
+ifeq ($(DEB_HOST_ARCH),sparc)
+DRI_DIRS += ffb
 endif
 
 endif # DRI or debian-indirect
diff --git a/configs/debian-dri-amd64 b/configs/debian-dri-amd64
deleted file mode 100644
index e2cf49695a0..00000000000
--- a/configs/debian-dri-amd64
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(TOP)/configs/debian-dri
-
-CONFIG_NAME = debian-dri-amd64
-
-DRI_DIRS = i915 mach64 mga r128 r200 r300 radeon savage tdfx unichrome
diff --git a/configs/debian-dri-i386 b/configs/debian-dri-i386
deleted file mode 100644
index 1079660adda..00000000000
--- a/configs/debian-dri-i386
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(TOP)/configs/debian_i386
-include $(TOP)/configs/debian-dri
-
-CONFIG_NAME = debian-dri-i386
diff --git a/configs/debian-dri-powerpc b/configs/debian-dri-powerpc
deleted file mode 100644
index 9b6cdad4297..00000000000
--- a/configs/debian-dri-powerpc
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(TOP)/configs/debian-dri
-
-CONFIG_NAME = debian-dri-powerpc
-
-DRI_DIRS = mach64 r128 r200 r300 radeon tdfx
diff --git a/configs/debian-glide-i386 b/configs/debian-glide-i386
deleted file mode 100644
index dd0ab727a63..00000000000
--- a/configs/debian-glide-i386
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(TOP)/configs/debian-i386
-
-CONFIG_NAME = debian-glide-i386
-
-DEBIAN_COMMON_CPPFLAGS += -DFX -I/usr/include/glide3
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lglide3x -lm -lpthread
diff --git a/configs/debian-glide_i386 b/configs/debian-glide_i386
index dd0ab727a63..eb323c63368 100644
--- a/configs/debian-glide_i386
+++ b/configs/debian-glide_i386
@@ -1,4 +1,4 @@
-include $(TOP)/configs/debian-i386
+include $(TOP)/configs/debian_i386
 
 CONFIG_NAME = debian-glide-i386
 
diff --git a/configs/debian-i386 b/configs/debian-i386
deleted file mode 100644
index a4a7e68fa78..00000000000
--- a/configs/debian-i386
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(TOP)/configs/debian
-
-CONFIG_NAME = debian-i386
-
-override DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=387 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff --git a/configs/debian-static b/configs/debian-static
index bc300d5b7e1..0b5318e53a8 100644
--- a/configs/debian-static
+++ b/configs/debian-static
@@ -7,7 +7,7 @@ CXX = c++
 
 DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 
-DEBIAN_COMMON_CFLAGS = -ansi -pedantic -Wall
+DEBIAN_COMMON_CFLAGS = -std=c99 -pedantic -Wall
 
 DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall
 
diff --git a/configs/debian-static-i386 b/configs/debian-static-i386
deleted file mode 100644
index 4f1ae52f944..00000000000
--- a/configs/debian-static-i386
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(TOP)/configs/debian-static
-
-CONFIG_NAME = debian-static-i386
-
-DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff --git a/configs/debian-static_i386 b/configs/debian-static_i386
index 4f1ae52f944..df86c83cc4d 100644
--- a/configs/debian-static_i386
+++ b/configs/debian-static_i386
@@ -2,6 +2,6 @@ include $(TOP)/configs/debian-static
 
 CONFIG_NAME = debian-static-i386
 
-DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+DEBIAN_OPT_CFLAGS = -O3 -march=i686 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff --git a/configs/debian_i386 b/configs/debian_i386
index 2865617a520..1def21d39f0 100644
--- a/configs/debian_i386
+++ b/configs/debian_i386
@@ -2,6 +2,6 @@ include $(TOP)/configs/debian
 
 CONFIG_NAME = debian-i386
 
-DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=387 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+DEBIAN_OPT_CFLAGS = -O3 -march=i686 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)