From 2ab17fa3f991a71cdb83d6dba8e345e14f11514c Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@posteo.nl>
Date: Thu, 18 Apr 2024 17:59:56 +0200
Subject: Update open_libndofdev and openal to latest versions.

- With the updated openal the dependency on sndio can be dropped
- The updated libndofdev is compiled against the correct version of SDL2 and thus NDOF can be enabled again
---
 .github/workflows/build.yaml | 12 ++++++------
 autobuild.xml                | 12 +++++-------
 indra/cmake/OPENAL.cmake     |  1 -
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3f1ff1d8a6..42dc364ed3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -19,10 +19,10 @@ jobs:
         exclude:
           - runner: windows-large
             configuration: ReleaseOS
-          - runner: macos-12-xl 
+          - runner: macos-12-xl
             configuration: ReleaseOS
           - runner: linux-large
-            configuration: Release 
+            configuration: Release
     runs-on: ${{ matrix.runner }}
     outputs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
@@ -103,7 +103,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -y \
-            libsndio-dev libpulse-dev libunwind-dev \
+            libpulse-dev libunwind-dev \
             libgl1-mesa-dev libglu1-mesa-dev libxinerama-dev \
             libxcursor-dev libxfixes-dev libgstreamer1.0-dev \
             libgstreamer-plugins-base1.0-dev ninja-build libxft-dev \
@@ -221,7 +221,7 @@ jobs:
             export CC=clang
             export CXX=clang++
             export CMAKE_OPTIONS='-DLINK_WITH_MOLD=ON'
-          fi 
+          fi
 
           ./build.sh
 
@@ -393,7 +393,7 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           pattern: "LinuxOS-app"
-      
+
       - name: Rename metadata
         run: |
           cp Windows-metadata/autobuild-package.xml Windows-autobuild-package.xml
@@ -422,7 +422,7 @@ jobs:
           append_body: true
           fail_on_unmatched_files: true
           files: |
-            macOS-installer/*.dmg 
+            macOS-installer/*.dmg
             Windows-installer/*.exe
             *-autobuild-package.xml
             *-viewer_version.txt
diff --git a/autobuild.xml b/autobuild.xml
index 0aab6f29f4..5812ae3b5d 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2204,11 +2204,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>2d20683554f0b00234bbb84d0ce7ac1be1ad70aa</string>
+              <string>f215c7e1a10f04a2c18cbb837e0039521fd150b6</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r1/open_libndofdev-0.14.8503290964-linux64-8503290964.tar.zst</string>
+              <string>https://github.com/secondlife/3p-open-libndofdev/releases/download/v1.14-r2/open_libndofdev-0.14.8730039102-linux64-8730039102.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -2221,7 +2221,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>copyright</key>
         <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
         <key>version</key>
-        <string>0.14.8503290964</string>
+        <string>0.14.8730039102</string>
         <key>name</key>
         <string>open-libndofdev</string>
         <key>description</key>
@@ -2236,11 +2236,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0e25ed4856d4c0009c741a7ad153e6efe30f1398</string>
+              <string>561032415ea95ce38d8836da2bb56e46968f5a82</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-r2/openal-1.23.1-linux64-8572560842.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-r3/openal-1.23.1-linux64-8730177813.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -3365,7 +3365,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-                  <string>-DNDOF=Off</string>
                 </array>
                 <key>arguments</key>
                 <array>
@@ -3392,7 +3391,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
                   <string>-DUSE_OPENAL=On</string>
-                  <string>-DNDOF=Off</string>
                 </array>
               </map>
               <key>build</key>
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index 6a28846029..0b6a7c2853 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -31,7 +31,6 @@ if (USE_OPENAL)
     target_link_libraries( ll::openal INTERFACE
             openal
             alut
-            sndio
             )
   else()
     message(FATAL_ERROR "OpenAL is not available for this platform")
-- 
cgit v1.2.3