The following commit has been merged in the master branch:
commit 95d151f47e388a67e643f9befeb8dde9913c7248
Author: Robin Cornelius <[EMAIL PROTECTED]>
Date: Tue Sep 2 21:52:24 2008 +0100
Fix openal patch
diff --git a/debian/patches/openal_1.21.0.diff
b/debian/patches/openal_1.21.0.diff
index 4c20dc8..a548b4c 100644
--- a/debian/patches/openal_1.21.0.diff
+++ b/debian/patches/openal_1.21.0.diff
@@ -1,7 +1,7 @@
-Index: omvviewer-1.21.0/indra/llaudio/audioengine.cpp
+Index: slviewer/indra/llaudio/audioengine.cpp
===================================================================
---- omvviewer-1.21.0.orig/indra/llaudio/audioengine.cpp 2008-08-31
09:42:53.000000000 +0100
-+++ omvviewer-1.21.0/indra/llaudio/audioengine.cpp 2008-08-31
14:26:27.000000000 +0100
+--- 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
@@ -111,6 +111,8 @@
// Initialize the decode manager
gAudioDecodeMgrp = new LLAudioDecodeMgr;
@@ -23,10 +23,10 @@ Index: omvviewer-1.21.0/indra/llaudio/audioengine.cpp
if (isLoop())
{
// Looped sources never die on their own.
-Index: omvviewer-1.21.0/indra/llaudio/audioengine.h
+Index: slviewer/indra/llaudio/audioengine.h
===================================================================
---- omvviewer-1.21.0.orig/indra/llaudio/audioengine.h 2008-08-31
09:42:53.000000000 +0100
-+++ omvviewer-1.21.0/indra/llaudio/audioengine.h 2008-08-31
11:54:11.000000000 +0100
+--- 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
@@ -159,6 +159,10 @@
static void assetCallback(LLVFS *vfs, const LLUUID &uuid,
LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat
ext_status);
@@ -38,10 +38,10 @@ Index: omvviewer-1.21.0/indra/llaudio/audioengine.h
friend class LLPipeline; // For debugging
public:
F32 mMaxWindGain; // Hack. Public to set before fade in?
-Index: omvviewer-1.21.0/indra/llaudio/audioengine_openal.cpp
+Index: slviewer/indra/llaudio/audioengine_openal.cpp
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ omvviewer-1.21.0/indra/llaudio/audioengine_openal.cpp 2008-08-31
14:34:11.000000000 +0100
++++ slviewer/indra/llaudio/audioengine_openal.cpp 2008-09-02
21:45:34.000000000 +0100
@@ -0,0 +1,618 @@
+/**
+ * @file audioengine_openal.cpp
@@ -661,10 +661,10 @@ Index:
omvviewer-1.21.0/indra/llaudio/audioengine_openal.cpp
+ return mInternetStreamURL;
+}
+
-Index: omvviewer-1.21.0/indra/llaudio/audioengine_openal.h
+Index: slviewer/indra/llaudio/audioengine_openal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ omvviewer-1.21.0/indra/llaudio/audioengine_openal.h 2008-08-31
14:48:25.000000000 +0100
++++ slviewer/indra/llaudio/audioengine_openal.h 2008-09-02
21:45:34.000000000 +0100
@@ -0,0 +1,122 @@
+/**
+ * @file audioengine_openal.cpp
@@ -788,10 +788,10 @@ Index: omvviewer-1.21.0/indra/llaudio/audioengine_openal.h
+};
+
+#endif
-Index: omvviewer-1.21.0/indra/llaudio/listener_openal.cpp
+Index: slviewer/indra/llaudio/listener_openal.cpp
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ omvviewer-1.21.0/indra/llaudio/listener_openal.cpp 2008-08-31
13:53:08.000000000 +0100
++++ slviewer/indra/llaudio/listener_openal.cpp 2008-09-02 21:47:52.000000000
+0100
@@ -0,0 +1,95 @@
+/**
+ * @file audioengine_openal.cpp
@@ -882,16 +882,16 @@ Index: omvviewer-1.21.0/indra/llaudio/listener_openal.cpp
+}
+
+F32 LLListener_OpenAL::getDopplerFactor(){
-+ ALfloat factor;
++ ALfloat factor=0;
+ alDopplerFactor(factor);
+ llinfos << "LLListener_OpenAL::getDopplerFactor() : " << factor <<
llendl;
+ return factor;
+}
+
-Index: omvviewer-1.21.0/indra/llaudio/CMakeLists.txt
+Index: slviewer/indra/llaudio/CMakeLists.txt
===================================================================
---- omvviewer-1.21.0.orig/indra/llaudio/CMakeLists.txt 2008-08-31
09:42:53.000000000 +0100
-+++ omvviewer-1.21.0/indra/llaudio/CMakeLists.txt 2008-08-31
14:55:11.000000000 +0100
+--- 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
@@ -9,6 +9,7 @@
include(LLMath)
include(LLMessage)
@@ -931,10 +931,10 @@ Index: omvviewer-1.21.0/indra/llaudio/CMakeLists.txt
set_source_files_properties(${llaudio_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
-Index: omvviewer-1.21.0/indra/newview/CMakeLists.txt
+Index: slviewer/indra/newview/CMakeLists.txt
===================================================================
---- omvviewer-1.21.0.orig/indra/newview/CMakeLists.txt 2008-08-31
09:42:53.000000000 +0100
-+++ omvviewer-1.21.0/indra/newview/CMakeLists.txt 2008-09-01
19:34:47.000000000 +0100
+--- 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
@@ -8,6 +8,7 @@
include(DirectX)
include(ELFIO)
@@ -951,9 +951,9 @@ Index: omvviewer-1.21.0/indra/newview/CMakeLists.txt
)
set(viewer_SOURCE_FILES
-@@ -1240,6 +1242,11 @@
+@@ -1238,6 +1240,11 @@
- #list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
+ list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
+
+if (OPENAL)
@@ -963,10 +963,10 @@ Index: omvviewer-1.21.0/indra/newview/CMakeLists.txt
if (FMOD)
set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS
-DLL_FMOD)
-Index: omvviewer-1.21.0/indra/cmake/OPENAL.cmake
+Index: slviewer/indra/cmake/OPENAL.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ omvviewer-1.21.0/indra/cmake/OPENAL.cmake 2008-08-31 13:09:59.000000000
+0100
++++ slviewer/indra/cmake/OPENAL.cmake 2008-09-02 21:45:34.000000000 +0100
@@ -0,0 +1,14 @@
+
+set(OPENAL OFF CACHE BOOL "Enable OpenAL")
@@ -982,10 +982,10 @@ Index: omvviewer-1.21.0/indra/cmake/OPENAL.cmake
+ )
+
+endif (OPENAL)
-Index: omvviewer-1.21.0/indra/newview/llstartup.cpp
+Index: slviewer/indra/newview/llstartup.cpp
===================================================================
---- omvviewer-1.21.0.orig/indra/newview/llstartup.cpp 2008-08-31
09:42:53.000000000 +0100
-+++ omvviewer-1.21.0/indra/newview/llstartup.cpp 2008-08-31
13:51:14.000000000 +0100
+--- 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
@@ -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
@@ -1023,11 +1023,11 @@ Index: omvviewer-1.21.0/indra/newview/llstartup.cpp
#endif
if (gAudiop)
-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
+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
+@@ -54,6 +54,10 @@
virtual void setPosition(LLVector3 pos);
virtual void setVelocity(LLVector3 vel);
virtual void orient(LLVector3 up, LLVector3 at);
diff --git a/debian/rules b/debian/rules
index 5ac4d8f..baa1a87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,8 @@ build-arch-stamp: patch
-DAPP_BINARY_DIR:STRING=/usr/games/ \
-DCMAKE_INSTALL_PREFIX:STRING=debian/ \
-DBINARY_NAME:STRING=omvviewer \
- -DOPENAL:BOOL=TRUE
+ -DOPENAL:BOOL=TRUE \
+ builddir
cd indra && make
touch $@
--
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and
OpenSim grids
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
