From 74562168a99b6a734b6d4eff58065af48d775195 Mon Sep 17 00:00:00 2001
From: AiraYumi <aira.youme@airanyumi.net>
Date: Mon, 10 Feb 2025 13:32:35 +0900
Subject: [PATCH 1/3] update sdl2 2.32.0

---
 autobuild.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 66e5c1c9f10..91ab31a293c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -26,11 +26,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>3f2f65cb135cd9d4704371eaf6d973517c372161</string>
+              <string>f5d20f9e964cb4c927a6616844b9ff044ad0498d</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-darwin64-11540565100.tar.zst</string>
+              <string>https://github.com/secondlife/3p-sdl2/releases/download/v2.32.0-r1/SDL2-2.32.0-r1-darwin64-13365192785.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -40,11 +40,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>27a431140f6f3f12f00b6a38f741fab43caa7708</string>
+              <string>456d1896eb3cad66067050a047bdda3e82136477</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-linux64-11540565100.tar.zst</string>
+              <string>https://github.com/secondlife/3p-sdl2/releases/download/v2.32.0-r1/SDL2-2.32.0-r1-linux64-13365192785.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -54,11 +54,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>f3485e4a02a7e8ba899e17cdc9ff0aaad661fcc1</string>
+              <string>ccf57c04f2b3e2b5dd7f4b118a69b8194756ea83</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-sdl2/releases/download/v2.30.8-r1/SDL2-2.30.8-windows64-11540565100.tar.zst</string>
+              <string>https://github.com/secondlife/3p-sdl2/releases/download/v2.32.0-r1/SDL2-2.32.0-r1-windows64-13365192785.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -2084,11 +2084,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>cbbcf3c5341e4ff4f956c0de960dc238faf20d54</string>
+              <string>836bd3122a98b4e019e1dd00d79df3774b6c3b36</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r4/open_libndofdev-0.14.11545940352-linux64-11545940352.tar.zst</string>
+              <string>https://github.com/AiraYumi/3p-open-libndofdev/releases/download/v1.14-r100/open_libndofdev-0.14.13381052644-linux64-13381052644.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>

From d843ee9750a4becf8aef4ebe05fcaaebeb841f8d Mon Sep 17 00:00:00 2001
From: AiraYumi <aira.youme@airanyumi.net>
Date: Sat, 15 Feb 2025 09:50:05 +0900
Subject: [PATCH 2/3] Exclude Mac libraries that have been removed from the sdl
 package from being copied.

---
 indra/cmake/Copy3rdPartyLibs.cmake | 1 -
 1 file changed, 1 deletion(-)

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)

From cbf7525315aa0d0a9c043be005ed9640f7625372 Mon Sep 17 00:00:00 2001
From: AiraYumi <aira.youme@airanyumi.net>
Date: Sun, 23 Feb 2025 00:00:30 +0900
Subject: [PATCH 3/3] Exclude Mac libraries that have been removed from the sdl
 package from viewer target.

---
 indra/newview/viewer_manifest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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)