mesa: Changes to 'debian-unstable'
configs/debian-default | 17
configs/debian-dri-amd64 | 9
configs/debian-dri-any | 9
configs/debian-dri-default | 36 +
configs/debian-dri-i386 | 9
configs/debian-dri-i386-i686 | 14
configs/debian-dri-optimized-default | 13
configs/debian-indirect-default | 7
configs/debian-indirect-hurd-i386 | 9
configs/debian-osmesa | 9
configs/debian-osmesa-default | 10
configs/debian-osmesa-static | 9
configs/debian-osmesa16 | 10
configs/debian-osmesa16-static | 10
configs/debian-osmesa32 | 10
configs/debian-osmesa32-static | 10
configs/debian-swx11+glu-alpha-ev5 | 12
configs/debian-swx11+glu-amd64 | 10
configs/debian-swx11+glu-any | 9
configs/debian-swx11+glu-default | 14
configs/debian-swx11+glu-i386 | 10
configs/debian-swx11+glu-i386-i686 | 14
configs/debian-swx11+glu-powerpc-603 | 13
configs/debian-swx11+glu-ppc64 | 11
configs/debian-swx11+glu-sparc | 10
configs/debian-swx11+glu-sparc-ultrasparc | 13
configs/debian-swx11+glu-static-amd64 | 10
configs/debian-swx11+glu-static-any | 10
configs/debian-swx11+glu-static-i386 | 10
configs/debian-swx11+glu-static-ppc64 | 11
configs/default-bp | 75 ++
configs/linux-dri-bp | 55 +
configs/linux-osmesa | 14
configs/linux-osmesa-static | 15
configs/linux-osmesa16 | 20
configs/linux-osmesa16-static | 19
configs/linux-osmesa32 | 17
configs/linux-osmesa32-static | 13
configs/linux-tcc | 22
debian/changelog | 9
debian/patches/04_debian-configs.patch | 892 ------------------------------
debian/patches/series | 1
src/mesa/drivers/dri/i915/intel_pixel.c | 8
src/mesa/drivers/dri/i965/brw_defines.h | 6
src/mesa/drivers/dri/i965/intel_context.c | 6
src/mesa/drivers/dri/i965/intel_context.h | 5
src/mesa/main/image.c | 2
src/mesa/main/mm.c | 8
src/mesa/main/mm.h | 5
src/mesa/main/texstore.c | 6
50 files changed, 590 insertions(+), 956 deletions(-)
New commits:
commit 2b831e73f5027850837e613636915c7dd6c7078a
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Jun 18 20:59:24 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index b6898c2..33f644a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (7.0.3-4) UNRELEASED; urgency=low
+mesa (7.0.3-4) unstable; urgency=low
* Pull from mesa_7_0_branch (2ac4919d).
* Put back our configs/ changes into the .diff.gz since choose-configs
needs them before quilt is invoked. Put 04_cleanup-osmesa-configs.patch
there as well for #485161.
- -- Brice Goglin <bgoglin@debian.org> Wed, 18 Jun 2008 20:52:39 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 18 Jun 2008 20:59:14 +0200
mesa (7.0.3-3) unstable; urgency=low
commit 6ec170290cf20fee464ccd7ccd3087c30069f08f
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Jun 18 20:58:35 2008 +0200
Put all configs/ changes into the .diff.gz
Put back our configs/ changes into the .diff.gz since choose-configs
needs them before quilt is invoked. Put 04_cleanup-osmesa-configs.patch
there as well for #485161.
diff --git a/configs/linux-osmesa b/configs/linux-osmesa
index 163b145..0a9cd31 100644
--- a/configs/linux-osmesa
+++ b/configs/linux-osmesa
@@ -9,8 +9,17 @@ CONFIG_NAME = linux-osmesa
# Compiler and flags
CC = gcc
CXX = g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+
+PIC_FLAGS = -fPIC
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+ -D_BSD_SOURCE -D_GNU_SOURCE \
+ -DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
+
+CFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
+ $(ASM_FLAGS) -ffast-math
+
+CXXFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
# Work around aliasing bugs - developers should comment this out
CFLAGS += -fno-strict-aliasing
@@ -26,3 +35,4 @@ PROGRAM_DIRS = osdemos
OSMESA_LIB_DEPS = -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
APP_LIB_DEPS = -lOSMesa -lGLU
+
diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static
index 465f83c..eb3575f 100644
--- a/configs/linux-osmesa-static
+++ b/configs/linux-osmesa-static
@@ -8,7 +8,8 @@ CONFIG_NAME = linux-osmesa-static
# Compiler and flags
MKLIB_OPTIONS = -static
+PIC_FLAGS =
# Library names
-OSMESA_LIB_NAME = libOSMesa.a
+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16
index 796fba1..d06bc46 100644
--- a/configs/linux-osmesa16
+++ b/configs/linux-osmesa16
@@ -1,31 +1,19 @@
# Configuration for 16 bits/channel OSMesa library on Linux
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-osmesa
CONFIG_NAME = linux-osmesa16
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
# Work around aliasing bugs - developers should comment this out
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
-
+DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=32
# Library names
OSMESA_LIB = OSMesa16
-OSMESA_LIB_NAME = libOSMesa16.so
-
# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
PROGRAM_DIRS =
-
# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa16
+APP_LIB_DEPS = -l$(OSMESA_LIB)
+
diff --git a/configs/linux-osmesa16-static b/configs/linux-osmesa16-static
index 0e0d151..515f6cc 100644
--- a/configs/linux-osmesa16-static
+++ b/configs/linux-osmesa16-static
@@ -1,14 +1,10 @@
# Configuration for 16 bits/channel OSMesa library on Linux
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-osmesa16
CONFIG_NAME = linux-osmesa16-static
# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
MKLIB_OPTIONS = -static
PIC_FLAGS =
@@ -17,16 +13,5 @@ CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
# Library names
-OSMESA_LIB = OSMesa16
-OSMESA_LIB_NAME = libOSMesa16.a
+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa16
diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32
index 12d0cb0..c1a6d4b 100644
--- a/configs/linux-osmesa32
+++ b/configs/linux-osmesa32
@@ -1,31 +1,22 @@
# Configuration for 32 bits/channel OSMesa library on Linux
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-osmesa
CONFIG_NAME = linux-osmesa32
# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
# Work around aliasing bugs - developers should comment this out
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
+DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
# Library names
OSMESA_LIB = OSMesa32
-OSMESA_LIB_NAME = libOSMesa32.so
-
# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
PROGRAM_DIRS =
-
# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa32
+APP_LIB_DEPS = -l$(OSMESA_LIB)
+
diff --git a/configs/linux-osmesa32-static b/configs/linux-osmesa32-static
index 6db8bc0..ecbb72e 100644
--- a/configs/linux-osmesa32-static
+++ b/configs/linux-osmesa32-static
@@ -1,28 +1,13 @@
# Configuration for 32 bits/channel OSMesa library on Linux
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-osmesa32
CONFIG_NAME = linux-osmesa32-static
# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
MKLIB_OPTIONS = -static
-
+PIC_FLAGS =
# Library names
-OSMESA_LIB = OSMesa32
-OSMESA_LIB_NAME = libOSMesa32.a
-
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
-
+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa32
diff --git a/debian/changelog b/debian/changelog
index 4a7a5ba..b6898c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
mesa (7.0.3-4) UNRELEASED; urgency=low
* Pull from mesa_7_0_branch (2ac4919d).
+ * Put back our configs/ changes into the .diff.gz since choose-configs
+ needs them before quilt is invoked. Put 04_cleanup-osmesa-configs.patch
+ there as well for #485161.
-- Brice Goglin <bgoglin@debian.org> Wed, 18 Jun 2008 20:52:39 +0200
diff --git a/debian/patches/04_cleanup-osmesa-configs.patch b/debian/patches/04_cleanup-osmesa-configs.patch
deleted file mode 100644
index 68bd477..0000000
--- a/debian/patches/04_cleanup-osmesa-configs.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-Index: mesa/configs/linux-osmesa
-===================================================================
---- mesa.orig/configs/linux-osmesa 2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa 2007-11-11 00:33:20.000000000 +0100
-@@ -9,8 +9,17 @@
- # Compiler and flags
- CC = gcc
- CXX = g++
--CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
--CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-+
-+PIC_FLAGS = -fPIC
-+
-+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-+ -D_BSD_SOURCE -D_GNU_SOURCE \
-+ -DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
-+
-+CFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-+ $(ASM_FLAGS) -ffast-math
-+
-+CXXFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
- # Work around aliasing bugs - developers should comment this out
- CFLAGS += -fno-strict-aliasing
-@@ -26,3 +35,4 @@
- OSMESA_LIB_DEPS = -lm -lpthread
- GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
- APP_LIB_DEPS = -lOSMesa -lGLU
-+
-Index: mesa/configs/linux-osmesa-static
-===================================================================
---- mesa.orig/configs/linux-osmesa-static 2007-11-11 00:24:01.000000000 +0100
-+++ mesa/configs/linux-osmesa-static 2007-11-11 00:33:20.000000000 +0100
-@@ -8,7 +8,8 @@
-
- # Compiler and flags
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
-
- # Library names
--OSMESA_LIB_NAME = libOSMesa.a
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
-Index: mesa/configs/linux-osmesa16
-===================================================================
---- mesa.orig/configs/linux-osmesa16 2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa16 2007-11-11 00:33:41.000000000 +0100
-@@ -1,31 +1,19 @@
- # Configuration for 16 bits/channel OSMesa library on Linux
-
--include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa
-
- CONFIG_NAME = linux-osmesa16
-
--# Compiler and flags
--CC = gcc
--CXX = g++
--CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
--CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
--
- # Work around aliasing bugs - developers should comment this out
- CFLAGS += -fno-strict-aliasing
- CXXFLAGS += -fno-strict-aliasing
--
-+DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=32
- # Library names
- OSMESA_LIB = OSMesa16
--OSMESA_LIB_NAME = libOSMesa16.so
--
-
- # Directories
--SRC_DIRS = mesa glu
--DRIVER_DIRS = osmesa
- PROGRAM_DIRS =
-
--
- # Dependencies
--OSMESA_LIB_DEPS = -lm -lpthread
--GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--APP_LIB_DEPS = -lOSMesa16
-+APP_LIB_DEPS = -l$(OSMESA_LIB)
-+
-Index: mesa/configs/linux-osmesa16-static
-===================================================================
---- mesa.orig/configs/linux-osmesa16-static 2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa16-static 2007-11-11 00:33:20.000000000 +0100
-@@ -1,14 +1,10 @@
- # Configuration for 16 bits/channel OSMesa library on Linux
-
--include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa16
-
- CONFIG_NAME = linux-osmesa16-static
-
- # Compiler and flags
--CC = gcc
--CXX = g++
--CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
--CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
- MKLIB_OPTIONS = -static
- PIC_FLAGS =
-
-@@ -17,16 +13,5 @@
- CXXFLAGS += -fno-strict-aliasing
-
- # Library names
--OSMESA_LIB = OSMesa16
--OSMESA_LIB_NAME = libOSMesa16.a
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
--
--# Directories
--SRC_DIRS = mesa glu
--DRIVER_DIRS = osmesa
--PROGRAM_DIRS =
--
--
--# Dependencies
--OSMESA_LIB_DEPS = -lm -lpthread
--APP_LIB_DEPS = -lOSMesa16
-Index: mesa/configs/linux-osmesa32
-===================================================================
---- mesa.orig/configs/linux-osmesa32 2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa32 2007-11-11 00:33:51.000000000 +0100
-@@ -1,31 +1,22 @@
- # Configuration for 32 bits/channel OSMesa library on Linux
-
--include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa
-
- CONFIG_NAME = linux-osmesa32
-
- # Compiler and flags
--CC = gcc
--CXX = g++
--CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
--CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
- # Work around aliasing bugs - developers should comment this out
- CFLAGS += -fno-strict-aliasing
- CXXFLAGS += -fno-strict-aliasing
-+DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-
- # Library names
- OSMESA_LIB = OSMesa32
--OSMESA_LIB_NAME = libOSMesa32.so
--
-
- # Directories
--SRC_DIRS = mesa glu
--DRIVER_DIRS = osmesa
- PROGRAM_DIRS =
-
--
- # Dependencies
--OSMESA_LIB_DEPS = -lm -lpthread
--GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--APP_LIB_DEPS = -lOSMesa32
-+APP_LIB_DEPS = -l$(OSMESA_LIB)
-+
-Index: mesa/configs/linux-osmesa32-static
-===================================================================
---- mesa.orig/configs/linux-osmesa32-static 2007-11-11 00:24:01.000000000 +0100
-+++ mesa/configs/linux-osmesa32-static 2007-11-11 00:33:20.000000000 +0100
-@@ -1,28 +1,13 @@
- # Configuration for 32 bits/channel OSMesa library on Linux
-
--include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa32
-
- CONFIG_NAME = linux-osmesa32-static
-
- # Compiler and flags
--CC = gcc
--CXX = g++
--CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
--CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
- MKLIB_OPTIONS = -static
--
-+PIC_FLAGS =
-
- # Library names
--OSMESA_LIB = OSMesa32
--OSMESA_LIB_NAME = libOSMesa32.a
--
--
--# Directories
--SRC_DIRS = mesa glu
--DRIVER_DIRS = osmesa
--PROGRAM_DIRS =
--
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
--# Dependencies
--OSMESA_LIB_DEPS = -lm -lpthread
--APP_LIB_DEPS = -lOSMesa32
diff --git a/debian/patches/series b/debian/patches/series
index 61b5df2..b370d51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
01_fix-makefile.patch
02_use-ieee-fp-on-s390-and-m68k.patch
03_optional-progs-and-install.patch
-04_cleanup-osmesa-configs.patch
commit 7c8ea0899aab2c39f5194031837503982a2f769c
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Jun 18 20:55:42 2008 +0200
Revert "Move our configs/ changes from the .diff.gz into our quilt patches"
This reverts commit 03970183fc9998bcdee9389830493a0b2dcda8d2.
Conflicts:
debian/changelog
diff --git a/configs/debian-default b/configs/debian-default
new file mode 100644
index 0000000..8d1b785
--- /dev/null
+++ b/configs/debian-default
@@ -0,0 +1,17 @@
+# Define Debian-specific defaults.
+
+CONFIG_NAME = debian-default
+
+OPT_FLAGS = -O2 -g
+
+# override settings in configs/linux-x86-64
+LIB_DIR = lib
+EXTRA_LIB_PATH =
+
+SRC_DIRS = mesa
+PROGRAM_DIRS =
+
+INSTALL_DIR = /usr
+
+# vim: ft=make
+
diff --git a/configs/debian-dri-amd64 b/configs/debian-dri-amd64
new file mode 100644
index 0000000..ff4232b
--- /dev/null
+++ b/configs/debian-dri-amd64
@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on i386.
+
+include $(TOP)/configs/linux-dri-x86-64
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-dri-amd64
+
+# vim: ft=make
+
diff --git a/configs/debian-dri-any b/configs/debian-dri-any
new file mode 100644
index 0000000..c4b65b0
--- /dev/null
+++ b/configs/debian-dri-any
@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-dri
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-dri-any
+
+# vim: ft=make
+
diff --git a/configs/debian-dri-default b/configs/debian-dri-default
new file mode 100644
index 0000000..f92c7ed
--- /dev/null
+++ b/configs/debian-dri-default
@@ -0,0 +1,36 @@
+# Configuration defaults for building the DRI drivers and DRI/GLX-enabled
+# libGL.
+
+include $(TOP)/configs/debian-default
+
+CONFIG_NAME = debian-dri-default
+
+SRC_DIRS = glx/x11 mesa progs
+DRIVER_DIRS = dri
+PROGRAM_DIRS = xdemos
+PROGS = glxdemo \
+ glxgears \
+ glxheads \
+ glxinfo
+
+LIB_DIR = lib/glx
+
+DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
+DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
+
+DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
+
+ARCH_X86 = i386 amd64
+
+ifneq ($(findstring $(DEB_BUILD_ARCH), $(ARCH_X86)),)
+ DRI_DIRS += i810 i915 i915tex i965 sis unichrome
+endif
+
+ifeq ($(DEB_BUILD_ARCH), sparc)
+ DRI_DIRS += ffb
+endif
+
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+
+# vim: ft=make
+
diff --git a/configs/debian-dri-i386 b/configs/debian-dri-i386
new file mode 100644
index 0000000..7a0aaa4
--- /dev/null
+++ b/configs/debian-dri-i386
@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on i386.
+
+include $(TOP)/configs/linux-dri-x86
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-dri-i386
+
+# vim: ft=make
+
diff --git a/configs/debian-dri-i386-i686 b/configs/debian-dri-i386-i686
new file mode 100644
index 0000000..b15cd77
--- /dev/null
+++ b/configs/debian-dri-i386-i686
@@ -0,0 +1,14 @@
+# Configuration for building the DRI drivers on i386.
+
+include $(TOP)/configs/linux-dri-x86
+include $(TOP)/configs/debian-dri-optimized-default
+
+CONFIG_NAME = debian-dri-i386-i686
+
+ARCH_FLAGS = -march=i686
+LIB_DIR = lib/glx/i686/cmov
+
+DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri/i686/cmov
+
+# vim: ft=make
+
diff --git a/configs/debian-dri-optimized-default b/configs/debian-dri-optimized-default
new file mode 100644
index 0000000..9c3f68d
--- /dev/null
+++ b/configs/debian-dri-optimized-default
@@ -0,0 +1,13 @@
+# Configuration defaults for CPU-optimized builds of the DRI drivers and
+# DRI/GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-dri-optimized-default
+
+# override so that the utility programs are not rebuilt with CPU-specific
+# optimizations
+SRC_DIRS = glx/x11 mesa
+
+# vim: ft=make
+
diff --git a/configs/debian-indirect-default b/configs/debian-indirect-default
new file mode 100644
index 0000000..a6926c9
--- /dev/null
+++ b/configs/debian-indirect-default
@@ -0,0 +1,7 @@
+# Configuration defaults for building GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-indirect-default
+
+DRI_DIRS =
diff --git a/configs/debian-indirect-hurd-i386 b/configs/debian-indirect-hurd-i386
new file mode 100644
index 0000000..dd4bb07
--- /dev/null
+++ b/configs/debian-indirect-hurd-i386
@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-indirect
+include $(TOP)/configs/debian-indirect-default
+
+CONFIG_NAME = debian-indirect-hurd-i386
+
+# vim: ft=make
+
diff --git a/configs/debian-osmesa b/configs/debian-osmesa
new file mode 100644
index 0000000..9b7fc7b
--- /dev/null
+++ b/configs/debian-osmesa
@@ -0,0 +1,9 @@
+# Configuration for building only OSMesa on Debian.
+
+include $(TOP)/configs/linux-osmesa
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa
+
+# vim: ft=make
+
diff --git a/configs/debian-osmesa-default b/configs/debian-osmesa-default
new file mode 100644
index 0000000..ef5a5ba
--- /dev/null
+++ b/configs/debian-osmesa-default
@@ -0,0 +1,10 @@
+# Configuration defaults for building OSMesa.
+
+include $(TOP)/configs/debian-default
+
+CONFIG_NAME = debian-osmesa-default
+
+DRIVER_DIRS = osmesa
+
+# vim: ft=make
+
diff --git a/configs/debian-osmesa-static b/configs/debian-osmesa-static
new file mode 100644
index 0000000..03fe8b5
--- /dev/null
+++ b/configs/debian-osmesa-static
@@ -0,0 +1,9 @@
+# Configuration for building only OSMesa (static version) on Debian.
+
+include $(TOP)/configs/linux-osmesa-static
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa-static
+
+# vim: ft=make
+
diff --git a/configs/debian-osmesa16 b/configs/debian-osmesa16
new file mode 100644
index 0000000..0077930
--- /dev/null
+++ b/configs/debian-osmesa16
@@ -0,0 +1,10 @@
+# Configuration for building OSMesa with support for 16 bits per color
+# channel.
+
+include $(TOP)/configs/linux-osmesa16
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa16
+
+# vim: ft=make
+
diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static
new file mode 100644
index 0000000..6ff399e
--- /dev/null
+++ b/configs/debian-osmesa16-static
@@ -0,0 +1,10 @@
+# Configuration for building a static version of OSMesa with support for 16
+# bits per color channel.
+
+include $(TOP)/configs/linux-osmesa16-static
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa16-static
+
+# vim: ft=make
+
diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32
new file mode 100644
index 0000000..de3b327
--- /dev/null
+++ b/configs/debian-osmesa32
@@ -0,0 +1,10 @@
+# Configuration for building OSMesa with support for 32 bits per color
+# channel.
+
+include $(TOP)/configs/linux-osmesa32
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa32
+
+# vim: ft=make
+
diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static
new file mode 100644
index 0000000..7fdfcef
--- /dev/null
+++ b/configs/debian-osmesa32-static
@@ -0,0 +1,10 @@
+# Configuration for building a static version of OSMesa with support for 32
+# bits per color channel.
+
+include $(TOP)/configs/linux-osmesa32-static
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa32-static
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-alpha-ev5 b/configs/debian-swx11+glu-alpha-ev5
new file mode 100644
index 0000000..fd16e49
--- /dev/null
+++ b/configs/debian-swx11+glu-alpha-ev5
@@ -0,0 +1,12 @@
+# Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized).
+
+include $(TOP)/configs/linux-alpha
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-alpha-ev5
+
+SRC_DIRS = mesa
+LIB_DIR = lib/ev5/cmov
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-amd64 b/configs/debian-swx11+glu-amd64
new file mode 100644
index 0000000..4bd7e51
--- /dev/null
+++ b/configs/debian-swx11+glu-amd64
@@ -0,0 +1,10 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on amd64.
+
+include $(TOP)/configs/linux-x86-64
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-amd64
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-any b/configs/debian-swx11+glu-any
new file mode 100644
index 0000000..884c9f9
--- /dev/null
+++ b/configs/debian-swx11+glu-any
@@ -0,0 +1,9 @@
+# Configuration for building Mesa (swx11 and GLU) on the build architecture.
+
+include $(TOP)/configs/linux
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-any
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-default b/configs/debian-swx11+glu-default
new file mode 100644
index 0000000..ccf8276
--- /dev/null
+++ b/configs/debian-swx11+glu-default
@@ -0,0 +1,14 @@
+# Configuration defaults for building Mesa (swx11 and GLU).
+
+include $(TOP)/configs/debian-default
+
+CONFIG_NAME = debian-swx11+glu-default
+
+SRC_DIRS = mesa glu glw
+DRIVER_DIRS = x11
+
+GLW_SOURCES += GLwMDrawA.c
+GLW_LIB_DEPS += -lXm
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-i386 b/configs/debian-swx11+glu-i386
new file mode 100644
index 0000000..0b800c6
--- /dev/null
+++ b/configs/debian-swx11+glu-i386
@@ -0,0 +1,10 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on i386.
+
+include $(TOP)/configs/linux-x86
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-i386
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-i386-i686 b/configs/debian-swx11+glu-i386-i686
new file mode 100644
index 0000000..c6969b3
--- /dev/null
+++ b/configs/debian-swx11+glu-i386-i686
@@ -0,0 +1,14 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on i386 (i686 optimized).
+
+include $(TOP)/configs/linux-x86
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-i386-i686
+
+ARCH_FLAGS += -march=i686
+SRC_DIRS = mesa
+LIB_DIR = lib/i686/cmov
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-powerpc-603 b/configs/debian-swx11+glu-powerpc-603
new file mode 100644
index 0000000..86b3580
--- /dev/null
+++ b/configs/debian-swx11+glu-powerpc-603
@@ -0,0 +1,13 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on powerpc (603 optimized).
+
+include $(TOP)/configs/linux-ppc
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-powerpc-603
+
+SRC_DIRS = mesa
+LIB_DIR = lib/603/cmov
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-ppc64 b/configs/debian-swx11+glu-ppc64
new file mode 100644
index 0000000..67c59b6
--- /dev/null
+++ b/configs/debian-swx11+glu-ppc64
@@ -0,0 +1,11 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on ppc64.
+
+include $(TOP)/configs/debian-swx11+glu-any
+
+CONFIG_NAME = debian-swx11+glu-ppc64
+
+LIB_DIR = lib64
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-sparc b/configs/debian-swx11+glu-sparc
new file mode 100644
index 0000000..8854b40
--- /dev/null
+++ b/configs/debian-swx11+glu-sparc
@@ -0,0 +1,10 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on sparc.
+
+include $(TOP)/configs/linux-sparc
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-sparc
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-sparc-ultrasparc b/configs/debian-swx11+glu-sparc-ultrasparc
new file mode 100644
index 0000000..14e3801
--- /dev/null
+++ b/configs/debian-swx11+glu-sparc-ultrasparc
@@ -0,0 +1,13 @@
+# Configuration for building Mesa (swx11 and GLU) with runtime-detected
+# assembler optimizations on sparc (ultrasparc-optimized).
+
+include $(TOP)/configs/linux-ultrasparc
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc
+
+SRC_DIRS = mesa
+LIB_DIR = lib/ultrasparc/cmov
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-static-amd64 b/configs/debian-swx11+glu-static-amd64
new file mode 100644
index 0000000..2976fbe
--- /dev/null
+++ b/configs/debian-swx11+glu-static-amd64
@@ -0,0 +1,10 @@
+# Configuration for building static versions of the libraries (swx11 and GLU)
+# on amd64.
+
+include $(TOP)/configs/linux-x86-64-static
+include $(TOP)/configs/debian-swx11+glu-default
+
+CONFIG_NAME = debian-swx11+glu-static-amd64
Reply to: