From 9db7bcde009a15a214e70abb1327ae9cfafe13fd Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Tue, 3 Jul 2012 17:33:37 +0000 Subject: [PATCH 01/19] Why or why ugly hack :/ --- indra/cmake/00-Common.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 58f8acf90..297d53280 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -283,8 +283,8 @@ if (LINUX OR DARWIN) set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") elseif(${CMAKE_C_COMPILER} MATCHES "clang*") - set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses - -Wno-non-virtual-dtor -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable") + set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses -Wno-non-virtual-dtor ") + set(UNIX_WARNINGS "${UNIX_WARNINGS} -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable") set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}") endif() From 7af331c50dc15ae4796aa8da147148ff1666f403 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Wed, 4 Jul 2012 00:26:42 +0000 Subject: [PATCH 02/19] First set of changes for new librarys and lib layout support! Modified repackage script to support new layout Fixed webkit to work against new llqtwebkit --- indra/cmake/Audio.cmake | 2 +- indra/cmake/BerkeleyDB.cmake | 7 +- indra/cmake/Boost.cmake | 2 +- indra/cmake/CMakeLists.txt | 13 +- indra/cmake/EXPAT.cmake | 2 +- indra/cmake/FindMono.cmake | 68 - indra/cmake/FindMySQL.cmake | 48 - indra/cmake/GooglePerfTools.cmake | 2 +- .../cmake/{HUNSPELL.cmake => Hunspell.cmake} | 0 indra/cmake/JPEG.cmake | 2 +- indra/cmake/JsonCpp.cmake | 2 +- indra/cmake/Linking.cmake | 6 +- indra/cmake/MonoDeps.cmake | 48 - indra/cmake/MonoEmbed.cmake | 57 - indra/cmake/MySQL.cmake | 26 - indra/cmake/OPENAL.cmake | 1 + indra/cmake/PNG.cmake | 10 +- indra/cmake/PulseAudio.cmake | 0 indra/cmake/UI.cmake | 1 - indra/cmake/XmlRpcEpi.cmake | 2 +- indra/cmake/ZLIB.cmake | 2 +- indra/llaudio/CMakeLists.txt | 2 +- indra/llimage/CMakeLists.txt | 3 + indra/llimage/llpngwrapper.h | 6 +- indra/llmessage/llcurl.cpp | 10 +- indra/llwindow/glh/glh_linear.h | 0 indra/newview/CMakeLists.txt | 2 +- indra/newview/viewer_manifest.py | 31 +- indra/plugins/webkit/media_plugin_webkit.cpp | 31 +- install.xml | 3485 ++++++++--------- scripts/repackage.sh | 8 +- 31 files changed, 1800 insertions(+), 2079 deletions(-) delete mode 100644 indra/cmake/FindMono.cmake delete mode 100644 indra/cmake/FindMySQL.cmake rename indra/cmake/{HUNSPELL.cmake => Hunspell.cmake} (100%) delete mode 100644 indra/cmake/MonoDeps.cmake delete mode 100644 indra/cmake/MonoEmbed.cmake delete mode 100644 indra/cmake/MySQL.cmake mode change 100755 => 100644 indra/cmake/PulseAudio.cmake mode change 100644 => 100755 indra/llwindow/glh/glh_linear.h diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake index d23bc2f9c..6bad4a726 100644 --- a/indra/cmake/Audio.cmake +++ b/indra/cmake/Audio.cmake @@ -9,7 +9,7 @@ if (STANDALONE) pkg_check_modules(VORBISFILE REQUIRED vorbisfile) else (STANDALONE) use_prebuilt_binary(ogg-vorbis) - set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake index e3ca0fd77..032dd510e 100644 --- a/indra/cmake/BerkeleyDB.cmake +++ b/indra/cmake/BerkeleyDB.cmake @@ -1,4 +1,4 @@ -# -*- cmake -*- +include(Prebuilt) set(DB_FIND_QUIETLY ON) set(DB_FIND_REQUIRED ON) @@ -8,9 +8,10 @@ if (STANDALONE) else (STANDALONE) if (LINUX) # Need to add dependency pthread explicitely to support ld.gold. - set(DB_LIBRARIES db-4.2 pthread) + use_prebuilt_binary(db) + set(DB_LIBRARIES db-5.1 pthread) else (LINUX) set(DB_LIBRARIES db-4.2) endif (LINUX) - set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (STANDALONE) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 1275d0547..6babb05fd 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -13,7 +13,7 @@ if (STANDALONE) set(BOOST_SYSTEM_LIBRARY boost_system-mt) else (STANDALONE) use_prebuilt_binary(boost) - set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) if (WINDOWS) set(BOOST_VERSION 1_45) diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 28a3d5e4f..21eee45ac 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -29,17 +29,16 @@ set(cmake_SOURCE_FILES FindELFIO.cmake FindGooglePerfTools.cmake FindHunSpell.cmake - FindMono.cmake FindMT.cmake - FindMySQL.cmake FindNDOF.cmake FindOpenJPEG.cmake FindXmlRpcEpi.cmake - FMOD.cmake + FMOD.cmake + FMODEX.cmake FreeType.cmake GStreamer010Plugin.cmake GooglePerfTools.cmake - HUNSPELL.cmake + Hunspell.cmake JPEG.cmake LLAddBuildTest.cmake LLAudio.cmake @@ -63,8 +62,6 @@ set(cmake_SOURCE_FILES LLXML.cmake LScript.cmake Linking.cmake - MonoEmbed.cmake - MySQL.cmake NDOF.cmake OPENAL.cmake OpenGL.cmake @@ -83,10 +80,6 @@ set(cmake_SOURCE_FILES ZLIB.cmake ) -if(FMODEX) - list(APPEND cmake_SOURCE_FILES FMODEX.cmake) -endif(FMODEX) - source_group("Shared Rules" FILES ${cmake_SOURCE_FILES}) set(master_SOURCE_FILES diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake index acb15dc62..8a8f84526 100644 --- a/indra/cmake/EXPAT.cmake +++ b/indra/cmake/EXPAT.cmake @@ -13,5 +13,5 @@ else (STANDALONE) else (WINDOWS) set(EXPAT_LIBRARIES expat) endif (WINDOWS) - set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (STANDALONE) diff --git a/indra/cmake/FindMono.cmake b/indra/cmake/FindMono.cmake deleted file mode 100644 index c36d7259e..000000000 --- a/indra/cmake/FindMono.cmake +++ /dev/null @@ -1,68 +0,0 @@ -# - Try to find the mono, mcs, gmcs and gacutil -# -# defines -# -# MONO_FOUND - system has mono, mcs, gmcs and gacutil -# MONO_PATH - where to find 'mono' -# MCS_PATH - where to find 'mcs' -# GMCS_PATH - where to find 'gmcs' -# GACUTIL_PATH - where to find 'gacutil' -# -# copyright (c) 2007 Arno Rehn arno@arnorehn.de -# -# Redistribution and use is allowed according to the terms of the GPL license. -# Removed the check for gmcs - -FIND_PROGRAM (MONO_EXECUTABLE mono - "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" - "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" - /bin - /usr/bin - /usr/local/bin -) -FIND_PROGRAM (MCS_EXECUTABLE mcs - "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" - "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" - /bin - /usr/bin - /usr/local/bin -) -FIND_PROGRAM (GMCS_EXECUTABLE gmcs - "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" - "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" - /bin - /usr/bin - /usr/local/bin -) -FIND_PROGRAM (GACUTIL_EXECUTABLE gacutil - "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" - "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" - /bin - /usr/bin - /usr/local/bin -) -FIND_PROGRAM (ILASM_EXECUTABLE - ilasm - NO_DEFAULT_PATH - PATHS "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin -) - -SET (MONO_FOUND FALSE) - -IF (MONO_EXECUTABLE AND MCS_EXECUTABLE AND GACUTIL_EXECUTABLE) - SET (MONO_FOUND TRUE) -ENDIF (MONO_EXECUTABLE AND MCS_EXECUTABLE AND GACUTIL_EXECUTABLE) - -IF (MONO_FOUND) - IF (NOT Mono_FIND_QUIETLY) - MESSAGE(STATUS "Found mono: ${MONO_EXECUTABLE}") - MESSAGE(STATUS "Found mcs: ${MCS_EXECUTABLE}") - MESSAGE(STATUS "Found gacutil: ${GACUTIL_EXECUTABLE}") - ENDIF (NOT Mono_FIND_QUIETLY) -ELSE (MONO_FOUND) - IF (Mono_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find one or more of the following programs: mono, mcs, gacutil") - ENDIF (Mono_FIND_REQUIRED) -ENDIF (MONO_FOUND) - -MARK_AS_ADVANCED(MONO_EXECUTABLE MCS_EXECUTABLE GACUTIL_EXECUTABLE) diff --git a/indra/cmake/FindMySQL.cmake b/indra/cmake/FindMySQL.cmake deleted file mode 100644 index 431940328..000000000 --- a/indra/cmake/FindMySQL.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# -*- cmake -*- - -# - Find MySQL -# Find the MySQL includes and library -# This module defines -# MYSQL_INCLUDE_DIR, where to find mysql.h, etc. -# MYSQL_LIBRARIES, the libraries needed to use Mysql. -# MYSQL_FOUND, If false, do not try to use Mysql. -# also defined, but not for general use are -# MYSQL_LIBRARY, where to find the Mysql library. - -FIND_PATH(MYSQL_INCLUDE_DIR mysql/mysql.h -/usr/local/include -/usr/include -) - -SET(MYSQL_NAMES ${MYSQL_NAMES} mysqlclient) -FIND_LIBRARY(MYSQL_LIBRARY - NAMES ${MYSQL_NAMES} - PATHS /usr/lib/mysql /usr/lib /usr/local/lib/mysql /usr/local/lib - ) - -IF (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR) - SET(MYSQL_LIBRARIES ${MYSQL_LIBRARY}) - SET(MYSQL_FOUND "YES") -ELSE (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR) - SET(MYSQL_FOUND "NO") -ENDIF (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR) - - -IF (MYSQL_FOUND) - IF (NOT MYSQL_FIND_QUIETLY) - MESSAGE(STATUS "Found MySQL: ${MYSQL_LIBRARIES}") - ENDIF (NOT MYSQL_FIND_QUIETLY) -ELSE (MYSQL_FOUND) - IF (MYSQL_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find MySQL library") - ENDIF (MYSQL_FIND_REQUIRED) -ENDIF (MYSQL_FOUND) - -# Deprecated declarations. -SET (NATIVE_MYSQL_INCLUDE_PATH ${MYSQL_INCLUDE_DIR} ) -GET_FILENAME_COMPONENT (NATIVE_MYSQL_LIB_PATH ${MYSQL_LIBRARY} PATH) - -MARK_AS_ADVANCED( - MYSQL_LIBRARY - MYSQL_INCLUDE_DIR - ) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index fc5b40d42..8fbe08dc2 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -5,7 +5,7 @@ if (STANDALONE) include(FindGooglePerfTools) else (STANDALONE) if (LINUX OR WINDOWS) - use_prebuilt_binary(google) + use_prebuilt_binary(gperftools) endif (LINUX OR WINDOWS) if (WINDOWS) set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib) diff --git a/indra/cmake/HUNSPELL.cmake b/indra/cmake/Hunspell.cmake similarity index 100% rename from indra/cmake/HUNSPELL.cmake rename to indra/cmake/Hunspell.cmake diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 9514d59f6..f3e5753a6 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -19,5 +19,5 @@ else (STANDALONE) elseif (WINDOWS) set(JPEG_LIBRARIES jpeglib) endif (LINUX) - set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (STANDALONE) diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 552fc19fc..856034955 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -18,5 +18,5 @@ else (STANDALONE) elseif (LINUX) set(JSONCPP_LIBRARIES jsoncpp) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) + set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/jsoncpp) endif (STANDALONE) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index eaa8a6dc2..70d005d33 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -6,11 +6,7 @@ if (NOT STANDALONE) set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) elseif (LINUX) - if (VIEWER) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client) - else (VIEWER) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release) - endif (VIEWER) + set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS}) set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS}) elseif (DARWIN) diff --git a/indra/cmake/MonoDeps.cmake b/indra/cmake/MonoDeps.cmake deleted file mode 100644 index 52d549156..000000000 --- a/indra/cmake/MonoDeps.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# -*- cmake -*- - -set(MONO_PREBUILT_LIBRARIES_DIR ${LIBS_PREBUILT_DIR}/mono/1.0) - -set(MONO_PREBUILT_LIBRARIES - Iesi.Collections.dll - Iesi.Collections.pdb - Mono.CompilerServices.SymbolWriter.dll - Mono.PEToolkit.dll - Mono.PEToolkit.pdb - Mono.Security.dll - PEAPI.dll - RAIL.dll - RAIL.pdb - ) - - set(MONO_CORE_LIBRARIES - System.dll - System.Xml.dll - mscorlib.dll) - -if(WINDOWS) - set(MONO_DEPENDENCIES - DomainCreator - DomainRegister - LslLibrary - LslUserScript - Script - ScriptTypes - TestFormat - UserScript - UThread - UThreadInjector - ) -else(WINDOWS) - set(MONO_DEPENDENCIES - DomainCreator_POST_BUILD - DomainRegister_POST_BUILD - LslLibrary_POST_BUILD - LslUserScript_POST_BUILD - Script_POST_BUILD - ScriptTypes_POST_BUILD - TestFormat_POST_BUILD - UserScript_POST_BUILD - UThread_POST_BUILD - UThreadInjector_POST_BUILD - ) -endif(WINDOWS) diff --git a/indra/cmake/MonoEmbed.cmake b/indra/cmake/MonoEmbed.cmake deleted file mode 100644 index 0f1f23309..000000000 --- a/indra/cmake/MonoEmbed.cmake +++ /dev/null @@ -1,57 +0,0 @@ -# -*- cmake -*- - -include(Prebuilt) -use_prebuilt_binary(libmono) - -SET(GLIB_2_0 glib-2.0) - -if (WINDOWS) - SET(MONO_LIB mono) -else (WINDOWS) - SET(MONO_LIB mono) - SET(M_LIBRARIES m) - SET(GTHREAD_2_0 gthread-2.0) -endif(WINDOWS) - - -IF (DARWIN) - - FIND_LIBRARY(MONO_LIBRARY NAMES Mono) - # Find_file doesnt work as expected. Hardcode relative to Mono.framework. - #FIND_FILE(GLIB_CONFIG glibconfig.h ${MONO_LIBRARY}) - #FIND_FILE(MONO_GLIB_LIBRARY glib.h ${MONO_LIBRARY}) - SET(MONO_GLIB_LIBRARY ${MONO_LIBRARY}/Headers/glib-2.0/) - SET(GLIB_CONFIG ${MONO_LIBRARY}/Libraries/glib-2.0/include/) - SET(MONO_LIB_DIRECTORY ${MONO_LIBRARY}/Libraries) - - IF (MONO_LIBRARY AND MONO_GLIB_LIBRARY AND GLIB_CONFIG) - MESSAGE(STATUS "Found Mono for embedding") - INCLUDE_DIRECTORIES(${MONO_GLIB_LIBRARY} ${GLIB_CONFIG}) - LINK_DIRECTORIES(${MONO_LIB_DIRECTORY}) - ELSE (MONO_LIBRARY AND MONO_GLIB_LIBRARY AND GLIB_CONFIG) - MESSAGE(FATAL_ERROR "Mono not found for embedding") - MESSAGE(${MONO_LIBRARY}) - MESSAGE(${MONO_GLIB_LIBRARY}) - MESSAGE(${GLIB_CONFIG}) - ENDIF (MONO_LIBRARY AND MONO_GLIB_LIBRARY AND GLIB_CONFIG) - -ELSE (DARWIN) - - SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) - SET(GLIB_2_0_PLATFORM_INCLUDE_DIR - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0) - SET(GLIB_2_0_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/glib-2.0) - - INCLUDE_DIRECTORIES( - ${MONO_INCLUDE_DIR} - ${GLIB_2_0_PLATFORM_INCLUDE_DIR} - ${GLIB_2_0_INCLUDE_DIR}) - -ENDIF (DARWIN) - -SET(MONO_LIBRARIES - ${MONO_LIB} - ${M_LIBRARIES} - ${GLIB_2_0} - ${GTHREAD_2_0} -) diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake deleted file mode 100644 index e591fbc3d..000000000 --- a/indra/cmake/MySQL.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# -*- cmake -*- -include(Linking) -include(Prebuilt) - -use_prebuilt_binary(mysql) - -if (LINUX) - if (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") - set(MYSQL_LIBRARIES mysqlclient) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) - else (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") - # Use the native MySQL library on a 64-bit system. - set(MYSQL_FIND_QUIETLY ON) - set(MYSQL_FIND_REQUIRED ON) - include(FindMySQL) - endif (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") -elseif (WINDOWS) - set(MYSQL_LIBRARIES mysqlclient) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) -elseif (DARWIN) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) - set(MYSQL_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a - ) -endif (LINUX) diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index d01c680ed..d5ab802d9 100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake @@ -21,6 +21,7 @@ if (OPENAL) openal alut ) + set(OPENAL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (OPENAL) if (OPENAL) diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index f075adaa0..269b54de7 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -10,8 +10,10 @@ else (STANDALONE) use_prebuilt_binary(libpng) if (WINDOWS) set(PNG_LIBRARIES libpng15) - else (WINDOWS) - set(PNG_LIBRARIES png12) - endif (WINDOWS) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + elseif(DARWIN) + set(PNG_LIBRARIES png15) + else(LINUX) + set(PNG_LIBRARIES png15) + endif() + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libpng15) endif (STANDALONE) diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake old mode 100755 new mode 100644 diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 6cf3a43d2..b0609b652 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -60,7 +60,6 @@ else (STANDALONE) ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1 - ${LIBS_PREBUILT_DIR}/include ) foreach(include ${${LL_ARCH}_INCLUDES}) include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include}) diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake index 56eb7e250..cbfe1e16f 100644 --- a/indra/cmake/XmlRpcEpi.cmake +++ b/indra/cmake/XmlRpcEpi.cmake @@ -9,5 +9,5 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(xmlrpc-epi) set(XMLRPCEPI_LIBRARIES xmlrpc-epi) - set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (STANDALONE) diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake index 48e5130ad..c133248be 100644 --- a/indra/cmake/ZLIB.cmake +++ b/indra/cmake/ZLIB.cmake @@ -17,6 +17,6 @@ else (STANDALONE) set(ZLIB_LIBRARIES z) endif (WINDOWS) if (WINDOWS OR LINUX) - set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib) + set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib) endif (WINDOWS OR LINUX) endif (STANDALONE) diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 13cb932b6..61c383c0d 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -35,7 +35,7 @@ include_directories( ${VORBISENC_INCLUDE_DIRS} ${VORBISFILE_INCLUDE_DIRS} ${VORBIS_INCLUDE_DIRS} - ${OPENAL_LIB_INCLUDE_DIRS} + ${OPENAL_INCLUDE_DIRS} ${FREEAULT_LIB_INCLUDE_DIRS} ) diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt index 5891b154c..97989030a 100644 --- a/indra/llimage/CMakeLists.txt +++ b/indra/llimage/CMakeLists.txt @@ -8,12 +8,15 @@ include(LLCommon) include(LLImage) include(LLMath) include(LLVFS) +include(JPEG) +include(PNG) include(ZLIB) include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS} + ${JPEG_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ) diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h index eb47fdbdd..a4c3d80b5 100644 --- a/indra/llimage/llpngwrapper.h +++ b/indra/llimage/llpngwrapper.h @@ -32,11 +32,7 @@ #ifndef LL_LLPNGWRAPPER_H #define LL_LLPNGWRAPPER_H -#if LL_WINDOWS -#include "libpng15/png.h" -#else -#include "libpng12/png.h" -#endif +#include "png.h" #include "llimage.h" class LLPngWrapper diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index b2f5ce471..0f46d2810 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -309,6 +309,14 @@ LLCurl::Easy* LLCurl::Easy::getEasy() CURLcode result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 0); check_curl_code(result); + // Disable SSL/TLS session caching. Some servers refuse to talk to us when session ids are enabled. + // id.secondlife.com is such a server, when greeted with a SSL HELLO and a session id, it immediatly returns a RST packet and closes + // the connections. + // Fixes: FIRE-5368, FIRE-5756, VWR-28039, VWR-28629 + result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_SSL_SESSIONID_CACHE, 0); + check_curl_code(result); + + ++gCurlEasyCount; return easy; } @@ -758,7 +766,7 @@ bool LLCurl::Multi::doPerform() } mQueued = q; - setState(STATE_COMPLETED) ; + setState(STATE_COMPLETED) ; mIdleTimer.reset() ; } else if(!mValid && mIdleTimer.getElapsedTimeF32() > mIdleTimeOut) //idle for too long, remove it. diff --git a/indra/llwindow/glh/glh_linear.h b/indra/llwindow/glh/glh_linear.h old mode 100644 new mode 100755 diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 83125c7fd..e196c1512 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -17,7 +17,7 @@ if(NOT FMODEX) include(FMOD) endif(NOT FMODEX) include(OPENAL) -include(HUNSPELL) +include(Hunspell) include(FindOpenGL) #include(JsonCpp) include(LLAddBuildTest) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 8f49f94a9..6fe1ef0e2 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -782,14 +782,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("../llcommon/libllcommon.so", "lib/libllcommon.so") - if (not self.standalone()) and self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"): - - try: - self.path("libkdu_v42R.so", "libkdu.so") - pass - except: - print "Skipping libkdu_v42R.so - not found" - pass + if (not self.standalone()) and self.prefix("../../libraries/i686-linux/lib/release", dst="lib"): try: self.path("libfmod-3.75.so") @@ -798,17 +791,19 @@ class Linux_i686Manifest(LinuxManifest): print "Skipping libfmod-3.75.so - not found" pass - self.path("libapr-1.so.0") - self.path("libaprutil-1.so.0") - self.path("libdb-4.2.so") - self.path("libcrypto.so.0.9.7") - self.path("libexpat.so.1") - self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0") - self.path("libssl.so.0.9.7") - #self.path("libuuid.so.1") - self.path("libSDL-1.2.so.0") self.path("libELFIO.so") - #self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") + self.path("libSDL-1.2.so*") + self.path("libapr-1.so*") + self.path("libaprutil-1.so*") + self.path("libcrypto.so*") + self.path("libdb*.so") + self.path("libdirect-1.*.so*") + self.path("libdirectfb-1.*.so*") + self.path("libfusion-1.*.so*") + self.path("libexpat.so*") + self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0") + self.path("libssl.so*") + self.path("libuuid.so*") self.path("libalut.so") self.path("libopenal.so.1") self.path("libtcmalloc_minimal.so.0") diff --git a/indra/plugins/webkit/media_plugin_webkit.cpp b/indra/plugins/webkit/media_plugin_webkit.cpp index 8568e1c59..95b0dae74 100755 --- a/indra/plugins/webkit/media_plugin_webkit.cpp +++ b/indra/plugins/webkit/media_plugin_webkit.cpp @@ -25,13 +25,11 @@ * $/LicenseInfo$ * @endcond */ - -#include "linden_common.h" - #include "llqtwebkit.h" - +#include "linden_common.h" #include "indra_constants.h" // for indra keyboard codes +#include "lltimer.h" #include "llgl.h" #include "llplugininstance.h" @@ -146,7 +144,7 @@ private: mVolumeCatcher.pump(); checkEditState(); - + if(mInitState == INIT_STATE_NAVIGATE_COMPLETE) { if(!mInitialNavigateURL.empty()) @@ -298,13 +296,17 @@ private: // turn on/off cookies based on what host app tells us LLQtWebKit::getInstance()->enableCookies( mCookiesEnabled ); - + // turn on/off plugins based on what host app tells us LLQtWebKit::getInstance()->enablePlugins( mPluginsEnabled ); // turn on/off Javascript based on what host app tells us +#if LLQTWEBKIT_API_VERSION >= 11 + LLQtWebKit::getInstance()->enableJavaScript( mJavascriptEnabled ); +#else LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled ); - +#endif + // create single browser window mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow(mWidth, mHeight, mTarget); @@ -971,9 +973,9 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) S32 height = message_in.getValueS32("height"); S32 texture_width = message_in.getValueS32("texture_width"); S32 texture_height = message_in.getValueS32("texture_height"); - mBackgroundR = message_in.getValueReal("background_r"); - mBackgroundG = message_in.getValueReal("background_g"); - mBackgroundB = message_in.getValueReal("background_b"); + mBackgroundR = (F32)message_in.getValueReal("background_r"); + mBackgroundG = (F32)message_in.getValueReal("background_g"); + mBackgroundB = (F32)message_in.getValueReal("background_b"); // mBackgroundA = message_in.setValueReal("background_a"); // Ignore any alpha if(!name.empty()) @@ -1226,6 +1228,15 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) mUserAgent = message_in.getValue("user_agent"); LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent ); } + else if(message_name == "show_web_inspector") + { +#if LLQTWEBKIT_API_VERSION >= 10 + bool val = message_in.getValueBoolean("show"); + LLQtWebKit::getInstance()->showWebInspector( val ); +#else + llwarns << "Ignoring showWebInspector message (llqtwebkit version is too old)." << llendl; +#endif + } else if(message_name == "ignore_ssl_cert_errors") { #if LLQTWEBKIT_API_VERSION >= 3 diff --git a/install.xml b/install.xml index a56aac3ad..fea7efb08 100644 --- a/install.xml +++ b/install.xml @@ -1,1762 +1,1723 @@ - - - - installables - - glext - - copyright - Copyright (c) 2007-2010 Khronos Group Inc. - description - OpenGL Extension Header Files - license - glext - packages - - linux - - md5sum - 2fc9a86782ec8dcc719ddc78026e7ba2 - url - https://github.com/downloads/siana/SingularityViewer/glext-68-win32-linux.tar.bz2 - - windows - - md5sum - 2fc9a86782ec8dcc719ddc78026e7ba2 - url - https://github.com/downloads/siana/SingularityViewer/glext-68-win32-linux.tar.bz2 - - - - freeglut - - copyright - Copyright (c) 1999-2000 Pawel W. Olszta. - description - OpenSource alternative to OpenGL Utility Toolkit - license - freeglut - packages - - windows - - md5sum - fefd6b548d677a60a198e50d9326d939 - url - https://github.com/downloads/Shyotl/SingularityViewer/freeglut-2.6.0-win32.tar.bz2 - - - - SDL - - copyright - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga - description - The Simple DirectMedia Layer libraries are used for handling input and basic window/GL setup on the Linux client. - license - lgpl - packages - - darwin - - md5sum - 7b07e7121a3623b2553ed36fb9024b40 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-darwin-20080818.tar.bz2 - - linux - - md5sum - 7952d45a61dc01faf1d9fd67023d96bd - url - https://github.com/downloads/siana/SingularityViewer/SDL-1.2.12-linux-20081222d.tar.bz2 - - windows - - md5sum - 149626b0c10d7eb8b9f9be96b5318218 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-windows-20080613.tar.bz2 - - - - apr_suite - - license - apache 2.0 - packages - - darwin - - md5sum - 2486db13c5ed9340855da3c1c48772af - url - https://github.com/downloads/LightDrake/SingularityViewer/apr_suite-1.4.2-darwin-20110217.tar.bz2 - - linux - - md5sum - 7b84cd6a3c601a104d9c09e58ef2f50c - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux-20080812.tar.bz2 - - linux64 - - md5sum - 1a7e1186855d48d8316ce86803095f70 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux64-20080909a.tar.bz2 - - windows - - md5sum - ea394402d4d4af4c5238fe4e35c64389 - url - https://github.com/downloads/siana/SingularityViewer/apr_suite-1.4.2-windows-20110504.tar.bz2 - - - - ares - - copyright - Copyright 1998 by the Massachusetts Institute of Technology. - description - Performs DNS requests and name resolves asynchronously. Used with libcurl to keep all HTTP operations async. - license - c-ares - packages - - darwin - - md5sum - ad736bc1558c37ca6648bc7e72047faa - url - https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-darwin-20100606.tar.bz2 - - linux - - md5sum - c6953535222475e248d57fa9c2eec5cf - url - https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-linux-20100527.tar.bz2 - - linux64 - - md5sum - f7cbf2b6e74de4556148663b93ead4d3 - url - https://github.com/downloads/Shyotl/SingularityViewer/ares-1.3.0-linux64-20080909.tar.bz2 - - windows - - md5sum - e4ab04da7db20ba388f2109e84f0fcda - url - https://github.com/downloads/siana/SingularityViewer/ares-1.7.1-windows-20110504.tar.bz2 - - - - artwork-common - - copyright - (C) 2008 Linden Research, Inc. - description - Second Life(TM) Viewer Artwork - license - artwork - packages - - common - - md5sum - a2cde4f24bdcc260b661e139846b8acd - url - http://imprudenceviewer.org/download/libs/imprudence-artwork-20101026.tar.bz2 - - - - berkeley - - copyright - Copyright (c) 1990-1999 Sleepycat Software. All rights reserved. - description - a high-performance, embedded database library - license - sleepycat - - boost - - copyright - various - description - A set of portable C++ libraries which provide a wide set of functionality. Used primarily for tokenization. - license - boost - packages - - darwin - - md5sum - 2cad51575b429be4fdadb5d63da1c739 - url - https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2 - - linux - - md5sum - a2d2fff5cc5555ffd9865daedfcd0dd5 - url - https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-linux-20110604.tar.bz2 - - windows - - md5sum - ce5ce1050d039ef5c233c4f684437b16 - url - https://bitbucket.org/Siana/singularityviewer/downloads/boost-1.45.0-windows-20120222.tar.bz2 - - - - curl - - copyright - Copyright (c) 1996 - 2008, Daniel Stenberg, <daniel@haxx.se>. - description - Client-side URL transfer library. Handles moving data across the net in many different protocols. Used to GET/POST/PUT/DELETE web resources. - license - curl - packages - - darwin - - md5sum - 525f6b18ea5af8fbd691c2ac1769056c - url - https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-darwin-20100606.tar.bz2 - - linux - - md5sum - 6244eec15fb26f9577785625fdb38f78 - url - https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-linux-20100527.tar.bz2 - - linux64 - - md5sum - 8a28849f4b9d99601dbc8db9d6a2f9ba - url - https://github.com/downloads/Shyotl/SingularityViewer/curl-7.16.4a-linux64-20090303.tar.bz2 - - windows - - md5sum - 60ed73408c4050ff9c96f26771fd6b46 - url - https://github.com/downloads/siana/SingularityViewer/curl-7.21.1-windows-20110504.tar.bz2 - - - - dbghelp - - copyright - Copyright Microsoft Corporation - description - dbghelp: Debug helper from Microsoft Debugging Tools For Windows - license - MSDTW - packages - - windows - - md5sum - b7563064037e032143ca2d610aae5153 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbghelp-6.11.1.404-windows-20090520.tar.bz2 - - - - dbusglib - - copyright - Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. - description - dbus/dbus-glib: headers only - license - AFL2.1 - packages - - linux - - md5sum - 5bbf7e33dadc7d046dcf44883a9ec3d0 - url - http://imprudenceviewer.org/download/libs/dbusglib-linux-20101031.tar.bz2 - - linux64 - - md5sum - 09be41e3145e1a960e50f2f9ce0a5e7d - url - http://imprudenceviewer.org/download/libs/dbusglib-linux64-20101007.tar.bz2 - - - - elfio - - license - lgpl - packages - - linux - - md5sum - 82ea408af2f968cfe5f013ab241323ef - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/elfio-1.0.3-linux-20080812.tar.bz2 - - linux64 - - md5sum - e829a52ba67e02b011cf2e372914d32f - url - http://imprudenceviewer.org/download/libs/elfio-1.0.3-linux64-20091129.tar.bz2 - - - - expat - - copyright - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - description - An XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags). - license - mit - packages - - darwin - - md5sum - c457a0a041ac4946265889a503d26c3d - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20090805.tar.bz2 - - linux - - md5sum - 67b470fd446b08c9831d1039674eae4e - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux-20080812.tar.bz2 - - linux64 - - md5sum - 278c61871419b9a4d50a4f88b7922403 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux64-20080909.tar.bz2 - - windows - - md5sum - 74494ba202b3d2cd74e4032716f4bf1b - url - https://github.com/downloads/siana/SingularityViewer/expat-2.0.1-windows-20110504.tar.bz2 - - - - fontconfig - - license - mit - packages - - linux - - md5sum - 9af6a1ed39fa540bfcaa402b0ea22f78 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fontconfig-2.2.3-linux-20080613.tar.bz2 - - - - freeglut - - license - mit - packages - - windows - - md5sum - fcbb695ff203775fad96d184bf5f34fc - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freeglut-2.4.0-windows-20090608.tar.bz2 - - - - freetype - - copyright - Copyright - description - Font - license - freetype - packages - - darwin - - md5sum - 2849e9dd6f26294371a27197972fd1cf - url - https://github.com/downloads/siana/SingularityViewer/freetype-2.4.4-darwin-20111010.tar.bz2 - - linux - - md5sum - efc845cf291073b1e4d381a271f194eb - url - http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux-20091103.tar.bz2 - - linux64 - - md5sum - 1b4624ab06a7ba30e29d1994424db41e - url - http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux64-20091230.tar.bz2 - - windows - - md5sum - c1fec2f5a4924b75ca6047edfcc91eba - url - https://github.com/downloads/siana/SingularityViewer/freetype-2.4.4-windows-20110504.tar.bz2 - - - - glh_linear - - copyright - Copyright (c) 2000 Cass Everitt; Copyright (c) 2000 NVIDIA Corporation; All rights reserved. - description - nVidia NVParse SDK: platform-indepenedent C++ Apple OpenGL helper library - license - glh_linear - packages - - darwin - - md5sum - 23bd9a75e5a2365a827461e6c324f52b - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-darwin-20080613.tar.bz2 - - linux - - md5sum - 23bd9a75e5a2365a827461e6c324f52b - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080812.tar.bz2 - - linux64 - - md5sum - 2965646aea1d2a6aec1fbc431c02733f - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080613.tar.bz2 - - windows - - md5sum - 38b9ddfe8dceff55ee4351016a937d1b - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-windows-20080613.tar.bz2 - - - - glib - - description - GLib is a library containing many useful C routines for things such as trees, hashes, and lists. - license - gpl - packages - - darwin - - md5sum - 64a131bae070964de6431e1c7d5e7362 - url - http://imprudenceviewer.org/download/libs/glib-2.12.0-darwin-20091107.tar.bz2 - - linux - - md5sum - 566cc47a572303bc4aef12ca02670902 - url - http://imprudenceviewer.org/download/libs/glib-2.20.5-linux32-20100529.tar.bz2 - - linux64 - - md5sum - 58c11add6b275c163950364df5b2964a - url - http://imprudenceviewer.org/download/libs/glib-2.20.5-linux64-20100515.tar.bz2 - - windows - - md5sum - b1e0e16472c0e5d3b6291870e3f20b0c - url - http://imprudenceviewer.org/download/libs/glib-2.18.4-windows-03162009.tar.bz2 - - - - glui - - license - lgpl - packages - - darwin - - md5sum - 84f792a860691d0fad6d1de6eeb31baa - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.36-darwin-20090623a.tar.bz2 - - windows - - md5sum - 5b8631fe510d4ebaeb965c673937e1e7 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.3.6-windows-freeglut-20090608.tar.bz2 - - - - google - - license - mit - packages - - linux - - md5sum - b190d8a0dce8dd8b514d2adb2c74b8d8 - url - http://sldev.free.fr/libraries/google-perftools-1.8.3-linux-20110924.tar.bz2 - - windows - - md5sum - 4f787437a5e063ccde6637dfb1ebc01d - url - https://bitbucket.org/Ansariel/phoenix-prebuilts/downloads/google_perftools-1.8-windows-20111005.tar.bz2 - - - - gstreamer - - license - lgpl - packages - - linux - - md5sum - 2cd3f6499f8444f1d119d097e4047252 - url - http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux-20091125.tar.bz2 - - linux64 - - md5sum - 7e6fc4e185e8444a07b58ba7c0df255a - url - http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux64-20091230.tar.bz2 - - - - gtk-atk-pango-glib - - copyright - Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - description - Libraries associated with GTK for gui features. atk: interfaces for accessibility; glib: low-level core functionality for using GTK+ and GNOME; pango: layout/rendering of text w/ emphasis on internationalization. - license - lgpl - packages - - linux - - md5sum - 349ee367e0ac1e878b24b66e449c6ff8 - url - http://imprudenceviewer.org/download/libs/gtk-etc-linux-20101106.1.tar.bz2 - - windows - - md5sum - d963750bcd333a108b3697d220c87d09 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-windows-20080613.tar.bz2 - - - - glib - - description - GLib is a library containing many useful C routines for things such as trees, hashes, and lists. - license - gpl - packages - - darwin - - md5sum - 64a131bae070964de6431e1c7d5e7362 - url - http://imprudenceviewer.org/download/libs/glib-2.12.0-darwin-20091107.tar.bz2 - - linux - - md5sum - 566cc47a572303bc4aef12ca02670902 - url - http://imprudenceviewer.org/download/libs/glib-2.20.5-linux32-20100529.tar.bz2 - - linux64 - - md5sum - 58c11add6b275c163950364df5b2964a - url - http://imprudenceviewer.org/download/libs/glib-2.20.5-linux64-20100515.tar.bz2 - - windows - - md5sum - b1e0e16472c0e5d3b6291870e3f20b0c - url - http://imprudenceviewer.org/download/libs/glib-2.18.4-windows-03162009.tar.bz2 - - - - hunspell - - copyright - various - description - A open source spell check library - license - lgpl - packages - - windows - - md5sum - 1eb49bf9bcce30f5fe0dddaed2a3c628 - url - http://imprudenceviewer.org/download/libs/windows_hunspell.tar.bz2 - - linux - - md5sum - dbe264ef2e932980e31db646ea29bbe7 - url - http://imprudenceviewer.org/download/libs/hunspell-1.2-linux32-20100902.tar.bz2 - - linux64 - - md5sum - 5388725d012c3bfabcc420be53442018 - url - http://imprudenceviewer.org/download/libs/hunspell-1.2-linux64-20100902.tar.bz2 - - darwin - - md5sum - 9b970abfc9df40ad6d183a4b1f732fb2 - url - http://imprudenceviewer.org/download/libs/hunspell-1.2-darwin.tar.gz - - - - dbusglib - - copyright - Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. - description - dbus/dbus-glib: headers only - license - AFL2.1 - packages - - linux - - md5sum - 5bbf7e33dadc7d046dcf44883a9ec3d0 - url - http://imprudenceviewer.org/download/libs/dbusglib-linux-20101031.tar.bz2 - - linux64 - - md5sum - 09be41e3145e1a960e50f2f9ce0a5e7d - url - http://imprudenceviewer.org/download/libs/dbusglib-linux64-20101007.tar.bz2 - - - - jpeglib - - copyright - Copyright (c) 2003, Yves Piguet. - description - An open-source JPEG (JFIF) library - license - jpeglib - packages - - darwin - - md5sum - 8d38d74c481e9aab4518c8f2a7d52800 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20080812.tar.bz2 - - linux - - md5sum - 8aa8e01e0c21f60f0ede0ffb04e9214f - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-linux-20081218.tar.bz2 - - linux64 - - md5sum - 0e7facf7d48531d20c0cd6a3c3f04021 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-linux64-20080909.tar.bz2 - - windows - - md5sum - e4dfbea847d92b46e3d2d1a2c25fe3b3 - url - https://github.com/downloads/siana/SingularityViewer/jpeglib-8c-windows-20110504.tar.bz2 - - - - jsoncpp - - copyright - json-cpp library released to Public Domain by Baptiste Lepilleur <blep@users.sourceforge.net> - description - jsoncpp is an implementation of a JSON (http://json.org) reader and writer in C++. - license - jsoncpp - packages - - darwin - - md5sum - 4c6b949778099a63550898f00f3e6a5e - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-darwin-20090923.tar.bz2 - - linux - - md5sum - a2a94b8ca1d32f23e3e668d64023514e - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux-20090922.tar.bz2 - - linux64 - - md5sum - a06ab38628ab7b53b8f3326cd942a6a8 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux64-20090922.tar.bz2 - - windows - - md5sum - 91e081c4b7b4949c4e53849182a42370 - url - https://github.com/downloads/siana/SingularityViewer/jsoncpp-0.5.0-windows-20110320.tar.bz2 - - - - libmono - - copyright - (C) 2005 Novell, Inc. http://www.novell.com - description - An open source implementation of the ECMA/ISO ECMA-334 Common L\ -anguage Infrstructure (CLI) international standard - license - lgpl - packages - - darwin - - md5sum - 39a803fcbe6f11b72358fc78b7777b6c - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libmono-darwin-20080724.tar.bz2 - - linux - - md5sum - 9bc0f8b7d5e0ff194b6d5635daf9ae3a - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libmono-1.2.6-linux-20080816a.tar.bz2 - - linux64 - - md5sum - 451521b4cb57c35caf3efb8dcf99b99e - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libmono-1.2.6-linux64-20080926.tar.bz2 - - windows - - md5sum - 6712a09311a914752f47d5d62562a239 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libmono-1.2.6-windows-20080903.tar.bz2 - - - - libpng - - copyright - Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson - description - An open, extensible image format with lossless compression. PNG Reference Library - license - libpng - packages - - darwin - - md5sum - 82659b48831cbf58bf04b86602939e0b - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-darwin-20090304.tar.bz2 - - linux - - md5sum - f5e84c991f6e3caacb26db259593cbea - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-linux-20090304.tar.bz2 - - linux64 - - md5sum - 5ee1e62bde38520c7f134c4afb9ac9b1 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-linux64-20090304.tar.bz2 - - windows - - md5sum - acf1626a563b2827a7f62d48661352c8 - url - https://github.com/downloads/siana/SingularityViewer/libpng-1.5.2-windows-20110512.tar.bz2 - - - - libuuid - - copyright - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - description - Generates UUIDs under Linux. Originally a part of the ext2fs filesystem. Also see lluuid.cpp for all platforms. Part of the e2fsprogs package. - license - lgpl - packages - - linux - - md5sum - 91b194aed4b38bc23493b198009a8c6a - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20090417.tar.bz2 - - - - libxml - - license - mit - packages - - linux - - md5sum - 4b5d2dcfe8a49b73fb69f10aab441092 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20080613.tar.bz2 - - linux64 - - md5sum - 921d7f980519101afb74623e29e9d175 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux64-20080909.tar.bz2 - - - - llqtwebkit - - license - lgpl - packages - - darwin - - md5sum - c983326e0fbe1b77ffc9e006a4c9bee2 - url - https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-darwin-20110317.tar.bz2 - - linux - - md5sum - 6e422a3548597a043223de9e9384c734 - url - https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-linux-20111013.tar.bz2 - - windows - - md5sum - 999b265a3af47eb13e9a380d042a1763 - url - https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-windows-20110320.tar.bz2 - - - - mesa - - copyright - Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - description - Mesa 3-D graphics library. Provides the required Apple OpenGL headers under Linux. - license - mesa - packages - - linux - - md5sum - 70d0bbe1145fff29a0131349c898260e - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20080812.tar.bz2 - - linux64 - - md5sum - 56630977f9261bd82039b0da08a0685c - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-6.2.1-linux64-20081016.tar.bz2 - - windows - - md5sum - 82cdcdcb2d0615389a7480485ea35f4c - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-windows-20080613.tar.bz2 - - - - ndofdev - - copyright - Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved. - description - in use on windows and darwin for joystick support. - license - linden - packages - - darwin - - md5sum - 17999c47e17f2dd9e12a22372ce8ff14 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-darwin-20080812.tar.bz2 - - linux - - md5sum - 38abfe002ba073b6824016db98269972 - url - http://imprudenceviewer.org/download/libs/ndofdev-linux32-0.3.1-20100817.tar.bz2 - - linux64 - - md5sum - d1986d287655f159be50d661c125ba19 - url - http://imprudenceviewer.org/download/libs/ndofdev-linux64-0.3.1-20100817.tar.bz2 - - windows - - md5sum - 383ce3f78ae3e6afa39ee9ced6d8e531 - url - https://github.com/downloads/siana/SingularityViewer/libndofdev-windows-20110504.tar.bz2 - - - - ogg-vorbis - - copyright - Copyright (C) 2008 Xiph.org Foundation - description - Ogg: container format Vorbis: audio compression scheme - license - xiph-bsd - packages - - darwin - - md5sum - 5a154313bc30eacd8cfa1acd852ecd3e - url - https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-darwin-20110616.tar.bz2 - - linux - - md5sum - 712b1d30790e9de83fea84ec3bc8fab0 - url - https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-linux-20110616.tar.bz2 - - linux64 - - md5sum - 83c72b57a95e8c42560fb67955169f19 - url - http://imprudenceviewer.org/download/libs/ogg-vorbis-linux64-20091202.tar.bz2 - - windows - - md5sum - 30bb58af8c5f818fc8ea8d481bd2f478 - url - https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-windows-20110512.tar.bz2 - - - - openSSL - - license - openSSL - packages - - darwin - - md5sum - a7b49e0f3eedbd5de117a3524c414b3a - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-darwin-20080812.tar.bz2 - - linux - - md5sum - f219ef07b02e2abb9282345c3a8f2b39 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-linux-20080812.tar.bz2 - - linux64 - - md5sum - 00b23f28a2457d9dabbaff0b29ee7323 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8g-linux64-20080909.tar.bz2 - - windows - - md5sum - dd85209081b832e836de6e1538541d89 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8j-windows-20090129.tar.bz2 - - - - openal-soft - - copyright - Copyright (C) 2008 by authors. - description - 3D Audio library - license - lgpl - packages - - darwin - - md5sum - a0757244e3e6688fde2ffeea35cc1f96 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-darwin-20080924.tar.bz2 - - linux - - md5sum - 3cf31623dc214b163fb79aab7f4c024b - url - https://github.com/downloads/siana/SingularityViewer/openal-linux-120202.tar.bz2 - - linux64 - - md5sum - 5ad0a3ab623356c1ad61394ba238f99f - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-soft-1.6.372-linux64-20081219.tar.bz2 - - windows - - md5sum - a0757244e3e6688fde2ffeea35cc1f96 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-windows-20080924.tar.bz2 - - - - pulseaudio - - copyright - Copyright 2004-2006 Lennart Poettering, Copyright 2006 Pierre Ossman (ossman@cendio.se) for Cendio AB - description - pulseaudio: headers only - license - lgpl - packages - - linux - - md5sum - 30cb00069fe2a545fbf7be1070386236 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2 - - - - tut - - copyright - Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008 Michal Rzechonek - description - C++ Template Unit Test - license - bsd - packages - - common - - md5sum - a1b8a118ba9df1f2a73f6aafa7980e83 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-2008-11-30-common-20081208.tar.bz2 - - - - unistd - - copyright - (c) 2008 Linden Lab. - description - Placeholder file to make flex happy on windows. - license - linden - packages - - windows - - md5sum - 6353aff33d7d03b22055aec76f53a866 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/unistd-windows-20080611.tar.bz2 - - - - vivox - - copyright - - license - vivox - packages - - darwin - - md5sum - 8675b5eedef038b514338b17f0e55961 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-darwin-20090309.tar.bz2 - - linux - - md5sum - 01573510dce7f380f44e561ef2f3dd9f - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2 - - linux64 - - md5sum - 01573510dce7f380f44e561ef2f3dd9f - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2 - - windows - - md5sum - 752daa90e07c05202d1f76980cb955eb - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-windows-20090309.tar.bz2 - - - - 32bitcompatibilitylibs - - copyright - Copyrights: Libidn: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 - Simon Josefsson. License GPL v3.0. - Freealut, libuuid, openal-soft: see copyright and license of the - according main packages. - - description - 32bit libraries needed for using voice - license - gpl - packages - - linux64 - - md5sum - cbaafc55fb8b14283541791e82f13462 - url - http://imprudenceviewer.org/download/libs/linux64-32bitcompatibilitylibs-20100903.tar.bz2 - - - - xmlrpc-epi - - copyright - Copyright 2000 Epinions, Inc. - description - Implementation of the xmlrpc protocol in C that provides an API for developers to serialize RPC requests to and from XML. - license - xmlrpc-epi - packages - - darwin - - md5sum - 2d3a918c88d756422c1a8139ebe15f56 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-darwin-20080812.tar.bz2 - - linux - - md5sum - 84a219199240ea70f54439c02acef0cd - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-linux-20080812.tar.bz2 - - linux64 - - md5sum - dc67b896c56116df8e18f2d1bbd07031 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-linux64-20080909.tar.bz2 - - windows - - md5sum - 2faea7fe8fa66872793e0ea917c33e2e - url - https://github.com/downloads/siana/SingularityViewer/xmlrpc_epi-0.54.1-windows-20110504.tar.bz2 - - - - zlib - - copyright - Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler - description - A Massively Spiffy Yet Delicately Unobtrusive Compression Library (Also Free, Not to Mention Unencumbered by Patents) - license - zlib - packages - - darwin - - md5sum - 58ef62004b508b234039f6a313d852eb - url - https://github.com/downloads/LightDrake/SingularityViewer/zlib-1.2.5-darwin-20110211.tar.bz2 - - linux - - md5sum - 26fe88213c213dc6153690ab142c25ca - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3dfsg-linux-20091208.tar.bz2 - - linux64 - - md5sum - 4bddfb2c6dd7b1470a3ed675ac14bd9a - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-linux64-20080909.tar.bz2 - - windows - - md5sum - 7fc3539a45054e91b7e225cc3888f838 - url - https://github.com/downloads/siana/SingularityViewer/zlib-1.2.5-windows-20110504.tar.bz2 - - - - - licenses - - AFL2.1 - - url - http://opensource-definition.org/licenses/afl-2.1.html - - glext - - text - Copyright (c) 2007-2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Materials. - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - - - freeglut - - text - Freeglut Copyright ------------------- - -Freeglut code without an explicit copyright is covered by the following -copyright: - -Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies or substantial portions of the Software. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of Pawel W. Olszta shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from Pawel W. Olszta. - - - MSDTW - - text - MICROSOFT SOFTWARE LICENSE TERMS -MICROSOFT DEBUGGING TOOLS FOR WINDOWS -These license terms are an agreement between Microsoft Corporation (or based on where you live, one of -its affiliates) and you. Please read them. They apply to the software named above, which includes the -media on which you received it, if any. The terms also apply to any Microsoft -* updates, -* supplements, -* Internet-based services -* support services, and -* Debugging symbol files that you may access over the internet -for this software, unless other terms accompany those items. If so, those terms apply. -By using the software, you accept these terms. If you do not accept them, do not use the -software. -If you comply with these license terms, you have the rights below. -1. INSTALLATION AND USE RIGHTS. One user may install and use any number of copies of the -software on your devices to design, develop, debug and test your programs. -2. ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. Distributable Code. The software contains code that you are permitted to distribute in programs -you develop if you comply with the terms below. -i. Right to Use and Distribute. The code and text files listed below are “Distributable Code.” -* REDIST.TXT Files. You may copy and distribute the object code form of code listed in -REDIST.TXT files. -* Sample Code. You may modify, copy, and distribute the source and object code form of -code marked as “sample.” -* Third Party Distribution. You may permit distributors of your programs to copy and -distribute the Distributable Code as part of those programs. -ii. Distribution Requirements. For any Distributable Code you distribute, you must -* add significant primary functionality to it in your programs; -* require distributors and external end users to agree to terms that protect it at least as much -as this agreement; -* display your valid copyright notice on your programs; and -* indemnify, defend, and hold harmless Microsoft from any claims, including attorneys’ fees, -related to the distribution or use of your programs. -iii. Distribution Restrictions. You may not -* alter any copyright, trademark or patent notice in the Distributable Code; -* distribute any symbol files which you may access or use under these license terms for the -software; -* use Microsoft’s trademarks in your programs’ names or in a way that suggests your -programs come from or are endorsed by Microsoft; -* distribute Distributable Code to run on a platform other than the Windows platform; -* include Distributable Code in malicious, deceptive or unlawful programs; or -* modify or distribute the source code of any Distributable Code so that any part of it -becomes subject to an Excluded License. An Excluded License is one that requires, as a -condition of use, modification or distribution, that -* the code be disclosed or distributed in source code form; or -* others have the right to modify it. -3. SCOPE OF LICENSE. The software is licensed, not sold. This agreement only gives you some rights -to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights -despite this limitation, you may use the software only as expressly permitted in this agreement. In -doing so, you must comply with any technical limitations in the software that only allow you to use it in -certain ways. You may not -* work around any technical limitations in the software; -* reverse engineer, decompile or disassemble the software, except and only to the extent that -applicable law expressly permits, despite this limitation; -* make more copies of the software than specified in this agreement or allowed by applicable law, -despite this limitation; -* publish the software for others to copy; -* rent, lease or lend the software; -* transfer the software or this agreement to any third party; or -* use the software for commercial software hosting services. -4. INTERNET-BASED SERVICES. Microsoft provides Internet-based services with the software. It may -change or cancel them at any time. -a. Consent for Internet-Based Services. The software contains features which may connect to -Microsoft or service provider computer systems over the Internet. In some cases, you will not -receive a separate notice when they connect. You may switch these features on or you may -choose not to use them. For more information about these features, see -http://www.microsoft.com/info/privacy/default.mspx. By using these features, you consent to the transmission of -this information. Microsoft does not use the information to identify or contact you. -b. Misuse of Internet-based Services. You may not use these services in any way that could -harm them or impair anyone else’s use of them. You may not use the services to try to gain -unauthorized access to any service, data, account or network by any means. - -5. BACKUP COPY. You may make one backup copy of the software. You may use it only to reinstall the -software. -6. DOCUMENTATION. Any person that has valid access to your computer or internal network may copy -and use the documentation for your internal, reference purposes. -7. EXPORT RESTRICTIONS. The software is subject to United States export laws and regulations. You -must comply with all domestic and international export laws and regulations that apply to the software. -These laws include restrictions on destinations, end users and end use. For additional information, see -www.microsoft.com/exporting. -8. SUPPORT SERVICES. Because this software is “as is,” we may not provide support services for it. -9. ENTIRE AGREEMENT. This agreement, and the terms for supplements, updates, Internet-based -services and support services that you use, are the entire agreement for the software and support -services. -10. APPLICABLE LAW. -a. United States. If you acquired the software in the United States, Washington state law governs -the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of -laws principles. The laws of the state where you live govern all other claims, including claims under -state consumer protection laws, unfair competition laws, and in tort. -b. Outside the United States. If you acquired the software in any other country, the laws of that -country apply. -11. LEGAL EFFECT. This agreement describes certain legal rights. You may have other rights under the -laws of your country. You may also have rights with respect to the party from whom you acquired the -software. This agreement does not change your rights under the laws of your country if the laws of -your country do not permit it to do so. -12. DISCLAIMER OF WARRANTY. The software is licensed “as-is.” You bear the risk of using -it. Microsoft gives no express warranties, guarantees or conditions. You may have -additional consumer rights under your local laws which this agreement cannot change. To -the extent permitted under your local laws, Microsoft excludes the implied warranties of -merchantability, fitness for a particular purpose and non-infringement. -13. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. You can recover from -Microsoft and its suppliers only direct damages up to U.S. $5.00. You cannot recover any -other damages, including consequential, lost profits, special, indirect or incidental -damages. -This limitation applies to -* anything related to the software, services, content (including code) on third party Internet sites, or -third party programs; and -* claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, -or other tort to the extent permitted by applicable law. -It also applies even if Microsoft knew or should have known about the possibility of the damages. The -above limitation or exclusion may not apply to you because your country may not allow the exclusion or -limitation of incidental, consequential or other damages. - - - apache 2.0 - - url - http://www.apache.org/licenses/LICENSE-2.0 - - artwork - - text - COPYRIGHT AND PERMISSION NOTICE - -Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. - -Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer -artwork and other works in the files distributed with this Notice under -the Creative Commons Attribution-Share Alike 3.0 License, available at -http://creativecommons.org/licenses/by-sa/3.0/legalcode. For the license -summary, see http://creativecommons.org/licenses/by-sa/3.0/. - -Notwithstanding the foregoing, all of Linden Lab's trademarks, including -but not limited to the Second Life brand name and Second Life Eye-in-Hand -logo, are subject to our trademark policy at -http://secondlife.com/corporate/trademark/. - -If you distribute any copies or adaptations of the Second Life viewer -artwork or any other works in these files, you must include this Notice -and clearly identify any changes made to the original works. Include -this Notice and information where copyright notices are usually included, -for example, after your own copyright notice acknowledging your use of -the Second Life viewer artwork, in a text file distributed with your -program, in your application's About window, or on a credits page for -your work. - - url - http://svn.secondlife.com/svn/linden/trunk/doc/LICENSE-logos.txt - - boost - - url - http://www.boost.org/LICENSE_1_0.txt - - bsd - - url - http://www.opensource.org/licenses/bsd-license.php - - c-ares - - text - http://daniel.haxx.se/projects/c-ares/license.html - - curl - - url - http://curl.haxx.se/docs/copyright.html - - fmod - - url - http://www.fmod.org/ifmodlicense.html - - freetype - - url - http://freetype.sourceforge.net/FTL.TXT - - glh_linear - - text - glh - is a platform-indepenedent C++ OpenGL helper library - -Copyright (c) 2000 Cass Everitt -Copyright (c) 2000 NVIDIA Corporation -All rights reserved. - -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the following -conditions are met: - -Redistributions of source code must retain the above -copyright notice, this list of conditions and the following -disclaimer. -Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following -disclaimer in the documentation and/or other materials -provided with the distribution. -The names of contributors to this software may not be used -to endorse or promote products derived from this software -without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -Cass Everitt - cass@r3.nu - - - - glut - - url - http://www.xmission.com/~nate/glut/README-win32.txt - - gpl - - url - http://www.gnu.org/licenses/gpl.html - - havok - - text - on file - - intel - - text - Haven't yet found. - - - jpeglib - - text - http://nyctergatis.com/jpeglib/ - - jsoncpp - - text - The json-cpp library and this documentation are in Public Domain. Retrieved from http://jsoncpp.sourceforge.net/ on 2009-09-04. - url - http://jsoncpp.sourceforge.net - - kdu - - text - jpeg2000 license #00024 (on file) - - lgpl - - url - http://www.gnu.org/copyleft/lgpl.html - - libpng - - text - http://www.libpng.org/pub/png/src/libpng-LICENSE.txt - - linden - - text - Using this license for Linden Lab owned library files - - mesa - - url - http://www.mesa3d.org/license.html - - mit - - text - http://www.jclark.com/xml/copying.txt - - ogg-vorbis - - url - http://www.xiph.org/licenses/bsd/ - - openSSL - - url - http://www.openssl.org/source/license.html - - openjpeg - - url - http://www.openjpeg.org/BSDlicense.txt - - quicktime - - text - ENGLISH - -Apple Computer, Inc. -QuickTime 7 Software Developer Kit (SDK) -Software License Agreement - -PLEASE READ THIS SOFTWARE LICENSE AGREEMENT ("LICENSE") BEFORE USING THE SOFTWARE. BY USING THE SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS LICENSE. IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, SIGNIFY YOUR AGREEMENT TO BE BOUND BY THE TERMS OF THIS LICENSE BY CLICKING THE "AGREE/ACCEPT" BUTTON. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENSE, RETURN THE APPLE SOFTWARE TO THE PLACE WHERE YOU OBTAINED IT FOR A REFUND OR, IF THE SOFTWARE WAS ACCESSED ELECTRONICALLY, CLICK "DISAGREE/DECLINE". - -IMPORTANT NOTE: To the extent this software may be used to reproduce materials, it is licensed to you only for reproduction of materials you are authorized or legally permitted to reproduce. - -1. License. Any software, tools, utilities, sample code, documentation, fonts, API?s, header files and other materials accompanying this License, whether on disk, print or electronic documentation, in read only memory, or any other media, (collectively, the "Apple Software") are licensed, not sold, to you by Apple Computer, Inc. ("Apple") for use only under the terms of this License, and Apple reserves all rights not expressly granted to you. The rights granted herein are limited to Apple's and its licensors' intellectual property rights in the Apple Software and do not include any other patents or intellectual property rights. You own the media on which the Apple Software is recorded but Apple and/or Apple's licensor(s) retain ownership of the Apple Software itself. The Apple Software in this package and any copies, modifications and derivative works that this License authorizes you to make are subject to this License. - -2. Permitted Uses and Restrictions. You may use the Apple Software to develop application software that is compatible with, and runs only on Mac OS X and/or Windows platforms with QuickTime installed. Except for compiling header files and linking libraries as necessary to build your application software, you have no right to modify, incorporate into or include in combination with your own programs, license or otherwise redistribute any portion of the Apple Software. Your software application may not interfere with the functionality of QuickTime Player or the QuickTime Plug-in, including but not limited to file type or MIME type associations that are registered to QuickTime. You may make only as many internal use copies of the Apple Software as reasonably necessary to use the Apple Software as permitted in this paragraph and distribute such copies only to your employees whose job duties require them to so use the Apple Software. You must reproduce on each copy of the Apple Software or portion thereof, the Apple copyright notice and any other proprietary legends that were on the original copy of the Apple Software. Except as expressly permitted in this License, you may not decompile, reverse engineer, disassemble, modify, rent, lease, loan, sublicense, distribute or create derivative works based upon the Apple Software in whole or part. Your rights under this License will terminate automatically without notice from Apple if you fail to comply with any term(s) of this License. In addition, Apple reserves the right to terminate this License if a new version of Apple's operating system software or the Apple Software is released which is incompatible with the Apple Software. - -3. Disclaimer Of Warranty. The Apple Software may be "alpha", "beta", "development", pre-release, untested, and/or not fully tested and may contain errors that could cause failures or loss of data, be incomplete or contain inaccuracies. YOU EXPRESSLY ACKNOWLEDGE AND AGREE THAT USE OF THE APPLE SOFTWARE IS AT YOUR SOLE RISK AND THAT THE ENTIRE RISK AS TO SATISFACTORY QUALITY, PERFORMANCE, ACCURACY AND EFFORT IS WITH YOU. EXCEPT FOR THE LIMITED WARRANTY ON MEDIA SET FORTH ABOVE AND TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE APPLE SOFTWARE IS PROVIDED "AS IS", WITH ALL FAULTS AND WITHOUT WARRANTY OF ANY KIND, AND APPLE AND APPLE'S LICENSORS (COLLECTIVELY REFERRED TO AS "APPLE" FOR THE PURPOSES OF SECTIONS 4 AND 5) HEREBY DISCLAIM ALL WARRANTIES AND CONDITIONS WITH RESPECT TO THE APPLE SOFTWARE, EITHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE, OF ACCURACY, OF QUIET ENJOYMENT, AND NON-INFRINGEMENT OF THIRD PARTY RIGHTS. APPLE DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE APPLE SOFTWARE, THAT THE FUNCTIONS CONTAINED IN THE APPLE SOFTWARE WILL MEET YOUR REQUIREMENTS, THAT THE OPERATION OF THE APPLE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT DEFECTS IN THE APPLE SOFTWARE WILL BE CORRECTED. NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE OR AN APPLE AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY. SHOULD THE APPLE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES OR LIMITATIONS ON APPLICABLE STATUTORY RIGHTS OF A CONSUMER, SO THE ABOVE EXCLUSION AND LIMITATIONS MAY NOT APPLY TO YOU. - -4. Limitation Of Liability. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT SHALL APPLE BE LIABLE FOR PERSONAL INJURY, OR ANY INCIDENTAL, SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES WHATSOEVER, INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF PROFITS, LOSS OF DATA, BUSINESS INTERRUPTION OR ANY OTHER COMMERCIAL DAMAGES OR LOSSES, ARISING OUT OF OR RELATED TO YOUR USE OR INABILITY TO USE THE APPLE SOFTWARE, HOWEVER CAUSED, REGARDLESS OF THE THEORY OF LIABILITY (CONTRACT, TORT OR OTHERWISE) AND EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY FOR PERSONAL INJURY, OR OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT APPLY TO YOU. In no event shall Apple's total liability to you for all damages (other than as may be required by applicable law in cases involving personal injury) exceed the amount of fifty dollars ($50.00). The foregoing limitations will apply even if the above stated remedy fails of its essential purpose. - -5. Export Control. You may not use or otherwise export or reexport the Apple Product except as authorized by United States law and the laws of the jurisdiction in which the Apple Product was obtained. In particular, but without limitation, the Apple Product may not be exported or re-exported (a) into any U.S. embargoed countries or (b) to anyone on the U.S. Treasury Department's list of Specially Designated Nationals or the U.S. Department of Commerce Denied Person?s List or Entity List. By using the Apple Product, you represent and warrant that you are not located in any such country or on any such list. - -6. Government End Users. The Apple Software and related documentation are "Commercial Items", as that term is defined at 48 C.F.R. ?2.101, consisting of "Commercial Computer Software" and "Commercial Computer Software Documentation", as such terms are used in 48 C.F.R. ?12.212 or 48 C.F.R. ?227.7202, as applicable. Consistent with 48 C.F.R. ?12.212 or 48 C.F.R. ?227.7202-1through 227.7202-4, as applicable, the Commercial Computer Software and Commercial Computer Software Documentation are being licensed to U.S. Government end users (a) only as Commercial Items and (b) with only those rights as are granted to all other end users pursuant to the terms and conditions herein. Unpublished-rights reserved under the copyright laws of the United States. - -7. Controlling Law and Severability. This License will be governed by and construed in accordance with the laws of the State of California, as applied to agreements entered into and to be performed entirely within California between California residents. This License shall not be governed by the United Nations Convention on Contracts for the International Sale of Goods, the application of which is expressly excluded. If for any reason a court of competent jurisdiction finds any provision, or portion thereof, to be unenforceable, the remainder of this License shall continue in full force and effect. - -8. Complete Agreement. This License constitutes the entire agreement between the parties with respect to the use of the Apple Software licensed hereunder and supersedes all prior or contemporaneous understandings regarding such subject matter. No amendment to or modification of this License will be binding unless in writing and signed by Apple. Any translation of this License is done for local requirements and in the event of a dispute between the English and any non-English versions, the English version of this License shall govern. - -EA0300 - - - sleepycat - - url - http://opensource.org/licenses/sleepycat.php - - smartheap - - text - on file - - - things - - - vivox - - text - on file - - xmlrpc-epi - - url - http://xmlrpc-epi.sourceforge.net/main.php?t=license - - xiph-bsd - - url - http://www.xiph.org/licenses/bsd/ - - zlib - - url - http://www.gzip.org/zlib/zlib_license.html - - - - + + + + installables + + 32bitcompatibilitylibs + + copyright + Copyrights: Libidn: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Simon Josefsson. License GPL v3.0. + Freealut, libuuid, openal-soft: see copyright and license of the + according main packages. + + description + 32bit libraries needed for using voice + license + gpl + packages + + linux64 + + md5sum + cbaafc55fb8b14283541791e82f13462 + url + http://imprudenceviewer.org/download/libs/linux64-32bitcompatibilitylibs-20100903.tar.bz2 + + + + GLOD + + copyright + Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia + description + GLOD + license + GLOD + packages + + linux + + md5sum + e84769e15f3d48ecbb07fa272c30365e + url + https://github.com/downloads/LightDrake/Public-Libraries/glod-1.0pre4-linux-20110611.tar.bz2 + + + + SDL + + copyright + Copyright (C) 1997-2009 Sam Lantinga + description + The Simple DirectMedia Layer libraries are used for handling input and basic window/GL setup on the Linux client. + license + lgpl + packages + + darwin + + md5sum + 7b07e7121a3623b2553ed36fb9024b40 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-darwin-20080818.tar.bz2 + + linux + + md5sum + 7806c04e09f0eb490c108bfab7731b7b + url + https://github.com/downloads/LightDrake/Public-Libraries/SDL-1.2.14-linux-20110309.tar.bz2 + + windows + + md5sum + 149626b0c10d7eb8b9f9be96b5318218 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-windows-20080613.tar.bz2 + + + + apr_suite + + license + apache 2.0 + packages + + darwin + + md5sum + 2486db13c5ed9340855da3c1c48772af + url + https://github.com/downloads/LightDrake/SingularityViewer/apr_suite-1.4.2-darwin-20110217.tar.bz2 + + linux + + md5sum + 471db9f761e5ee66b91e0e330e331f68 + url + https://github.com/downloads/LightDrake/Public-Libraries/apr_suite-1.4.5-linux-20120618.tar.bz2 + + linux64 + + md5sum + 1a7e1186855d48d8316ce86803095f70 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux64-20080909a.tar.bz2 + + windows + + md5sum + ea394402d4d4af4c5238fe4e35c64389 + url + https://github.com/downloads/siana/SingularityViewer/apr_suite-1.4.2-windows-20110504.tar.bz2 + + + + ares + + copyright + Copyright 1998 by the Massachusetts Institute of Technology. + description + Performs DNS requests and name resolves asynchronously. Used with libcurl to keep all HTTP operations async. + license + c-ares + packages + + darwin + + md5sum + ad736bc1558c37ca6648bc7e72047faa + url + https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-darwin-20100606.tar.bz2 + + linux + + md5sum + 6acb4fde2fe2e02e0a91ae2a2dac166a + url + https://github.com/downloads/LightDrake/Public-Libraries/ares-1.7.1-linux-20110310.tar.bz2 + + linux64 + + md5sum + f7cbf2b6e74de4556148663b93ead4d3 + url + https://github.com/downloads/Shyotl/SingularityViewer/ares-1.3.0-linux64-20080909.tar.bz2 + + windows + + md5sum + e4ab04da7db20ba388f2109e84f0fcda + url + https://github.com/downloads/siana/SingularityViewer/ares-1.7.1-windows-20110504.tar.bz2 + + + + boost + + copyright + various + description + A set of portable C++ libraries which provide a wide set of functionality. Used primarily for tokenization. + license + boost + packages + + darwin + + md5sum + 2cad51575b429be4fdadb5d63da1c739 + url + https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2 + + linux + + md5sum + 6e71c78873593aea2ec5c68dcfde0167 + url + https://github.com/downloads/LightDrake/Public-Libraries/boost-1.45.0-linux-20110604.tar.bz2 + + windows + + md5sum + ce5ce1050d039ef5c233c4f684437b16 + url + https://bitbucket.org/Siana/singularityviewer/downloads/boost-1.45.0-windows-20120222.tar.bz2 + + + + curl + + copyright + Copyright (c) 1996 - 2008, Daniel Stenberg, <daniel@haxx.se>. + description + Client-side URL transfer library. Handles moving data across the net in many different protocols. Used to GET/POST/PUT/DELETE web resources. + license + curl + packages + + darwin + + md5sum + 525f6b18ea5af8fbd691c2ac1769056c + url + https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-darwin-20100606.tar.bz2 + + linux + + md5sum + f35a301aa5e058b3fb15e69b984a0534 + url + https://github.com/downloads/LightDrake/Public-Libraries/curl-7.21.1-linux-20110316.tar.bz2 + + linux64 + + md5sum + 8a28849f4b9d99601dbc8db9d6a2f9ba + url + https://github.com/downloads/Shyotl/SingularityViewer/curl-7.16.4a-linux64-20090303.tar.bz2 + + windows + + md5sum + 60ed73408c4050ff9c96f26771fd6b46 + url + https://github.com/downloads/siana/SingularityViewer/curl-7.21.1-windows-20110504.tar.bz2 + + + + db + + copyright + Copyright (c) 1990, 2010 Oracle and/or its affiliates. All rights reserved. + description + a high-performance, embedded database library + license + bsd + packages + + linux + + md5sum + 3262d0a90b93c81e6fb650beb88cbdbb + url + https://github.com/downloads/LightDrake/Public-Libraries/db-5.1.25-linux-20110309.tar.bz2 + + + + dbghelp + + copyright + Copyright Microsoft Corporation + description + dbghelp: Debug helper from Microsoft Debugging Tools For Windows + license + MSDTW + packages + + windows + + md5sum + b7563064037e032143ca2d610aae5153 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbghelp-6.11.1.404-windows-20090520.tar.bz2 + + + + dbusglib + + copyright + Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. + description + dbus/dbus-glib: headers only + license + AFL2.1 + packages + + linux + + md5sum + 5bbf7e33dadc7d046dcf44883a9ec3d0 + url + http://imprudenceviewer.org/download/libs/dbusglib-linux-20101031.tar.bz2 + + linux64 + + md5sum + 09be41e3145e1a960e50f2f9ce0a5e7d + url + http://imprudenceviewer.org/download/libs/dbusglib-linux64-20101007.tar.bz2 + + + + elfio + + license + lgpl + packages + + linux + + md5sum + 048f301afc327d4502d2e5111c0dcba0 + url + https://github.com/downloads/LightDrake/Public-Libraries/elfio-1.0.3-linux-20110225.tar.bz2 + + linux64 + + md5sum + e829a52ba67e02b011cf2e372914d32f + url + http://imprudenceviewer.org/download/libs/elfio-1.0.3-linux64-20091129.tar.bz2 + + + + expat + + copyright + Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + description + An XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags). + license + mit + packages + + darwin + + md5sum + c457a0a041ac4946265889a503d26c3d + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20090805.tar.bz2 + + linux + + md5sum + 1a5b715652a5162145c18525196f7419 + url + https://github.com/downloads/LightDrake/Public-Libraries/expat-2.0.1-linux-20110219.tar.bz2 + + linux64 + + md5sum + 278c61871419b9a4d50a4f88b7922403 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux64-20080909.tar.bz2 + + windows + + md5sum + 74494ba202b3d2cd74e4032716f4bf1b + url + https://github.com/downloads/siana/SingularityViewer/expat-2.0.1-windows-20110504.tar.bz2 + + + + fontconfig + + license + mit + packages + + linux + + md5sum + 2f88d7924fb9fcc93e44139f0fe4880a + url + https://github.com/downloads/LightDrake/Public-Libraries/fontconfig-2.8.0-linux-20110311.tar.bz2 + + + + freeglut + + copyright + Copyright (c) 1999-2000 Pawel W. Olszta. + description + OpenSource alternative to OpenGL Utility Toolkit + license + freeglut + packages + + windows + + md5sum + fefd6b548d677a60a198e50d9326d939 + url + https://github.com/downloads/Shyotl/SingularityViewer/freeglut-2.6.0-win32.tar.bz2 + + + + freetype + + copyright + Copyright + description + Font + license + freetype + packages + + darwin + + md5sum + 2849e9dd6f26294371a27197972fd1cf + url + https://github.com/downloads/siana/SingularityViewer/freetype-2.4.4-darwin-20111010.tar.bz2 + + linux + + md5sum + efc845cf291073b1e4d381a271f194eb + url + http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux-20091103.tar.bz2 + + linux64 + + md5sum + 1b4624ab06a7ba30e29d1994424db41e + url + http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux64-20091230.tar.bz2 + + windows + + md5sum + c1fec2f5a4924b75ca6047edfcc91eba + url + https://github.com/downloads/siana/SingularityViewer/freetype-2.4.4-windows-20110504.tar.bz2 + + + + glext + + copyright + Copyright (c) 2007-2010 Khronos Group Inc. + description + OpenGL Extension Header Files + license + glext + packages + + linux + + md5sum + b94a97e60b37afee73f5525cd07ba959 + url + https://github.com/downloads/LightDrake/Public-Libraries/glext-82-win32-linux.tar.bz2 + + windows + + md5sum + b94a97e60b37afee73f5525cd07ba959 + url + https://github.com/downloads/LightDrake/Public-Libraries/glext-82-win32-linux.tar.bz2 + + + + glh_linear + + copyright + Copyright (c) 2000 Cass Everitt; Copyright (c) 2000 NVIDIA Corporation; All rights reserved. + description + nVidia NVParse SDK: platform-indepenedent C++ Apple OpenGL helper library + license + glh_linear + packages + + darwin + + md5sum + 23bd9a75e5a2365a827461e6c324f52b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-darwin-20080613.tar.bz2 + + linux + + md5sum + 23bd9a75e5a2365a827461e6c324f52b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080812.tar.bz2 + + linux64 + + md5sum + 2965646aea1d2a6aec1fbc431c02733f + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080613.tar.bz2 + + windows + + md5sum + 38b9ddfe8dceff55ee4351016a937d1b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-windows-20080613.tar.bz2 + + + + glib + + description + GLib is a library containing many useful C routines for things such as trees, hashes, and lists. + license + gpl + packages + + darwin + + md5sum + 64a131bae070964de6431e1c7d5e7362 + url + http://imprudenceviewer.org/download/libs/glib-2.12.0-darwin-20091107.tar.bz2 + + linux + + md5sum + 566cc47a572303bc4aef12ca02670902 + url + http://imprudenceviewer.org/download/libs/glib-2.20.5-linux32-20100529.tar.bz2 + + linux64 + + md5sum + 58c11add6b275c163950364df5b2964a + url + http://imprudenceviewer.org/download/libs/glib-2.20.5-linux64-20100515.tar.bz2 + + windows + + md5sum + b1e0e16472c0e5d3b6291870e3f20b0c + url + http://imprudenceviewer.org/download/libs/glib-2.18.4-windows-03162009.tar.bz2 + + + + glui + + license + lgpl + packages + + darwin + + md5sum + 84f792a860691d0fad6d1de6eeb31baa + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.36-darwin-20090623a.tar.bz2 + + windows + + md5sum + 5b8631fe510d4ebaeb965c673937e1e7 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.3.6-windows-freeglut-20090608.tar.bz2 + + + + gperftools + + license + mit + packages + + linux + + md5sum + c3e754fbff965bcc036d5c76f587e6be + url + https://github.com/downloads/LightDrake/Public-Libraries/google-perftools-1.8.3-linux-20120703.tar.bz2 + + windows + + md5sum + 4f787437a5e063ccde6637dfb1ebc01d + url + https://bitbucket.org/Ansariel/phoenix-prebuilts/downloads/google_perftools-1.8-windows-20111005.tar.bz2 + + + + gstreamer + + license + lgpl + packages + + linux + + md5sum + 5e6564f5102e3112781e3017c93e762f + url + https://github.com/downloads/LightDrake/Public-Libraries/gstreamer-0.10.24-linux-20091125.tar.bz2 + + linux64 + + md5sum + 7e6fc4e185e8444a07b58ba7c0df255a + url + http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux64-20091230.tar.bz2 + + + + gtk-atk-pango-glib + + copyright + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + description + Libraries associated with GTK for gui features. atk: interfaces for accessibility; glib: low-level core functionality for using GTK+ and GNOME; pango: layout/rendering of text w/ emphasis on internationalization. + license + lgpl + packages + + linux + + md5sum + e0eec19274dba0b58f5a1679d71f4204 + url + https://github.com/downloads/LightDrake/Public-Libraries/gtk-etc-linux-20101106.tar.bz2 + + windows + + md5sum + d963750bcd333a108b3697d220c87d09 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-windows-20080613.tar.bz2 + + + + hunspell + + copyright + various + description + A open source spell check library + license + lgpl + packages + + darwin + + md5sum + 9b970abfc9df40ad6d183a4b1f732fb2 + url + http://imprudenceviewer.org/download/libs/hunspell-1.2-darwin.tar.gz + + linux + + md5sum + dbe264ef2e932980e31db646ea29bbe7 + url + http://imprudenceviewer.org/download/libs/hunspell-1.2-linux32-20100902.tar.bz2 + + linux64 + + md5sum + 5388725d012c3bfabcc420be53442018 + url + http://imprudenceviewer.org/download/libs/hunspell-1.2-linux64-20100902.tar.bz2 + + windows + + md5sum + 1eb49bf9bcce30f5fe0dddaed2a3c628 + url + http://imprudenceviewer.org/download/libs/windows_hunspell.tar.bz2 + + + + jpeglib + + copyright + Copyright (c) 1991-2011, Thomas G. Lane, Guido Vollbeding + description + An open-source JPEG (JFIF) library + license + jpeglib + packages + + darwin + + md5sum + 8d38d74c481e9aab4518c8f2a7d52800 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20080812.tar.bz2 + + linux + + md5sum + e6a47cfe0a7610c57eb8c7cb4136ca09 + url + https://github.com/downloads/LightDrake/Public-Libraries/jpeglib-8c-linux-20110323.tar.bz2 + + linux64 + + md5sum + 0e7facf7d48531d20c0cd6a3c3f04021 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-linux64-20080909.tar.bz2 + + windows + + md5sum + e4dfbea847d92b46e3d2d1a2c25fe3b3 + url + https://github.com/downloads/siana/SingularityViewer/jpeglib-8c-windows-20110504.tar.bz2 + + + + jsoncpp + + copyright + json-cpp library released to Public Domain by Baptiste Lepilleur <blep@users.sourceforge.net> + description + jsoncpp is an implementation of a JSON (http://json.org) reader and writer in C++. + license + jsoncpp + packages + + darwin + + md5sum + 4c6b949778099a63550898f00f3e6a5e + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-darwin-20090923.tar.bz2 + + linux + + md5sum + e462fe4b2752f1c3d9300a0013243ec8 + url + https://github.com/downloads/LightDrake/Public-Libraries/jsoncpp-0.5.0-linux-20110315.tar.bz2 + + linux64 + + md5sum + a06ab38628ab7b53b8f3326cd942a6a8 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux64-20090922.tar.bz2 + + windows + + md5sum + 91e081c4b7b4949c4e53849182a42370 + url + https://github.com/downloads/siana/SingularityViewer/jsoncpp-0.5.0-windows-20110320.tar.bz2 + + + + libpng + + copyright + Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson + description + An open, extensible image format with lossless compression. PNG Reference Library + license + libpng + packages + + darwin + + md5sum + 82659b48831cbf58bf04b86602939e0b + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-darwin-20090304.tar.bz2 + + linux + + md5sum + 7953ff3422fb0f84c1c713db0b1aa9ca + url + https://github.com/downloads/LightDrake/Public-Libraries/libpng-1.5.1-linux-20110223.tar.bz2 + + linux64 + + md5sum + 5ee1e62bde38520c7f134c4afb9ac9b1 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-linux64-20090304.tar.bz2 + + windows + + md5sum + acf1626a563b2827a7f62d48661352c8 + url + https://github.com/downloads/siana/SingularityViewer/libpng-1.5.2-windows-20110512.tar.bz2 + + + + libuuid + + copyright + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + description + Generates UUIDs under Linux. Originally a part of the ext2fs filesystem. Also see lluuid.cpp for all platforms. Part of the e2fsprogs package. + license + lgpl + packages + + linux + + md5sum + ab4f25d8a2a30516cc77c47664bdf75f + url + https://github.com/downloads/LightDrake/Public-Libraries/libuuid-1.6.2-linux-20110315.tar.bz2 + + + + libxml + + license + mit + packages + + linux + + md5sum + 899ff969b1a82a6eea6b3ec85185942f + url + https://github.com/downloads/LightDrake/Public-Libraries/libxml-2.6.24-linux-20101013.tar.bz2 + + linux64 + + md5sum + 921d7f980519101afb74623e29e9d175 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux64-20080909.tar.bz2 + + + + llqtwebkit + + license + lgpl + packages + + darwin + + md5sum + c983326e0fbe1b77ffc9e006a4c9bee2 + url + https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-darwin-20110317.tar.bz2 + + linux + + md5sum + 307fdcc100ba95cfb12f35aab4fd0d08 + url + https://github.com/downloads/LightDrake/Public-Libraries/llqtwebkit-4.7.1-linux-20120228.tar.bz2 + + windows + + md5sum + 999b265a3af47eb13e9a380d042a1763 + url + https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-windows-20110320.tar.bz2 + + + + mesa + + copyright + Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + description + Mesa 3-D graphics library. Provides the required Apple OpenGL headers under Linux. + license + mesa + packages + + linux + + md5sum + 70d0bbe1145fff29a0131349c898260e + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20080812.tar.bz2 + + linux64 + + md5sum + 56630977f9261bd82039b0da08a0685c + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-6.2.1-linux64-20081016.tar.bz2 + + windows + + md5sum + 82cdcdcb2d0615389a7480485ea35f4c + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-windows-20080613.tar.bz2 + + + + ndofdev + + copyright + Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved. + description + in use on windows and darwin for joystick support. + license + linden + packages + + darwin + + md5sum + 17999c47e17f2dd9e12a22372ce8ff14 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-darwin-20080812.tar.bz2 + + linux + + md5sum + 38abfe002ba073b6824016db98269972 + url + http://imprudenceviewer.org/download/libs/ndofdev-linux32-0.3.1-20100817.tar.bz2 + + linux64 + + md5sum + d1986d287655f159be50d661c125ba19 + url + http://imprudenceviewer.org/download/libs/ndofdev-linux64-0.3.1-20100817.tar.bz2 + + windows + + md5sum + 383ce3f78ae3e6afa39ee9ced6d8e531 + url + https://github.com/downloads/siana/SingularityViewer/libndofdev-windows-20110504.tar.bz2 + + + + ogg-vorbis + + copyright + Copyright (C) 2008 Xiph.org Foundation + description + Ogg: container format Vorbis: audio compression scheme + license + xiph-bsd + packages + + darwin + + md5sum + 5a154313bc30eacd8cfa1acd852ecd3e + url + https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-darwin-20110616.tar.bz2 + + linux + + md5sum + 5317c7859cfa24d4e9114ac0411b2cc6 + url + https://github.com/downloads/LightDrake/Public-Libraries/ogg_vorbis-1.2.2-1.3.2-linux-20110511.tar.bz2 + + linux64 + + md5sum + 83c72b57a95e8c42560fb67955169f19 + url + http://imprudenceviewer.org/download/libs/ogg-vorbis-linux64-20091202.tar.bz2 + + windows + + md5sum + 30bb58af8c5f818fc8ea8d481bd2f478 + url + https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-windows-20110512.tar.bz2 + + + + openSSL + + license + openSSL + packages + + darwin + + md5sum + a7b49e0f3eedbd5de117a3524c414b3a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-darwin-20080812.tar.bz2 + + linux + + md5sum + 1eecd24e4d51b11110efee63b2928961 + url + https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0d-linux-20110418.tar.bz2 + + linux64 + + md5sum + 00b23f28a2457d9dabbaff0b29ee7323 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8g-linux64-20080909.tar.bz2 + + windows + + md5sum + dd85209081b832e836de6e1538541d89 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8j-windows-20090129.tar.bz2 + + + + openal-soft + + copyright + Copyright (C) 2008 by authors. + description + 3D Audio library + license + lgpl + packages + + darwin + + md5sum + a0757244e3e6688fde2ffeea35cc1f96 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-darwin-20080924.tar.bz2 + + linux + + md5sum + 0b257146f1a05dcae1ca2e0d79330e6b + url + https://github.com/downloads/LightDrake/Public-Libraries/openal-linux-20120202.tar.bz2 + + linux64 + + md5sum + 5ad0a3ab623356c1ad61394ba238f99f + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-soft-1.6.372-linux64-20081219.tar.bz2 + + windows + + md5sum + a0757244e3e6688fde2ffeea35cc1f96 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-windows-20080924.tar.bz2 + + + + pulseaudio + + copyright + Copyright 2004-2006 Lennart Poettering, Copyright 2006 Pierre Ossman (ossman@cendio.se) for Cendio AB + description + pulseaudio: headers only + license + lgpl + packages + + linux + + md5sum + 30cb00069fe2a545fbf7be1070386236 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2 + + + + tut + + copyright + Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008 Michal Rzechonek + description + C++ Template Unit Test + license + bsd + packages + + common + + md5sum + a1b8a118ba9df1f2a73f6aafa7980e83 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-2008-11-30-common-20081208.tar.bz2 + + + + unistd + + copyright + (c) 2008 Linden Lab. + description + Placeholder file to make flex happy on windows. + license + linden + packages + + windows + + md5sum + 6353aff33d7d03b22055aec76f53a866 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/unistd-windows-20080611.tar.bz2 + + + + vivox + + copyright + + license + vivox + packages + + darwin + + md5sum + 8675b5eedef038b514338b17f0e55961 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-darwin-20090309.tar.bz2 + + linux + + md5sum + 01573510dce7f380f44e561ef2f3dd9f + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2 + + linux64 + + md5sum + 01573510dce7f380f44e561ef2f3dd9f + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2 + + windows + + md5sum + 752daa90e07c05202d1f76980cb955eb + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-windows-20090309.tar.bz2 + + + + xmlrpc-epi + + copyright + Copyright 2000 Epinions, Inc. + description + Implementation of the xmlrpc protocol in C that provides an API for developers to serialize RPC requests to and from XML. + license + xmlrpc-epi + packages + + darwin + + md5sum + 2d3a918c88d756422c1a8139ebe15f56 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-darwin-20080812.tar.bz2 + + linux + + md5sum + d3b9f85ce4a04cd4c319a202c6367b2d + url + https://github.com/downloads/LightDrake/Public-Libraries/xmlrpc_epi-0.54.1-linux-20110314.tar.bz2 + + linux64 + + md5sum + dc67b896c56116df8e18f2d1bbd07031 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-linux64-20080909.tar.bz2 + + windows + + md5sum + 2faea7fe8fa66872793e0ea917c33e2e + url + https://github.com/downloads/siana/SingularityViewer/xmlrpc_epi-0.54.1-windows-20110504.tar.bz2 + + + + zlib + + copyright + Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler + description + A Massively Spiffy Yet Delicately Unobtrusive Compression Library (Also Free, Not to Mention Unencumbered by Patents) + license + zlib + packages + + darwin + + md5sum + 58ef62004b508b234039f6a313d852eb + url + https://github.com/downloads/LightDrake/SingularityViewer/zlib-1.2.5-darwin-20110211.tar.bz2 + + linux + + md5sum + c2707c0214bd0d58b35c77fa351f8cb0 + url + https://github.com/downloads/LightDrake/Public-Libraries/zlib-1.2.5-linux-20110314.tar.bz2 + + linux64 + + md5sum + 4bddfb2c6dd7b1470a3ed675ac14bd9a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-linux64-20080909.tar.bz2 + + windows + + md5sum + 7fc3539a45054e91b7e225cc3888f838 + url + https://github.com/downloads/siana/SingularityViewer/zlib-1.2.5-windows-20110504.tar.bz2 + + + + + licenses + + AFL2.1 + + url + http://opensource-definition.org/licenses/afl-2.1.html + + GLOD + + text + The GLOD Open-Source License Version 1.0 July 22, 2003 + +Copyright (C) 2003 Jonathan Cohen, Nat Duca, Johns Hopkins University +and David Luebke, Brenden Schubert, University of Virginia. All rights +reserved. + +Redistribution and use in source and binary forms, with or without +modification, is permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer and + request. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer and + request in the documentation and/or other materials provided with + the distribution. + +3. The name "GLOD" must not be used to endorse or promote products + derived from this software without prior written permission. + +4. Redistributions of any modified version of this source, whether in + source or binary form , must include a form of the following + acknowledgment: "This product is derived from the GLOD library, + which is available from http://www.cs.jhu.edu/~graphics/GLOD." + +5. Redistributions of any modified version of this source in binary + form must provide, free of charge, access to the modified version + of the code. + +6. This license shall be governed by and construed and enforced in + accordance with the laws of the State of Maryland, without + reference to its conflicts of law provisions. The exclusive + jurisdiction and venue for all legal actions relating to this + license shall be in courts of competent subject matter jurisdiction + located in the State of Maryland. + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, GLOD IS PROVIDED +UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, +EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES +THAT GLOD IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR +PURPOSE OR NON-INFRINGING. ALL WARRANTIES ARE DISCLAIMED AND THE +ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE CODE IS WITH +YOU. SHOULD ANY CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE +COPYRIGHT HOLDER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY +NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY +CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY CODE IS +AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL +THE COPYRIGHT HOLDER OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY +SPECIAL, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES FOR LOSS OF +PROFITS, REVENUE, OR FOR LOSS OF INFORMATION OR ANY OTHER LOSS. + +YOU EXPRESSLY AGREE TO FOREVER INDEMNIFY, DEFEND AND HOLD HARMLESS THE +COPYRIGHT HOLDERS AND CONTRIBUTORS OF GLOD AGAINST ALL CLAIMS, +DEMANDS, SUITS OR OTHER ACTIONS ARISING DIRECTLY OR INDIRECTLY FROM +YOUR ACCEPTANCE AND USE OF GLOD. + +Although NOT REQUIRED, we would appreciate it if active users of GLOD +put a link on their web site to the GLOD web site when possible. + + url + http://www.cs.jhu.edu/~graphics/GLOD/license/ + + MSDTW + + text + MICROSOFT SOFTWARE LICENSE TERMS +MICROSOFT DEBUGGING TOOLS FOR WINDOWS +These license terms are an agreement between Microsoft Corporation (or based on where you live, one of +its affiliates) and you. Please read them. They apply to the software named above, which includes the +media on which you received it, if any. The terms also apply to any Microsoft +* updates, +* supplements, +* Internet-based services +* support services, and +* Debugging symbol files that you may access over the internet +for this software, unless other terms accompany those items. If so, those terms apply. +By using the software, you accept these terms. If you do not accept them, do not use the +software. +If you comply with these license terms, you have the rights below. +1. INSTALLATION AND USE RIGHTS. One user may install and use any number of copies of the +software on your devices to design, develop, debug and test your programs. +2. ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. +a. Distributable Code. The software contains code that you are permitted to distribute in programs +you develop if you comply with the terms below. +i. Right to Use and Distribute. The code and text files listed below are “Distributable Code.” +* REDIST.TXT Files. You may copy and distribute the object code form of code listed in +REDIST.TXT files. +* Sample Code. You may modify, copy, and distribute the source and object code form of +code marked as “sample.” +* Third Party Distribution. You may permit distributors of your programs to copy and +distribute the Distributable Code as part of those programs. +ii. Distribution Requirements. For any Distributable Code you distribute, you must +* add significant primary functionality to it in your programs; +* require distributors and external end users to agree to terms that protect it at least as much +as this agreement; +* display your valid copyright notice on your programs; and +* indemnify, defend, and hold harmless Microsoft from any claims, including attorneys’ fees, +related to the distribution or use of your programs. +iii. Distribution Restrictions. You may not +* alter any copyright, trademark or patent notice in the Distributable Code; +* distribute any symbol files which you may access or use under these license terms for the +software; +* use Microsoft’s trademarks in your programs’ names or in a way that suggests your +programs come from or are endorsed by Microsoft; +* distribute Distributable Code to run on a platform other than the Windows platform; +* include Distributable Code in malicious, deceptive or unlawful programs; or +* modify or distribute the source code of any Distributable Code so that any part of it +becomes subject to an Excluded License. An Excluded License is one that requires, as a +condition of use, modification or distribution, that +* the code be disclosed or distributed in source code form; or +* others have the right to modify it. +3. SCOPE OF LICENSE. The software is licensed, not sold. This agreement only gives you some rights +to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights +despite this limitation, you may use the software only as expressly permitted in this agreement. In +doing so, you must comply with any technical limitations in the software that only allow you to use it in +certain ways. You may not +* work around any technical limitations in the software; +* reverse engineer, decompile or disassemble the software, except and only to the extent that +applicable law expressly permits, despite this limitation; +* make more copies of the software than specified in this agreement or allowed by applicable law, +despite this limitation; +* publish the software for others to copy; +* rent, lease or lend the software; +* transfer the software or this agreement to any third party; or +* use the software for commercial software hosting services. +4. INTERNET-BASED SERVICES. Microsoft provides Internet-based services with the software. It may +change or cancel them at any time. +a. Consent for Internet-Based Services. The software contains features which may connect to +Microsoft or service provider computer systems over the Internet. In some cases, you will not +receive a separate notice when they connect. You may switch these features on or you may +choose not to use them. For more information about these features, see +http://www.microsoft.com/info/privacy/default.mspx. By using these features, you consent to the transmission of +this information. Microsoft does not use the information to identify or contact you. +b. Misuse of Internet-based Services. You may not use these services in any way that could +harm them or impair anyone else’s use of them. You may not use the services to try to gain +unauthorized access to any service, data, account or network by any means. + +5. BACKUP COPY. You may make one backup copy of the software. You may use it only to reinstall the +software. +6. DOCUMENTATION. Any person that has valid access to your computer or internal network may copy +and use the documentation for your internal, reference purposes. +7. EXPORT RESTRICTIONS. The software is subject to United States export laws and regulations. You +must comply with all domestic and international export laws and regulations that apply to the software. +These laws include restrictions on destinations, end users and end use. For additional information, see +www.microsoft.com/exporting. +8. SUPPORT SERVICES. Because this software is “as is,” we may not provide support services for it. +9. ENTIRE AGREEMENT. This agreement, and the terms for supplements, updates, Internet-based +services and support services that you use, are the entire agreement for the software and support +services. +10. APPLICABLE LAW. +a. United States. If you acquired the software in the United States, Washington state law governs +the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of +laws principles. The laws of the state where you live govern all other claims, including claims under +state consumer protection laws, unfair competition laws, and in tort. +b. Outside the United States. If you acquired the software in any other country, the laws of that +country apply. +11. LEGAL EFFECT. This agreement describes certain legal rights. You may have other rights under the +laws of your country. You may also have rights with respect to the party from whom you acquired the +software. This agreement does not change your rights under the laws of your country if the laws of +your country do not permit it to do so. +12. DISCLAIMER OF WARRANTY. The software is licensed “as-is.” You bear the risk of using +it. Microsoft gives no express warranties, guarantees or conditions. You may have +additional consumer rights under your local laws which this agreement cannot change. To +the extent permitted under your local laws, Microsoft excludes the implied warranties of +merchantability, fitness for a particular purpose and non-infringement. +13. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. You can recover from +Microsoft and its suppliers only direct damages up to U.S. $5.00. You cannot recover any +other damages, including consequential, lost profits, special, indirect or incidental +damages. +This limitation applies to +* anything related to the software, services, content (including code) on third party Internet sites, or +third party programs; and +* claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, +or other tort to the extent permitted by applicable law. +It also applies even if Microsoft knew or should have known about the possibility of the damages. The +above limitation or exclusion may not apply to you because your country may not allow the exclusion or +limitation of incidental, consequential or other damages. + + + apache 2.0 + + url + http://www.apache.org/licenses/LICENSE-2.0 + + artwork + + text + COPYRIGHT AND PERMISSION NOTICE + +Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. + +Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer +artwork and other works in the files distributed with this Notice under +the Creative Commons Attribution-Share Alike 3.0 License, available at +http://creativecommons.org/licenses/by-sa/3.0/legalcode. For the license +summary, see http://creativecommons.org/licenses/by-sa/3.0/. + +Notwithstanding the foregoing, all of Linden Lab's trademarks, including +but not limited to the Second Life brand name and Second Life Eye-in-Hand +logo, are subject to our trademark policy at +http://secondlife.com/corporate/trademark/. + +If you distribute any copies or adaptations of the Second Life viewer +artwork or any other works in these files, you must include this Notice +and clearly identify any changes made to the original works. Include +this Notice and information where copyright notices are usually included, +for example, after your own copyright notice acknowledging your use of +the Second Life viewer artwork, in a text file distributed with your +program, in your application's About window, or on a credits page for +your work. + + url + http://svn.secondlife.com/svn/linden/trunk/doc/LICENSE-logos.txt + + boost + + url + http://www.boost.org/LICENSE_1_0.txt + + bsd + + url + http://www.opensource.org/licenses/bsd-license.php + + c-ares + + text + http://daniel.haxx.se/projects/c-ares/license.html + + curl + + url + http://curl.haxx.se/docs/copyright.html + + fmod + + url + http://www.fmod.org/ifmodlicense.html + + freeglut + + text + Freeglut Copyright +------------------ + +Freeglut code without an explicit copyright is covered by the following +copyright: + +Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies or substantial portions of the Software. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Pawel W. Olszta shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from Pawel W. Olszta. + + + freetype + + url + http://freetype.sourceforge.net/FTL.TXT + + glext + + text + Copyright (c) 2007-2012 The Khronos Group Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and/or associated documentation files (the +"Materials"), to deal in the Materials without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Materials, and to +permit persons to whom the Materials are furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Materials. + +THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + + + glh_linear + + text + glh - is a platform-indepenedent C++ OpenGL helper library + +Copyright (c) 2000 Cass Everitt +Copyright (c) 2000 NVIDIA Corporation +All rights reserved. + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the following +conditions are met: + +Redistributions of source code must retain the above +copyright notice, this list of conditions and the following +disclaimer. +Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following +disclaimer in the documentation and/or other materials +provided with the distribution. +The names of contributors to this software may not be used +to endorse or promote products derived from this software +without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +Cass Everitt - cass@r3.nu + + + + glut + + url + http://www.xmission.com/~nate/glut/README-win32.txt + + gpl + + url + http://www.gnu.org/licenses/gpl.html + + havok + + text + on file + + intel + + text + Haven't yet found. + + + jpeglib + + text + http://nyctergatis.com/jpeglib/ + + jsoncpp + + text + The json-cpp library and this documentation are in Public Domain. Retrieved from http://jsoncpp.sourceforge.net/ on 2009-09-04. + url + http://jsoncpp.sourceforge.net + + kdu + + text + jpeg2000 license #00024 (on file) + + lgpl + + url + http://www.gnu.org/copyleft/lgpl.html + + libpng + + text + http://www.libpng.org/pub/png/src/libpng-LICENSE.txt + + linden + + text + Using this license for Linden Lab owned library files + + mesa + + url + http://www.mesa3d.org/license.html + + mit + + text + http://www.jclark.com/xml/copying.txt + + ogg-vorbis + + url + http://www.xiph.org/licenses/bsd/ + + openSSL + + url + http://www.openssl.org/source/license.html + + openjpeg + + url + http://www.openjpeg.org/BSDlicense.txt + + quicktime + + text + ENGLISH + +Apple Computer, Inc. +QuickTime 7 Software Developer Kit (SDK) +Software License Agreement + +PLEASE READ THIS SOFTWARE LICENSE AGREEMENT ("LICENSE") BEFORE USING THE SOFTWARE. BY USING THE SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS LICENSE. IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, SIGNIFY YOUR AGREEMENT TO BE BOUND BY THE TERMS OF THIS LICENSE BY CLICKING THE "AGREE/ACCEPT" BUTTON. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENSE, RETURN THE APPLE SOFTWARE TO THE PLACE WHERE YOU OBTAINED IT FOR A REFUND OR, IF THE SOFTWARE WAS ACCESSED ELECTRONICALLY, CLICK "DISAGREE/DECLINE". + +IMPORTANT NOTE: To the extent this software may be used to reproduce materials, it is licensed to you only for reproduction of materials you are authorized or legally permitted to reproduce. + +1. License. Any software, tools, utilities, sample code, documentation, fonts, API?s, header files and other materials accompanying this License, whether on disk, print or electronic documentation, in read only memory, or any other media, (collectively, the "Apple Software") are licensed, not sold, to you by Apple Computer, Inc. ("Apple") for use only under the terms of this License, and Apple reserves all rights not expressly granted to you. The rights granted herein are limited to Apple's and its licensors' intellectual property rights in the Apple Software and do not include any other patents or intellectual property rights. You own the media on which the Apple Software is recorded but Apple and/or Apple's licensor(s) retain ownership of the Apple Software itself. The Apple Software in this package and any copies, modifications and derivative works that this License authorizes you to make are subject to this License. + +2. Permitted Uses and Restrictions. You may use the Apple Software to develop application software that is compatible with, and runs only on Mac OS X and/or Windows platforms with QuickTime installed. Except for compiling header files and linking libraries as necessary to build your application software, you have no right to modify, incorporate into or include in combination with your own programs, license or otherwise redistribute any portion of the Apple Software. Your software application may not interfere with the functionality of QuickTime Player or the QuickTime Plug-in, including but not limited to file type or MIME type associations that are registered to QuickTime. You may make only as many internal use copies of the Apple Software as reasonably necessary to use the Apple Software as permitted in this paragraph and distribute such copies only to your employees whose job duties require them to so use the Apple Software. You must reproduce on each copy of the Apple Software or portion thereof, the +Apple copyright notice and any other proprietary legends that were on the original copy of the Apple Software. Except as expressly permitted in this License, you may not decompile, reverse engineer, disassemble, modify, rent, lease, loan, sublicense, distribute or create derivative works based upon the Apple Software in whole or part. Your rights under this License will terminate automatically without notice from Apple if you fail to comply with any term(s) of this License. In addition, Apple reserves the right to terminate this License if a new version of Apple's operating system software or the Apple Software is released which is incompatible with the Apple Software. + +3. Disclaimer Of Warranty. The Apple Software may be "alpha", "beta", "development", pre-release, untested, and/or not fully tested and may contain errors that could cause failures or loss of data, be incomplete or contain inaccuracies. YOU EXPRESSLY ACKNOWLEDGE AND AGREE THAT USE OF THE APPLE SOFTWARE IS AT YOUR SOLE RISK AND THAT THE ENTIRE RISK AS TO SATISFACTORY QUALITY, PERFORMANCE, ACCURACY AND EFFORT IS WITH YOU. EXCEPT FOR THE LIMITED WARRANTY ON MEDIA SET FORTH ABOVE AND TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE APPLE SOFTWARE IS PROVIDED "AS IS", WITH ALL FAULTS AND WITHOUT WARRANTY OF ANY KIND, AND APPLE AND APPLE'S LICENSORS (COLLECTIVELY REFERRED TO AS "APPLE" FOR THE PURPOSES OF SECTIONS 4 AND 5) HEREBY DISCLAIM ALL WARRANTIES AND CONDITIONS WITH RESPECT TO THE APPLE SOFTWARE, EITHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE, OF ACCURACY, +OF QUIET ENJOYMENT, AND NON-INFRINGEMENT OF THIRD PARTY RIGHTS. APPLE DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE APPLE SOFTWARE, THAT THE FUNCTIONS CONTAINED IN THE APPLE SOFTWARE WILL MEET YOUR REQUIREMENTS, THAT THE OPERATION OF THE APPLE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT DEFECTS IN THE APPLE SOFTWARE WILL BE CORRECTED. NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE OR AN APPLE AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY. SHOULD THE APPLE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES OR LIMITATIONS ON APPLICABLE STATUTORY RIGHTS OF A CONSUMER, SO THE ABOVE EXCLUSION AND LIMITATIONS MAY NOT APPLY TO YOU. + +4. Limitation Of Liability. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT SHALL APPLE BE LIABLE FOR PERSONAL INJURY, OR ANY INCIDENTAL, SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES WHATSOEVER, INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF PROFITS, LOSS OF DATA, BUSINESS INTERRUPTION OR ANY OTHER COMMERCIAL DAMAGES OR LOSSES, ARISING OUT OF OR RELATED TO YOUR USE OR INABILITY TO USE THE APPLE SOFTWARE, HOWEVER CAUSED, REGARDLESS OF THE THEORY OF LIABILITY (CONTRACT, TORT OR OTHERWISE) AND EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY FOR PERSONAL INJURY, OR OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT APPLY TO YOU. In no event shall Apple's total liability to you for all damages (other than as may be required by applicable law in cases involving personal injury) exceed the amount of fifty dollars ($50.00). The foregoing limitations will apply even if the above stated remedy fails of its essential +purpose. + +5. Export Control. You may not use or otherwise export or reexport the Apple Product except as authorized by United States law and the laws of the jurisdiction in which the Apple Product was obtained. In particular, but without limitation, the Apple Product may not be exported or re-exported (a) into any U.S. embargoed countries or (b) to anyone on the U.S. Treasury Department's list of Specially Designated Nationals or the U.S. Department of Commerce Denied Person?s List or Entity List. By using the Apple Product, you represent and warrant that you are not located in any such country or on any such list. + +6. Government End Users. The Apple Software and related documentation are "Commercial Items", as that term is defined at 48 C.F.R. ?2.101, consisting of "Commercial Computer Software" and "Commercial Computer Software Documentation", as such terms are used in 48 C.F.R. ?12.212 or 48 C.F.R. ?227.7202, as applicable. Consistent with 48 C.F.R. ?12.212 or 48 C.F.R. ?227.7202-1through 227.7202-4, as applicable, the Commercial Computer Software and Commercial Computer Software Documentation are being licensed to U.S. Government end users (a) only as Commercial Items and (b) with only those rights as are granted to all other end users pursuant to the terms and conditions herein. Unpublished-rights reserved under the copyright laws of the United States. + +7. Controlling Law and Severability. This License will be governed by and construed in accordance with the laws of the State of California, as applied to agreements entered into and to be performed entirely within California between California residents. This License shall not be governed by the United Nations Convention on Contracts for the International Sale of Goods, the application of which is expressly excluded. If for any reason a court of competent jurisdiction finds any provision, or portion thereof, to be unenforceable, the remainder of this License shall continue in full force and effect. + +8. Complete Agreement. This License constitutes the entire agreement between the parties with respect to the use of the Apple Software licensed hereunder and supersedes all prior or contemporaneous understandings regarding such subject matter. No amendment to or modification of this License will be binding unless in writing and signed by Apple. Any translation of this License is done for local requirements and in the event of a dispute between the English and any non-English versions, the English version of this License shall govern. + +EA0300 + + + sleepycat + + url + http://opensource.org/licenses/sleepycat.php + + smartheap + + text + on file + + things + + + vivox + + text + on file + + xiph-bsd + + url + http://www.xiph.org/licenses/bsd/ + + xmlrpc-epi + + url + http://xmlrpc-epi.sourceforge.net/main.php?t=license + + zlib + + url + http://www.gzip.org/zlib/zlib_license.html + + + + diff --git a/scripts/repackage.sh b/scripts/repackage.sh index 5b1097273..5e2ce5d9e 100755 --- a/scripts/repackage.sh +++ b/scripts/repackage.sh @@ -30,17 +30,19 @@ case "$1" in --mac|--osx|--darwin|-x|mac|osx|darwin) MODE=osx LIBPATH="libraries/universal-darwin/lib_release" - LIBDPATH="libraries/universal-darwin/lib_release" + LIBDPATH="libraries/universal-darwin/lib/release" INCPATH="libraries/universal-darwin/include" ;; --lin|--linux|-l|linux) MODE=linux - LIBPATH="libraries/i686-linux/lib_release_client" + LIBPATH="libraries/i686-linux/lib/release" + LIBDPATH="libraries/i686-linux/lib/debug" INCPATH="libraries/i686-linux/include" ;; --linux64|-6|linux64) MODE=linux64 - LIBPATH="libraries/x86_64-linux/lib_release_client" + LIBPATH="libraries/x86_64-linux/lib/release" + LIBDPATH="libraries/x86_64-linux/lib/debug" INCPATH="libraries/x86_64-linux/include" ;; *) From d0c1c4d753222c582de7797fef752ab1d8468cf6 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Wed, 4 Jul 2012 00:29:59 +0000 Subject: [PATCH 03/19] Dos2Unix line endings and a file mode change --- indra/cmake/FindMT.cmake | 34 +++++++++++++++++----------------- indra/newview/llviewerbuild.h | 0 2 files changed, 17 insertions(+), 17 deletions(-) mode change 100755 => 100644 indra/newview/llviewerbuild.h diff --git a/indra/cmake/FindMT.cmake b/indra/cmake/FindMT.cmake index 71b5a43e5..babc68db5 100644 --- a/indra/cmake/FindMT.cmake +++ b/indra/cmake/FindMT.cmake @@ -1,17 +1,17 @@ -#Find the windows manifest tool. -if (MSVC80) - FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt - PATHS - "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin" - "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin" - "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin") - IF(HAVE_MANIFEST_TOOL) - MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.") - ELSE(HAVE_MANIFEST_TOOL) - MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.") - ENDIF(HAVE_MANIFEST_TOOL) - - STRING(REPLACE "/MANIFEST " "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS - ${CMAKE_EXE_LINKER_FLAGS}) - -endif (MSVC80) +#Find the windows manifest tool. +if (MSVC80) + FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt + PATHS + "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin" + "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin" + "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin") + IF(HAVE_MANIFEST_TOOL) + MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.") + ELSE(HAVE_MANIFEST_TOOL) + MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.") + ENDIF(HAVE_MANIFEST_TOOL) + + STRING(REPLACE "/MANIFEST " "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS + ${CMAKE_EXE_LINKER_FLAGS}) + +endif (MSVC80) diff --git a/indra/newview/llviewerbuild.h b/indra/newview/llviewerbuild.h old mode 100755 new mode 100644 From 5748de1f9d50e5e59e14ce6cfaacc6eb1d0dd470 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Wed, 4 Jul 2012 04:41:33 +0000 Subject: [PATCH 04/19] More changes for lib and packaging update --- indra/cmake/DBusGlib.cmake | 7 +++---- indra/cmake/ELFIO.cmake | 2 +- indra/cmake/FindJsonCpp.cmake | 4 ++-- indra/cmake/FindLLQtWebkit.cmake | 2 +- indra/cmake/FreeType.cmake | 2 +- indra/cmake/Hunspell.cmake | 2 +- indra/cmake/LLWindow.cmake | 4 ++-- indra/cmake/NDOF.cmake | 2 +- indra/cmake/OpenGL.cmake | 2 +- indra/cmake/PulseAudio.cmake | 2 +- indra/newview/viewer_manifest.py | 2 +- install.xml | 32 ++++++++++++++++---------------- 12 files changed, 31 insertions(+), 32 deletions(-) diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index b78a0b1e7..05266eb9c 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -7,15 +7,14 @@ if (STANDALONE) pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1) elseif (LINUX) - use_prebuilt_binary(glib) # dbusglib needs glib use_prebuilt_binary(dbusglib) set(DBUSGLIB_FOUND ON FORCE BOOL) set(DBUSGLIB_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/dbus ) - + # We don't need to explicitly link against dbus-glib itself, because + # the viewer probes for the system's copy at runtime. set(DBUSGLIB_LIBRARIES - dbus-glib-1 gobject-2.0 glib-2.0 ) diff --git a/indra/cmake/ELFIO.cmake b/indra/cmake/ELFIO.cmake index e51993b0f..fbde78311 100644 --- a/indra/cmake/ELFIO.cmake +++ b/indra/cmake/ELFIO.cmake @@ -8,7 +8,7 @@ if (STANDALONE) elseif (LINUX) use_prebuilt_binary(elfio) set(ELFIO_LIBRARIES ELFIO) - set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) + set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) set(ELFIO_FOUND "YES") endif (STANDALONE) diff --git a/indra/cmake/FindJsonCpp.cmake b/indra/cmake/FindJsonCpp.cmake index 7dfc2b097..44ab0e769 100644 --- a/indra/cmake/FindJsonCpp.cmake +++ b/indra/cmake/FindJsonCpp.cmake @@ -24,8 +24,8 @@ EXEC_PROGRAM(${CMAKE_CXX_COMPILER} # Try to find a library that was compiled with the same compiler version as we currently use. SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so) IF (STANDALONE) - # On standalone, assume that the system installed library was compiled with the used compiler. - SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so) + # On standalone, assume that the system installed library was compiled with the used compiler. + SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so) ENDIF (STANDALONE) FIND_LIBRARY(JSONCPP_LIBRARY NAMES ${JSONCPP_NAMES} diff --git a/indra/cmake/FindLLQtWebkit.cmake b/indra/cmake/FindLLQtWebkit.cmake index c747ec32a..731ae67d7 100644 --- a/indra/cmake/FindLLQtWebkit.cmake +++ b/indra/cmake/FindLLQtWebkit.cmake @@ -35,7 +35,7 @@ find_path(LLQTWEBKIT_INCLUDE_DIR llqtwebkit.h NO_SYSTEM_ENVIRONMENT_PATH HINTS $ find_library(LLQTWEBKIT_LIBRARY NAMES llqtwebkit NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_LIBRARY_DIRS}) -if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) # If pkg-config couldn't find it, pretend we don't have pkg-config. +if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) # If pkg-config couldn't find it, pretend we don't have pkg-config. set(LLQTWEBKIT_LIBRARIES llqtwebkit) get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH) endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake index 5f1aa26e8..e9d4d8093 100644 --- a/indra/cmake/FreeType.cmake +++ b/indra/cmake/FreeType.cmake @@ -11,7 +11,7 @@ else (STANDALONE) set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) else (LINUX) - set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (LINUX) set(FREETYPE_LIBRARIES freetype) diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake index cd5d7e00b..365df6783 100644 --- a/indra/cmake/Hunspell.cmake +++ b/indra/cmake/Hunspell.cmake @@ -9,7 +9,7 @@ else (STANDALONE) set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell) if (LINUX OR DARWIN) - set(HUNSPELL_LIBRARY hunspell-1.2) + set(HUNSPELL_LIBRARY hunspell-1.3) else (LINUX OR DARWIN) set(HUNSPELL_LIBRARY libhunspell) endif (LINUX OR DARWIN) diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index 5cf92335e..e32409020 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -19,8 +19,8 @@ else (STANDALONE) if (LINUX AND VIEWER) use_prebuilt_binary(SDL) set (SDL_FOUND TRUE) - set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) - set (SDL_LIBRARY SDL) + set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}) + set (SDL_LIBRARY SDL directfb fusion direct) endif (LINUX AND VIEWER) endif (STANDALONE) diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index bdf5db130..a4e210405 100644 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake @@ -15,7 +15,7 @@ else (STANDALONE) set(NDOF_LIBRARY ndofdev) endif (WINDOWS) - set(NDOF_INCLUDE_DIR ${ARCH_PREBUILT_DIRS}/include/ndofdev) + set(NDOF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ndofdev) set(NDOF_FOUND 1) endif (STANDALONE) diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index 5ba730c4a..91d949409 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -6,5 +6,5 @@ if (NOT (STANDALONE OR DARWIN)) # possible glh_linear should have its own .cmake file instead #use_prebuilt_binary(glh_linear) # actually... not any longer, it's now in git -SG - set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) + set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif () diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake index e918de019..dafdd4163 100644 --- a/indra/cmake/PulseAudio.cmake +++ b/indra/cmake/PulseAudio.cmake @@ -13,7 +13,7 @@ if (PULSEAUDIO) use_prebuilt_binary(pulseaudio) set(PULSEAUDIO_FOUND ON FORCE BOOL) set(PULSEAUDIO_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/include + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include ) # We don't need to explicitly link against pulseaudio itself, because # the viewer probes for the system's copy at runtime. diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6fe1ef0e2..402fb836d 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -801,7 +801,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libdirectfb-1.*.so*") self.path("libfusion-1.*.so*") self.path("libexpat.so*") - self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0") + self.path("libhunspell-*.so.*") self.path("libssl.so*") self.path("libuuid.so*") self.path("libalut.so") diff --git a/install.xml b/install.xml index fea7efb08..e290aaa47 100644 --- a/install.xml +++ b/install.xml @@ -278,9 +278,9 @@ linux md5sum - 5bbf7e33dadc7d046dcf44883a9ec3d0 + e4a22c3401a0f938ee0a6a2becfa7840 url - http://imprudenceviewer.org/download/libs/dbusglib-linux-20101031.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/dbus_glib-0.76-linux-20110310.tar.bz2 linux64 @@ -300,9 +300,9 @@ linux md5sum - 048f301afc327d4502d2e5111c0dcba0 + fb4e8f07c7f3e86cc8baa73f8c02f777 url - https://github.com/downloads/LightDrake/Public-Libraries/elfio-1.0.3-linux-20110225.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/elfio-1.0.3-linux-20080812.tar.bz2 linux64 @@ -407,9 +407,9 @@ linux md5sum - efc845cf291073b1e4d381a271f194eb + 155c50560099db8a37540c50d9ee48d0 url - http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux-20091103.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/freetype-2.3.11-linux-20091103_1.tar.bz2 linux64 @@ -511,9 +511,9 @@ linux md5sum - 566cc47a572303bc4aef12ca02670902 + bc5bf517ada0a3a1036e7e193884db79 url - http://imprudenceviewer.org/download/libs/glib-2.20.5-linux32-20100529.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/glib-2.20.5-linux32-20100529.tar.bz2 linux64 @@ -643,9 +643,9 @@ linux md5sum - dbe264ef2e932980e31db646ea29bbe7 + bc470ff6673553c5580ccb47958d7789 url - http://imprudenceviewer.org/download/libs/hunspell-1.2-linux32-20100902.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/libhunspell-1.3.2-linux-20120616.tar.bz2 linux64 @@ -866,9 +866,9 @@ linux md5sum - 70d0bbe1145fff29a0131349c898260e + a816df4887085fb0f0d301336d87cd70 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20080812.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/mesa-7.0-linux-20100930.tar.bz2 linux64 @@ -906,9 +906,9 @@ linux md5sum - 38abfe002ba073b6824016db98269972 + c366f71de80a56c7336c5166520b40a5 url - http://imprudenceviewer.org/download/libs/ndofdev-linux32-0.3.1-20100817.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/ndofdev-linux32-0.3.1_1-20100817.tar.bz2 linux64 @@ -1055,9 +1055,9 @@ linux md5sum - 30cb00069fe2a545fbf7be1070386236 + 6c7325be47ddce71a3fbbd24621f86e1 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/linux-pulse-headers-0.9.14_1.tar.bz2 From 31ca817dc0218f91e16240bd66ce1dd41f3638c5 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Wed, 4 Jul 2012 10:25:04 +0000 Subject: [PATCH 05/19] Removed ReleaseSSE2 Removed ReleaseSSE2 and moved its options under Release. --- indra/CMakeLists.txt | 4 +- indra/cmake/00-Common.cmake | 65 +++++++----------- indra/cmake/CopyWinLibs.cmake | 83 ----------------------- indra/develop.py | 4 +- indra/lib/python/indra/util/llmanifest.py | 2 +- 5 files changed, 29 insertions(+), 129 deletions(-) diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index e16652a6c..e81965cc6 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -33,8 +33,8 @@ include(UnixInstall) set (DISABLE_FATAL_WARNINGS TRUE) if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE ReleaseSSE2 CACHE STRING - "Build type. One of: Debug Release ReleaseSSE2 RelWithDebInfo" FORCE) + set(CMAKE_BUILD_TYPE Release CACHE STRING + "Build type. One of: Debug Release RelWithDebInfo" FORCE) endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) # Create a 'prepare' target in which to perform setup actions. This diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 297d53280..230cc2d42 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -12,17 +12,12 @@ set(CMAKE_CXX_FLAGS_RELEASE "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") -set(CMAKE_CXX_FLAGS_RELEASESSE2 - "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG") -#llimage now requires this (?) -set(CMAKE_C_FLAGS_RELEASESSE2 - "${CMAKE_CXX_FLAGS_RELEASESSE2}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1") # Don't bother with a MinSizeRel build. -set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;ReleaseSSE2;Debug" CACHE STRING +set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING "Supported build types." FORCE) # Platform-specific compilation flags. @@ -40,23 +35,17 @@ if (WINDOWS) "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /arch:SSE2" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE /fp:fast" + "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast" CACHE STRING "C++ compiler release options" FORCE) set(CMAKE_C_FLAGS_RELEASE - "${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE /fp:fast" + "${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast" CACHE STRING "C compiler release options" FORCE) - set(CMAKE_CXX_FLAGS_RELEASESSE2 - "${CMAKE_CXX_FLAGS_RELEASESSE2} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast" - CACHE STRING "C++ compiler release-SSE2 options" FORCE) - set(CMAKE_C_FLAGS_RELEASESSE2 - "${CMAKE_C_FLAGS_RELEASESSE2} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast" - CACHE STRING "C compiler release-SSE2 options" FORCE) set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LARGEADDRESSAWARE") set(CMAKE_CXX_STANDARD_LIBRARIES "") set(CMAKE_C_STANDARD_LIBRARIES "") - + add_definitions( /DLL_WINDOWS=1 /DUNICODE @@ -78,12 +67,9 @@ if (WINDOWS) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" CACHE STRING "C++ compiler release options" FORCE) - set(CMAKE_CXX_FLAGS_RELEASESSE2 - "${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" - CACHE STRING "C++ compiler release-SSE2 options" FORCE) - set(CMAKE_C_FLAGS_RELEASESSE2 - "${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" - CACHE STRING "C compiler release-SSE2 options" FORCE) + set(CMAKE_C_FLAGS_RELEASE + "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" + CACHE STRING "C compiler release options" FORCE) add_definitions( /Zc:wchar_t- ) @@ -208,8 +194,8 @@ if (LINUX) endif (NOT STANDALONE) if (${ARCH} STREQUAL "x86_64") add_definitions(-DLINUX64=1 -pipe) - set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") - set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") else (${ARCH} STREQUAL "x86_64") @@ -218,8 +204,8 @@ if (LINUX) endif (NOT STANDALONE) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2") - set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") - set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") endif (${ARCH} STREQUAL "x86_64") @@ -244,8 +230,8 @@ if (LINUX) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2") - set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2}${MARCH_FLAG} -msse2") - set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2}${MARCH_FLAG} -msse2") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -msse2") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -msse2") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2") endif() @@ -254,8 +240,6 @@ if (LINUX) set(CMAKE_C_FLAGS_DEBUG "-O0 ${CMAKE_CXX_FLAGS_DEBUG}") set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}") set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}") - set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O3 ${CMAKE_CXX_FLAGS_RELEASESSE2}") - set(CMAKE_C_FLAGS_RELEASESSE2 "-O3 ${CMAKE_C_FLAGS_RELEASESSE2}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO}") endif (LINUX) @@ -269,12 +253,10 @@ if (DARWIN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch") # NOTE: it's critical that the optimization flag is put in front. # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered. - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") - set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -O3 -msse2 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") - set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2} -O3 -msse2 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") endif (DARWIN) @@ -327,16 +309,17 @@ if(1 EQUAL 1) endif (NOT "$ENV{SHY_MOD}" STREQUAL "") endif(1 EQUAL 1) -SET( CMAKE_EXE_LINKER_FLAGS_RELEASESSE2 +SET( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}" CACHE STRING - "Flags used for linking binaries under SSE2 build." + "Flags used for linking binaries under build." FORCE ) -SET( CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2 +SET( CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" CACHE STRING - "Flags used by the shared libraries linker under SSE2 build." + "Flags used by the shared libraries linker under build." FORCE ) MARK_AS_ADVANCED( - CMAKE_CXX_FLAGS_RELEASESSE2 - CMAKE_C_FLAGS_RELEASESSE2 - CMAKE_EXE_LINKER_FLAGS_RELEASESSE2 - CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2 ) + CMAKE_CXX_FLAGS_RELEASE + CMAKE_C_FLAGS_RELEASE + CMAKE_EXE_LINKER_FLAGS_RELEASE + CMAKE_SHARED_LINKER_FLAGS_RELEASE + ) diff --git a/indra/cmake/CopyWinLibs.cmake b/indra/cmake/CopyWinLibs.cmake index 21fe3f246..5e8651cfd 100644 --- a/indra/cmake/CopyWinLibs.cmake +++ b/indra/cmake/CopyWinLibs.cmake @@ -112,14 +112,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -copy_if_different( - ${plugintest_release_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2" - out_targets - ${plugintest_release_files} - ) -set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${plugintest_release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo" @@ -146,14 +138,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -copy_if_different( - ${plugintest_release_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2/imageformats" - out_targets - ${plugintest_release_files} - ) -set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${plugintest_release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo/imageformats" @@ -170,14 +154,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -copy_if_different( - ${plugintest_release_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin/imageformats" - out_targets - ${plugintest_release_files} - ) -set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${plugintest_release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin/imageformats" @@ -224,14 +200,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -copy_if_different( - ${plugins_release_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin" - out_targets - ${plugins_release_files} - ) -set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${plugins_release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin" @@ -259,8 +227,6 @@ if(FMODEX) if(FMODEX_BINARY_DIR) copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmodex.dll) set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" out_targets fmodex.dll) - set(all_targets ${all_targets} ${out_targets}) copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmodex.dll) set(all_targets ${all_targets} ${out_targets}) copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmodex.dll) @@ -278,8 +244,6 @@ if(FMOD) if(FMOD_BINARY_DIR) copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmod.dll) set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" out_targets fmod.dll) - set(all_targets ${all_targets} ${out_targets}) copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmod.dll) set(all_targets ${all_targets} ${out_targets}) copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmod.dll) @@ -305,22 +269,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -copy_if_different( - ${release_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" - out_targets - ${release_files} - ) -set(all_targets ${all_targets} ${out_targets}) - -copy_if_different( - ${vivox_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" - out_targets - ${vivox_files} - ) -set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" @@ -371,15 +319,6 @@ else(EXISTS ${internal_llkdu_path}) COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release" ) set(all_targets ${all_targets} ${release_llkdu_dst}) - - set(releasesse2_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llkdu.dll") - ADD_CUSTOM_COMMAND( - OUTPUT ${releasesse2_llkdu_dst} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${releasesse2_llkdu_dst} - DEPENDS ${release_llkdu_src} - COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" - ) - set(all_targets ${all_targets} ${releasesse2_llkdu_dst}) set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll") ADD_CUSTOM_COMMAND( @@ -455,14 +394,6 @@ if (MSVC80) ) set(all_targets ${all_targets} ${out_targets}) - copy_if_different( - ${release_msvc8_redist_path} - "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" - out_targets - ${release_msvc8_files} - ) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${release_msvc8_redist_path} "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" @@ -483,19 +414,6 @@ if (MSVC80) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest COMMENT "Creating release app config file" ) - - set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config) - add_custom_command( - OUTPUT ${releasesse2_appconfig_file} - COMMAND ${PYTHON_EXECUTABLE} - ARGS - ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py - ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest - ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config - ${releasesse2_appconfig_file} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest - COMMENT "Creating release-sse2 app config file" - ) set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config) add_custom_command( @@ -517,7 +435,6 @@ add_custom_target(copy_win_libs ALL DEPENDS ${all_targets} ${release_appconfig_file} - ${releasesse2_appconfig_file} ${relwithdebinfo_appconfig_file} ${debug_appconfig_file} ) diff --git a/indra/develop.py b/indra/develop.py index d44db29c7..5e94ca125 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -70,7 +70,7 @@ def quote(opts): class PlatformSetup(object): generator = None build_types = {} - for t in ('Debug', 'Release', 'ReleaseSSE2', 'RelWithDebInfo'): + for t in ('Debug', 'Release', 'RelWithDebInfo'): build_types[t.lower()] = t build_type = build_types['relwithdebinfo'] @@ -764,7 +764,7 @@ Options: --unattended build unattended, do not invoke any tools requiring a human response --universal build a universal binary on Mac OS X (unsupported) - -t | --type=NAME build type ("Debug", "Release", "ReleaseSSE2", or "RelWithDebInfo") + -t | --type=NAME build type ("Debug", "Release", or "RelWithDebInfo") -m32 | -m64 build architecture (32-bit or 64-bit) -N | --no-distcc disable use of distcc -G | --generator=NAME generator name diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 3e5e39efa..11945a239 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -120,7 +120,7 @@ ARGUMENTS=[ On Linux this would try to use Linux_i686Manifest.""", default=""), dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE), - dict(name='buildtype', description="""The build type used. ('Debug', 'Release', 'ReleaseSSE2' or 'RelWithDebInfo') + dict(name='buildtype', description="""The build type used. ('Debug', 'Release', or 'RelWithDebInfo') Default is Release """, default="Release"), dict(name='branding_id', description="""Identifier for the branding set to From d238cfe7531b9b75985e920b7e22112c967bb609 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Thu, 5 Jul 2012 02:08:27 +0000 Subject: [PATCH 06/19] LibraryWork: Windows Libraries Repacked the windows libraries for new package layout. Cleaned install.xml of unused libraries on windows. Cleaned install.xml of unused libraries on darwin. Repacked windows gperftools from Kitty/Catznip. Updated windows openal. --- indra/cmake/CopyWinLibs.cmake | 49 +++++------ install.xml | 153 +++++++--------------------------- 2 files changed, 52 insertions(+), 150 deletions(-) diff --git a/indra/cmake/CopyWinLibs.cmake b/indra/cmake/CopyWinLibs.cmake index 5e8651cfd..f9b6dd5ce 100644 --- a/indra/cmake/CopyWinLibs.cmake +++ b/indra/cmake/CopyWinLibs.cmake @@ -43,10 +43,6 @@ set(all_targets ${all_targets} ${out_targets}) set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") set(plugintest_debug_files libeay32.dll - libglib-2.0-0.dll - libgmodule-2.0-0.dll - libgobject-2.0-0.dll - libgthread-2.0-0.dll qtcored4.dll qtguid4.dll qtnetworkd4.dll @@ -92,11 +88,6 @@ set(all_targets ${all_targets} ${out_targets}) set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") set(plugintest_release_files libeay32.dll - libglib-2.0-0.dll - libgmodule-2.0-0.dll - libgobject-2.0-0.dll - libgthread-2.0-0.dll -# llkdu.dll (not required for plugin test) qtcore4.dll qtgui4.dll qtnetwork4.dll @@ -218,39 +209,39 @@ set(release_files ) if(FMODEX) - find_path(FMODEX_BINARY_DIR fmodex.dll + find_path(FMODEX_BINARY_DIR fmodex.dll ${release_src_dir} ${FMODEX_SDK_DIR}/api ${FMODEX_SDK_DIR} ) - if(FMODEX_BINARY_DIR) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmodex.dll) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmodex.dll) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmodex.dll) - set(all_targets ${all_targets} ${out_targets}) - endif(FMODEX_BINARY_DIR) + if(FMODEX_BINARY_DIR) + copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmodex.dll) + set(all_targets ${all_targets} ${out_targets}) + copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmodex.dll) + set(all_targets ${all_targets} ${out_targets}) + copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmodex.dll) + set(all_targets ${all_targets} ${out_targets}) + endif(FMODEX_BINARY_DIR) endif(FMODEX) if(FMOD) - find_path(FMOD_BINARY_DIR fmod.dll + find_path(FMOD_BINARY_DIR fmod.dll ${release_src_dir} ${FMOD_SDK_DIR}/api ${FMOD_SDK_DIR} ) - if(FMOD_BINARY_DIR) - copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmod.dll) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmod.dll) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmod.dll) - set(all_targets ${all_targets} ${out_targets}) - else(FMOD_BINARY_DIR) - list(APPEND release_files fmod.dll) #Required for compile. This will cause an error in copying binaries. - endif(FMOD_BINARY_DIR) +if(FMOD_BINARY_DIR) + copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmod.dll) + set(all_targets ${all_targets} ${out_targets}) + copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmod.dll) + set(all_targets ${all_targets} ${out_targets}) + copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmod.dll) + set(all_targets ${all_targets} ${out_targets}) + else(FMOD_BINARY_DIR) + list(APPEND release_files fmod.dll) #Required for compile. This will cause an error in copying binaries. + endif(FMOD_BINARY_DIR) endif(FMOD) copy_if_different( diff --git a/install.xml b/install.xml index e290aaa47..049237c46 100644 --- a/install.xml +++ b/install.xml @@ -55,13 +55,6 @@ lgpl packages - darwin - - md5sum - 7b07e7121a3623b2553ed36fb9024b40 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-darwin-20080818.tar.bz2 - linux md5sum @@ -69,13 +62,6 @@ url https://github.com/downloads/LightDrake/Public-Libraries/SDL-1.2.14-linux-20110309.tar.bz2 - windows - - md5sum - 149626b0c10d7eb8b9f9be96b5318218 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-windows-20080613.tar.bz2 - apr_suite @@ -181,9 +167,9 @@ windows md5sum - ce5ce1050d039ef5c233c4f684437b16 + ba3165f8e51c7a59f55c7464932fbfc1 url - https://bitbucket.org/Siana/singularityviewer/downloads/boost-1.45.0-windows-20120222.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/boost-1.45.0-windows-20120704.tar.bz2 @@ -347,9 +333,9 @@ windows md5sum - 74494ba202b3d2cd74e4032716f4bf1b + 5aff9e0f0e1ba7ada2f118f92139f759 url - https://github.com/downloads/siana/SingularityViewer/expat-2.0.1-windows-20110504.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/expat-2.0.1-windows-20110215.tar.bz2 @@ -381,9 +367,9 @@ windows md5sum - fefd6b548d677a60a198e50d9326d939 + 74758efd7fc6246f704ea702c4b3e310 url - https://github.com/downloads/Shyotl/SingularityViewer/freeglut-2.6.0-win32.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/freeglut-2.6.0-windows-20110214.tar.bz2 @@ -421,9 +407,9 @@ windows md5sum - c1fec2f5a4924b75ca6047edfcc91eba + fcb8ec727e72e2b8ae766d8af78f12ea url - https://github.com/downloads/siana/SingularityViewer/freetype-2.4.4-windows-20110504.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/freetype-2.4.4-windows-20110218.tar.bz2 @@ -453,46 +439,6 @@ - glh_linear - - copyright - Copyright (c) 2000 Cass Everitt; Copyright (c) 2000 NVIDIA Corporation; All rights reserved. - description - nVidia NVParse SDK: platform-indepenedent C++ Apple OpenGL helper library - license - glh_linear - packages - - darwin - - md5sum - 23bd9a75e5a2365a827461e6c324f52b - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-darwin-20080613.tar.bz2 - - linux - - md5sum - 23bd9a75e5a2365a827461e6c324f52b - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080812.tar.bz2 - - linux64 - - md5sum - 2965646aea1d2a6aec1fbc431c02733f - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080613.tar.bz2 - - windows - - md5sum - 38b9ddfe8dceff55ee4351016a937d1b - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-windows-20080613.tar.bz2 - - - glib description @@ -501,13 +447,6 @@ gpl packages - darwin - - md5sum - 64a131bae070964de6431e1c7d5e7362 - url - http://imprudenceviewer.org/download/libs/glib-2.12.0-darwin-20091107.tar.bz2 - linux md5sum @@ -522,13 +461,6 @@ url http://imprudenceviewer.org/download/libs/glib-2.20.5-linux64-20100515.tar.bz2 - windows - - md5sum - b1e0e16472c0e5d3b6291870e3f20b0c - url - http://imprudenceviewer.org/download/libs/glib-2.18.4-windows-03162009.tar.bz2 - glui @@ -547,9 +479,9 @@ windows md5sum - 5b8631fe510d4ebaeb965c673937e1e7 + eeec9982df843043a18748276bbf39ce url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.3.6-windows-freeglut-20090608.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/glui-2.36-windows-20110214.tar.bz2 @@ -569,9 +501,9 @@ windows md5sum - 4f787437a5e063ccde6637dfb1ebc01d + a0ab68d140da9c55d404586cd7150a97 url - https://bitbucket.org/Ansariel/phoenix-prebuilts/downloads/google_perftools-1.8-windows-20111005.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/google_perftools-1.8.3-windows-20110914.tar.bz2 @@ -614,13 +546,6 @@ url https://github.com/downloads/LightDrake/Public-Libraries/gtk-etc-linux-20101106.tar.bz2 - windows - - md5sum - d963750bcd333a108b3697d220c87d09 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-windows-20080613.tar.bz2 - hunspell @@ -657,9 +582,9 @@ windows md5sum - 1eb49bf9bcce30f5fe0dddaed2a3c628 + bbaf7035a4a5b59153f18bca1d8fa107 url - http://imprudenceviewer.org/download/libs/windows_hunspell.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/hunspell-windows-20120704.tar.bz2 @@ -697,9 +622,9 @@ windows md5sum - e4dfbea847d92b46e3d2d1a2c25fe3b3 + d28938e6930bf48584e332f764208822 url - https://github.com/downloads/siana/SingularityViewer/jpeglib-8c-windows-20110504.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/jpeglib-8c-windows-20120704.tar.bz2 @@ -737,9 +662,9 @@ windows md5sum - 91e081c4b7b4949c4e53849182a42370 + 8aa2d47182e93cbc856517309fe11dc7 url - https://github.com/downloads/siana/SingularityViewer/jsoncpp-0.5.0-windows-20110320.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/jsoncpp-0.5.0-windows-20120704.tar.bz2 @@ -777,9 +702,9 @@ windows md5sum - acf1626a563b2827a7f62d48661352c8 + a698200d34d20b53fe72fb53fc1c6dcf url - https://github.com/downloads/siana/SingularityViewer/libpng-1.5.2-windows-20110512.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/libpng-1.5.2-windows-20120704.tar.bz2 @@ -847,9 +772,9 @@ windows md5sum - 999b265a3af47eb13e9a380d042a1763 + ccb96fa1260ef6c3060d407b8c6b3972 url - https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-windows-20110320.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/llqtwebkit-4.7.1-windows-20120228.tar.bz2 @@ -877,13 +802,6 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-6.2.1-linux64-20081016.tar.bz2 - windows - - md5sum - 82cdcdcb2d0615389a7480485ea35f4c - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-windows-20080613.tar.bz2 - ndofdev @@ -920,9 +838,9 @@ windows md5sum - 383ce3f78ae3e6afa39ee9ced6d8e531 + f897874709ed6d0ef06db3730b3eea7d url - https://github.com/downloads/siana/SingularityViewer/libndofdev-windows-20110504.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/libndofdev-windows-20120704.tar.bz2 @@ -960,9 +878,9 @@ windows md5sum - 30bb58af8c5f818fc8ea8d481bd2f478 + 3339ac49f5986068e7fa17b6655b9f9b url - https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-windows-20110512.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/ogg_vorbis-1.2.2-1.3.2-windows-20110510.tar.bz2 @@ -1012,13 +930,6 @@ lgpl packages - darwin - - md5sum - a0757244e3e6688fde2ffeea35cc1f96 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-darwin-20080924.tar.bz2 - linux md5sum @@ -1036,9 +947,9 @@ windows md5sum - a0757244e3e6688fde2ffeea35cc1f96 + e75f1529adcaa6e508d1725f59d93a16 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-windows-20080924.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/openal-1.12.854-1.1.0-windows-20110301.tar.bz2 @@ -1171,9 +1082,9 @@ windows md5sum - 2faea7fe8fa66872793e0ea917c33e2e + 0d208a90f378284e27138c22e8c15f10 url - https://github.com/downloads/siana/SingularityViewer/xmlrpc_epi-0.54.1-windows-20110504.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/xmlrpc_epi-0.54.1-windows-20120704.tar.bz2 @@ -1211,9 +1122,9 @@ windows md5sum - 7fc3539a45054e91b7e225cc3888f838 + d76dad53f2984827db98fd9d62232ab2 url - https://github.com/downloads/siana/SingularityViewer/zlib-1.2.5-windows-20110504.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/zlib-1.2.5-windows-20120704.tar.bz2 From 259a9ff0cc1658b6c0cfa7d7ee80a4d5ca3c3821 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Thu, 5 Jul 2012 02:43:37 +0000 Subject: [PATCH 07/19] Cleanup and more library work Cleaned up unneeded files in LICENSES already provided by the prebuilt packages themselves install.xml: Added in pcre, colladadom, and windows glod library Corrected, descriptions licenses, and copyrights. --- LICENSES/elfio.txt | 19 -- LICENSES/fontconfig.txt | 23 -- LICENSES/libxml.txt | 29 -- LICENSES/openal.txt | 484 ----------------------------- LICENSES/qt-4.5-linden-changes.txt | 5 - install.xml | 195 ++++++++---- 6 files changed, 128 insertions(+), 627 deletions(-) delete mode 100644 LICENSES/elfio.txt delete mode 100644 LICENSES/fontconfig.txt delete mode 100644 LICENSES/libxml.txt delete mode 100644 LICENSES/openal.txt delete mode 100644 LICENSES/qt-4.5-linden-changes.txt diff --git a/LICENSES/elfio.txt b/LICENSES/elfio.txt deleted file mode 100644 index 0f25e4bae..000000000 --- a/LICENSES/elfio.txt +++ /dev/null @@ -1,19 +0,0 @@ -ELFIO.h - ELF reader and producer. -Copyright (C) 2001 Serge Lamikhov-Center - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -The GNU Library GPL is available at http://www.gnu.org/copyleft/lesser.html - diff --git a/LICENSES/fontconfig.txt b/LICENSES/fontconfig.txt deleted file mode 100644 index eb766faed..000000000 --- a/LICENSES/fontconfig.txt +++ /dev/null @@ -1,23 +0,0 @@ -http://www.jclark.com/xml/copying.txt - -Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/LICENSES/libxml.txt b/LICENSES/libxml.txt deleted file mode 100644 index a5c4e6689..000000000 --- a/LICENSES/libxml.txt +++ /dev/null @@ -1,29 +0,0 @@ -http://xmlsoft.org/ -http://www.opensource.org/licenses/mit-license.html - -Open Source Initiative OSI - The MIT License:Licensing -Tue, 2006-10-31 04:56 . nelson - -The MIT License - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - diff --git a/LICENSES/openal.txt b/LICENSES/openal.txt deleted file mode 100644 index d0c897869..000000000 --- a/LICENSES/openal.txt +++ /dev/null @@ -1,484 +0,0 @@ - - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - - Copyright (C) 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - diff --git a/LICENSES/qt-4.5-linden-changes.txt b/LICENSES/qt-4.5-linden-changes.txt deleted file mode 100644 index d424824cb..000000000 --- a/LICENSES/qt-4.5-linden-changes.txt +++ /dev/null @@ -1,5 +0,0 @@ -The pristine version of Qt corresponding to this build is available at: -http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/qt-all-opensource-src-4.5.2.tar.bz2 - -The patches we applied to the above package to get this build are available at: -http://hg.secondlife.com/llqtwebkit/src/tip/qt_patches/ diff --git a/install.xml b/install.xml index 049237c46..c421cae79 100644 --- a/install.xml +++ b/install.xml @@ -31,7 +31,7 @@ copyright Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia description - GLOD + Geometric Level of Detail for OpenGL license GLOD packages @@ -43,6 +43,13 @@ url https://github.com/downloads/LightDrake/Public-Libraries/glod-1.0pre4-linux-20110611.tar.bz2 + windows + + md5sum + a6c13213a76658f4ad505b968d54aba3 + url + https://github.com/downloads/LightDrake/Public-Libraries/glod-1.0pre4-windows-20110610.tar.bz2 + SDL @@ -173,6 +180,32 @@ + colladadom + + copyright + Copyright 2005 Sony Computer Entertainment Inc. + description + Library for processing collada file format + license + scea + packages + + linux + + md5sum + c8c56c032bc39d174876ab25c72a05d8 + url + https://github.com/downloads/LightDrake/Public-Libraries/colladadom-2.2-linux-20110621.tar.bz2 + + windows + + md5sum + 5c5d071338dcf9d504c2cc2eed8b025a + url + https://github.com/downloads/LightDrake/Public-Libraries/colladadom-2.2-windows-20110413.tar.bz2 + + + curl copyright @@ -487,8 +520,12 @@ gperftools + copyright + Copyright (c) 2005, Google Inc. + description + High performance memory allocator. license - mit + bsd packages linux @@ -953,6 +990,25 @@ + pcre + + copyright + Copyright (c) 1997-2008 University of Cambridge + description + Perl Compatible Regular Expressions Library + license + bsd + packages + + linux + + md5sum + 3372b361e916df8981cb3bd7393b0353 + url + https://github.com/downloads/LightDrake/Public-Libraries/pcre-7.6-linux-20110504.tar.bz2 + + + pulseaudio copyright @@ -1208,117 +1264,117 @@ put a link on their web site to the GLOD web site when possible. MSDTW text - MICROSOFT SOFTWARE LICENSE TERMS -MICROSOFT DEBUGGING TOOLS FOR WINDOWS -These license terms are an agreement between Microsoft Corporation (or based on where you live, one of -its affiliates) and you. Please read them. They apply to the software named above, which includes the + MICROSOFT SOFTWARE LICENSE TERMS +MICROSOFT DEBUGGING TOOLS FOR WINDOWS +These license terms are an agreement between Microsoft Corporation (or based on where you live, one of +its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft * updates, * supplements, -* Internet-based services +* Internet-based services * support services, and -* Debugging symbol files that you may access over the internet +* Debugging symbol files that you may access over the internet for this software, unless other terms accompany those items. If so, those terms apply. -By using the software, you accept these terms. If you do not accept them, do not use the +By using the software, you accept these terms. If you do not accept them, do not use the software. If you comply with these license terms, you have the rights below. -1. INSTALLATION AND USE RIGHTS. One user may install and use any number of copies of the +1. INSTALLATION AND USE RIGHTS. One user may install and use any number of copies of the software on your devices to design, develop, debug and test your programs. 2. ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. Distributable Code. The software contains code that you are permitted to distribute in programs +a. Distributable Code. The software contains code that you are permitted to distribute in programs you develop if you comply with the terms below. i. Right to Use and Distribute. The code and text files listed below are “Distributable Code.” -* REDIST.TXT Files. You may copy and distribute the object code form of code listed in +* REDIST.TXT Files. You may copy and distribute the object code form of code listed in REDIST.TXT files. -* Sample Code. You may modify, copy, and distribute the source and object code form of +* Sample Code. You may modify, copy, and distribute the source and object code form of code marked as “sample.” -* Third Party Distribution. You may permit distributors of your programs to copy and +* Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs. ii. Distribution Requirements. For any Distributable Code you distribute, you must * add significant primary functionality to it in your programs; -* require distributors and external end users to agree to terms that protect it at least as much -as this agreement; +* require distributors and external end users to agree to terms that protect it at least as much +as this agreement; * display your valid copyright notice on your programs; and -* indemnify, defend, and hold harmless Microsoft from any claims, including attorneys’ fees, +* indemnify, defend, and hold harmless Microsoft from any claims, including attorneys’ fees, related to the distribution or use of your programs. iii. Distribution Restrictions. You may not -* alter any copyright, trademark or patent notice in the Distributable Code; -* distribute any symbol files which you may access or use under these license terms for the +* alter any copyright, trademark or patent notice in the Distributable Code; +* distribute any symbol files which you may access or use under these license terms for the software; -* use Microsoft’s trademarks in your programs’ names or in a way that suggests your -programs come from or are endorsed by Microsoft; +* use Microsoft’s trademarks in your programs’ names or in a way that suggests your +programs come from or are endorsed by Microsoft; * distribute Distributable Code to run on a platform other than the Windows platform; * include Distributable Code in malicious, deceptive or unlawful programs; or -* modify or distribute the source code of any Distributable Code so that any part of it -becomes subject to an Excluded License. An Excluded License is one that requires, as a +* modify or distribute the source code of any Distributable Code so that any part of it +becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that -* the code be disclosed or distributed in source code form; or +* the code be disclosed or distributed in source code form; or * others have the right to modify it. -3. SCOPE OF LICENSE. The software is licensed, not sold. This agreement only gives you some rights -to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights -despite this limitation, you may use the software only as expressly permitted in this agreement. In -doing so, you must comply with any technical limitations in the software that only allow you to use it in +3. SCOPE OF LICENSE. The software is licensed, not sold. This agreement only gives you some rights +to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights +despite this limitation, you may use the software only as expressly permitted in this agreement. In +doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not * work around any technical limitations in the software; -* reverse engineer, decompile or disassemble the software, except and only to the extent that +* reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation; -* make more copies of the software than specified in this agreement or allowed by applicable law, +* make more copies of the software than specified in this agreement or allowed by applicable law, despite this limitation; * publish the software for others to copy; * rent, lease or lend the software; * transfer the software or this agreement to any third party; or -* use the software for commercial software hosting services. -4. INTERNET-BASED SERVICES. Microsoft provides Internet-based services with the software. It may +* use the software for commercial software hosting services. +4. INTERNET-BASED SERVICES. Microsoft provides Internet-based services with the software. It may change or cancel them at any time. -a. Consent for Internet-Based Services. The software contains features which may connect to -Microsoft or service provider computer systems over the Internet. In some cases, you will not -receive a separate notice when they connect. You may switch these features on or you may -choose not to use them. For more information about these features, see -http://www.microsoft.com/info/privacy/default.mspx. By using these features, you consent to the transmission of +a. Consent for Internet-Based Services. The software contains features which may connect to +Microsoft or service provider computer systems over the Internet. In some cases, you will not +receive a separate notice when they connect. You may switch these features on or you may +choose not to use them. For more information about these features, see +http://www.microsoft.com/info/privacy/default.mspx. By using these features, you consent to the transmission of this information. Microsoft does not use the information to identify or contact you. -b. Misuse of Internet-based Services. You may not use these services in any way that could -harm them or impair anyone else’s use of them. You may not use the services to try to gain -unauthorized access to any service, data, account or network by any means. - -5. BACKUP COPY. You may make one backup copy of the software. You may use it only to reinstall the +b. Misuse of Internet-based Services. You may not use these services in any way that could +harm them or impair anyone else’s use of them. You may not use the services to try to gain +unauthorized access to any service, data, account or network by any means. + +5. BACKUP COPY. You may make one backup copy of the software. You may use it only to reinstall the software. -6. DOCUMENTATION. Any person that has valid access to your computer or internal network may copy +6. DOCUMENTATION. Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes. -7. EXPORT RESTRICTIONS. The software is subject to United States export laws and regulations. You -must comply with all domestic and international export laws and regulations that apply to the software. -These laws include restrictions on destinations, end users and end use. For additional information, see +7. EXPORT RESTRICTIONS. The software is subject to United States export laws and regulations. You +must comply with all domestic and international export laws and regulations that apply to the software. +These laws include restrictions on destinations, end users and end use. For additional information, see www.microsoft.com/exporting. 8. SUPPORT SERVICES. Because this software is “as is,” we may not provide support services for it. -9. ENTIRE AGREEMENT. This agreement, and the terms for supplements, updates, Internet-based -services and support services that you use, are the entire agreement for the software and support +9. ENTIRE AGREEMENT. This agreement, and the terms for supplements, updates, Internet-based +services and support services that you use, are the entire agreement for the software and support services. 10. APPLICABLE LAW. -a. United States. If you acquired the software in the United States, Washington state law governs -the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of -laws principles. The laws of the state where you live govern all other claims, including claims under +a. United States. If you acquired the software in the United States, Washington state law governs +the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of +laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort. -b. Outside the United States. If you acquired the software in any other country, the laws of that +b. Outside the United States. If you acquired the software in any other country, the laws of that country apply. -11. LEGAL EFFECT. This agreement describes certain legal rights. You may have other rights under the -laws of your country. You may also have rights with respect to the party from whom you acquired the -software. This agreement does not change your rights under the laws of your country if the laws of +11. LEGAL EFFECT. This agreement describes certain legal rights. You may have other rights under the +laws of your country. You may also have rights with respect to the party from whom you acquired the +software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so. -12. DISCLAIMER OF WARRANTY. The software is licensed “as-is.” You bear the risk of using -it. Microsoft gives no express warranties, guarantees or conditions. You may have -additional consumer rights under your local laws which this agreement cannot change. To -the extent permitted under your local laws, Microsoft excludes the implied warranties of +12. DISCLAIMER OF WARRANTY. The software is licensed “as-is.” You bear the risk of using +it. Microsoft gives no express warranties, guarantees or conditions. You may have +additional consumer rights under your local laws which this agreement cannot change. To +the extent permitted under your local laws, Microsoft excludes the implied warranties of merchantability, fitness for a particular purpose and non-infringement. -13. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. You can recover from -Microsoft and its suppliers only direct damages up to U.S. $5.00. You cannot recover any -other damages, including consequential, lost profits, special, indirect or incidental +13. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. You can recover from +Microsoft and its suppliers only direct damages up to U.S. $5.00. You cannot recover any +other damages, including consequential, lost profits, special, indirect or incidental damages. This limitation applies to -* anything related to the software, services, content (including code) on third party Internet sites, or +* anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and -* claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, +* claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law. -It also applies even if Microsoft knew or should have known about the possibility of the damages. The -above limitation or exclusion may not apply to you because your country may not allow the exclusion or +It also applies even if Microsoft knew or should have known about the possibility of the damages. The +above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages. @@ -1336,7 +1392,7 @@ Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer artwork and other works in the files distributed with this Notice under -the Creative Commons Attribution-Share Alike 3.0 License, available at +the Creative Commons Attribution-Share Alike 3.0 License, available at http://creativecommons.org/licenses/by-sa/3.0/legalcode. For the license summary, see http://creativecommons.org/licenses/by-sa/3.0/. @@ -1596,6 +1652,11 @@ purpose. EA0300 + scea + + url + http://research.scea.com/scea_shared_source_license.html + sleepycat url From 02ae36b4273bc7eb1a23cc1131e971b41ca79236 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Thu, 5 Jul 2012 12:59:50 +0000 Subject: [PATCH 08/19] OpenSSL Updated. OpenSSL 1.0.0g --- install.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install.xml b/install.xml index c421cae79..0585bd064 100644 --- a/install.xml +++ b/install.xml @@ -937,9 +937,9 @@ linux md5sum - 1eecd24e4d51b11110efee63b2928961 + c57c14353e07e45c0f168313f26ace8e url - https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0d-linux-20110418.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0g-linux-20120207.tar.bz2 linux64 @@ -951,9 +951,9 @@ windows md5sum - dd85209081b832e836de6e1538541d89 + 30062b843657b745ab297bb674ac0b6e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8j-windows-20090129.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0g-windows-20120207.tar.bz2 From 822098b5acf29ef35b85934c7a09f0398c3d1245 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Thu, 5 Jul 2012 13:44:44 +0000 Subject: [PATCH 09/19] Fixed a typo in repackage.sh So. I was tired and that happened. --- scripts/repackage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repackage.sh b/scripts/repackage.sh index 5e2ce5d9e..a75d381c0 100755 --- a/scripts/repackage.sh +++ b/scripts/repackage.sh @@ -30,7 +30,7 @@ case "$1" in --mac|--osx|--darwin|-x|mac|osx|darwin) MODE=osx LIBPATH="libraries/universal-darwin/lib_release" - LIBDPATH="libraries/universal-darwin/lib/release" + LIBDPATH="libraries/universal-darwin/lib/debug" INCPATH="libraries/universal-darwin/include" ;; --lin|--linux|-l|linux) From 9565d9600624dec918c71e14c41098afd3e6f826 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Thu, 5 Jul 2012 13:44:44 +0000 Subject: [PATCH 10/19] Fixed a typo in repackage.sh So. I was tired and that happened. --- scripts/repackage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/repackage.sh b/scripts/repackage.sh index 5e2ce5d9e..bed453591 100755 --- a/scripts/repackage.sh +++ b/scripts/repackage.sh @@ -2,8 +2,8 @@ #(C) 2011 SIANA GEARZ usage() { - echo "Usage: repackage PLATTFORM FILEIN.tar.bz2 [FILEOUT.tar.bz2] -Repackage an archive from llautobuild format into legacy format + echo "Usage: repackage PLATFORM FILEIN.tar.bz2 [FILEOUT.tar.bz2] +Repackage an archive from llautobuild format into singularity format PLATTFORM can be one of windows, linux, mac. " @@ -30,7 +30,7 @@ case "$1" in --mac|--osx|--darwin|-x|mac|osx|darwin) MODE=osx LIBPATH="libraries/universal-darwin/lib_release" - LIBDPATH="libraries/universal-darwin/lib/release" + LIBDPATH="libraries/universal-darwin/lib/debug" INCPATH="libraries/universal-darwin/include" ;; --lin|--linux|-l|linux) From d8c191490fc1b904b65f86462b282ea6546fcf0d Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Thu, 5 Jul 2012 14:19:37 +0000 Subject: [PATCH 11/19] OK HAPPY? ITS FIXED MY GOD RAGE RAGE RAGE RAGE RAGE AND MOAR RAGE Yes I know this looks stupid. Really. --- scripts/repackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repackage.sh b/scripts/repackage.sh index bed453591..ee07ecd95 100755 --- a/scripts/repackage.sh +++ b/scripts/repackage.sh @@ -109,8 +109,8 @@ fi echo " Packing..." tar -cjvf "$FILEOUT" libraries LICENSES echo " Checksum:" -cd `dirname "$FILEOUT"` -md5sum -b `basename "$FILEOUT"` +cd "`dirname "$FILEOUT"`" +md5sum -b "`basename "$FILEOUT"`" cd "$PWD" rm -rf "$TMP" From d1b6b78206f0cd1d8f4a5cbae4b99425b43d5fc8 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Thu, 5 Jul 2012 22:38:24 +0200 Subject: [PATCH 12/19] Fixing windows build --- indra/cmake/CopyWinLibs.cmake | 4 ++++ indra/cmake/LLWindow.cmake | 6 ++---- indra/cmake/UI.cmake | 4 +--- indra/newview/viewer_manifest.py | 2 ++ install.xml | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/indra/cmake/CopyWinLibs.cmake b/indra/cmake/CopyWinLibs.cmake index f9b6dd5ce..aa345e9cc 100644 --- a/indra/cmake/CopyWinLibs.cmake +++ b/indra/cmake/CopyWinLibs.cmake @@ -29,6 +29,8 @@ set(debug_files libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libeay32.dll + ssleay32.dll ) copy_if_different( @@ -206,6 +208,8 @@ set(release_files libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libeay32.dll + ssleay32.dll ) if(FMODEX) diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index e32409020..f8d2a2902 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -13,15 +13,13 @@ if (STANDALONE) SDL_LIBRARY ) else (STANDALONE) - if (NOT DARWIN) + if (LINUX) use_prebuilt_binary(mesa) - endif (NOT DARWIN) - if (LINUX AND VIEWER) use_prebuilt_binary(SDL) set (SDL_FOUND TRUE) set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}) set (SDL_LIBRARY SDL directfb fusion direct) - endif (LINUX AND VIEWER) + endif (LINUX) endif (STANDALONE) if (SDL_FOUND) diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index b0609b652..679b5bf3a 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -31,11 +31,9 @@ if (STANDALONE) add_definitions(${${pkg}_CFLAGS_OTHERS}) endforeach(pkg) else (STANDALONE) - if (NOT DARWIN) + if (LINUX) use_prebuilt_binary(glib) # gtk-etc needs glib use_prebuilt_binary(gtk-atk-pango-glib) - endif (NOT DARWIN) - if (LINUX) set(UI_LIBRARIES atk-1.0 X11 diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 402fb836d..8e037e4e5 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -275,6 +275,8 @@ class WindowsManifest(ViewerManifest): print "Skipping llcommon.dll (assuming llcommon was linked statically)" self.end_prefix() if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): + self.path("libeay32.dll") + self.path("ssleay32.dll") try: self.path('libapr-1.dll') self.path('libaprutil-1.dll') diff --git a/install.xml b/install.xml index c421cae79..296fb48e2 100644 --- a/install.xml +++ b/install.xml @@ -951,9 +951,9 @@ windows md5sum - dd85209081b832e836de6e1538541d89 + 30062b843657b745ab297bb674ac0b6e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8j-windows-20090129.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0g-windows-20120207.tar.bz2 From b40a9c7a06240e36a8315c603e9064b6fc0e7ec9 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Fri, 6 Jul 2012 09:12:42 +0000 Subject: [PATCH 13/19] Updated about floater Moved the licensing to its own tab Updated and added relevant copyright notices --- .../skins/default/xui/en-us/floater_about.xml | 118 ++++++------------ 1 file changed, 41 insertions(+), 77 deletions(-) diff --git a/indra/newview/skins/default/xui/en-us/floater_about.xml b/indra/newview/skins/default/xui/en-us/floater_about.xml index 0f35260c8..2f32819c1 100644 --- a/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -1,99 +1,63 @@ - - - -