vircadia · digisomni · Oct 4, 2022 · Jun 24, 2022 · Jun 27, 2022 · Jul 1, 2022
diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml
@@ -124,7 +124,8 @@ jobs:
           sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1
         else # macOS
           echo "Downloading MacOSX10.12 SDK.."
-          curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://cloudflare-ipfs.com/ipfs/QmTDLEYdo616YgZKSYC2mySSw8EKQWTz7CH8UyMupMBpzK?filename=macOS_SDK10.12.4.tar.xz" || exit 1
+          # TODO: do this in cmake or python build scripts to make use of centralized external asset configuration with fallback gateways.
+          curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://ipfs.vircadia.dev/ipfs/QmTDLEYdo616YgZKSYC2mySSw8EKQWTz7CH8UyMupMBpzK?filename=macOS_SDK10.12.4.tar.xz" || exit 1
           echo "  done\n"
           echo "Checking MacOSX10.12 SDK.."
           echo "c00e03cb64bed8d0d75d7a01c93de094b6ffaa3bc3318e7b29a9bdc354f0e29e363c454b7db89db8a3b78e9702668d1c661f1af279807de8db11accecb0ca498  macOS_SDK10.12.4.tar.xz" >> macOS_SDK10.12.4.tar.xz.checksum

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
@@ -158,7 +158,8 @@ jobs:
           sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1
         else # macOS
           echo "Downloading MacOSX10.12 SDK.."
-          curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://cloudflare-ipfs.com/ipfs/QmTDLEYdo616YgZKSYC2mySSw8EKQWTz7CH8UyMupMBpzK?filename=macOS_SDK10.12.4.tar.xz" || exit 1
+          # TODO: do this in cmake or python build scripts to make use of centralized external asset configuration with fallback gateways.
+          curl --progress-bar -L -o macOS_SDK10.12.4.tar.xz "https://ipfs.vircadia.dev/ipfs/QmTDLEYdo616YgZKSYC2mySSw8EKQWTz7CH8UyMupMBpzK?filename=macOS_SDK10.12.4.tar.xz" || exit 1
           echo "  done\n"
           echo "Checking MacOSX10.12 SDK.."
           echo "c00e03cb64bed8d0d75d7a01c93de094b6ffaa3bc3318e7b29a9bdc354f0e29e363c454b7db89db8a3b78e9702668d1c661f1af279807de8db11accecb0ca498  macOS_SDK10.12.4.tar.xz" >> macOS_SDK10.12.4.tar.xz.checksum

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -227,11 +227,19 @@ set(BUILD_INSTALLER_OPTION ON)
 set(DISABLE_QML_OPTION OFF)
 set(DOWNLOAD_SERVERLESS_CONTENT_OPTION OFF)
 set(ENABLE_WEBRTC_DATA_CHANNELS_OPTION OFF)
