diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-03-13 12:51:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 12:51:09 -0700 |
| commit | 665d59d46eced8b0864d83191e7391933bb308ac (patch) | |
| tree | 354f1dd1b993806c1a174e22847cb9d64f488daa | |
| parent | d909e7243861320b43634ab9cafd2bb5a8dc558b (diff) | |
| parent | 4c3d090bf425ea81de4e308e1a8b46d78f646eb7 (diff) | |
Merge pull request #978 from secondlife/brad/926-hdri-local-openexr-static-link
secondlife/viewer#926 chage openexr lib to use static link on mac
| -rw-r--r-- | autobuild.xml | 22 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 6 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
3 files changed, 18 insertions, 16 deletions
diff --git a/autobuild.xml b/autobuild.xml index f0038f6532..94a9f8fb9b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2219,25 +2219,39 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>158cbe79bef4ecafb870052bbaca541e07107228</string> + <string>17cd63922214b588d9a36137fadf927237ec0f25</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-openexr/releases/download/v1.8/openexr-3.2.2-darwin64-6501c65.tar.zst</string> + <string>https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-darwin64-df7544d.tar.zst</string> </map> <key>name</key> <string>darwin64</string> </map> + <key>linux64</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>b092658ab5ec009a5875e8b6e5b7109730ad6846</string> + <key>hash_algorithm</key> + <string>sha1</string> + <key>url</key> + <string>https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-linux64-df7544d.tar.zst</string> + </map> + <key>name</key> + <string>linux64</string> + </map> <key>windows64</key> <map> <key>archive</key> <map> <key>hash</key> - <string>924f6ddf6669af023d1f3832cb79b50b913ae0ca</string> + <string>c511ae9a3e401375af2199b498a75f32cebc010f</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/3p-openexr/releases/download/v1.8/openexr-3.2.2-windows64-6501c65.tar.zst</string> + <string>https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-windows64-df7544d.tar.zst</string> </map> <key>name</key> <string>windows64</string> diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 415641f65f..873253b419 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -190,12 +190,6 @@ elseif(DARWIN) liburiparser.dylib liburiparser.1.dylib liburiparser.1.0.27.dylib - libIex-3_2.dylib - libIlmThread-3_2.dylib - libImath-3_1.dylib - libOpenEXR-3_2.dylib - libOpenEXRCore-3_2.dylib - libOpenEXRUtil-3_2.dylib ) if (TARGET ll::fmodstudio) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 70121ecc64..5258842b75 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -942,12 +942,6 @@ class Darwin_x86_64_Manifest(ViewerManifest): with self.prefix(src=relpkgdir, dst=""): self.path("libndofdev.dylib") self.path("libhunspell-*.dylib") - self.path("libIex-3_2.dylib") - self.path("libIlmThread-3_2.dylib") - self.path("libImath-3_1.dylib") - self.path("libOpenEXR-3_2.dylib") - self.path("libOpenEXRCore-3_2.dylib") - self.path("libOpenEXRUtil-3_2.dylib") with self.prefix(src_dst="cursors_mac"): self.path("*.tif") |