Add patch to fix upstream build system to correctly install libOSMesa and

variants. This patch also fixes the build system not to install libGL if only
the OSMesa library is built.

Update *.install files to install more files. Pretty much everything except
debugging and optimized libraries is now built and installed.

Enable building static libraries for inclusion in the -dev packages.

18 files changed, 58 insertions, 12 deletions

diff --git a/configs/debian-dri-default b/configs/debian-dri-default
index 553dfcecd1a..ba4ffd92089 100644
--- a/configs/debian-dri-default
+++ b/configs/debian-dri-default
@@ -4,10 +4,11 @@ include $(TOP)/configs/debian-common
 
 CONFIG_NAME = debian-dri-default
 
+override LIB_DIR = libglx
 override SRC_DIRS = glx/x11 mesa
 override PROGRAM_DIRS =
 
-override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
+override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/$(LIB_DIR)/dri
 override DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
 
 # vim: ft=make
diff --git a/configs/debian-osmesa b/configs/debian-osmesa
index 273f5a2eabf..a639d59895c 100644
--- a/configs/debian-osmesa
+++ b/configs/debian-osmesa
@@ -5,6 +5,9 @@ include $(TOP)/configs/linux-osmesa
 
 CONFIG_NAME = debian-osmesa
 
+override SRC_DIRS = mesa
+override PROGRAM_DIRS =
+
 # vim: ft=make
 
 
diff --git a/configs/debian-osmesa16 b/configs/debian-osmesa16
index 32747fac926..3019d49fa4e 100644
--- a/configs/debian-osmesa16
+++ b/configs/debian-osmesa16
@@ -6,5 +6,7 @@ include $(TOP)/configs/linux-osmesa16
 
 CONFIG_NAME = debian-osmesa16
 
+override SRC_DIRS = mesa
+
 # vim: ft=make
 
diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static
index 78b202c72cb..74396404595 100644
--- a/configs/debian-osmesa16-static
+++ b/configs/debian-osmesa16-static
@@ -6,5 +6,7 @@ include $(TOP)/configs/linux-osmesa16-static
 
 CONFIG_NAME = debian-osmesa16-static
 
+override SRC_DIRS = mesa
+
 # vim: ft=make
 
diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32
index 27171b87e3a..468045bd438 100644
--- a/configs/debian-osmesa32
+++ b/configs/debian-osmesa32
@@ -6,5 +6,7 @@ include $(TOP)/configs/linux-osmesa32
 
 CONFIG_NAME = debian-osmesa32
 
+override SRC_DIRS = mesa
+
 # vim: ft=make
 
diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static
index 6cf3a03ae42..237a632b90d 100644
--- a/configs/debian-osmesa32-static
+++ b/configs/debian-osmesa32-static
@@ -6,5 +6,7 @@ include $(TOP)/configs/linux-osmesa32-static
 
 CONFIG_NAME = debian-osmesa32-static
 
+override SRC_DIRS = mesa
+
 # vim: ft=make
 
diff --git a/configs/debian-static b/configs/debian-static
index 4253b270f45..c3e7f05b030 100644
--- a/configs/debian-static
+++ b/configs/debian-static
@@ -1,12 +1,12 @@
-# Override options needed to build static versions of the libraries.
-#
-# This configuration cannot be used standalone.
+# Configuration for building static versions of the libraries.
 
 include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-static
 
 CONFIG_NAME = debian-static
 
-override MKLIB_OPTIONS = -static
+override SRC_DIRS = mesa glu
+override PROGRAM_DIRS =
 
 # vim: ft=make
 
