xserver xkeyboard-config mesa git update 5 dec 2011

6 files changed, 4 insertions, 94 deletions

diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin
index 98cd457a0..e2ca70af9 100644
--- a/mesalib/configs/darwin
+++ b/mesalib/configs/darwin
@@ -54,5 +54,5 @@ GLU_DIRS = sgi
 DRIVER_DIRS = osmesa
 #DRIVER_DIRS = dri
 DRI_DIRS = swrast
-GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad failover
+GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad
 #GALLIUM_DRIVERS_DIRS += llvmpipe
diff --git a/mesalib/configs/default b/mesalib/configs/default
index 2b1bf9bef..33e5f024d 100644
--- a/mesalib/configs/default
+++ b/mesalib/configs/default
@@ -116,10 +116,10 @@ EGL_DRIVERS_DIRS = glx
 # gbm backends to build
 GBM_BACKEND_DIRS = dri
 
-# Gallium directories and 
+# Gallium directories and
 GALLIUM_DIRS = auxiliary drivers state_trackers
 GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
-GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 i965 svga r300 nvfx nv50 failover
+GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 svga r300 nvfx nv50
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = sw sw/xlib
 GALLIUM_TARGET_DIRS = libgl-xlib
diff --git a/mesalib/configs/linux-cell b/mesalib/configs/linux-cell
deleted file mode 100644
index 7f38da971..000000000
--- a/mesalib/configs/linux-cell
+++ /dev/null
@@ -1,71 +0,0 @@
-# linux-cell  (non-debug build)
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-cell
-
-
-# Omiting other gallium drivers:
-GALLIUM_DRIVERS_DIRS = cell softpipe trace rbug identity
-
-
-# Compiler and flags
-CC = ppu32-gcc
-CXX = ppu32-g++
-HOST_CC = gcc
-APP_CC = gcc
-APP_CXX = g++
-
-OPT_FLAGS = -O3
-
-# Cell SDK location
-## For SDK 2.1: (plus, remove -DSPU_MAIN_PARAM_LONG_LONG below)
-#SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
-## For SDK 3.0:
-SDK = /opt/cell/sdk/usr
-
-
-
-COMMON_C_CPP_FLAGS = $(OPT_FLAGS) -Wall -Winline \
-	-fPIC -m32 -mabi=altivec -maltivec \
-	-I. -I$(SDK)/include \
-	-DGALLIUM_CELL $(DEFINES)
-
-CFLAGS = $(COMMON_C_CPP_FLAGS) -Wmissing-prototypes -std=c99
-
-CXXFLAGS = $(COMMON_C_CPP_FLAGS)
-
-
-SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
-	gallium gallium/winsys gallium/targets glu
-
-# Build no traditional Mesa drivers:
-DRIVER_DIRS =
-
-
-MKDEP_OPTIONS = -fdepend -Y
-
-
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
-	-L$(SDK)/lib -m32 -Wl,-m,elf32ppc -R$(SDK)/lib -lspe2
-
-
-CELL_SPU_LIB = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
-
-
-### SPU stuff
-
-SPU_CC = spu-gcc
-
-SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main \
-	-I. -I$(SDK)/spu/include -I$(TOP)/src/mesa/ $(INCLUDE_DIRS) \
-	-DSPU_MAIN_PARAM_LONG_LONG \
-	-include spu_intrinsics.h
-
-SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc -lm
-
-SPU_AR = ppu-ar
-SPU_AR_FLAGS = -qcs
-
-SPU_EMBED = ppu32-embedspu
-SPU_EMBED_FLAGS = -m32
diff --git a/mesalib/configs/linux-cell-debug b/mesalib/configs/linux-cell-debug
deleted file mode 100644
index 42f3245ed..000000000
--- a/mesalib/configs/linux-cell-debug
+++ /dev/null
@@ -1,10 +0,0 @@
-# linux-cell-debug
-
-include $(TOP)/configs/linux-cell
-
-# just override name and OPT_FLAGS here:
-
-CONFIG_NAME = linux-cell-debug
-
-OPT_FLAGS = -g -DDEBUG
-
diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri
index 44c0c3d1d..6990c3a7a 100644
--- a/mesalib/configs/linux-dri
+++ b/mesalib/configs/linux-dri
@@ -58,7 +58,7 @@ SRC_DIRS := glx egl $(SRC_DIRS)
 EGL_DRIVERS_DIRS = glx
 
 DRIVER_DIRS = dri
-GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 svga/drm
+GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel svga/drm
 GALLIUM_TARGET_DIRS = dri-vmwgfx
 GALLIUM_STATE_TRACKERS_DIRS = egl dri
 
diff --git a/mesalib/configs/linux-i965 b/mesalib/configs/linux-i965
deleted file mode 100644
index 7656a2adc..000000000
--- a/mesalib/configs/linux-i965
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for standalone mode i965 debug
-
-include $(TOP)/configs/linux-debug
-
-CONFIG_NAME = linux-i965
-
-GALLIUM_DRIVER_DIRS = i965
-GALLIUM_WINSYS_DIRS = drm/i965/xlib
-GALLIUM_TARGET_DIRS =