just a reminder --- there are changes in it you don't want

README

@@ -1,3 +1,17 @@
+
+
+This repo has moved: git clone git://dawn.adminart.net/lsl-repo.git
+
+
+
+
+
+
+
+
+
+
+
 00000000011111111112222222222333333333344444444445555555555666666666677777777778
 12345678901234567890123456789012345678901234567890123456789012345678901234567890
        ______ ___ __   _  _____ _    _       ______  _____ ___ _____ _   _

README.compile

@@ -0,0 +1,36 @@
+
+2015-09-18:
+
+failing webkit on Gentoo: apparently emerging dev-qt/qtopengl fixes it
+
+for reference:
+
+build-linux-x86_64-release/newview/packaged $ LD_LIBRARY_PATH="`pwd`/lib64:`pwd`/lib32:$LD_LIBRARY_PATH" ldd ../../plugins/webkit/libmedia_plugin_webkit.so | grep found
+
+... to see what's missing, and go from there
+
+
+OLD:
+
+compiling on a minimal centos 6.5 installation from their DVD:
+
+
+yum install cmake gcc gcc-c++ mesa-libGL-devel mesa-libGLU-devel
+yum install libidn-devel libXrender-devel libXinerama-devel
+
+optionally:
+
+yum install prelink
+
+
+edit SingularityViewer/indra/cmake/00-Common.cmake and comment out
+the line "-flto=4"
+
+install fmod according to instructions on singularity website
+
+run
+
+  sh ./mkupdate.sh
+
+... and it should compile.  If prelink is not installed, the binary
+will not be prelinked, and this is not required.

README.gentoo

@@ -0,0 +1,14 @@
+
+To compile on Gentoo:
+
+
++ Use python2.7, not 3.x.
+
++ When you get undefined references to GOMP_.* and omp.* symbols, add
+  '-lgomp' (without the quotes) to:
+
+  build-linux-x86_64-release/newview/CMakeFiles/secondlife-bin.dir/link.txt
+  build-linux-x86_64-release/llplugin/slplugin/CMakeFiles/SLPlugin.dir/link.txt
+
++ You may get messages about 'libwebkit_pluin' failing.  I don't know
+  how to fix that.

indra/cmake/00-Common.cmake

@@ -132,12 +132,51 @@ if (LINUX)
       -DAPPID=secondlife
       -D_REENTRANT
       -fexceptions
+
+      -fdelete-dead-exceptions
+
       -fno-math-errno
       -fno-strict-aliasing
       -fsigned-char
       -fvisibility=hidden
-      -g
+#      -g
       -pthread
+      -march=native
+#
+      -maes
+      -mmmx
+      -mpopcnt
+      -msse
+      -msse2
+      -msse3
+      -msse4.1
+      -msse4.2
+      -mssse3
+#
+      -O3
+      -fno-stack-protector
+      -fomit-frame-pointer
+
+      -finline-functions
+#      -ffast-math
+      -funsafe-math-optimizations
+      -ffinite-math-only
+      -fno-signed-zeros
+      -fcx-limited-range
+      -funroll-loops
+      -frename-registers
+#      -ftracer
+      -fvariable-expansion-in-unroller
+      -freorder-blocks-and-partition
+       -fuse-linker-plugin
+       -flto=24
+#      -I/usr/lib/gcc/x86_64-redhat-linux/4.8.1/
+
+	-Wno-strict-aliasing
+#	-ftree-loop-linear // don't
+	-ftree-loop-im
+      -ftree-parallelize-loops=24
+	-funswitch-loops
       )
 
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ")
@@ -197,10 +236,10 @@ if (LINUX)
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
 
-    if (NOT STANDALONE)
-      # this stops us requiring a really recent glibc at runtime
-      add_definitions(-fno-stack-protector)
-    endif (NOT STANDALONE)
+    # if (NOT STANDALONE)
+    #   # this stops us requiring a really recent glibc at runtime
+    #   add_definitions(-fno-stack-protector)
+    # endif (NOT STANDALONE)
     if (${ARCH} STREQUAL "x86_64")
       add_definitions(-DLINUX64=1 -pipe)
       set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
@@ -219,10 +258,10 @@ if (LINUX)
       set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
     endif (${ARCH} STREQUAL "x86_64")
   elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    if (NOT STANDALONE)
-      # this stops us requiring a really recent glibc at runtime
-      add_definitions(-fno-stack-protector)
-    endif (NOT STANDALONE)
+    # if (NOT STANDALONE)
+    #   # this stops us requiring a really recent glibc at runtime
+    #   add_definitions(-fno-stack-protector)
+    # 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")
@@ -232,10 +271,10 @@ if (LINUX)
     set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
   elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
 
-    if (NOT STANDALONE)
-      # this stops us requiring a really recent glibc at runtime
-      add_definitions(-fno-stack-protector)
-    endif (NOT STANDALONE)
+    # if (NOT STANDALONE)
+    #   # this stops us requiring a really recent glibc at runtime
+    #   add_definitions(-fno-stack-protector)
+    # endif (NOT STANDALONE)
 
     if (NOT STANDALONE)
       set(MARCH_FLAG " -axsse4.1 -msse2")

