X Strike Force X.Org X11 SVN commit: r1367 - in branches/modular/app/mesa-utils-6.3.2: . debian xdemos
Author: dnusinow
Date: 2006-03-04 18:41:07 -0500 (Sat, 04 Mar 2006)
New Revision: 1367
Added:
branches/modular/app/mesa-utils-6.3.2/debian/
branches/modular/app/mesa-utils-6.3.2/debian/changelog
branches/modular/app/mesa-utils-6.3.2/debian/compat
branches/modular/app/mesa-utils-6.3.2/debian/control
branches/modular/app/mesa-utils-6.3.2/debian/copyright
branches/modular/app/mesa-utils-6.3.2/debian/mesa-utils.install
branches/modular/app/mesa-utils-6.3.2/debian/rules
Modified:
branches/modular/app/mesa-utils-6.3.2/xdemos/Makefile
branches/modular/app/mesa-utils-6.3.2/xdemos/glxgears.c
Log:
Add debian packaging
Added: branches/modular/app/mesa-utils-6.3.2/debian/changelog
===================================================================
--- branches/modular/app/mesa-utils-6.3.2/debian/changelog 2006-03-04 23:38:33 UTC (rev 1366)
+++ branches/modular/app/mesa-utils-6.3.2/debian/changelog 2006-03-04 23:41:07 UTC (rev 1367)
@@ -0,0 +1,18 @@
+mesa-utils (6.3.2-1) experimental; urgency=low
+
+ * First upload to Debian
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 4 Mar 2006 18:40:35 -0500
+
+mesa-utils (6.3.2-0ubuntu6) breezy; urgency=low
+
+ * Add -printfps flag to glxgears to make it actually print the FPS count, as
+ it is silent per default.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Tue, 11 Oct 2005 20:01:31 +1000
+
+mesa-utils (6.3.2-0ubuntu5) breezy; urgency=low
+
+ * First mesa-utils release independent of mesa.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Wed, 6 Jul 2005 15:48:17 +1000
Added: branches/modular/app/mesa-utils-6.3.2/debian/compat
===================================================================
--- branches/modular/app/mesa-utils-6.3.2/debian/compat 2006-03-04 23:38:33 UTC (rev 1366)
+++ branches/modular/app/mesa-utils-6.3.2/debian/compat 2006-03-04 23:41:07 UTC (rev 1367)
@@ -0,0 +1 @@
+4
Added: branches/modular/app/mesa-utils-6.3.2/debian/control
===================================================================
--- branches/modular/app/mesa-utils-6.3.2/debian/control 2006-03-04 23:38:33 UTC (rev 1366)
+++ branches/modular/app/mesa-utils-6.3.2/debian/control 2006-03-04 23:41:07 UTC (rev 1367)
@@ -0,0 +1,14 @@
+Source: mesa-utils
+Section: x11
+Priority: optional
+Maintainer: Daniel Stone <daniel.stone@ubuntu.com>
+Build-Depends: debhelper (>= 4.0.0), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, freeglut3-dev, libx11-dev (>= 1:6.2.1+cvs.20050722-1)
+Standards-Version: 3.6.1.0
+
+Package: mesa-utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc: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.
Added: branches/modular/app/mesa-utils-6.3.2/debian/copyright
===================================================================
--- branches/modular/app/mesa-utils-6.3.2/debian/copyright 2006-03-04 23:38:33 UTC (rev 1366)
+++ branches/modular/app/mesa-utils-6.3.2/debian/copyright 2006-03-04 23:41:07 UTC (rev 1367)
@@ -0,0 +1,21 @@
+Copyright 1989,1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
Added: branches/modular/app/mesa-utils-6.3.2/debian/mesa-utils.install
===================================================================
--- branches/modular/app/mesa-utils-6.3.2/debian/mesa-utils.install 2006-03-04 23:38:33 UTC (rev 1366)
+++ branches/modular/app/mesa-utils-6.3.2/debian/mesa-utils.install 2006-03-04 23:41:07 UTC (rev 1367)
@@ -0,0 +1,4 @@
+xdemos/glxdemo usr/bin
+xdemos/glxgears usr/bin
+xdemos/glxheads usr/bin
+xdemos/glxinfo usr/bin
Added: branches/modular/app/mesa-utils-6.3.2/debian/rules
===================================================================
--- branches/modular/app/mesa-utils-6.3.2/debian/rules 2006-03-04 23:38:33 UTC (rev 1366)
+++ branches/modular/app/mesa-utils-6.3.2/debian/rules 2006-03-04 23:41:07 UTC (rev 1367)
@@ -0,0 +1,74 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian mesa-utils package.
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
+# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+
+ $(MAKE) -C xdemos glxgears glxinfo glxdemo glxheads
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ rm -f config.cache config.log config.status
+ rm -f */config.cache */config.log */config.status
+ rm -f conftest* */conftest*
+ rm -rf autom4te.cache */autom4te.cache
+
+ -$(MAKE) -C xdemos clean
+
+ dh_clean
+
+# Build architecture-dependent files here.
+binary-arch: build
+ dh_testdir
+ dh_testroot
+
+ dh_installdocs
+ dh_installchangelogs
+ dh_install
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture-independent files here.
+binary-indep: build install
+# Nothing to do
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Modified: branches/modular/app/mesa-utils-6.3.2/xdemos/Makefile
===================================================================
--- branches/modular/app/mesa-utils-6.3.2/xdemos/Makefile 2006-03-04 23:38:33 UTC (rev 1366)
+++ branches/modular/app/mesa-utils-6.3.2/xdemos/Makefile 2006-03-04 23:41:07 UTC (rev 1367)
@@ -1,13 +1,7 @@
# progs/xdemos/Makefile
-TOP = ../..
-include $(TOP)/configs/current
+APP_LIB_DEPS = -lGL -lGLU -lglut -lm
-
-INCDIR = $(TOP)/include
-
-LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME)
-
PROGS = glthreads \
glxdemo \
glxgears \
@@ -36,8 +30,8 @@
.SUFFIXES:
.SUFFIXES: .c
-.c: $(LIB_DEP)
- $(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
+.c:
+ $(CC) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
##### TARGETS #####
@@ -58,26 +52,25 @@
$(CC) $(CFLAGS) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
pbinfo.o: pbinfo.c pbutil.h
- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
+ $(CC) -c -I. $(CFLAGS) pbinfo.c
pbdemo.o: pbdemo.c pbutil.h
- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbdemo.c
+ $(CC) -c -I. $(CFLAGS) pbdemo.c
pbutil.o: pbutil.c pbutil.h
- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
+ $(CC) -c -I. $(CFLAGS) pbutil.c
glxgears_fbconfig: glxgears_fbconfig.o pbutil.o
$(CC) $(CFLAGS) glxgears_fbconfig.o pbutil.o $(APP_LIB_DEPS) -o $@
glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h
- $(CC) $(CFLAGS) -c -I. -I$(INCDIR) $(CFLAGS) glxgears_fbconfig.c
+ $(CC) $(CFLAGS) -c -I. $(CFLAGS) glxgears_fbconfig.c
xrotfontdemo: xrotfontdemo.o xuserotfont.o
$(CC) $(CFLAGS) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
xuserotfont.o: xuserotfont.c xuserotfont.h
- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c
+ $(CC) -c -I. $(CFLAGS) xuserotfont.c
xrotfontdemo.o: xrotfontdemo.c xuserotfont.h
- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) xrotfontdemo.c
-
+ $(CC) -c -I. $(CFLAGS) xrotfontdemo.c
Modified: branches/modular/app/mesa-utils-6.3.2/xdemos/glxgears.c
===================================================================
--- branches/modular/app/mesa-utils-6.3.2/xdemos/glxgears.c 2006-03-04 23:38:33 UTC (rev 1366)
+++ branches/modular/app/mesa-utils-6.3.2/xdemos/glxgears.c 2006-03-04 23:41:07 UTC (rev 1367)
@@ -567,7 +567,8 @@
else if (strcmp(argv[i], "-fullscreen") == 0) {
fullscreen = GL_TRUE;
}
- else if (strcmp(argv[i], "-iacknowledgethatthistoolisnotabenchmark") == 0) {
+ else if ((strcmp(argv[i], "-iacknowledgethatthistoolisnotabenchmark") == 0) ||
+ (strcmp(argv[i], "-printfps") == 0)) {
printfps = GL_TRUE;
}
else
Reply to: