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.

9 files changed, 30 insertions, 265 deletions

diff --git a/configs/linux-osmesa b/configs/linux-osmesa
index 163b1452910..0a9cd316abf 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 465f83ca058..eb3575f424b 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 796fba17806..d06bc461faf 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 0e0d1519f39..515f6cca638 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 12d0cb053d0..c1a6d4b5528 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 6db8bc02370..ecbb72ecfde 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 4a7a5ba8e29..b6898c26050 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 68bd4775e13..00000000000
--- 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 61b5df2292c..b370d514349 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