From b1d3b65094ddd1df5d458149b0000c67d86100c0 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 23 Dec 2024 17:50:20 +0800 Subject: MacPorts' openal-soft has been upgraded to 1.24.1 The __APPLE__ undef and redefining is for getting around the `expected ';' after top level declarator` error that would happen on /opt/local/include/AL/alext.h line 165: typedef ALCboolean (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context) ALC_API_NOEXCEPT17; where ALCcontext wouldn't be recognised because of freealut's /opt/local/include/AL/alut.h that would include macOS' OpenAL framework alc.h instead of MacPorts openal-soft's own alc.h, if __APPLE__ is defined, hence the undefining just before including freealut's alut.h (and redefining afterwards, to avoid any problem). --- indra/newview/FixPackage.cmake.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/FixPackage.cmake.in') diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index 5f9ba28fc0..e1f8e648a5 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -235,9 +235,9 @@ execute_process( COMMAND lipo libogg.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libogg.0.dylib - COMMAND lipo libopenal.1.23.1.dylib + COMMAND lipo libopenal.1.24.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenal.1.23.1.dylib + -output libopenal.1.24.1.dylib COMMAND lipo libpcre.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libpcre.1.dylib @@ -310,7 +310,7 @@ execute_process( Frameworks/libndofdev.dylib Frameworks/libnghttp2.14.dylib Frameworks/libogg.0.dylib - Frameworks/libopenal.1.23.1.dylib + Frameworks/libopenal.1.24.1.dylib Frameworks/libpcre.1.dylib Frameworks/libpcrecpp.0.dylib Frameworks/libpng16.16.dylib -- cgit v1.2.3