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

Robin Cornelius robin.cornelius at gmail.com
Fri Sep 5 20:30:45 UTC 2008 

The following commit has been merged in the master branch:
commit 4998217f63b34614eeee41e22e7a659cbb13d684
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Fri Sep 5 16:14:44 2008 +0100

    Add final patches to complete a full build

diff --git a/debian/patches/add_find_curl_cmake.patch b/debian/patches/add_find_curl_cmake.patch
new file mode 100644
index 0000000..21abdb3
--- /dev/null
+++ b/debian/patches/add_find_curl_cmake.patch
@@ -0,0 +1,66 @@
+Index: slviewer/indra/cmake/FindCURL.cmake
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ slviewer/indra/cmake/FindCURL.cmake	2008-09-05 16:13:47.000000000 +0100
+@@ -0,0 +1,39 @@
++# -*- cmake -*-
++
++FIND_PATH(CURL_INCLUDE_DIR curl.h
++/usr/local/include/curl
++/usr/include/curl
++)
++
++SET(CURL_NAMES ${CURL_NAMES} curl)
++FIND_LIBRARY(CURL_LIBRARY
++  NAMES ${CURL_NAMES}
++  PATHS /usr/lib /usr/local/lib
++  )
++
++IF (CURL_LIBRARY AND CURL_INCLUDE_DIR)
++    SET(CURL_LIBRARIES ${CURL_LIBRARY})
++    SET(CURL_FOUND "YES")
++ELSE (CURL_LIBRARY CURL CURL_INCLUDE_DIR)
++  SET(CURL_FOUND "NO")
++ENDIF (CURL_LIBRARY AND CURL_INCLUDE_DIR)
++
++IF (CURL_FOUND)
++   IF (NOT CURL_FIND_QUIETLY)
++      MESSAGE(STATUS "Found CURL: ${CURL_LIBRARIES}")
++   ENDIF (NOT CURL_FIND_QUIETLY)
++ELSE (CURL_FOUND)
++   IF (CURL_FIND_REQUIRED)
++      MESSAGE(FATAL_ERROR "Could not find CURL library")
++   ENDIF (CURL_FIND_REQUIRED)
++ENDIF (CURL_FOUND)
++
++# Deprecated declarations.
++SET (NATIVE_CURL_INCLUDE_PATH ${CURL_INCLUDE_DIR} )
++GET_FILENAME_COMPONENT (NATIVE_CURL_LIB_PATH ${CURL_LIBRARY} PATH)
++
++MARK_AS_ADVANCED(
++  CURL_LIBRARY
++  CURL_INCLUDE_DIR
++  )
++
+Index: slviewer/indra/linux_crash_logger/CMakeLists.txt
+===================================================================
+--- slviewer.orig/indra/linux_crash_logger/CMakeLists.txt	2008-09-05 16:13:50.000000000 +0100
++++ slviewer/indra/linux_crash_logger/CMakeLists.txt	2008-09-05 16:13:59.000000000 +0100
+@@ -4,6 +4,8 @@
+ 
+ include(00-Common)
+ include(Boost)
++include(CURL)
++include(APR)
+ include(LLCommon)
+ include(LLCrashLogger)
+ include(LLMath)
+@@ -54,6 +56,8 @@
+     ${UI_LIBRARIES}
+     ${BOOST_SIGNALS_LIBRARY}
+     ${DB_LIBRARIES}
++    ${CURL_LIBRAIES}
++    ${APR_LIBRARIES}
+     )
+ 
+ add_custom_command(
diff --git a/debian/patches/lltemplatemessagereader_memcpy.patch b/debian/patches/lltemplatemessagereader_memcpy.patch
new file mode 100644
index 0000000..6d424a0
--- /dev/null
+++ b/debian/patches/lltemplatemessagereader_memcpy.patch
@@ -0,0 +1,13 @@
+Index: slviewer/indra/llmessage/lltemplatemessagereader.cpp
+===================================================================
+--- slviewer.orig/indra/llmessage/lltemplatemessagereader.cpp	2008-09-05 12:15:27.000000000 +0100
++++ slviewer/indra/llmessage/lltemplatemessagereader.cpp	2008-09-05 12:15:36.000000000 +0100
+@@ -676,7 +676,7 @@
+ 						// default to 0s.
+ 						U32 size = mvci.getSize();
+ 						std::vector<U8> data(size);
+-						memset(&(data[0]), 0, size);
++						memset(&(data[0]), 0, (size_t)size);
+ 						cur_data_block->addData(mvci.getName(), &(data[0]), 
+ 												size, mvci.getType());
+ 					}
diff --git a/debian/patches/no_old_school_typedefs.patch b/debian/patches/no_old_school_typedefs.patch
new file mode 100644
index 0000000..06e03d3
--- /dev/null
+++ b/debian/patches/no_old_school_typedefs.patch
@@ -0,0 +1,13 @@
+Index: slviewer/indra/llrender/llrender.h
+===================================================================
+--- slviewer.orig/indra/llrender/llrender.h	2008-09-05 12:18:03.000000000 +0100
++++ slviewer/indra/llrender/llrender.h	2008-09-05 12:18:25.000000000 +0100
+@@ -213,7 +213,7 @@
+ 
+ 	LLTexUnit* getTexUnit(U32 index);
+ 
+-	typedef struct Vertex
++	struct Vertex
+ 	{
+ 		GLfloat v[3];
+ 		GLubyte c[4];
diff --git a/debian/patches/openal_1.21.0.diff b/debian/patches/openal_1.21.0.diff
index 34a58d9..7e38e2d 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-05 11:18:58.000000000 +0100
-+++ slviewer/indra/llaudio/audioengine.cpp	2008-09-05 11:20:36.000000000 +0100
+--- slviewer.orig/indra/llaudio/audioengine.cpp	2008-09-05 13:13:58.000000000 +0100
++++ slviewer/indra/llaudio/audioengine.cpp	2008-09-05 13:43:07.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-05 11:18:58.000000000 +0100
-+++ slviewer/indra/llaudio/audioengine.h	2008-09-05 11:20:36.000000000 +0100
+--- slviewer.orig/indra/llaudio/audioengine.h	2008-09-05 13:13:59.000000000 +0100
++++ slviewer/indra/llaudio/audioengine.h	2008-09-05 13:43:07.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-05 11:20:36.000000000 +0100
++++ slviewer/indra/llaudio/audioengine_openal.cpp	2008-09-05 13:43:07.000000000 +0100
 @@ -0,0 +1,618 @@
 +/**
 + * @file audioengine_openal.cpp
@@ -664,8 +664,8 @@ 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-05 11:20:36.000000000 +0100
-@@ -0,0 +1,122 @@
++++ slviewer/indra/llaudio/audioengine_openal.h	2008-09-05 14:33:58.000000000 +0100
+@@ -0,0 +1,123 @@
 +/**
 + * @file audioengine_openal.cpp
 + * @brief implementation of audio engine using OpenAL
@@ -699,6 +699,7 @@ Index: slviewer/indra/llaudio/audioengine_openal.h
 +#ifndef LL_AUDIOENGINE_OpenAL_H
 +#define LL_AUDIOENGINE_OpenAL_H
 +
++#undef XMLCALL
 +
 +#include <string>
 +
@@ -791,7 +792,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-05 11:20:36.000000000 +0100
++++ slviewer/indra/llaudio/listener_openal.cpp	2008-09-05 13:43:07.000000000 +0100
 @@ -0,0 +1,95 @@
 +/**
 + * @file audioengine_openal.cpp
@@ -890,8 +891,8 @@ Index: slviewer/indra/llaudio/listener_openal.cpp
 +
 Index: slviewer/indra/llaudio/CMakeLists.txt
 ===================================================================
---- 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
+--- slviewer.orig/indra/llaudio/CMakeLists.txt	2008-09-05 13:13:59.000000000 +0100
++++ slviewer/indra/llaudio/CMakeLists.txt	2008-09-05 13:43:07.000000000 +0100
 @@ -9,6 +9,7 @@
  include(LLMath)
  include(LLMessage)
@@ -933,8 +934,8 @@ Index: slviewer/indra/llaudio/CMakeLists.txt
  
 Index: slviewer/indra/newview/CMakeLists.txt
 ===================================================================
---- 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
+--- slviewer.orig/indra/newview/CMakeLists.txt	2008-09-05 13:43:06.000000000 +0100
++++ slviewer/indra/newview/CMakeLists.txt	2008-09-05 15:09:01.000000000 +0100
 @@ -8,6 +8,7 @@
  include(DirectX)
  include(ELFIO)
@@ -966,7 +967,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-05 11:20:36.000000000 +0100
++++ slviewer/indra/cmake/OPENAL.cmake	2008-09-05 13:43:07.000000000 +0100
 @@ -0,0 +1,14 @@
 +
 +set(OPENAL OFF CACHE BOOL "Enable OpenAL")
@@ -984,8 +985,8 @@ Index: slviewer/indra/cmake/OPENAL.cmake
 +endif (OPENAL)
 Index: slviewer/indra/newview/llstartup.cpp
 ===================================================================
---- 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
+--- slviewer.orig/indra/newview/llstartup.cpp	2008-09-05 13:13:59.000000000 +0100
++++ slviewer/indra/newview/llstartup.cpp	2008-09-05 13:43:07.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 +1026,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-05 11:18:58.000000000 +0100
-+++ slviewer/indra/llaudio/listener_openal.h	2008-09-05 11:20:36.000000000 +0100
+--- slviewer.orig/indra/llaudio/listener_openal.h	2008-09-05 13:13:59.000000000 +0100
++++ slviewer/indra/llaudio/listener_openal.h	2008-09-05 13:43:07.000000000 +0100
 @@ -54,6 +54,10 @@
  	virtual void setPosition(LLVector3 pos);
  	virtual void setVelocity(LLVector3 vel);
@@ -1038,3 +1039,13 @@ Index: slviewer/indra/llaudio/listener_openal.h
  };
  
  #endif
+Index: slviewer/indra/cmake/LLAudio.cmake
+===================================================================
+--- slviewer.orig/indra/cmake/LLAudio.cmake	2008-09-05 15:12:13.000000000 +0100
++++ slviewer/indra/cmake/LLAudio.cmake	2008-09-05 15:12:39.000000000 +0100
+@@ -12,4 +12,5 @@
+     ${VORBISFILE_LIBRARIES}
+     ${VORBIS_LIBRARIES}
+     ${OGG_LIBRARIES}
++    ${OPENAL_LIBRARIES}
+     )
diff --git a/debian/patches/series b/debian/patches/series
index 5cc667b..8721960 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,6 @@ VWR-5082_set_bulk_inv_permissions.diff
 use_c_locale_and_dont_spam_me_because_i_am_not_american.patch
 dont_depend_on_artwork_to_build.patch
 VWR-8751-Build-with-a-shared-llmozlib2.patch
+lltemplatemessagereader_memcpy.patch
+no_old_school_typedefs.patch
+add_find_curl_cmake.patch

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