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

Robin Cornelius robin.cornelius at gmail.com
Tue Sep 2 22:49:03 UTC 2008


The following commit has been merged in the master branch:
commit 9e6a9ba119be5c36b974459c13af09486265d47e
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Tue Sep 2 21:44:46 2008 +0100

    Build fixes and extra required patches

diff --git a/debian/changelog b/debian/changelog
index f4a9903..c34768e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+omvviewer (1.21.0-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Robin Cornelius <robin.cornelius at gmail.com>  Tue, 02 Sep 2008 21:06:11 +0100
+
 omvviewer (1.20.15-1) unstable; urgency=low
 
   * New Upstream Version, 
diff --git a/debian/patches/VWR-8194_clamp_outline_for_broken_nvidia.diff b/debian/patches/VWR-8194_clamp_outline_for_broken_nvidia.diff
index cc9d0c5..59b7a68 100644
--- a/debian/patches/VWR-8194_clamp_outline_for_broken_nvidia.diff
+++ b/debian/patches/VWR-8194_clamp_outline_for_broken_nvidia.diff
@@ -6,11 +6,11 @@
 
 @DPATCH@
 
-diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
-index e9c1227..5c1c73e 100644
---- a/indra/llrender/llrender.cpp
-+++ b/indra/llrender/llrender.cpp
-@@ -657,6 +657,9 @@ void LLRender::vertex3fv(const GLfloat* v)
+Index: slviewer/indra/llrender/llrender.cpp
+===================================================================
+--- slviewer.orig/indra/llrender/llrender.cpp	2008-09-02 21:12:34.000000000 +0100
++++ slviewer/indra/llrender/llrender.cpp	2008-09-02 21:12:38.000000000 +0100
+@@ -669,6 +669,9 @@
  
  void LLRender::texCoord2f(const GLfloat& x, const GLfloat& y)
  { 
@@ -20,7 +20,7 @@ index e9c1227..5c1c73e 100644
  	mTexcoordsp[mCount] = LLVector2(x,y);
  }
  
-@@ -672,6 +675,10 @@ void LLRender::texCoord2fv(const GLfloat* tc)
+@@ -684,6 +687,10 @@
  
  void LLRender::color4ub(const GLubyte& r, const GLubyte& g, const GLubyte& b, const GLubyte& a)
  {
diff --git a/debian/patches/openal_1.21.0.diff b/debian/patches/openal_1.21.0.diff
index f43c7ff..4c20dc8 100644
--- a/debian/patches/openal_1.21.0.diff
+++ b/debian/patches/openal_1.21.0.diff
@@ -888,73 +888,6 @@ Index: omvviewer-1.21.0/indra/llaudio/listener_openal.cpp
 +	return factor;
 +}
 +
-Index: omvviewer-1.21.0/indra/llaudio/listener_openal.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ omvviewer-1.21.0/indra/llaudio/listener_openal.h	2008-08-31 14:34:35.000000000 +0100
-@@ -0,0 +1,62 @@
-+/** 
-+ * @file listener_openal.h
-+ * @brief Description of LISTENER class abstracting the audio support
-+ * as an OpenAL implementation
-+ *
-+ * $LicenseInfo:firstyear=2000&license=viewergpl$
-+ * 
-+ * Copyright (c) 2000-2008, Linden Research, Inc.
-+ * 
-+ * Second Life Viewer Source Code
-+ * The source code in this file ("Source Code") is provided by Linden Lab
-+ * to you under the terms of the GNU General Public License, version 2.0
-+ * ("GPL"), unless you have obtained a separate licensing agreement
-+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
-+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
-+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
-+ * 
-+ * There are special exceptions to the terms and conditions of the GPL as
-+ * it is applied to this Source Code. View the full text of the exception
-+ * in the file doc/FLOSS-exception.txt in this software distribution, or
-+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
-+ * 
-+ * By copying, modifying or distributing this software, you acknowledge
-+ * that you have read and understood your obligations described above,
-+ * and agree to abide by those obligations.
-+ * 
-+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-+ * COMPLETENESS OR PERFORMANCE.
-+ * $/LicenseInfo$
-+ */
-+
-+#ifndef LL_LISTENER_OPENAL_H
-+#define LL_LISTENER_OPENAL_H
-+
-+#include "listener.h"
-+#include "AL/al.h"
-+#include "AL/alut.h"
-+
-+class LLListener_OpenAL  : public LLListener
-+{
-+ private:
-+ protected:
-+ public:
-+
-+ private:
-+ protected:
-+ public:  
-+	LLListener_OpenAL();
-+	virtual ~LLListener_OpenAL();
-+
-+	virtual void translate(LLVector3 offset);
-+	virtual void setPosition(LLVector3 pos);
-+	virtual void setVelocity(LLVector3 vel);
-+	virtual void orient(LLVector3 up, LLVector3 at);
-+	virtual void commitDeferredChanges();
-+
-+	virtual void setDopplerFactor(F32 factor);
-+	virtual F32 getDopplerFactor();
-+};
-+
-+#endif
 Index: omvviewer-1.21.0/indra/llaudio/CMakeLists.txt
 ===================================================================
 --- omvviewer-1.21.0.orig/indra/llaudio/CMakeLists.txt	2008-08-31 09:42:53.000000000 +0100
@@ -1090,15 +1023,18 @@ Index: omvviewer-1.21.0/indra/newview/llstartup.cpp
  #endif
  
  			if (gAudiop)
-Index: omvviewer-1.21.0/indra/cmake/LLAudio.cmake
-===================================================================
---- omvviewer-1.21.0.orig/indra/cmake/LLAudio.cmake	2008-08-31 13:06:37.000000000 +0100
-+++ omvviewer-1.21.0/indra/cmake/LLAudio.cmake	2008-08-31 13:07:05.000000000 +0100
-@@ -8,6 +8,7 @@
+diff --git a/indra/llaudio/listener_openal.h b/indra/llaudio/listener_openal.h
+index cc4bb9e..0a8bb6f 100644
+--- a/indra/llaudio/listener_openal.h
++++ b/indra/llaudio/listener_openal.h
+@@ -54,6 +54,10 @@ class LLListener_OpenAL  : public LLListener
+ 	virtual void setPosition(LLVector3 pos);
+ 	virtual void setVelocity(LLVector3 vel);
+ 	virtual void orient(LLVector3 up, LLVector3 at);
++	virtual void commitDeferredChanges();
++
++	virtual void setDopplerFactor(F32 factor);
++	virtual F32 getDopplerFactor();
+ };
  
- set(LLAUDIO_LIBRARIES
-     llaudio
-+    ${OPENAL_LIBRARIES}
-     ${VORBISENC_LIBRARIES}
-     ${VORBISFILE_LIBRARIES}
-     ${VORBIS_LIBRARIES}
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 8d013a2..d7d57b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+rename_binary_cmake.patch
 24_always_test_vectorize.diff
 50_get_cpu_clock_count_for_more_than_just_i386.diff
 55_fix_the_locales.diff
@@ -25,4 +26,4 @@ openal_1.21.0.diff
 
 VWR-5082_set_bulk_inv_permissions.diff
 use_c_locale_and_dont_spam_me_because_i_am_not_american.patch
-VWR-4981_save_windlight_settings_in_user_rw_area.patch
+dont_depend_on_artwork_to_build.patch
diff --git a/debian/rules b/debian/rules
index e341837..5ac4d8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,10 +47,8 @@ realclean:
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp
-	
-	cd indra && make clean
-
-	dh_clean indra/newview/omvviewer indra/newview/omvviewer-globalsyms
+	#[ ! -f  indra/Makefile ] || cd indra && make clean
+	dh_clean
 
 install: install-indep install-arch
 install-indep:

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



More information about the Pkg-games-commits mailing list