Add code to provide a mesa-utils package since those utilities are shipped in

the MesaDemos tarball.

7 files changed, 80 insertions, 1 deletions

diff --git a/configs/debian-default b/configs/debian-default
index 3412bb351d1..b64a6806bad 100644
--- a/configs/debian-default
+++ b/configs/debian-default
@@ -8,6 +8,7 @@ SRC_DIRS = mesa
 PROGRAM_DIRS =
 
 INSTALL_DIR = $(DESTDIR)/usr
+INSTALL = /usr/bin/install
 
 # vim: ft=make
 
diff --git a/configs/debian-utils b/configs/debian-utils
new file mode 100644
index 00000000000..1705802c79e
--- /dev/null
+++ b/configs/debian-utils
@@ -0,0 +1,17 @@
+# Configuration defaults for building Mesa (swx11 and GLU).
+
+include $(TOP)/configs/debian-default
+
+CONFIG_NAME = debian-utils
+
+SRC_DIRS =
+PROGRAM_DIRS = xdemos
+PROGS = glxdemo \
+        glxgears \
+        glxheads \
+        glxinfo
+
+APP_LIB_DEPS = -lGL
+
+# vim: ft=make
+
diff --git a/debian/control b/debian/control
index fb44a2b0667..697d819ebe9 100644
--- a/debian/control
+++ b/debian/control
@@ -306,4 +306,14 @@ Description: Mesa software rasteriser source -- development support files
  software rasteriser source to build the GLcore module for unaccelerated
  indirect rendering.
 
+Package: mesa-utils
+Section: x11
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: xbase-clients (<< 6.8.2-38)
+Description: Miscellaneous Mesa GL utilities
+ This package provides several basic GL utilities built by Mesa, including
+ glxinfo and glxgears.
+
 # vim: tw=0
diff --git a/debian/mesa-utils.install b/debian/mesa-utils.install
new file mode 100644
index 00000000000..4d4d07e3f00
--- /dev/null
+++ b/debian/mesa-utils.install
@@ -0,0 +1,4 @@
+usr/bin/glxdemo
+usr/bin/glxgears
+usr/bin/glxheads
+usr/bin/glxinfo
diff --git a/debian/patches/04_optional-progs-and-install.patch b/debian/patches/04_optional-progs-and-install.patch
new file mode 100644
index 00000000000..66a4771003b
--- /dev/null
+++ b/debian/patches/04_optional-progs-and-install.patch
@@ -0,0 +1,45 @@
+Allow the programs that are to be built to be defined in the build
+configuration.
+
+Provide an install target for installing the programs in $(INSTALL_DIR)/bin.
+
+This patch by Thierry Reding.
+Not submitted to Mesa.
+
+--- a/progs/xdemos/Makefile
++++ b/progs/xdemos/Makefile
+@@ -8,7 +8,7 @@
+ 
+ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
+ 
+-PROGS = glthreads \
++PROGS ?= glthreads \
+ 	glxdemo \
+ 	glxgears \
+ 	glxgears_fbconfig \
+@@ -44,6 +44,9 @@
+ 
+ default: $(PROGS)
+ 
++install: $(PROGS)
++	$(INSTALL) -d $(INSTALL_DIR)/bin
++	$(INSTALL) -m 755 $(PROGS) $(INSTALL_DIR)/bin
+ 
+ clean:
+ 	-rm -f $(PROGS)
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -21,8 +21,12 @@
+ 		fi \
+ 	done
+ 
+-# Dummy install target
+ install:
++	@for dir in $(SUBDIRS) ; do \
++		if [ -d $$dir ] ; then \
++			(cd $$dir ; $(MAKE) install) ; \
++		fi \
++	done
+ 
+ clean:
+ 	@for dir in $(SUBDIRS) tests ; do \
diff --git a/debian/patches/series b/debian/patches/series
index 31078561786..327a78f2151 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 01_fix-makefile.patch
 02_use-ieee-fp-on-s390-and-m68k.patch
 03_handle-sync-and-dont-unlock-display.patch
+04_optional-progs-and-install.patch
diff --git a/debian/rules b/debian/rules
index 307088a54de..bb2f35c061d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,8 @@ CONFIGS = $(SWX11_GLU_CONFIGS) \
           debian-osmesa16 \
           debian-osmesa16-static \
           debian-osmesa32 \
-          debian-osmesa32-static
+          debian-osmesa32-static \
+          debian-utils
 
 STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
 BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))