From bd94e2ae731b9161162a966f234401409ca98cc2 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 21 Oct 2014 05:41:44 -0400 Subject: [PATCH] Linux64 library update! (other platforms to come) Curl 7.38 LibPNG 1.6.13 LLQTWebkit 4.8.6 OpenSSL 1.0.1j (Yep, this fixes POODLE) Libraries provided by Alchemy Viewer. --- indra/cmake/OpenSSL.cmake | 6 ++++-- indra/cmake/PNG.cmake | 20 +++++++++++++++++++- indra/cmake/WebKitLibPlugin.cmake | 4 +++- indra/llimage/llpngwrapper.h | 2 +- indra/llmessage/aicurl.cpp | 2 +- indra/newview/llfloaterabout.cpp | 10 +++++++++- install.xml | 16 ++++++++-------- 7 files changed, 45 insertions(+), 15 deletions(-) diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake index fffe868fd..51532054c 100644 --- a/indra/cmake/OpenSSL.cmake +++ b/indra/cmake/OpenSSL.cmake @@ -16,6 +16,8 @@ else (STANDALONE OR USE_SYSTEM_OPENSSL) set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (STANDALONE OR USE_SYSTEM_OPENSSL) -if (LINUX OR DARWIN) +if (LINUX) + set(CRYPTO_LIBRARIES crypto dl) +elseif (DARWIN) set(CRYPTO_LIBRARIES crypto) -endif (LINUX OR DARWIN) +endif (LINUX) diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index 011b87f64..565c22cec 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -13,7 +13,25 @@ else (STANDALONE) elseif(DARWIN) set(PNG_LIBRARIES png15) else(LINUX) - set(PNG_LIBRARIES png15) + if (CMAKE_SIZEOF_VOID_P EQUAL 4) # Singu TODO: update png + set(PNG_LIBRARIES png15) + else () + # + # When we have updated static libraries in competition with older + # shared libraries and we want the former to win, we need to do some + # extra work. The *_PRELOAD_ARCHIVES settings are invoked early + # and will pull in the entire archive to the binary giving it + # priority in symbol resolution. Beware of cmake moving the + # achive load itself to another place on the link command line. If + # that happens, you can try something like -Wl,-lpng16 here to hide + # the archive. Also be aware that the linker will not tolerate a + # second whole-archive load of the archive. See viewer's + # CMakeLists.txt for more information. + # + set(PNG_PRELOAD_ARCHIVES -Wl,--whole-archive png16 -Wl,--no-whole-archive) + set(PNG_LIBRARIES png16) + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16) + endif () endif() set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/) endif (STANDALONE) diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 5d1036c6f..7a6305f22 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -50,7 +50,6 @@ elseif (LINUX) ssl # qgif # qjpeg - jscore jpeg fontconfig X11 @@ -58,5 +57,8 @@ elseif (LINUX) Xext GL ) + if (CMAKE_SIZEOF_VOID_P EQUAL 4) # Singu TODO: update webkit + set(WEBKIT_PLUGIN_LIBRARIES ${WEBKIT_PLUGIN_LIBRARIES} jscore) + endif (CMAKE_SIZEOF_VOID_P EQUAL 4) endif (STANDALONE) endif (WINDOWS) diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h index 5f3ad0d5a..397d316d0 100644 --- a/indra/llimage/llpngwrapper.h +++ b/indra/llimage/llpngwrapper.h @@ -26,7 +26,7 @@ #ifndef LL_LLPNGWRAPPER_H #define LL_LLPNGWRAPPER_H -#ifdef LL_STANDALONE +#if LL_STANDALONE || (LL_LINUX && defined(__x86_64__)) #include #else // Workaround for wrongly packaged prebuilt. diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp index bed2242cc..20579654d 100644 --- a/indra/llmessage/aicurl.cpp +++ b/indra/llmessage/aicurl.cpp @@ -1513,7 +1513,7 @@ CurlMultiHandle::~CurlMultiHandle() } // namespace AICurlPrivate -#if LL_LINUX +#if LL_LINUX && !defined(__x86_64__) extern "C" { // Keep linker happy. diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 312296fa5..56060da2b 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -298,7 +298,15 @@ LLFloaterAbout::LLFloaterAbout() // TODO: Implement media plugin version query - support.append("Qt Webkit Version: 4.7.1 (version number hard-coded)"); + support.append("Qt Webkit Version: "); + support.append( +#if LL_LINUX && defined(__x86_64__) + "4.8.6" +#else + "4.7.1" +#endif + ); + support.append(" (version number hard-coded)"); support.append("\n"); if (gPacketsIn > 0) diff --git a/install.xml b/install.xml index a703de3fc..c5b0a2f8b 100644 --- a/install.xml +++ b/install.xml @@ -310,9 +310,9 @@ linux64 md5sum - f6d0f7a6151c1b5a2633679126fbefb0 + 6d610caca171531d71b79075ebfa54eb url - https://bitbucket.org/SingularityViewer/libraries/downloads/curl-7.24.0-linux-x86_64-20120605.tar.bz2 + https://bitbucket.org/SingularityViewer/libraries/downloads/curl-7.38-linux64-20141020.tar.bz2 windows @@ -898,9 +898,9 @@ linux64 md5sum - ec833cfbfce8a818158e289a6c21ad72 + b6bef6d2dcc1c57fb05de868de2756ea url - https://bitbucket.org/SingularityViewer/libraries/downloads/libpng-1.5.10-linux-x86_64-20120420.tar.bz2 + https://bitbucket.org/SingularityViewer/libraries/downloads/libpng-1.6.13-linux64-20141020.tar.bz2 windows @@ -989,9 +989,9 @@ linux64 md5sum - 50ab4b0642c427e062f4e86b5421eb01 + 79fcd5b5e1c1ac4f35235354289205ba url - https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-4.7.1-linux64-20130116.tar.bz2 + https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-4.8.6-linux64-20141021.tar.bz2 windows @@ -1178,9 +1178,9 @@ linux64 md5sum - e4d434731ad8280e85f5177da8d8ed3a + 10e3de555fe95d7be00b6209e26a0566 url - https://bitbucket.org/SingularityViewer/libraries/downloads/openssl-1.0.0g-linux-x86_64-20120605.tar.bz2 + https://bitbucket.org/SingularityViewer/libraries/downloads/openssl-1.0.1j-linux64-20141020.tar.bz2 windows