Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated doc/contributions.txt and added various missing patches from imprudence.

Browse Source 
This updates the source tree with patches that I committed to
imprudence up till and including 2010-10-19.
This commit is contained in:
Aleric Inglewood
2011-05-04 15:52:25 +02:00
parent 6848c2df6f
commit ccaa494e85
10 changed files with 36 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/cmake/CMakeLists.txt
View File

@@ -35,7 +35,6 @@ set(cmake_SOURCE_FILES
FindNDOF.cmake
FindOpenJPEG.cmake
FindXmlRpcEpi.cmake
FindMyZLIB.cmake
FMOD.cmake
FreeType.cmake
GStreamer010Plugin.cmake

46
indra/cmake/FindMyZLIB.cmake
View File

@@ -1,46 +0,0 @@
# -*- cmake -*-
# - Find zlib
# Find the ZLIB includes and library
# This module defines
# ZLIB_INCLUDE_DIRS, where to find zlib.h, etc.
# ZLIB_LIBRARIES, the libraries needed to use zlib.
# ZLIB_FOUND, If false, do not try to use zlib.
#
# This FindZLIB is about 43 times as fast the one provided with cmake (2.8.x),
# because it doesn't look up the version of zlib, resulting in a dramatic
# speed up for configure (from 4 minutes 22 seconds to 6 seconds).
#
# Note: Since this file is only used for standalone, the windows
# specific parts were left out.
FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
NO_SYSTEM_ENVIRONMENT_PATH
)
FIND_LIBRARY(ZLIB_LIBRARY z)
if (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
SET(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
SET(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
SET(ZLIB_FOUND "YES")
else (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
SET(ZLIB_FOUND "NO")
endif (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
if (ZLIB_FOUND)
if (NOT ZLIB_FIND_QUIETLY)
message(STATUS "Found ZLIB: ${ZLIB_LIBRARIES}")
SET(ZLIB_FIND_QUIETLY TRUE)
endif (NOT ZLIB_FIND_QUIETLY)
else (ZLIB_FOUND)
if (ZLIB_FIND_REQUIRED)
message(FATAL_ERROR "Could not find ZLIB library")
endif (ZLIB_FIND_REQUIRED)
endif (ZLIB_FOUND)
mark_as_advanced(
ZLIB_LIBRARY
ZLIB_INCLUDE_DIR
)

1
indra/cmake/UI.cmake
View File

@@ -42,6 +42,7 @@ else (STANDALONE)
gdk_pixbuf-2.0
Xinerama
glib-2.0
gio-2.0
gmodule-2.0
gobject-2.0
gthread-2.0

2
indra/cmake/ZLIB.cmake
View File

@@ -6,7 +6,7 @@ set(ZLIB_FIND_REQUIRED ON)
include(Prebuilt)
if (STANDALONE)
include(FindMyZLIB)
include(FindZLIB)
else (STANDALONE)
use_prebuilt_binary(zlib)
if (WINDOWS)

10
indra/newview/llappviewer.cpp
View File

@@ -1120,16 +1120,6 @@ bool LLAppViewer::mainLoop()
bool LLAppViewer::cleanup()
{
//----------------------------------------------
//this test code will be removed after the test
//test manual call stack tracer
if(gSavedSettings.getBOOL("QAMode"))
{
LLError::LLCallStacks::print() ;
}
//end of the test code
//----------------------------------------------
//flag all elements as needing to be destroyed immediately
// to ensure shutdown order
LLMortician::setZealous(TRUE);

2
indra/newview/llfloaterabout.cpp
View File

@@ -275,7 +275,7 @@ LLFloaterAbout::LLFloaterAbout()
// TODO: Implement media plugin version query
support.append("Qt Webkit Version: 4.7.1 ");
support.append("Qt Webkit Version: 4.7.1 (version number hard-coded)");
support.append("\n");
if (gPacketsIn > 0)

2
indra/newview/llselectmgr.h
View File

@@ -252,7 +252,7 @@ public:
return (object != NULL) && node->mValid && !node->mIndividualSelection && (object->isRootEdit() || object->isJointChild());
}
};
typedef boost::filter_iterator<is_root, list_t::iterator > valid_root_iterator;
typedef boost::filter_iterator<is_valid_root, list_t::iterator > valid_root_iterator;
valid_root_iterator valid_root_begin() { return valid_root_iterator(mList.begin(), mList.end()); }
valid_root_iterator valid_root_end() { return valid_root_iterator(mList.end(), mList.end()); }

17
indra/newview/viewer_manifest.py
View File

@@ -827,25 +827,8 @@ class Linux_x86_64Manifest(LinuxManifest):
self.path("libopenal.so.1")
self.path("libalut.so.0")
# GTK+ and dependencies
## Lets just use the system libraries for all of these:
##self.path("libatk-1.0.so.0")
##self.path("libcairo.so.2")
##self.path("libfontconfig.so.1")
##self.path("libfreetype.so.6")
self.path("libgdk_pixbuf-2.0.so.0") # was commented to use systems gdk pixbufs instead -
# but seems webkit needs it o_O . Packaging for testing now.
##self.path("libgdk-x11-2.0.so.0")
##self.path("libgtk-x11-2.0.so.0")
# self.path("libpango-1.0.so.0") # use systems pango instead
# self.path("libpangoft2-1.0.so.0") # Both gdk pixbufs and pango would load systems modules
# self.path("libpangox-1.0.so.0") # and crash if not compatible or present.
# self.path("libpangoxft-1.0.so.0") # So we depend system gdk pixbufs and pango anyway.
##self.path("libpixman-1.so.0")
self.end_prefix("lib64")
# Vivox runtimes and libs
if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
self.path("SLVoice")