diff --git a/autobuild.xml b/autobuild.xml index 66e5c1c9f10..91ab31a293c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -26,11 +26,11 @@ archive hash - 3f2f65cb135cd9d4704371eaf6d973517c372161 + f5d20f9e964cb4c927a6616844b9ff044ad0498d hash_algorithm sha1 url - https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-darwin64-11540565100.tar.zst + https://github.com/secondlife/3p-sdl2/releases/download/v2.32.0-r1/SDL2-2.32.0-r1-darwin64-13365192785.tar.zst name darwin64 @@ -40,11 +40,11 @@ archive hash - 27a431140f6f3f12f00b6a38f741fab43caa7708 + 456d1896eb3cad66067050a047bdda3e82136477 hash_algorithm sha1 url - https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-linux64-11540565100.tar.zst + https://github.com/secondlife/3p-sdl2/releases/download/v2.32.0-r1/SDL2-2.32.0-r1-linux64-13365192785.tar.zst name linux64 @@ -54,11 +54,11 @@ archive hash - f3485e4a02a7e8ba899e17cdc9ff0aaad661fcc1 + ccf57c04f2b3e2b5dd7f4b118a69b8194756ea83 hash_algorithm sha1 url - https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-windows64-11540565100.tar.zst + https://github.com/secondlife/3p-sdl2/releases/download/v2.32.0-r1/SDL2-2.32.0-r1-windows64-13365192785.tar.zst name windows64 @@ -2084,11 +2084,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - cbbcf3c5341e4ff4f956c0de960dc238faf20d54 + 836bd3122a98b4e019e1dd00d79df3774b6c3b36 hash_algorithm sha1 url - https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r4/open_libndofdev-0.14.11545940352-linux64-11545940352.tar.zst + https://github.com/AiraYumi/3p-open-libndofdev/releases/download/v1.14-r100/open_libndofdev-0.14.13381052644-linux64-13381052644.tar.zst name linux64 diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index bae3dc5d94a..a52e17ac8e9 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -171,7 +171,6 @@ elseif(DARWIN) set(release_files libndofdev.dylib libSDL2.dylib - libSDL2-2.0.dylib ) if(LLCOMMON_LINK_SHARED) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 8daf42b6162..5d5bfbe589e 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -936,7 +936,7 @@ def construct(self): with self.prefix(src=relpkgdir, dst=""): self.path("libndofdev.dylib") - self.path("libSDL2-*.dylib") + self.path("libSDL2*.dylib") with self.prefix(src_dst="cursors_mac"): self.path("*.tif") @@ -1038,7 +1038,7 @@ def path_optional(src, dst): # SDL2 for libfile in ( - 'libSDL2-2.0.dylib', + 'libSDL2.dylib', ): dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)