indra/llcommon/llsys.cpp

@@ -882,7 +882,7 @@ static U32 LLMemoryAdjustKBResult(U32 inKB)
 }
 #endif
 
-U32 LLMemoryInfo::getPhysicalMemoryKB() const
+U64 LLMemoryInfo::getPhysicalMemoryKB() const
 {
 #if LL_WINDOWS
 	return LLMemoryAdjustKBResult(mStatsMap["Total Physical KB"].asInteger());
@@ -900,7 +900,7 @@ U32 LLMemoryInfo::getPhysicalMemoryKB() const
 #elif LL_LINUX
 	U64 phys = 0;
 	phys = (U64)(getpagesize()) * (U64)(get_phys_pages());
-	return (U32)(phys >> 10);
+	return (U64)(phys >> 10);
 
 #elif LL_SOLARIS
 	U64 phys = 0;
@@ -913,20 +913,10 @@ U32 LLMemoryInfo::getPhysicalMemoryKB() const
 #endif
 }
 
-U32 LLMemoryInfo::getPhysicalMemoryClamped() const
+U64 LLMemoryInfo::getPhysicalMemoryClamped() const
 {
-	// Return the total physical memory in bytes, but clamp it
-	// to no more than U32_MAX
-
-	U32 phys_kb = getPhysicalMemoryKB();
-	if (phys_kb >= 4194304 /* 4GB in KB */)
-	{
-		return U32_MAX;
-	}
-	else
-	{
-		return phys_kb << 10;
-	}
+	U64 phys_kb = getPhysicalMemoryKB();
+	return (phys_kb << 10);
 }
 
 //static

indra/llcommon/llsys.h

@@ -112,12 +112,13 @@ class LL_COMMON_API LLMemoryInfo
 	LLMemoryInfo(); ///< Default constructor
 	void stream(std::ostream& s) const;	///< output text info to s
 
-	U32 getPhysicalMemoryKB() const; ///< Memory size in KiloBytes
+	U64 getPhysicalMemoryKB() const; ///< Memory size in KiloBytes
 
 	/*! Memory size in bytes, if total memory is >= 4GB then U32_MAX will
 	**  be returned.
 	*/
-	U32 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes
+	// no, do return actual memory, not clamped
+	U64 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes
 
 	//get the available memory infomation in KiloBytes.
 	static void getAvailableMemoryKB(U32& avail_physical_mem_kb, U32& avail_virtual_mem_kb);

indra/llimage/llimage.cpp

@@ -281,7 +281,7 @@ U8* LLImageBase::allocateDataSize(S32 width, S32 height, S32 ncomponents, S32 si
 // LLImageRaw
 //---------------------------------------------------------------------------
 
-AIThreadSafeSimpleDC<S32> LLImageRaw::sGlobalRawMemory;
+AIThreadSafeSimpleDC<U64> LLImageRaw::sGlobalRawMemory;
 S32 LLImageRaw::sRawImageCount = 0;
 S32 LLImageRaw::sRawImageCachedCount = 0;
 
@@ -358,7 +358,7 @@ LLImageRaw::~LLImageRaw()
 U8* LLImageRaw::allocateData(S32 size)
 {
 	U8* res = LLImageBase::allocateData(size);
-	*AIAccess<S32>(sGlobalRawMemory) += getDataSize();
+	*AIAccess<U64>(sGlobalRawMemory) += getDataSize();
 	return res;
 }
 
@@ -367,15 +367,15 @@ U8* LLImageRaw::reallocateData(S32 size)
 {
 	S32 old_data_size = getDataSize();
 	U8* res = LLImageBase::reallocateData(size);
-	*AIAccess<S32>(sGlobalRawMemory) += getDataSize() - old_data_size;
+	*AIAccess<U64>(sGlobalRawMemory) += getDataSize() - old_data_size;
 	return res;
 }
 
 // virtual
 void LLImageRaw::deleteData()
 {
 	{
-		*AIAccess<S32>(sGlobalRawMemory) -= getDataSize();
+		*AIAccess<U64>(sGlobalRawMemory) -= getDataSize();
 	}
 	LLImageBase::deleteData();
 }
@@ -392,7 +392,7 @@ void LLImageRaw::setDataAndSize(U8 *data, S32 width, S32 height, S8 components)
 	LLImageBase::setSize(width, height, components) ;
 	LLImageBase::setDataAndSize(data, width * height * components) ;
 
-	*AIAccess<S32>(sGlobalRawMemory) += getDataSize();
+	*AIAccess<U64>(sGlobalRawMemory) += getDataSize();
 }
 
 BOOL LLImageRaw::resize(U16 width, U16 height, S8 components)

indra/llimage/llimage.h

@@ -257,7 +257,7 @@ class LLImageRaw : public LLImageBase
 	void setDataAndSize(U8 *data, S32 width, S32 height, S8 components) ;
 
 public:
-	static AIThreadSafeSimpleDC<S32> sGlobalRawMemory;
+	static AIThreadSafeSimpleDC<U64> sGlobalRawMemory;
 	static S32 sRawImageCount;
 
 	static S32 sRawImageCachedCount;