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

Linux - Update 3p libs, fix linux-crash-logger, contributed by Pork Chop, thank you!

master
Zi Ree 2022-08-01 13:35:25 +02:00
parent ff45c6b438
commit 5230df4b14
3 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
autobuild.xml
View File

@ -618,9 +618,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>401f317fbb67623c97a7b9d8b6627ef1</string>
<string>8d96a9d1a9a208b1f48ac677edb7ca4d</string>
<key>url</key>
<string>http://3p.firestormviewer.org/boost-1.72-linux64_bionic-220402045.tar.bz2</string>
<string>http://3p.firestormviewer.org/boost-1.72-linux64-222121224.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -736,9 +736,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>88ee58d6548deae6c306f125b6461d61</string>
<string>e1a8e9eca2894687b3532474ffc9b326</string>
<key>url</key>
<string>http://3p.firestormviewer.org/colladadom-2.3.220402056-linux64_bionic-220402056.tar.bz2</string>
<string>http://3p.firestormviewer.org/colladadom-2.3.222130404-linux64-222130404.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -866,9 +866,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>0bcccd248a5e4084af4026eee439816b</string>
<string>bacaa5403be0f1cba52b2250c2c227d9</string>
<key>url</key>
<string>http://3p.firestormviewer.org/curl-7.81.0.220511906-linux64_bionic-220511906.tar.bz2</string>
<string>http://3p.firestormviewer.org/curl-7.81.0.222121724-linux64-222121724.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -2000,9 +2000,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>0bc56fa68f59537486c75b04646d65a9</string>
<string>c68bbfe6c9bd59d182c4d20d966492b4</string>
<key>url</key>
<string>http://3p.firestormviewer.org/libxml2-2.9.4.180841555-linux64-180841555.tar.bz2</string>
<string>http://3p.firestormviewer.org/libxml2-2.9.4.222130358-linux64-222130358.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -2318,6 +2318,18 @@
<key>name</key>
<string>darwin64</string>
</map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>50d647afc4e510af72f09dcd7a77e920</string>
<key>url</key>
<string>http://3p.firestormviewer.org/meshoptimizer-0.16.222121104-linux64-222121104.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
<key>windows</key>
<map>
<key>archive</key>
@ -2374,6 +2386,18 @@
<key>name</key>
<string>darwin64</string>
</map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>ee4e3a02ad4669a4d84e9c32e509530e</string>
<key>url</key>
<string>http://3p.firestormviewer.org/minizip_ng-3.0.2.222121607-linux64-222121607.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
<key>windows</key>
<map>
<key>archive</key>
@ -2762,9 +2786,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>ea82e634334bccf088daf3d15eab07b7</string>
<string>cdd9c6c484542a2e1be99149c4f0e75f</string>
<key>url</key>
<string>http://3p.firestormviewer.org/openssl-1.1.1l.212872015-linux64-212872015.tar.bz2</string>
<string>http://3p.firestormviewer.org/openssl-1.1.1l.222121440-linux64-222121440.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -3362,9 +3386,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>15a645809cb2f14074f22e7848bb42cf</string>
<string>5ee7cda65cede06190c811e59b3880b0</string>
<key>url</key>
<string>http://3p.firestormviewer.org/zlib-1.2.8.180841547-linux64-180841547.tar.bz2</string>
<string>http://3p.firestormviewer.org/zlib_ng-2.0.5.222121000-linux64-222121000.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>

2
indra/CMakeLists.txt
View File

@ -136,7 +136,7 @@ if (LINUX)
include(LLAppearanceUtility)
add_subdirectory(${LLAPPEARANCEUTILITY_SRC_DIR} ${LLAPPEARANCEUTILITY_BIN_DIR})
endif (INSTALL_PROPRIETARY)
add_dependencies(viewer linux-crash-logger-strip-target)
# add_dependencies(viewer linux-crash-logger-strip-target)
elseif (WINDOWS)
# cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake
if (EXISTS ${VIEWER_DIR}win_setup)

12
indra/linux_crash_logger/CMakeLists.txt
View File

@ -7,7 +7,7 @@ include(Linking)
include(UI)
include(CURL)
include(OpenSSL)
include(ZLIB)
include(ZLIBNG)
include_directories(
${LLCOREHTTP_INCLUDE_DIRS}
@ -54,12 +54,12 @@ set(LIBRT_LIBRARY rt)
target_link_libraries(linux-crash-logger
${UI_LIBRARIES}
${CURL_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${ZLIB_LIBRARIES}
${CURL_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${ZLIBNG_LIBRARIES}
${LIBRT_LIBRARY}
X11
X11
)
add_custom_target(linux-crash-logger-target ALL