+set(ENABLE_WEBRTC_AUDIO_OPTION OFF)
 
 if (WIN32 OR (UNIX AND NOT APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64"))
     set(ENABLE_WEBRTC_DATA_CHANNELS_OPTION ON)
 endif()
 
+if (WIN32 OR (UNIX AND NOT ANDROID AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64"))
+    # We don't yet have a working libwebrtc for android.
+    # WebRTC is difficult to build on aarch64 Linux.
+    # an alternative is https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing.
+    set(ENABLE_WEBRTC_AUDIO_OPTION ON)
+endif()
+
 if (ANDROID OR UWP)
   set(BUILD_SERVER_OPTION OFF)
   set(BUILD_TOOLS_OPTION OFF)
@@ -304,13 +312,18 @@ option(
   ${DOWNLOAD_SERVERLESS_CONTENT_OPTION}
 )
 option(ENABLE_WEBRTC_DATA_CHANNELS "Use WebRTC for client-server connection in parallel with UDP" ${ENABLE_WEBRTC_DATA_CHANNELS_OPTION})
+option(ENABLE_WEBRTC_AUDIO "Use WebRTC for audio processing (e.g. echo cancelation)." ${ENABLE_WEBRTC_AUDIO_OPTION})
 
 set(PLATFORM_QT_GL OpenGL)
 
 if (ENABLE_WEBRTC_DATA_CHANNELS)
   add_compile_definitions(WEBRTC_DATA_CHANNELS=1)
 endif()
 
+if (ENABLE_WEBRTC_AUDIO)
+  add_compile_definitions(WEBRTC_AUDIO=1)
+endif()
+
 if (USE_KHR_ROBUSTNESS)
   add_definitions(-DUSE_KHR_ROBUSTNESS)
 endif()
@@ -338,6 +351,7 @@ MESSAGE(STATUS "Build installer:       " ${BUILD_INSTALLER})
 MESSAGE(STATUS "GL ES:                 " ${USE_GLES})
 MESSAGE(STATUS "DL serverless content: " ${DOWNLOAD_SERVERLESS_CONTENT})
 MESSAGE(STATUS "WebRTC Data Channels:  " ${ENABLE_WEBRTC_DATA_CHANNELS})
+MESSAGE(STATUS "WebRTC Audio:          " ${ENABLE_WEBRTC_AUDIO})
 MESSAGE(STATUS "Static standard libraries: " ${STATIC_STDLIB})
 MESSAGE(STATUS "Shared internal libraries: " ${BUILD_SHARED_LIBS})
 

diff --git a/INSTALLER.md b/INSTALLER.md
@@ -32,22 +32,24 @@ To produce an executable installer on Windows, the following are required:
     1. Extract Zip
     1. Copy `Include\nsProcess.nsh` to `C:\Program Files (x86)\NSIS\Include\`
     1. Copy `Plugins\nsProcess.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
-    1. Copy `Plugins\nsProcessW.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
+    1. Copy `Plugins\nsProcessW.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\` and rename the filename to `nsProcess.dll` (remove the 'W' character)
 
 1. [InetC Plug-in for Nullsoft](http://nsis.sourceforge.net/Inetc_plug-in) - 1.0
     1. Extract Zip
     1. Copy `Plugin\x86-ansi\InetC.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
     1. Copy `Plugin\x86-unicode\InetC.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
 
-1. [NSISpcre Plug-in for Nullsoft](http://nsis.sourceforge.net/NSISpcre_plug-in) - 1.0
+1. [NSISpcre Plug-in for Nullsoft](https://github.com/mazinsw/NSISpcre/archive/refs/heads/master.zip) - 1.0
     1. Extract Zip
-    1. Copy `NSISpre.nsh` to `C:\Program Files (x86)\NSIS\Include\`
-    1. Copy `NSISpre.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
+    1. Copy `include\NSISpre.nsh` to `C:\Program Files (x86)\NSIS\Include\`
+    1. Copy `bin\x86-ansi\NSISpre.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
+    1. Copy `bin\x86-unicode\NSISpre.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
+
 
 1. [nsisSlideshow Plug-in for Nullsoft](<http://wiz0u.free.fr/prog/nsisSlideshow/>) - 1.7
    1.  Extract Zip
    1.  Copy `bin\nsisSlideshow.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
-   1.  Copy `bin\nsisSlideshowW.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
+   1.  Copy `bin\nsisSlideshowW.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\` and rename the filename to `nsisSlideshow.dll` (remove the 'W' character)
 
 1. [Nsisunz plug-in for Nullsoft](http://nsis.sourceforge.net/Nsisunz_plug-in)
    1.  Download both Zips and unzip

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
@@ -475,11 +475,6 @@ void Agent::executeScript() {
                 packetType = PacketType::SilentAudioFrame;
             }
 
-            Transform audioTransform;
-            auto headOrientation = scriptedAvatar->getHeadOrientation();
-            audioTransform.setTranslation(scriptedAvatar->getWorldPosition());
-            audioTransform.setRotation(headOrientation);
-
             QByteArray encodedBuffer;
             if (_encoder) {
                 _encoder->encode(audio, encodedBuffer);
@@ -488,7 +483,7 @@ void Agent::executeScript() {
             }
 
             AbstractAudioInterface::emitAudioPacket(encodedBuffer.data(), encodedBuffer.size(), audioSequenceNumber, false,
-                                                    audioTransform, scriptedAvatar->getWorldPosition(), glm::vec3(0),
+                                                    {scriptedAvatar->getWorldPosition(), scriptedAvatar->getHeadOrientation()}, scriptedAvatar->getWorldPosition(), glm::vec3(0),
                                                     packetType, _selectedCodecName);
         });
 
@@ -719,7 +714,7 @@ void Agent::processAgentAvatarAudio() {
             if (isPlayingRecording && !_shouldMuteRecordingAudio) {
                 _shouldMuteRecordingAudio = true;
             }
-            
+
             auto audioData = _avatarSound->getAudioData();
             nextSoundOutput = reinterpret_cast<const int16_t*>(audioData->rawData()
                     + _numAvatarSoundSentBytes);
@@ -880,7 +875,7 @@ void Agent::aboutToFinish() {
     {
         DependencyManager::get<ScriptEngines>()->shutdownScripting();
     }
-    
+
     DependencyManager::destroy<ScriptEngines>();
 
     DependencyManager::destroy<AssignmentDynamicFactory>();

diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -279,7 +279,7 @@ bool shouldBeSkipped(MixableStream& stream, const Node& listener,
     bool shouldCheckIgnoreBox = (listenerAudioStream.isIgnoreBoxEnabled() ||
                                  stream.positionalStream->isIgnoreBoxEnabled());
     if (shouldCheckIgnoreBox &&
-        listenerAudioStream.getIgnoreBox().touches(stream.positionalStream->getIgnoreBox())) {
+        isTouching(listenerAudioStream.getIgnoreBox(), stream.positionalStream->getIgnoreBox())) {
         return true;
     }
 
@@ -587,7 +587,7 @@ void AudioMixerSlave::updateHRTFParameters(AudioMixerClientData::MixableStream&
     glm::vec3 relativePosition = streamToAdd->getPosition() - listeningNodeStream.getPosition();
 
     float distance = glm::max(glm::length(relativePosition), EPSILON);
-    float gain = isEcho ? 1.0f : computeGain(masterAvatarGain, masterInjectorGain, listeningNodeStream, *streamToAdd, 
+    float gain = isEcho ? 1.0f : computeGain(masterAvatarGain, masterInjectorGain, listeningNodeStream, *streamToAdd,
                                              relativePosition, distance);
     float azimuth = isEcho ? 0.0f : computeAzimuth(listeningNodeStream, listeningNodeStream, relativePosition);
 
@@ -815,14 +815,14 @@ float computeAzimuth(const AvatarAudioStream& listeningNodeStream,
 
     float rotatedSourcePositionLength2 = glm::length2(rotatedSourcePosition);
     if (rotatedSourcePositionLength2 > SOURCE_DISTANCE_THRESHOLD) {
-        
+
         // produce an oriented angle about the y-axis
         glm::vec3 direction = rotatedSourcePosition * (1.0f / fastSqrtf(rotatedSourcePositionLength2));
         float angle = fastAcosf(glm::clamp(-direction.z, -1.0f, 1.0f)); // UNIT_NEG_Z is "forward"
         return (direction.x < 0.0f) ? -angle : angle;
 
-    } else {   
+    } else {
         // no azimuth if they are in same spot
-        return 0.0f; 
+        return 0.0f;
     }
 }
diff --git a/cmake/ExternalAssetsConfig.cmake b/cmake/ExternalAssetsConfig.cmake
@@ -3,19 +3,21 @@
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros/ExternalAssetsUtils.cmake")
 
 set(USE_IPFS_EXTERNAL_BUILD_ASSETS true CACHE STRING "Enable IPFS gateway for external assets (default: true)")
-set(USE_DIRECT_EXTERNAL_BUILD_ASSETS true CACHE STRING "Enable direct links for external assets (default: true)")
+set(USE_DIRECT_EXTERNAL_BUILD_ASSETS false CACHE STRING "Enable direct links for external assets (default: false)")
 
 set(EXTERNAL_BUILD_ASSETS_DIRECT_BASE_URLS
     "https://athena-public.s3.amazonaws.com"
     "http://motofckr9k.ddns.net"
     "https://data.moto9000.moe"
+    "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/android"
+    "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/"
     CACHE
     STRING "Direct base urls for external assets"
 )
 
 set(EXTERNAL_BUILD_ASSETS_IPFS_BASE_URLS
     "http://localhost:8080/ipfs"
-    "http://ipfs.vircadia.dev/ipfs"
+    "https://ipfs.vircadia.dev/ipfs"
     "https://cf-ipfs.com/ipfs"
     "https://gateway.ipfs.io/ipfs"
     "https://cloudflare-ipfs.com/ipfs"
@@ -301,3 +303,108 @@ set(EXTERNAL_QT_DEBIAN_AARCH64_SHA512 "c18f8a6ff2ca091fb14947e437c3179368d85c1da
 set(EXTERNAL_QT_DEBIAN_AARCH64_MD5 "097069159999c32b6cf626fe05f22e7a")
 define_external_asset_urls(QT_DEBIAN_AARCH64)
 
+set(EXTERNAL_QT_LINUX_ARMV8_LIBCPP_OPENSSL_PATCHED_PATH "qt-5.11.1_linux_armv8-libcpp_openssl_patched.tgz")
+set(EXTERNAL_QT_LINUX_ARMV8_LIBCPP_OPENSSL_PATCHED_IPFS_CID "Qma2EUEymBG8KB1DGxFaD8jZZD8VC4CtpVzbSsg3CQBKYT")
+set(EXTERNAL_QT_LINUX_ARMV8_LIBCPP_OPENSSL_PATCHED_MD5 "aa449d4bfa963f3bc9a9dfe558ba29df")
+define_external_asset_urls(QT_LINUX_ARMV8_LIBCPP_OPENSSL_PATCHED)
+
+set(EXTERNAL_QT_WIN_ARMV8_LIBCPP_OPENSSL_PATCHED_PATH "qt-5.11.1_win_armv8-libcpp_openssl_patched.tgz")
+set(EXTERNAL_QT_WIN_ARMV8_LIBCPP_OPENSSL_PATCHED_IPFS_CID "QmPXk7uJnY7tFH1gBFPiFmnWQmvMq57Ltpg9PcbfhSk77K")
+set(EXTERNAL_QT_WIN_ARMV8_LIBCPP_OPENSSL_PATCHED_MD5 "0582191cc55431aa4f660848a542883e")
+define_external_asset_urls(QT_WIN_ARMV8_LIBCPP_OPENSSL_PATCHED)
+
+set(EXTERNAL_QT_MAC_ARMV8_LIBCPP_OPENSSL_PATCHED_PATH "qt-5.11.1_osx_armv8-libcpp_openssl_patched.tgz")
+set(EXTERNAL_QT_MAC_ARMV8_LIBCPP_OPENSSL_PATCHED_IPFS_CID "QmesL4YUQi1hw3LYx8FWKm43RJ9K9gmC7wanYaw9rby245")
+set(EXTERNAL_QT_MAC_ARMV8_LIBCPP_OPENSSL_PATCHED_MD5 "c83cc477c08a892e00c71764dca051a0")
+define_external_asset_urls(QT_MAC_ARMV8_LIBCPP_OPENSSL_PATCHED)
+
+set(EXTERNAL_BULLET_ARMV8_LIBCPP_PATH "bullet-2.88_armv8-libcpp.tgz")
+set(EXTERNAL_BULLET_ARMV8_LIBCPP_IPFS_CID "QmdRdQWXS4oxg5cS7x1BMnovfivJEkHEkrZ26Zuy7Zxy2m")
+set(EXTERNAL_BULLET_ARMV8_LIBCPP_MD5 "81642779ccb110f8c7338e8739ac38a0")
+define_external_asset_urls(BULLET_ARMV8_LIBCPP)
+
+set(EXTERNAL_DRACO_ARMV8_LIBCPP_PATH "draco_armv8-libcpp.tgz")
+set(EXTERNAL_DRACO_ARMV8_LIBCPP_IPFS_CID "QmQuA9gUT7DUxPPjEb95FkvkYZ3B4by5r9H3uGv8iU8ig6")
+set(EXTERNAL_DRACO_ARMV8_LIBCPP_MD5 "617a80d213a5ec69fbfa21a1f2f738cd")
+define_external_asset_urls(DRACO_ARMV8_LIBCPP)
+
+set(EXTERNAL_GLAD_ARMV8_LIBCPP_PATH "glad_armv8-libcpp.zip")
+set(EXTERNAL_GLAD_ARMV8_LIBCPP_IPFS_CID "QmVpvmDg9MEPudkfKTDJfPZg4ckq1jcUQzhZ1YyBiNs2TR")
+set(EXTERNAL_GLAD_ARMV8_LIBCPP_MD5 "a8ee8584cf1ccd34766c7ddd9d5e5449")
+define_external_asset_urls(GLAD_ARMV8_LIBCPP)
+
+set(EXTERNAL_GVRSDK_PATH "gvrsdk_v1.101.0.tgz")
+set(EXTERNAL_GVRSDK_IPFS_CID "QmbPZqU7dKoQEARUbF6ztcSyPWN5LW6VPzfATjhL6x2aN3")
+set(EXTERNAL_GVRSDK_MD5 "57fd02baa069176ba18597a29b6b4fc7")
+define_external_asset_urls(GVRSDK)
+
+set(EXTERNAL_NVTT_ARMV8_LIBCPP_PATH "nvtt_armv8-libcpp.zip")
+set(EXTERNAL_NVTT_ARMV8_LIBCPP_IPFS_CID "QmcxwNX5HPVqJ9Xbqyk7vWe9i2skm2kPp7gd9MMHwJ7y8T")
+set(EXTERNAL_NVTT_ARMV8_LIBCPP_MD5 "eb46d0b683e66987190ed124aabf8910")
+define_external_asset_urls(NVTT_ARMV8_LIBCPP)
+
+set(EXTERNAL_OVR_SDK_MOBILE_PATH "ovr_sdk_mobile_1.37.0.zip")
+set(EXTERNAL_OVR_SDK_MOBILE_IPFS_CID "Qmek4kWXEMiGx7vyn5ntLAKtB7uVaAaGUbYcRown1b9KLj")
+set(EXTERNAL_OVR_SDK_MOBILE_MD5 "6040e1966f335a3e5015295154cd7383")
+define_external_asset_urls(OVR_SDK_MOBILE)
+
+set(EXTERNAL_OVR_PLATFORM_SDK_ANDROID_PATH "ovr_platform_sdk_23.0.0.zip")
+set(EXTERNAL_OVR_PLATFORM_SDK_ANDROID_IPFS_CID "QmW2CamwqPd3mAz5KtCsbnoFz17pJw8vCyvLXmRa7m7WZ4")
+set(EXTERNAL_OVR_PLATFORM_SDK_ANDROID_MD5 "29d02b560f60d0fa7b8a64cd965dd55b")
+define_external_asset_urls(OVR_PLATFORM_SDK_ANDROID)
+
+set(EXTERNAL_POLYVOX_ARMV8_LIBCPP_PATH "polyvox_armv8-libcpp.tgz")
+set(EXTERNAL_POLYVOX_ARMV8_LIBCPP_IPFS_CID "QmXHgaQ3wo3GHSGbxPQo26twARQUtE9uQpDJqW5HxsBm9A")
+set(EXTERNAL_POLYVOX_ARMV8_LIBCPP_MD5 "dba88b3a098747af4bb169e9eb9af57e")
+define_external_asset_urls(POLYVOX_ARMV8_LIBCPP)
+
+set(EXTERNAL_TBB_ARMV8_LIBCPP_PATH "tbb-2018_U1_armv8_libcpp.tgz")
+set(EXTERNAL_TBB_ARMV8_LIBCPP_IPFS_CID "QmWB2BAitm8N2iECVYg56LZAVs8SqvGRzDkrdY4wGxxk13")
+set(EXTERNAL_TBB_ARMV8_LIBCPP_MD5 "20768f298f53b195e71b414b0ae240c4")
+define_external_asset_urls(TBB_ARMV8_LIBCPP)
+
+set(EXTERNAL_CODECSDK_ANDROID_ARMV8_PATH "codecSDK-android_armv8-2.0.zip")
+set(EXTERNAL_CODECSDK_ANDROID_ARMV8_IPFS_CID "QmWP6AZizmuDkMboFW78qxAWEhQZYriXP5tg28iCZkFCxL")
+set(EXTERNAL_CODECSDK_ANDROID_ARMV8_MD5 "1cbef929675818fc64c4101b72f84a6a")
+define_external_asset_urls(CODECSDK_ANDROID_ARMV8)
+
+set(EXTERNAL_ETC2COMP_PATCHED_ARMV8_LIBCPP_PATH "etc2comp-patched-armv8-libcpp.tgz")
+set(EXTERNAL_ETC2COMP_PATCHED_ARMV8_LIBCPP_IPFS_CID "QmZSCzQsTs7EsdoskNZDz9coywhzbWV1d8PP192rKCBVte")
+set(EXTERNAL_ETC2COMP_PATCHED_ARMV8_LIBCPP_MD5 "14b02795d774457a33bbc60e00a786bc")
+define_external_asset_urls(ETC2COMP_PATCHED_ARMV8_LIBCPP)
+
+set(EXTERNAL_BREAKPAD_PATH "breakpad.tgz")
+set(EXTERNAL_BREAKPAD_IPFS_CID "QmSTohJ6X1L5MNyPs98izFRKzm1tt3sLPytoJVNo9ehz6B")
+set(EXTERNAL_BREAKPAD_MD5 "ddcb23df336b08017042ba4786db1d9e")
+define_external_asset_urls(BREAKPAD)
+
+set(EXTERNAL_WEBRTC_ANDROID_PATH "webrtc-20190626-android.tar.gz")
+set(EXTERNAL_WEBRTC_ANDROID_IPFS_CID "QmcwRmgYmfyFyQ2Y8bhAw8aH5BQ63R9HBrNiRAUVWroEoE")
+set(EXTERNAL_WEBRTC_ANDROID_MD5 "e2dccd3d8efdcba6d428c87ba7fb2a53")
+define_external_asset_urls(WEBRTC_ANDROID)
+
+set(EXTERNAL_NLOHMANN_JSON_JSONHPP_PATH "nlohmann-json-v3.3.0/json.hpp")
+set(EXTERNAL_NLOHMANN_JSON_JSONHPP_IPFS_CID "QmRe7unCwvNjzmt7CExnphS13Ltnk8WBSmNqHmS3VTmBFs")
+set(EXTERNAL_NLOHMANN_JSON_JSONHPP_SHA512 "c4e4bb84d1488f87a02c4e12409491225e345cc508e6dbbee1a3542fbd4953052c256d0fe78c4d3ce02d44c3a2155fe66f0c8a93a3851ddf94fec4f9f3fd6918")
+define_external_asset_urls(NLOHMANN_JSON_JSONHPP)
+
+set(EXTERNAL_NLOHMANN_JSON_LICENSE_PATH "nlohmann-json-v3.3.0/LICENSE.MIT")
+set(EXTERNAL_NLOHMANN_JSON_LICENSE_IPFS_CID "QmRSAu3zMMfoZAdpU8nhN5hnJMHFBsP5X3vxGGgTwUfiXD")
+set(EXTERNAL_NLOHMANN_JSON_LICENSE_SHA512 "0fdb404547467f4523579acde53066badf458504d33edbb6e39df0ae145ed27d48a720189a60c225c0aab05f2aa4ce4050dcb241b56dc693f7ee9f54c8728a75")
+define_external_asset_urls(NLOHMANN_JSON_LICENSE)
+
+set(EXTERNAL_OPENSSL_102S_PATH "openssl-1.0.2s.tar.gz")
+set(EXTERNAL_OPENSSL_102S_IPFS_CID "QmXRKtBhXJbYJm2FhrVobYo7sboU5V5C8xXMc3ryNs6z8F")
+set(EXTERNAL_OPENSSL_102S_SHA512 "9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a")
+define_external_asset_urls(OPENSSL_102S)
+
+set(EXTERNAL_OPENSSL_111H_PATH "openssl-1.1.1h.tar.gz")
+set(EXTERNAL_OPENSSL_111H_IPFS_CID "QmYks763hXmjvMooXx3y2gi75RVGB3KbbcCFqPmouu9gWk")
+set(EXTERNAL_OPENSSL_111H_SHA512 "da50fd99325841ed7a4367d9251c771ce505a443a73b327d8a46b2c6a7d2ea99e43551a164efc86f8743b22c2bdb0020bf24a9cbd445e9d68868b2dc1d34033a")
+define_external_asset_urls(OPENSSL_111H)
+
+set(EXTERNAL_ZLIB_PATH "zlib-1.2.11.tar.gz")
+set(EXTERNAL_ZLIB_IPFS_CID "QmVUxkKQnLaiWK7nSwMFQ97LYSeGuwtRFjhw9ooMpJd5Gr")
+set(EXTERNAL_ZLIB_SHA512 "73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae")
+define_external_asset_urls(ZLIB)
+
diff --git a/cmake/macros/ExternalAssetsUtils.cmake b/cmake/macros/ExternalAssetsUtils.cmake
@@ -20,6 +20,7 @@ macro(define_external_asset_urls ASSETNAME)
 
     file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/EXTERNAL_${ASSETNAME}_URLS.txt" "${EXTERNAL_${ASSETNAME}_URLS}")
     file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/EXTERNAL_${ASSETNAME}_SHA512.txt" "${EXTERNAL_${ASSETNAME}_SHA512}")
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/_env/EXTERNAL_${ASSETNAME}_MD5.txt" "${EXTERNAL_${ASSETNAME}_MD5}")
 
 endmacro(define_external_asset_urls)
 
diff --git a/cmake/ports/nlohmann-json/portfile.cmake b/cmake/ports/nlohmann-json/portfile.cmake
@@ -1,17 +1,20 @@
 include(vcpkg_common_functions)
 
-set(SOURCE_VERSION 3.3.0)
+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_NLOHMANN_JSON_JSONHPP_URLS.txt" EXTERNAL_NLOHMANN_JSON_JSONHPP_URLS)
+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_NLOHMANN_JSON_LICENSE_URLS.txt" EXTERNAL_NLOHMANN_JSON_LICENSE_URLS)
+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_NLOHMANN_JSON_JSONHPP_SHA512.txt" EXTERNAL_NLOHMANN_JSON_JSONHPP_SHA512)
+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_NLOHMANN_JSON_LICENSE_SHA512.txt" EXTERNAL_NLOHMANN_JSON_LICENSE_SHA512)
 
 vcpkg_download_distfile(HEADER
-    URLS "https://github.com/nlohmann/json/releases/download/v${SOURCE_VERSION}/json.hpp"
-    FILENAME "nlohmann-json-${SOURCE_VERSION}.hpp"
-    SHA512 c4e4bb84d1488f87a02c4e12409491225e345cc508e6dbbee1a3542fbd4953052c256d0fe78c4d3ce02d44c3a2155fe66f0c8a93a3851ddf94fec4f9f3fd6918
+    URLS ${EXTERNAL_NLOHMANN_JSON_JSONHPP_URLS}
+    FILENAME "nlohmann-json.hpp"
+    SHA512 ${EXTERNAL_NLOHMANN_JSON_JSONHPP_SHA512}
 )
 
 vcpkg_download_distfile(LICENSE
-    URLS "https://github.com/nlohmann/json/raw/v${SOURCE_VERSION}/LICENSE.MIT"
-    FILENAME "nlohmann-json-LICENSE-${SOURCE_VERSION}.txt"
-    SHA512 0fdb404547467f4523579acde53066badf458504d33edbb6e39df0ae145ed27d48a720189a60c225c0aab05f2aa4ce4050dcb241b56dc693f7ee9f54c8728a75
+    URLS ${EXTERNAL_NLOHMANN_JSON_LICENSE_URLS}
+    FILENAME "nlohmann-json-LICENSE.txt"
+    SHA512 ${EXTERNAL_NLOHMANN_JSON_LICENSE_SHA512}
 )
 
 file(INSTALL ${HEADER} DESTINATION ${CURRENT_PACKAGES_DIR}/include/nlohmann RENAME json.hpp)

diff --git a/cmake/ports/openssl-unix/portfile.cmake b/cmake/ports/openssl-unix/portfile.cmake
@@ -1,5 +1,6 @@
 include(vcpkg_common_functions)
 
+
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
     message(FATAL_ERROR "This port is only for openssl on Unix-like systems")
 endif()
@@ -16,12 +17,15 @@ endif()
 
 vcpkg_find_acquire_program(PERL)
 
+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_OPENSSL_102S_URLS.txt" EXTERNAL_OPENSSL_102S_URLS)
+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_OPENSSL_102S_SHA512.txt" EXTERNAL_OPENSSL_102S_SHA512)
+
 set(OPENSSL_VERSION 1.0.2s)
 
 vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
-    URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz"
+    URLS ${EXTERNAL_OPENSSL_102S_URLS}
     FILENAME "openssl-${OPENSSL_VERSION}.tar.gz"
-    SHA512 9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a
+    SHA512 ${EXTERNAL_OPENSSL_102S_SHA512}
 )
 
 vcpkg_extract_source_archive_ex(