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

Robin Cornelius robin.cornelius at gmail.com
Fri Sep 5 10:12:06 UTC 2008 

The following commit has been merged in the master branch:
commit f522a1f82136f9ef0507c7dd4b61521a6a3da382
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Fri Sep 5 11:22:03 2008 +0100

    More packaging fixes and correct openAL inclusion

diff --git a/debian/control b/debian/control
index a7d3332..04c2493 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Secondlife Debian Team <secondlife-debian-maintainers at slupdate.byteme.org.uk>
 Uploaders: Robin Cornelius <robin.cornelius at gmail.com>
-Build-Depends: debhelper (>= 5), quilt (>= 0.40), cmake, libcairo2-dev, libglib2.0-dev, libgtk2.0-dev, libsdl1.2-dev, libvorbis-dev, libopenjpeg-dev, libjpeg62-dev, libpng12-dev, flex, bison, libcurl4-openssl-dev | libcurl3-openssl-dev, libssl-dev, libexpat1-dev, libaprutil1-dev, libapr1-dev, zlib1g-dev, libxmlrpc-epi-dev, libgl1-mesa-dev ( >= 7 ) | libgl-dev, libboost-dev, libboost-regex-dev,libboost-signals-dev ,libboost-program-options-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libc-ares-dev , libllmozlib2-dev  (>= 0.0.1), libopenal-dev, libalut-dev, libapr1-dev
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), cmake, libcairo2-dev, libglib2.0-dev, libgtk2.0-dev, libsdl1.2-dev, libvorbis-dev, libopenjpeg-dev, libjpeg62-dev, libpng12-dev, flex, bison, libssl-dev, libexpat1-dev, libaprutil1-dev, libapr1-dev, zlib1g-dev, libxmlrpc-epi-dev, libgl1-mesa-dev ( >= 7 ) | libgl-dev, libboost-dev, libboost-regex-dev,libboost-signals-dev ,libboost-program-options-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libc-ares-dev , libllmozlib2-dev  (>= 0.0.1), libopenal-dev, libalut-dev, libapr1-dev
 Standards-Version: 3.7.3
 XS-Vcs-Svn: svn://slupdate.byteme.org.uk/slviewer/slviewer/trunk
 XS-Vcs-Browser: http://slupdate.byteme.org.uk/
diff --git a/debian/docs b/debian/docs
index af213aa..13432ae 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
 doc/contributions.txt
-indra/newview/releasenotes.txt
-indra/newview/linux_tools/client-readme.txt
+#indra/newview/releasenotes.txt
+#indra/newview/linux_tools/client-readme.txt
diff --git a/debian/omvviewer.install b/debian/omvviewer.install
index 361d24d..70cdb10 100644
--- a/debian/omvviewer.install
+++ b/debian/omvviewer.install
@@ -1,4 +1,4 @@
-indra/newview/omvviewer usr/games/
-indra/newview/res/viewericon.xpm usr/share/pixmaps/
+indra/build/newview/omvviewer usr/games/
+#indra/build/newview/res/viewericon.xpm usr/share/pixmaps/
 debian/omvviewer.desktop usr/share/applications/
 
diff --git a/debian/patches/openal_1.21.0.diff b/debian/patches/openal_1.21.0.diff
index a548b4c..34a58d9 100644
--- a/debian/patches/openal_1.21.0.diff
+++ b/debian/patches/openal_1.21.0.diff
@@ -1,7 +1,7 @@
 Index: slviewer/indra/llaudio/audioengine.cpp
 ===================================================================
---- slviewer.orig/indra/llaudio/audioengine.cpp	2008-09-02 21:40:29.000000000 +0100
-+++ slviewer/indra/llaudio/audioengine.cpp	2008-09-02 21:45:34.000000000 +0100
+--- slviewer.orig/indra/llaudio/audioengine.cpp	2008-09-05 11:18:58.000000000 +0100
++++ slviewer/indra/llaudio/audioengine.cpp	2008-09-05 11:20:36.000000000 +0100
 @@ -111,6 +111,8 @@
  	// Initialize the decode manager
  	gAudioDecodeMgrp = new LLAudioDecodeMgr;
@@ -25,8 +25,8 @@ Index: slviewer/indra/llaudio/audioengine.cpp
  		// Looped sources never die on their own.
 Index: slviewer/indra/llaudio/audioengine.h
 ===================================================================
---- slviewer.orig/indra/llaudio/audioengine.h	2008-09-02 21:40:29.000000000 +0100
-+++ slviewer/indra/llaudio/audioengine.h	2008-09-02 21:45:34.000000000 +0100
+--- slviewer.orig/indra/llaudio/audioengine.h	2008-09-05 11:18:58.000000000 +0100
++++ slviewer/indra/llaudio/audioengine.h	2008-09-05 11:20:36.000000000 +0100
 @@ -159,6 +159,10 @@
  	static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status);
  
@@ -41,7 +41,7 @@ Index: slviewer/indra/llaudio/audioengine.h
 Index: slviewer/indra/llaudio/audioengine_openal.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ slviewer/indra/llaudio/audioengine_openal.cpp	2008-09-02 21:45:34.000000000 +0100
