Author: beatle Date: 2006-11-02 16:05:29 -0500 (Thu, 02 Nov 2006) New Revision: 3934
Added: branches/experimental/mesa/configs/debian-utils branches/experimental/mesa/debian/mesa-utils.install branches/experimental/mesa/debian/patches/04_optional-progs-and-install.patch Modified: branches/experimental/mesa/configs/debian-default branches/experimental/mesa/debian/control branches/experimental/mesa/debian/patches/series branches/experimental/mesa/debian/rules Log: Add code to provide a mesa-utils package since they ship with the MesaUtils tarball. Modified: branches/experimental/mesa/configs/debian-default =================================================================== --- branches/experimental/mesa/configs/debian-default 2006-11-01 11:00:05 UTC (rev 3933) +++ branches/experimental/mesa/configs/debian-default 2006-11-02 21:05:29 UTC (rev 3934) @@ -8,6 +8,7 @@ PROGRAM_DIRS = INSTALL_DIR = $(DESTDIR)/usr +INSTALL = /usr/bin/install # vim: ft=make Added: branches/experimental/mesa/configs/debian-utils =================================================================== --- branches/experimental/mesa/configs/debian-utils (rev 0) +++ branches/experimental/mesa/configs/debian-utils 2006-11-02 21:05:29 UTC (rev 3934) @@ -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 + Modified: branches/experimental/mesa/debian/control =================================================================== --- branches/experimental/mesa/debian/control 2006-11-01 11:00:05 UTC (rev 3933) +++ branches/experimental/mesa/debian/control 2006-11-02 21:05:29 UTC (rev 3934) @@ -306,4 +306,14 @@ 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 Added: branches/experimental/mesa/debian/mesa-utils.install =================================================================== --- branches/experimental/mesa/debian/mesa-utils.install (rev 0) +++ branches/experimental/mesa/debian/mesa-utils.install 2006-11-02 21:05:29 UTC (rev 3934) @@ -0,0 +1,4 @@ +usr/bin/glxdemo +usr/bin/glxgears +usr/bin/glxheads +usr/bin/glxinfo Added: branches/experimental/mesa/debian/patches/04_optional-progs-and-install.patch =================================================================== --- branches/experimental/mesa/debian/patches/04_optional-progs-and-install.patch (rev 0) +++ branches/experimental/mesa/debian/patches/04_optional-progs-and-install.patch 2006-11-02 21:05:29 UTC (rev 3934) @@ -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 \ Modified: branches/experimental/mesa/debian/patches/series =================================================================== --- branches/experimental/mesa/debian/patches/series 2006-11-01 11:00:05 UTC (rev 3933) +++ branches/experimental/mesa/debian/patches/series 2006-11-02 21:05:29 UTC (rev 3934) @@ -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 Modified: branches/experimental/mesa/debian/rules =================================================================== --- branches/experimental/mesa/debian/rules 2006-11-01 11:00:05 UTC (rev 3933) +++ branches/experimental/mesa/debian/rules 2006-11-02 21:05:29 UTC (rev 3934) @@ -75,7 +75,8 @@ 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)) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]