summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/cmake/FMODSTUDIO.cmake26
-rw-r--r--indra/llcommon/llprocess.cpp8
-rw-r--r--indra/newview/FixBundle.cmake.in6
-rw-r--r--indra/newview/FixPackage.cmake.in6
-rw-r--r--indra/newview/PKGBUILD.in2
-rw-r--r--indra/newview/ViewerInstall.cmake2
6 files changed, 25 insertions, 25 deletions
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index 55ac4ee144..7baf067029 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 fmodstudioapi20226mac-installer.dmg
+ COMMAND hdiutil attach -noverify fmodstudioapi20227mac-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/fmodstudioapi20226linux.tar.gz
+ INPUT $ENV{HOME}/Downloads/fmodstudioapi20227linux.tar.gz
DESTINATION ${CMAKE_BINARY_DIR}
)
file(
COPY
- ${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
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod.hpp
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_codec.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_common.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_dsp.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_dsp_effects.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_errors.h
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_output.h
DESTINATION ${LIBS_PREBUILT_DIR}/include/fmodstudio
)
file(
COPY
- ${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
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
+ ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.27
DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
FOLLOW_SYMLINK_CHAIN
)
diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp
index 40ef0ddf9b..2800cc5608 100644
--- a/indra/llcommon/llprocess.cpp
+++ b/indra/llcommon/llprocess.cpp
@@ -176,13 +176,13 @@ public:
// In general, our streambuf might contain a number of different
// physical buffers; iterate over those.
bool keepwriting = true;
- for (const_buffer_sequence::const_iterator bufi(bufs.begin()), bufend(bufs.end());
+ for (auto bufi = buffer_sequence_begin(bufs), bufend = buffer_sequence_end(bufs);
bufi != bufend && keepwriting; ++bufi)
{
// http://www.boost.org/doc/libs/1_49_0_beta1/doc/html/boost_asio/reference/buffer.html#boost_asio.reference.buffer.accessing_buffer_contents
// Although apr_file_write() accepts const void*, we
// manipulate const char* so we can increment the pointer.
- const char* remainptr = boost::asio::buffer_cast<const char*>(*bufi);
+ const char* remainptr = static_cast<const char*>((*bufi).data());
std::size_t remainlen = boost::asio::buffer_size(*bufi);
while (remainlen)
{
@@ -377,14 +377,14 @@ public:
// In general, the mutable_buffer_sequence returned by prepare() might
// contain a number of different physical buffers; iterate over those.
std::size_t tocommit(0);
- for (mutable_buffer_sequence::const_iterator bufi(bufs.begin()), bufend(bufs.end());
+ for (auto bufi = buffer_sequence_begin(bufs), bufend = buffer_sequence_end(bufs);
bufi != bufend; ++bufi)
{
// http://www.boost.org/doc/libs/1_49_0_beta1/doc/html/boost_asio/reference/buffer.html#boost_asio.reference.buffer.accessing_buffer_contents
std::size_t toread(boost::asio::buffer_size(*bufi));
apr_size_t gotten(toread);
apr_status_t err = apr_file_read(mPipe,
- boost::asio::buffer_cast<void*>(*bufi),
+ static_cast<void*>((*bufi).data()),
&gotten);
// EAGAIN is exactly what we want from a nonblocking pipe.
// Rather than waiting for data, it should return immediately.
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)
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-11 18:48:42 +0000