++++ slviewer/indra/llaudio/audioengine_openal.cpp	2008-09-05 11:20:36.000000000 +0100
 @@ -0,0 +1,618 @@
 +/**
 + * @file audioengine_openal.cpp
@@ -664,7 +664,7 @@ Index: slviewer/indra/llaudio/audioengine_openal.cpp
 Index: slviewer/indra/llaudio/audioengine_openal.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ slviewer/indra/llaudio/audioengine_openal.h	2008-09-02 21:45:34.000000000 +0100
++++ slviewer/indra/llaudio/audioengine_openal.h	2008-09-05 11:20:36.000000000 +0100
 @@ -0,0 +1,122 @@
 +/**
 + * @file audioengine_openal.cpp
@@ -791,7 +791,7 @@ Index: slviewer/indra/llaudio/audioengine_openal.h
 Index: slviewer/indra/llaudio/listener_openal.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ slviewer/indra/llaudio/listener_openal.cpp	2008-09-02 21:47:52.000000000 +0100
++++ slviewer/indra/llaudio/listener_openal.cpp	2008-09-05 11:20:36.000000000 +0100
 @@ -0,0 +1,95 @@
 +/**
 + * @file audioengine_openal.cpp
@@ -890,8 +890,8 @@ Index: slviewer/indra/llaudio/listener_openal.cpp
 +
 Index: slviewer/indra/llaudio/CMakeLists.txt
 ===================================================================
---- slviewer.orig/indra/llaudio/CMakeLists.txt	2008-09-02 21:40:29.000000000 +0100
-+++ slviewer/indra/llaudio/CMakeLists.txt	2008-09-02 21:45:34.000000000 +0100
+--- slviewer.orig/indra/llaudio/CMakeLists.txt	2008-09-05 11:18:58.000000000 +0100
++++ slviewer/indra/llaudio/CMakeLists.txt	2008-09-05 11:20:36.000000000 +0100
 @@ -9,6 +9,7 @@
  include(LLMath)
  include(LLMessage)
@@ -933,8 +933,8 @@ Index: slviewer/indra/llaudio/CMakeLists.txt
  
 Index: slviewer/indra/newview/CMakeLists.txt
 ===================================================================
---- slviewer.orig/indra/newview/CMakeLists.txt	2008-09-02 21:45:34.000000000 +0100
-+++ slviewer/indra/newview/CMakeLists.txt	2008-09-02 21:47:25.000000000 +0100
+--- slviewer.orig/indra/newview/CMakeLists.txt	2008-09-05 11:20:36.000000000 +0100
++++ slviewer/indra/newview/CMakeLists.txt	2008-09-05 11:21:07.000000000 +0100
 @@ -8,6 +8,7 @@
  include(DirectX)
  include(ELFIO)
@@ -966,7 +966,7 @@ Index: slviewer/indra/newview/CMakeLists.txt
 Index: slviewer/indra/cmake/OPENAL.cmake
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ slviewer/indra/cmake/OPENAL.cmake	2008-09-02 21:45:34.000000000 +0100
++++ slviewer/indra/cmake/OPENAL.cmake	2008-09-05 11:20:36.000000000 +0100
 @@ -0,0 +1,14 @@
 +
 +set(OPENAL OFF CACHE BOOL "Enable OpenAL")
@@ -984,8 +984,8 @@ Index: slviewer/indra/cmake/OPENAL.cmake
 +endif (OPENAL)
 Index: slviewer/indra/newview/llstartup.cpp
 ===================================================================
---- slviewer.orig/indra/newview/llstartup.cpp	2008-09-02 21:40:29.000000000 +0100
-+++ slviewer/indra/newview/llstartup.cpp	2008-09-02 21:45:34.000000000 +0100
+--- slviewer.orig/indra/newview/llstartup.cpp	2008-09-05 11:18:58.000000000 +0100
++++ slviewer/indra/newview/llstartup.cpp	2008-09-05 11:20:36.000000000 +0100
 @@ -17,7 +17,7 @@
   * 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
@@ -1025,8 +1025,8 @@ Index: slviewer/indra/newview/llstartup.cpp
  			if (gAudiop)
 Index: slviewer/indra/llaudio/listener_openal.h
 ===================================================================
---- slviewer.orig/indra/llaudio/listener_openal.h	2008-09-02 21:40:29.000000000 +0100
-+++ slviewer/indra/llaudio/listener_openal.h	2008-09-02 21:45:34.000000000 +0100
+--- slviewer.orig/indra/llaudio/listener_openal.h	2008-09-05 11:18:58.000000000 +0100
++++ slviewer/indra/llaudio/listener_openal.h	2008-09-05 11:20:36.000000000 +0100
 @@ -54,6 +54,10 @@
  	virtual void setPosition(LLVector3 pos);
  	virtual void setVelocity(LLVector3 vel);
diff --git a/debian/rules b/debian/rules
index 9775c34..ef5772d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,9 @@ realclean:
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp
 	- rm -f -r indra/build	
-	dh_clean
+	dh_clean indra/lib/python/indra/*.pyc indra/lib/python/indra/ipc/*.pyc
+
+
 
 install: install-indep install-arch
 install-indep:
diff --git a/indra/cmake/LLAudio.cmake b/indra/cmake/LLAudio.cmake
index eff643d..49b87b2 100644
--- a/indra/cmake/LLAudio.cmake
+++ b/indra/cmake/LLAudio.cmake
@@ -1,9 +1,13 @@
 # -*- cmake -*-
 
 include(Audio)
+include(OPENAL)
 
 set(LLAUDIO_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llaudio
     )
 
-set(LLAUDIO_LIBRARIES llaudio)
+set(LLAUDIO_LIBRARIES llaudio
+	${OPENAL_LIBRARIES}
+	)
+

-- 
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