From 36ec777336ff97353fac91602912b4c22d01cd28 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 29 Nov 2024 11:37:28 -0800
Subject: [PATCH] openal-soft: update to 1.24.1

Fixes PPC compilation failure.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 releases.json                                    |  1 +
 subprojects/openal-soft.wrap                     |  8 ++++----
 subprojects/packagefiles/openal-soft/meson.build | 15 ++++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/releases.json b/releases.json
index c417f0a02..76c1ce207 100644
--- a/releases.json
+++ b/releases.json
@@ -2703,6 +2703,7 @@
       "openal"
     ],
     "versions": [
+      "1.24.1-1",
       "1.24.0-1",
       "1.23.1-3",
       "1.23.1-2",
diff --git a/subprojects/openal-soft.wrap b/subprojects/openal-soft.wrap
index 040edd7da..039bd9335 100644
--- a/subprojects/openal-soft.wrap
+++ b/subprojects/openal-soft.wrap
@@ -1,8 +1,8 @@
 [wrap-file]
-directory = openal-soft-1.24.0
-source_url = https://github.com/kcat/openal-soft/archive/refs/tags/1.24.0.tar.gz
-source_filename = openal-soft-1.24.0.tar.gz
-source_hash = d3753f7aba798574ce2dc934e3c47dc655cd7a4652c038f2a860b0e81ff6d3dc
+directory = openal-soft-1.24.1
+source_url = https://github.com/kcat/openal-soft/archive/refs/tags/1.24.1.tar.gz
+source_filename = openal-soft-1.24.1.tar.gz
+source_hash = e1b6ec960e00bfed3d480330274b0f102dc10e4ae0dbb70fd9db80d6978165b1
 patch_directory = openal-soft
 
 [provide]
diff --git a/subprojects/packagefiles/openal-soft/meson.build b/subprojects/packagefiles/openal-soft/meson.build
index cf74f39a7..27aaff30e 100644
--- a/subprojects/packagefiles/openal-soft/meson.build
+++ b/subprojects/packagefiles/openal-soft/meson.build
@@ -1,7 +1,7 @@
 project(
   'openal-soft',
   'cpp',
-  version: '1.24.0',
+  version: '1.24.1',
   meson_version: '>=0.58',
   default_options: ['cpp_std=c++17', 'c_std=c11'],
 )
@@ -12,6 +12,7 @@ if meson.version().version_compare('>= 0.62')
 else
   dl_dep = cpp.find_library('dl', required: false)
 endif
+fmt_dep = dependency('fmt')
 thread_dep = dependency('threads')
 alsa_dep = dependency('alsa', required: get_option('alsa'))
 apple_dep = dependency('appleframeworks', modules: ['AudioToolbox', 'CoreAudio', 'CoreFoundation'], required: host_machine.system() == 'darwin')
@@ -28,9 +29,6 @@ sdl2_dep = dependency('sdl2', required: get_option('sdl2'))
 sndio_dep = dependency('sndio', required: get_option('sndio'))
 solaris_dep = dependency('audioio', required: get_option('solaris'))
 
-#Disable SIMD on PPC for now. It's fixed in master, broken in releaee
-add_project_arguments('-DPFFFT_SIMD_DISABLE', language: 'cpp')
-
 if host_machine.system() == 'windows'
   add_project_arguments('-DNOMINMAX', language: 'cpp')
   if cpp.get_argument_syntax() == 'msvc'
@@ -237,9 +235,13 @@ configure_file(input: 'config_simd.h.in', output: 'config_simd.h', format: 'cmak
 cdata = configuration_data()
 
 #ignore for now
-cdata.set('ALSOFT_EAX', false)
 cdata.set('ALSOFT_UWP', false)
 
+cdata.set('ALSOFT_EAX', host_machine.system() == 'windows')
+if cdata.get('ALSOFT_EAX')
+  alc_sources += files('al/eax/api.cpp', 'al/eax/call.cpp', 'al/eax/exception.cpp', 'al/eax/fx_slot_index.cpp', 'al/eax/fx_slots.cpp', 'al/eax/utils.cpp')
+endif
+
 cdata.set('HAVE_RTKIT', rtkit_dep.found())
 if cdata.get('HAVE_RTKIT')
   alc_sources += files('core/dbus_wrap.cpp', 'core/rtkit.cpp')
@@ -292,7 +294,6 @@ endif
 common_lib = static_library(
   'common',
   common_sources,
-  dependencies: atomic_dep,
 )
 
 common_inc = include_directories('.')
@@ -300,7 +301,7 @@ common_inc = include_directories('.')
 common_dep = declare_dependency(
   link_with: common_lib,
   include_directories: common_inc,
-  dependencies: atomic_dep,
+  dependencies: [atomic_dep, fmt_dep],
 )
 
 openal_inc = include_directories('common', 'include', 'include/AL')