Base the Debian OSMesa configurations on linux-osmesa* provided upstream.

Add a configuration for building a static version of OSMesa with 32 bits per
color channel.

8 files changed, 45 insertions, 36 deletions

diff --git a/configs/debian-common b/configs/debian-common
index c45c42d75c3..98796f6cf9f 100644
--- a/configs/debian-common
+++ b/configs/debian-common
@@ -1,10 +1,6 @@
 # Override defaults set by the Mesa configuration.
 
-include $(TOP)/configs/default
-
 CONFIG_NAME = debian-common
 
-override OPT_FLAGS = -O2 -g
-
 # vim: ft=make
 
diff --git a/configs/debian-osmesa b/configs/debian-osmesa
new file mode 100644
index 00000000000..273f5a2eabf
--- /dev/null
+++ b/configs/debian-osmesa
@@ -0,0 +1,10 @@
+# Configuration for building OSMesa on Debian.
+
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-osmesa
+
+CONFIG_NAME = debian-osmesa
+
+# vim: ft=make
+
+
diff --git a/configs/debian-osmesa16 b/configs/debian-osmesa16
index b87178785c0..32747fac926 100644
--- a/configs/debian-osmesa16
+++ b/configs/debian-osmesa16
@@ -2,20 +2,9 @@
 # channel.
 
 include $(TOP)/configs/debian-common
-include $(TOP)/configs/linux-osmesa
+include $(TOP)/configs/linux-osmesa16
 
 CONFIG_NAME = debian-osmesa16
 
-DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-
-override OSMESA_LIB = OSMesa16
-override OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
-
-override SRC_DIRS = mesa glu
-override DRIVER_DIRS = osmesa
-override PROGRAM_DIRS =
-
-override APP_LIB_DEPS = -lOSMesa16
-
 # vim: ft=make
 
diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static
index eb507a20a76..78b202c72cb 100644
--- a/configs/debian-osmesa16-static
+++ b/configs/debian-osmesa16-static
@@ -1,12 +1,10 @@
 # Configuration for building a static version of OSMesa with support for 16
 # bits per color channel.
 
-include $(TOP)/configs/debian-static
-include $(TOP)/configs/debian-osmesa16
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-osmesa16-static
 
 CONFIG_NAME = debian-osmesa16-static
 
-override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
 # vim: ft=make
 
diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32
index a5d5216d6d4..27171b87e3a 100644
--- a/configs/debian-osmesa32
+++ b/configs/debian-osmesa32
@@ -2,20 +2,9 @@
 # channel.
 
 include $(TOP)/configs/debian-common
-include $(TOP)/configs/linux-osmesa
+include $(TOP)/configs/linux-osmesa32
 
 CONFIG_NAME = debian-osmesa32
 
-DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-
-override OSMESA_LIB = OSMesa32
-override OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
-
-override SRC_DIRS = mesa glu
-override DRIVER_DIRS = osmesa
-override PROGRAM_DIRS =
-
-override APP_LIB_DEPS = -lOSMesa32
-
 # vim: ft=make
 
diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static
index 21468edbf6f..6cf3a03ae42 100644
--- a/configs/debian-osmesa32-static
+++ b/configs/debian-osmesa32-static
@@ -1,12 +1,10 @@
 # Configuration for building a static version of OSMesa with support for 32
 # bits per color channel.
 
-include $(TOP)/configs/debian-static
-include $(TOP)/configs/debian-osmesa32
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-osmesa32-static
 
 CONFIG_NAME = debian-osmesa32-static
 
-override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
 # vim: ft=make
 
diff --git a/configs/linux-osmesa32-static b/configs/linux-osmesa32-static
new file mode 100644
index 00000000000..6db8bc02370
--- /dev/null
+++ b/configs/linux-osmesa32-static
@@ -0,0 +1,28 @@
+# Configuration for 32 bits/channel OSMesa library on Linux
+
+include $(TOP)/configs/default
+
+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
+
+
+# Library names
+OSMESA_LIB = OSMesa32
+OSMESA_LIB_NAME = libOSMesa32.a
+
+
+# Directories
+SRC_DIRS = mesa glu
+DRIVER_DIRS = osmesa
+PROGRAM_DIRS = 
+
+
+# Dependencies
+OSMESA_LIB_DEPS = -lm -lpthread
+APP_LIB_DEPS = -lOSMesa32
diff --git a/debian/rules b/debian/rules
index aa5299b36ef..0b0e60f3438 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ STAMPDIR = debian/stamp
 # build the following configurations
 CONFIGS = debian \
           debian-dri \
+          debian-osmesa \
           debian-osmesa16 \
           debian-osmesa16-static \
           debian-osmesa32 \