diff --git a/debian/libgl1-mesa-dri.install b/debian/libgl1-mesa-dri.install
index 55500c81209..f3e8ada53ac 100644
--- a/debian/libgl1-mesa-dri.install
+++ b/debian/libgl1-mesa-dri.install
@@ -1 +1 @@
-usr/lib/dri/*.so
+usr/libglx/dri/*.so usr/lib/dri
diff --git a/debian/libgl1-mesa-glx.install b/debian/libgl1-mesa-glx.install
index 3fc3ba6696e..270e569baa4 100644
--- a/debian/libgl1-mesa-glx.install
+++ b/debian/libgl1-mesa-glx.install
@@ -1 +1 @@
-usr/lib/libGL.so.1*
+usr/libglx/libGL.so.* usr/lib
diff --git a/debian/libgl1-mesa-swx11-dev.install b/debian/libgl1-mesa-swx11-dev.install
index e69de29bb2d..2258776adea 100644
--- a/debian/libgl1-mesa-swx11-dev.install
+++ b/debian/libgl1-mesa-swx11-dev.install
@@ -0,0 +1,3 @@
+usr/include/GL/glx*.h
+usr/lib/libGL.a
+usr/lib/libGL.so
diff --git a/debian/libgl1-mesa-swx11.install b/debian/libgl1-mesa-swx11.install
index e69de29bb2d..26237d51434 100644
--- a/debian/libgl1-mesa-swx11.install
+++ b/debian/libgl1-mesa-swx11.install
@@ -0,0 +1,2 @@
+usr/lib/libGL.so.*
+usr/lib/libOSMesa.*
diff --git a/debian/libglu1-mesa-dev.install b/debian/libglu1-mesa-dev.install
index abada7c1aec..78ac2b01eda 100644
--- a/debian/libglu1-mesa-dev.install
+++ b/debian/libglu1-mesa-dev.install
@@ -1,3 +1,4 @@
 usr/include/GL/glu.h
 usr/include/GL/glu_mangle.h
+usr/lib/libGLU.a
 usr/lib/libGLU.so
diff --git a/debian/libglu1-mesa.install b/debian/libglu1-mesa.install
index d252083d81e..9ad0953c1ca 100644
--- a/debian/libglu1-mesa.install
+++ b/debian/libglu1-mesa.install
@@ -1 +1 @@
-usr/lib/libGLU.so.1*
+usr/lib/libGLU.so.*
diff --git a/debian/libosmesa6-dev.install b/debian/libosmesa6-dev.install
index e69de29bb2d..e92cc0d05bb 100644
--- a/debian/libosmesa6-dev.install
+++ b/debian/libosmesa6-dev.install
@@ -0,0 +1,4 @@
+usr/lib/libOSMesa16.a
+usr/lib/libOSMesa16.so
+usr/lib/libOSMesa32.a
+usr/lib/libOSMesa32.so
diff --git a/debian/libosmesa6.install b/debian/libosmesa6.install
index e69de29bb2d..dbf33f54a7d 100644
--- a/debian/libosmesa6.install
+++ b/debian/libosmesa6.install
@@ -0,0 +1,2 @@
+usr/lib/libOSMesa16.so.*
+usr/lib/libOSMesa32.so.*
diff --git a/debian/patches/01_fix-makefile.patch b/debian/patches/01_fix-makefile.patch
new file mode 100644
index 00000000000..f013c46e1c0
--- /dev/null
+++ b/debian/patches/01_fix-makefile.patch
@@ -0,0 +1,15 @@
+--- a/src/mesa/Makefile
++++ b/src/mesa/Makefile
+@@ -154,7 +154,11 @@
+ 	$(INSTALL) -d $(INSTALL_DIR)/include/GL
+ 	$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
+ 	$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
+-	$(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGL.* $(INSTALL_DIR)/$(LIB_DIR)
++	@if [ "${DRIVER_DIRS}" != "osmesa" ]; then \
++		$(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(GL_LIB).* $(INSTALL_DIR)/$(LIB_DIR); \
++	else \
++		$(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(OSMESA_LIB).* $(INSTALL_DIR)/$(LIB_DIR); \
++	fi
+ 	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
+ 		cd drivers/dri ; $(MAKE) install ; \
+ 	fi
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000000..6840f95c944
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix-makefile.patch
diff --git a/debian/rules b/debian/rules
index 0b0e60f3438..966d25ed8b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+QUILT_STAMPFN ?= debian/stamp/patch
+include /usr/share/quilt/quilt.make
+
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -34,7 +37,8 @@ CONFIGS = debian \
           debian-osmesa16 \
           debian-osmesa16-static \
           debian-osmesa32 \
-          debian-osmesa32-static
+          debian-osmesa32-static \
+          debian-static
 
 STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE)
 BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
@@ -44,7 +48,7 @@ debian/stamp:
 	dh_testdir
 	mkdir -p debian/stamp
 
-build: debian/stamp $(BUILD_STAMPS)
+build: debian/stamp patch $(BUILD_STAMPS)
 $(STAMP)-build-%:
 	dh_testdir
 	mkdir -p $(DEB_BUILD_DIR)/$*
@@ -57,15 +61,17 @@ pre-install:
 	dh_testdir
 	dh_testroot
 	dh_clean -k --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
+	rm -rf $(INSTALL_STAMPS)
 	dh_installdirs
 
 install: build pre-install $(INSTALL_STAMPS)
 
-$(STAMP)-install-%:
+$(STAMP)-install-%: $(STAMP)-build-%
 	# Add here commands to install the package into debian/tmp
 	cd $(DEB_BUILD_DIR)/$* && $(MAKE) install INSTALL_DIR=$(CURDIR)/debian/tmp/usr
+	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf $(DEB_BUILD_DIR) debian/stamp