diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-02-15 15:02:06 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-02-15 15:02:06 +0800 |
| commit | d7cebdc089c38af288e1a384e3c51f4161419d86 (patch) | |
| tree | cd00f13df5e3a595525148a0a8f6fab7ccf5c7ae /indra/newview | |
| parent | 1f8eb029e0a178a8d0140c92298e40bdd8a902ba (diff) | |
| parent | 934b2de85e33fd2d4a7bf9abe12dcdeb743ff418 (diff) | |
Merge branch 'main' into 2024.12-ForeverFPS
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 6 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 6 | ||||
| -rw-r--r-- | indra/newview/PKGBUILD.in | 2 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 53885896cc..066cdc1a1b 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.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.24.1.dylib + COMMAND lipo libopenal.1.24.2.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenal.1.24.1.dylib + -output libopenal.1.24.2.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.24.1.dylib + Frameworks/libopenal.1.24.2.dylib Frameworks/libpcre.1.dylib Frameworks/libpcrecpp.0.dylib Frameworks/libpng16.16.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index c03057662e..1cff561ea6 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.24.1.dylib + COMMAND lipo libopenal.1.24.2.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenal.1.24.1.dylib + -output libopenal.1.24.2.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.24.1.dylib + Frameworks/libopenal.1.24.2.dylib Frameworks/libpcre.1.dylib Frameworks/libpcrecpp.0.dylib Frameworks/libpng16.16.dylib diff --git a/indra/newview/PKGBUILD.in b/indra/newview/PKGBUILD.in index d917f216b6..f288b12287 100644 --- a/indra/newview/PKGBUILD.in +++ b/indra/newview/PKGBUILD.in @@ -6,7 +6,7 @@ pkgdesc="${VIEWER_PACKAGE_COMMENT}" arch=('${CMAKE_SYSTEM_PROCESSOR}') url="https://${VIEWER_PACKAGE_DOMAIN_NAME}" license=('LGPL-2.1') -depends=(freealut apr-util boost-libs fltk glu hunspell libnghttp2 sdl2 uriparser vlc libvorbis) +depends=(apr-util boost-libs fltk glu hunspell libnghttp2 sdl2 uriparser vlc libvorbis) package() { cd "$startdir" diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 47a0512885..373c771253 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -112,7 +112,7 @@ if (LINUX) install(FILES ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13 - ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.26 + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.27 DESTINATION ${_LIB}) endif (USE_FMODSTUDIO) endif (LINUX) |