livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

master
Ansariel 2021-10-22 23:24:51 +02:00
parent 35398057a4 d49684d093
commit 757084cc2e
9 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -656,9 +656,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>51d9ce98279709854b0be5d0f450ba63</string>
<string>96dd770f246917589b776300a2d07f9e</string>
<key>url</key>
<string>http://3p.firestormviewer.org/curl-7.54.1.180841943-linux64-180841943.tar.bz2</string>
<string>http://3p.firestormviewer.org/curl-7.54.1.212891029-linux64-212891029.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -2968,9 +2968,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>7920fce93d9addf63a420d86f91c5749</string>
<string>ea82e634334bccf088daf3d15eab07b7</string>
<key>url</key>
<string>http://3p.firestormviewer.org/openssl-1.0.2l.180841936-linux64-180841936.tar.bz2</string>
<string>http://3p.firestormviewer.org/openssl-1.1.1l.212872015-linux64-212872015.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>

5
indra/cmake/00-Common.cmake
View File

@ -165,6 +165,11 @@ endif (WINDOWS)
if (LINUX)
set(CMAKE_SKIP_RPATH TRUE)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0.0 )
message( FATAL_ERROR "GCC greater 9.4.0 is not supported. Recompile boost for support of GCC 10.0.0 and up." )
endif()
# <FS:ND/>
# And another hack for FORTIFY_SOURCE. Some distributions (for example Gentoo) define FORTIFY_SOURCE by default.
# Check if this is the case, if yes, do not define it again.

2
indra/cmake/OpenSSL.cmake
View File

@ -17,7 +17,7 @@ else (USESYSTEMLIBS)
endif (USESYSTEMLIBS)
if (LINUX)
set(CRYPTO_LIBRARIES crypto dl)
set(CRYPTO_LIBRARIES crypto dl pthread)
elseif (DARWIN)
set(CRYPTO_LIBRARIES crypto)
endif (LINUX)

6
indra/llcommon/llpreprocessor.h
View File

@ -40,6 +40,12 @@
#define LL_BIG_ENDIAN 1
#endif
//<FS:ND> FIRE-31221 workaround for newer glibc versions, patch from Lance Corrimal
// Figure out GLIBC version - 2.34 needs an additional include as a build fix
#if (__GLIBC__*1000 + __GLIBC_MINOR__) >= 2034
#include <bits/pthread_stack_min.h>
#endif
// </FS:Nd>
// Per-compiler switches

2
indra/llcrashlogger/llcrashlogger.cpp
View File

@ -785,7 +785,7 @@ void LLCrashLogger::init_curl()
}
CRYPTO_set_locking_callback(ssl_locking_callback);
CRYPTO_THREADID_set_callback(ssl_thread_id_callback);
(void)CRYPTO_THREADID_set_callback(ssl_thread_id_callback);
}
}

2
indra/newview/CMakeLists.txt
View File

@ -2562,7 +2562,7 @@ if (NOT ENABLE_MEDIA_PLUGINS)
else (NOT ENABLE_MEDIA_PLUGINS)
set(COPY_INPUT_DEPENDENCIES
${VIEWER_BINARY_NAME}
linux-crash-logger
#linux-crash-logger
SLPlugin
media_plugin_cef
#media_plugin_gstreamer010

2
indra/newview/llsechandler_basic.cpp
View File

@ -355,7 +355,7 @@ LLSD cert_name_from_X509_NAME(X509_NAME* name)
char buffer[32];
X509_NAME_ENTRY *entry = X509_NAME_get_entry(name, entry_index);
std::string name_value = std::string((const char*)ASN1_STRING_data(X509_NAME_ENTRY_get_data(entry)),
std::string name_value = std::string((const char*)ASN1_STRING_get0_data(X509_NAME_ENTRY_get_data(entry)),
ASN1_STRING_length(X509_NAME_ENTRY_get_data(entry)));
ASN1_OBJECT* name_obj = X509_NAME_ENTRY_get_object(entry);

3
indra/newview/llviewerwindow.cpp
View File

@ -3332,7 +3332,8 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
// ToUnicodeEx changes buffer state on OS below Win10, which is undesirable,
// but since we already did a TranslateMessage() in gatherInput(), this
// should have no negative effect
int res = ToUnicodeEx(key, 0, keyboard_state, chars, char_count, 1 << 2 /*do not modify buffer flag*/, layout);
// ToUnicodeEx works with virtual key codes
int res = ToUnicodeEx(raw_key, 0, keyboard_state, chars, char_count, 1 << 2 /*do not modify buffer flag*/, layout);
if (res == 1 && chars[0] >= 0x20)
{
// Let it fall through to character handler and get a WM_CHAR.

4
indra/newview/viewer_manifest.py
View File

@ -1448,6 +1448,8 @@ class DarwinManifest(ViewerManifest):
# in our bundled sub-apps. For each of these we'll create a
# symlink from sub-app/Contents/Resources to the real .dylib.
# Need to get the llcommon dll from any of the build directories as well.
libfile_parent = self.get_dst_prefix()
libfile = "libllcommon.dylib"
dylibs = []
for libfile in (
"libapr-1.0.dylib",
@ -1829,7 +1831,7 @@ class LinuxManifest(ViewerManifest):
with self.prefix(dst="bin"):
self.path("firestorm-bin","do-not-directly-run-firestorm-bin")
self.path("../linux_crash_logger/linux-crash-logger","linux-crash-logger.bin")
#self.path("../linux_crash_logger/linux-crash-logger","linux-crash-logger.bin")
self.path2basename("../llplugin/slplugin", "SLPlugin")
#this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322 and SL-323
# <FS:Ansariel> Remove VMP