summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/build.yaml4
-rw-r--r--indra/cmake/FMODSTUDIO.cmake26
-rw-r--r--indra/llaudio/lllistener_openal.h6
-rw-r--r--indra/llrender/llimagegl.cpp4
-rw-r--r--indra/newview/FixBundle.cmake.in36
-rw-r--r--indra/newview/FixPackage.cmake.in36
-rw-r--r--indra/newview/ViewerInstall.cmake2
-rw-r--r--indra/newview/featuretable_mac.txt4
8 files changed, 64 insertions, 54 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 57e86ad8f6..7d6bcd2bc4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,7 +42,7 @@ jobs:
needs: setup
strategy:
matrix:
- runner: [windows-large, macos-13-xlarge]
+ runner: [windows-large, macos-12-large]
configuration: ${{ fromJSON(needs.setup.outputs.configurations) }}
runs-on: ${{ matrix.runner }}
outputs:
@@ -64,7 +64,7 @@ jobs:
# autobuild-package.xml.
AUTOBUILD_VCS_INFO: "true"
AUTOBUILD_VSVER: "170"
- DEVELOPER_DIR: "/Applications/Xcode_14.1.app/Contents/Developer"
+ DEVELOPER_DIR: "/Applications/Xcode_14.0.1.app/Contents/Developer"
# Ensure that Linden viewer builds engage Bugsplat.
BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }}
build_coverity: false
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index f3a46b480c..55ac4ee144 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -34,7 +34,7 @@ if (USE_FMODSTUDIO)
file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release)
if (DARWIN)
execute_process(
- COMMAND hdiutil attach -noverify fmodstudioapi20225mac-installer.dmg
+ COMMAND hdiutil attach -noverify fmodstudioapi20226mac-installer.dmg
WORKING_DIRECTORY $ENV{HOME}/Downloads
)
file(
@@ -64,26 +64,26 @@ if (USE_FMODSTUDIO)
file(WRITE ${PREBUILD_TRACKING_DIR}/fmodstudio_installed "${fmodstudio_installed}")
else (DARWIN)
file(ARCHIVE_EXTRACT
- INPUT $ENV{HOME}/Downloads/fmodstudioapi20225linux.tar.gz
+ INPUT $ENV{HOME}/Downloads/fmodstudioapi20226linux.tar.gz
DESTINATION ${CMAKE_BINARY_DIR}
)
file(
COPY
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/inc/fmod.h
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/inc/fmod.hpp
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/inc/fmod_codec.h
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/inc/fmod_common.h
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/inc/fmod_dsp.h
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/inc/fmod_dsp_effects.h
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/inc/fmod_errors.h
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/inc/fmod_output.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/inc/fmod.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/inc/fmod.hpp
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/inc/fmod_codec.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/inc/fmod_common.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/inc/fmod_dsp.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/inc/fmod_dsp_effects.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/inc/fmod_errors.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/inc/fmod_output.h
DESTINATION ${LIBS_PREBUILT_DIR}/include/fmodstudio
)
file(
COPY
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
- ${CMAKE_BINARY_DIR}/fmodstudioapi20225linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.25
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20226linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.26
DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
FOLLOW_SYMLINK_CHAIN
)
diff --git a/indra/llaudio/lllistener_openal.h b/indra/llaudio/lllistener_openal.h
index f1b69ddcef..12d9aa6611 100644
--- a/indra/llaudio/lllistener_openal.h
+++ b/indra/llaudio/lllistener_openal.h
@@ -31,7 +31,13 @@
#include "lllistener.h"
#include "AL/al.h"
+#ifdef LL_DARWIN
+#undef __APPLE__
+#endif
#include "AL/alut.h"
+#ifdef LL_DARWIN
+#define __APPLE__
+#endif
#include "AL/alext.h"
class LLListener_OpenAL : public LLListener
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 18fafa201c..4e2658dcdc 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -2537,7 +2537,9 @@ bool LLImageGL::scaleDown(S32 desired_discard)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
- if (mTarget != GL_TEXTURE_2D)
+ if (mTarget != GL_TEXTURE_2D
+ || mFormatInternal == -1 // not initialized
+ )
{
return false;
}
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index 63041fb603..53885896cc 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -110,18 +110,18 @@ file(CREATE_LINK
SYMBOLIC
)
file(CREATE_LINK
- "../../../../Frameworks/libicudata.74.dylib"
- "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicudata.74.dylib"
+ "../../../../Frameworks/libicudata.76.dylib"
+ "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicudata.76.dylib"
SYMBOLIC
)
file(CREATE_LINK
- "../../../../Frameworks/libicui18n.74.dylib"
- "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicui18n.74.dylib"
+ "../../../../Frameworks/libicui18n.76.dylib"
+ "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicui18n.76.dylib"
SYMBOLIC
)
file(CREATE_LINK
- "../../../../Frameworks/libicuuc.74.dylib"
- "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicuuc.74.dylib"
+ "../../../../Frameworks/libicuuc.76.dylib"
+ "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicuuc.76.dylib"
SYMBOLIC
)
file(CREATE_LINK
@@ -202,15 +202,15 @@ execute_process(
COMMAND lipo libiconv.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libiconv.2.dylib
- COMMAND lipo libicudata.74.2.dylib
+ COMMAND lipo libicudata.76.1.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicudata.74.2.dylib
- COMMAND lipo libicui18n.74.2.dylib
+ -output libicudata.76.1.dylib
+ COMMAND lipo libicui18n.76.1.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicui18n.74.2.dylib
- COMMAND lipo libicuuc.74.2.dylib
+ -output libicui18n.76.1.dylib
+ COMMAND lipo libicuuc.76.1.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicuuc.74.2.dylib
+ -output libicuuc.76.1.dylib
COMMAND lipo libjpeg.8.3.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libjpeg.8.3.2.dylib
@@ -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
@@ -299,9 +299,9 @@ execute_process(
Frameworks/libfreetype.6.dylib
Frameworks/libhunspell-1.7.0.dylib
Frameworks/libiconv.2.dylib
- Frameworks/libicudata.74.2.dylib
- Frameworks/libicui18n.74.2.dylib
- Frameworks/libicuuc.74.2.dylib
+ Frameworks/libicudata.76.1.dylib
+ Frameworks/libicui18n.76.1.dylib
+ Frameworks/libicuuc.76.1.dylib
Frameworks/libjpeg.8.3.2.dylib
Frameworks/libllwebrtc.dylib
Frameworks/liblzma.5.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
diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in
index 5f9ba28fc0..c03057662e 100644
--- a/indra/newview/FixPackage.cmake.in
+++ b/indra/newview/FixPackage.cmake.in
@@ -110,18 +110,18 @@ file(CREATE_LINK
SYMBOLIC
)
file(CREATE_LINK
- "../../../../Frameworks/libicudata.74.dylib"
- "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicudata.74.dylib"
+ "../../../../Frameworks/libicudata.76.dylib"
+ "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicudata.76.dylib"
SYMBOLIC
)
file(CREATE_LINK
- "../../../../Frameworks/libicui18n.74.dylib"
- "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicui18n.74.dylib"
+ "../../../../Frameworks/libicui18n.76.dylib"
+ "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicui18n.76.dylib"
SYMBOLIC
)
file(CREATE_LINK
- "../../../../Frameworks/libicuuc.74.dylib"
- "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicuuc.74.dylib"
+ "../../../../Frameworks/libicuuc.76.dylib"
+ "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicuuc.76.dylib"
SYMBOLIC
)
file(CREATE_LINK
@@ -202,15 +202,15 @@ execute_process(
COMMAND lipo libiconv.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libiconv.2.dylib
- COMMAND lipo libicudata.74.2.dylib
+ COMMAND lipo libicudata.76.1.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicudata.74.2.dylib
- COMMAND lipo libicui18n.74.2.dylib
+ -output libicudata.76.1.dylib
+ COMMAND lipo libicui18n.76.1.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicui18n.74.2.dylib
- COMMAND lipo libicuuc.74.2.dylib
+ -output libicui18n.76.1.dylib
+ COMMAND lipo libicuuc.76.1.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicuuc.74.2.dylib
+ -output libicuuc.76.1.dylib
COMMAND lipo libjpeg.8.3.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libjpeg.8.3.2.dylib
@@ -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
@@ -299,9 +299,9 @@ execute_process(
Frameworks/libfreetype.6.dylib
Frameworks/libhunspell-1.7.0.dylib
Frameworks/libiconv.2.dylib
- Frameworks/libicudata.74.2.dylib
- Frameworks/libicui18n.74.2.dylib
- Frameworks/libicuuc.74.2.dylib
+ Frameworks/libicudata.76.1.dylib
+ Frameworks/libicui18n.76.1.dylib
+ Frameworks/libicuuc.76.1.dylib
Frameworks/libjpeg.8.3.2.dylib
Frameworks/libllwebrtc.dylib
Frameworks/liblzma.5.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
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 7fb2f6a6fa..17ba8ff2fc 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.25
+ ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.26
DESTINATION ${_LIB})
endif (USE_FMODSTUDIO)
endif (LINUX)
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index cfc1ea8f42..eedce61509 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 71
+version 72
// The version number above should be incremented IF AND ONLY IF some
// change has been made that is sufficiently important to justify
// resetting the graphics preferences of all users to the recommended
@@ -84,6 +84,7 @@ RenderExposure 1 1
RenderTonemapType 1 1
RenderTonemapMix 1 1
RenderDisableVintageMode 1 1
+RenderDownScaleMethod 1 0
//
// Low Graphics Settings
@@ -408,6 +409,7 @@ RenderTerrainPBRDetail 1 -1
list AMD
UseOcclusion 1 0
RenderGLMultiThreadedTextures 1 0
+RenderGLMultiThreadedMedia 1 0
list NVIDIA
RenderGLMultiThreadedTextures 1 0
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 21:09:44 +0000