From 02f377d5e2dd18537d0807ad63675a0970b5a37d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 4 Nov 2011 08:57:20 +0100
Subject: xserver pixman mesa git update 4 nov 2011

---
 mesalib/configs/autoconf.in      | 2 +-
 mesalib/configs/freebsd-dri      | 2 +-
 mesalib/configs/linux-dri        | 2 +-
 mesalib/configs/linux-dri-debug  | 2 +-
 mesalib/configs/linux-dri-ppc    | 2 +-
 mesalib/configs/linux-dri-x86-64 | 2 +-
 mesalib/configs/linux-dri-xcb    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'mesalib/configs')

diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in
index 96fe5da87..3d4c749cf 100644
--- a/mesalib/configs/autoconf.in
+++ b/mesalib/configs/autoconf.in
@@ -25,7 +25,7 @@ CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@
 LDFLAGS = @LDFLAGS@
 EXTRA_LIB_PATH = @EXTRA_LIB_PATH@
 RADEON_CFLAGS = @RADEON_CFLAGS@
-RADEON_LDFLAGS = @RADEON_LDFLAGS@
+RADEON_LIBS = @RADEON_LIBS@
 NOUVEAU_CFLAGS = @NOUVEAU_CFLAGS@
 NOUVEAU_LIBS = @NOUVEAU_LIBS@
 INTEL_LIBS = @INTEL_LIBS@
diff --git a/mesalib/configs/freebsd-dri b/mesalib/configs/freebsd-dri
index 9e810c4b8..b18ac51e3 100644
--- a/mesalib/configs/freebsd-dri
+++ b/mesalib/configs/freebsd-dri
@@ -47,5 +47,5 @@ DRIVER_DIRS = dri
 
 DRM_SOURCE_PATH=$(TOP)/../drm
 
-DRI_DIRS = i915 i965 r200 r300 radeon
+DRI_DIRS = i915 i965 r200 radeon
 
diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri
index aa2dddc1c..44c0c3d1d 100644
--- a/mesalib/configs/linux-dri
+++ b/mesalib/configs/linux-dri
@@ -62,7 +62,7 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 svga/drm
 GALLIUM_TARGET_DIRS = dri-vmwgfx
 GALLIUM_STATE_TRACKERS_DIRS = egl dri
 
-DRI_DIRS = i915 i965 nouveau r200 r300 r600 radeon swrast
+DRI_DIRS = i915 i965 nouveau r200 radeon swrast
 
 INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel)
 INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
diff --git a/mesalib/configs/linux-dri-debug b/mesalib/configs/linux-dri-debug
index c42654ce3..a1a4465d8 100644
--- a/mesalib/configs/linux-dri-debug
+++ b/mesalib/configs/linux-dri-debug
@@ -10,5 +10,5 @@ ARCH_FLAGS = -DDEBUG
 # Helpful to reduce the amount of stuff that gets built sometimes:
 #DRI_DIRS = i915tex i915 
 #DRI_DIRS = i965
-#DRI_DIRS = radeon r200 r300
+#DRI_DIRS = radeon r200
 
diff --git a/mesalib/configs/linux-dri-ppc b/mesalib/configs/linux-dri-ppc
index cc1ab9c4f..5dd3615ff 100644
--- a/mesalib/configs/linux-dri-ppc
+++ b/mesalib/configs/linux-dri-ppc
@@ -13,5 +13,5 @@ MESA_ASM_SOURCES = $(PPC_SOURCES)
 
 # Build only the drivers for cards that exist on PowerPC.  At some point MGA
 # will be added, but not yet.
-DRI_DIRS = r200 r300 radeon
+DRI_DIRS = r200 radeon
 
diff --git a/mesalib/configs/linux-dri-x86-64 b/mesalib/configs/linux-dri-x86-64
index 84f547812..c1dff630f 100644
--- a/mesalib/configs/linux-dri-x86-64
+++ b/mesalib/configs/linux-dri-x86-64
@@ -16,5 +16,5 @@ LIB_DIR = lib64
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib64
 
-DRI_DIRS = i915 i965 r200 r300 radeon
+DRI_DIRS = i915 i965 r200 radeon
 
diff --git a/mesalib/configs/linux-dri-xcb b/mesalib/configs/linux-dri-xcb
index 6968bebe4..85665207b 100644
--- a/mesalib/configs/linux-dri-xcb
+++ b/mesalib/configs/linux-dri-xcb
@@ -52,4 +52,4 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
 SRC_DIRS = glx gallium mesa glu
 
 DRIVER_DIRS = dri
-DRI_DIRS = i915 r200 r300 radeon
+DRI_DIRS = i915 r200 radeon
-- 
cgit v1.2.3