[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.21.6-101-g528ee6d

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 528ee6d57f83cd52bd79c710ac677bcb169a2e37
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Sat Nov 1 15:18:06 2008 +0000

    Update build procedure and fix some mistakes

diff --git a/debian/patches/VWR-9557-nvidia-headers-missing-defines.patch b/debian/patches/VWR-9557-nvidia-headers-missing-defines.patch
deleted file mode 100644
index 68172e7..0000000
--- a/debian/patches/VWR-9557-nvidia-headers-missing-defines.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/indra/llrender/llglheaders.h
-+++ b/indra/llrender/llglheaders.h
-@@ -77,6 +75,12 @@
- #endif // LL_LINUX && !LL_MESA_HEADLESS
- 
- 
-+// Needed to compile with Nvidia's gl.h
-+
-+extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
-+extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB;
-+extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
-+
- // GL_ARB_vertex_buffer_object
- extern PFNGLBINDBUFFERARBPROC		glBindBufferARB;
- extern PFNGLDELETEBUFFERSARBPROC	glDeleteBuffersARB;
diff --git a/debian/rules b/debian/rules
index ef5772d..07f4377 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ export VERBOSE=1
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS = -Wall -g
+CFLAGS = -O2
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	BUILDTYPE=releasenoopt
@@ -27,9 +27,10 @@ build: build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp: patch
-	 - mkdir indra/build
-	 cd indra/build && \
-	 cmake -DUNATTENDED:BOOl=FALSE -DSTANDALONE:BOOL=TRUE \
+	dh_testdir
+	-mkdir -p indra/build
+	cd indra/build && \
+	cmake -DUNATTENDED:BOOl=FALSE -DSTANDALONE:BOOL=TRUE \
 	-DCMAKE_BUILD_TYPE:STRING=RELWITHDEBINFO -DSERVER:BOOL=FALSE \
 	-DVIEWER:BOOL=TRUE -DMOZLIB:BOOL=true -DINSTALL:BOOL=TRUE \
 	-DAPP_SHARE_DIR:STRING=/usr/share/omvviewer/ \
@@ -37,8 +38,9 @@ build-arch-stamp: patch
 	-DCMAKE_INSTALL_PREFIX:STRING=debian/ \
 	-DBINARY_NAME:STRING=omvviewer \
 	-DOPENAL:BOOL=TRUE \
+	-DCMAKE_CXX_FLAGS:STRING="$(CFLAGS)" \
 	..
-	cd indra/build && make
+	cd indra/build && $(MAKE)
 	touch $@
 
 build-indep: build-indep-stamp

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids