summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/cmake/LLPrimitive.cmake3
-rw-r--r--indra/newview/CMakeLists.txt2
-rw-r--r--indra/newview/FixBundle.cmake.in52
-rw-r--r--indra/newview/FixPackage.cmake.in52
4 files changed, 52 insertions, 57 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 09413c912d..ec17c82e27 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -21,6 +21,9 @@ endif()
if (TRUE)
include(FindPkgConfig)
pkg_check_modules(Minizip REQUIRED minizip)
+ if (${LINUX_DISTRO} MATCHES arch OR DARWIN)
+ set(Minizip_INCLUDE_DIRS ${Minizip_INCLUDE_DIRS}/minizip)
+ endif ()
pkg_check_modules(Libxml2 REQUIRED libxml-2.0)
target_link_libraries( ll::minizip-ng INTERFACE ${Minizip_LIBRARIES} )
target_link_libraries( ll::libxml INTERFACE ${Libxml2_LIBRARIES} )
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e609416dc1..e411794759 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2398,7 +2398,7 @@ if (LINUX)
set(CPACK_RPM_PACKAGE_REQUIRES "apr-util, boost-fiber, boost-program-options, boost-regex, boost-thread, boost-url, expat, fltk, mesa-libGLU, hunspell, libnghttp2, openjpeg2, SDL2, vlc-libs, vlc-plugins-base, libvorbis"
CACHE STRING "RPM package requirements.")
else ()
- set(CPACK_RPM_PACKAGE_REQUIRES "libapr-util1-0, libboost_fiber1_90_0, libboost_program_options1_90_0, libboost_regex1_90_0, libboost_thread1_90_0, libboost_url1_90_0, libboost_url1_90_0-x86-64-v3, libpng16-16 expat, libfltk1_3, libGLU1, libhunspell-1_7-0, libnghttp2-14, openjpeg2, libSDL2-2_0-0, libvlc5, vlc-codecs, libvorbis0"
+ set(CPACK_RPM_PACKAGE_REQUIRES "libapr-util1-0, libboost_fiber1_90_0, libboost_program_options1_90_0, libboost_regex1_90_0, libboost_thread1_90_0, libboost_url1_90_0, libboost_url1_90_0-x86-64-v3, libpng16-16 expat, libfltk1_3, libGLU1, libhunspell-1_7-0, libnghttp2-14, openjpeg2, libSDL2-2_0-0, libvlc5, libvorbis0"
CACHE STRING "RPM package requirements.")
endif ()
endif ()
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index fbeea05359..49ef0d3d11 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -80,18 +80,18 @@ file(CREATE_LINK
SYMBOLIC
)
file(CREATE_LINK
- "../../../../Frameworks/libicudata.76.dylib"
- "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicudata.76.dylib"
+ "../../../../Frameworks/libicudata.78.dylib"
+ "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicudata.78.dylib"
SYMBOLIC
)
file(CREATE_LINK
- "../../../../Frameworks/libicui18n.76.dylib"
- "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicui18n.76.dylib"
+ "../../../../Frameworks/libicui18n.78.dylib"
+ "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicui18n.78.dylib"
SYMBOLIC
)
file(CREATE_LINK
- "../../../../Frameworks/libicuuc.76.dylib"
- "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicuuc.76.dylib"
+ "../../../../Frameworks/libicuuc.78.dylib"
+ "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicuuc.78.dylib"
SYMBOLIC
)
file(CREATE_LINK
@@ -158,9 +158,9 @@ execute_process(
COMMAND lipo libbz2.1.0.8.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libbz2.1.0.8.dylib
- COMMAND lipo libexpat.1.11.1.dylib
+ COMMAND lipo libexpat.1.11.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libexpat.1.11.1.dylib
+ -output libexpat.1.11.2.dylib
COMMAND lipo libfreetype.6.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libfreetype.6.dylib
@@ -170,24 +170,21 @@ execute_process(
COMMAND lipo libiconv.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libiconv.2.dylib
- COMMAND lipo libicudata.76.1.dylib
+ COMMAND lipo libicudata.78.3.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicudata.76.1.dylib
- COMMAND lipo libicui18n.76.1.dylib
+ -output libicudata.78.3.dylib
+ COMMAND lipo libicui18n.78.3.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicui18n.76.1.dylib
- COMMAND lipo libicuuc.76.1.dylib
+ -output libicui18n.78.3.dylib
+ COMMAND lipo libicuuc.78.3.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicuuc.76.1.dylib
+ -output libicuuc.78.3.dylib
COMMAND lipo libjpeg.8.3.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libjpeg.8.3.2.dylib
COMMAND lipo libllwebrtc.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libllwebrtc.dylib
- COMMAND lipo liblzma.5.dylib
- -thin ${CMAKE_OSX_ARCHITECTURES}
- -output liblzma.5.dylib
COMMAND lipo libminizip.1.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libminizip.1.dylib
@@ -227,12 +224,12 @@ execute_process(
COMMAND lipo libvorbisfile.3.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libvorbisfile.3.dylib
- COMMAND lipo libxml2.2.dylib
+ COMMAND lipo libxml2.16.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libxml2.2.dylib
- COMMAND lipo libz.1.3.1.dylib
+ -output libxml2.16.dylib
+ COMMAND lipo libz.1.3.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libz.1.3.1.dylib
+ -output libz.1.3.2.dylib
WORKING_DIRECTORY ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Frameworks
ERROR_QUIET
)
@@ -261,16 +258,15 @@ execute_process(
Frameworks/libbrotlidec.1.2.0.dylib
Frameworks/libbz2.1.0.8.dylib
Frameworks/libdiscord_partner_sdk.dylib
- Frameworks/libexpat.1.11.1.dylib
+ Frameworks/libexpat.1.11.2.dylib
Frameworks/libfreetype.6.dylib
Frameworks/libhunspell-1.7.0.dylib
Frameworks/libiconv.2.dylib
- Frameworks/libicudata.76.1.dylib
- Frameworks/libicui18n.76.1.dylib
- Frameworks/libicuuc.76.1.dylib
+ Frameworks/libicudata.78.3.dylib
+ Frameworks/libicui18n.78.3.dylib
+ Frameworks/libicuuc.78.3.dylib
Frameworks/libjpeg.8.3.2.dylib
Frameworks/libllwebrtc.dylib
- Frameworks/liblzma.5.dylib
Frameworks/libminizip.1.dylib
Frameworks/libncurses.6.dylib
Frameworks/libndofdev.dylib
@@ -284,8 +280,8 @@ execute_process(
Frameworks/libvorbis.0.dylib
Frameworks/libvorbisenc.2.dylib
Frameworks/libvorbisfile.3.dylib
- Frameworks/libxml2.2.dylib
- Frameworks/libz.1.3.1.dylib
+ Frameworks/libxml2.16.dylib
+ Frameworks/libz.1.3.2.dylib
Resources/libndofdev.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_cef.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_libvlc.dylib
diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in
index 17272f5881..0be6a90968 100644
--- a/indra/newview/FixPackage.cmake.in
+++ b/indra/newview/FixPackage.cmake.in
@@ -80,18 +80,18 @@ file(CREATE_LINK
SYMBOLIC
)
file(CREATE_LINK
- "../../../../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"
+ "../../../../Frameworks/libicudata.78.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.78.dylib"
SYMBOLIC
)
file(CREATE_LINK
- "../../../../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"
+ "../../../../Frameworks/libicui18n.78.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.78.dylib"
SYMBOLIC
)
file(CREATE_LINK
- "../../../../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"
+ "../../../../Frameworks/libicuuc.78.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.78.dylib"
SYMBOLIC
)
file(CREATE_LINK
@@ -158,9 +158,9 @@ execute_process(
COMMAND lipo libbz2.1.0.8.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libbz2.1.0.8.dylib
- COMMAND lipo libexpat.1.11.1.dylib
+ COMMAND lipo libexpat.1.11.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libexpat.1.11.1.dylib
+ -output libexpat.1.11.2.dylib
COMMAND lipo libfreetype.6.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libfreetype.6.dylib
@@ -170,24 +170,21 @@ execute_process(
COMMAND lipo libiconv.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libiconv.2.dylib
- COMMAND lipo libicudata.76.1.dylib
+ COMMAND lipo libicudata.78.3.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicudata.76.1.dylib
- COMMAND lipo libicui18n.76.1.dylib
+ -output libicudata.78.3.dylib
+ COMMAND lipo libicui18n.78.3.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicui18n.76.1.dylib
- COMMAND lipo libicuuc.76.1.dylib
+ -output libicui18n.78.3.dylib
+ COMMAND lipo libicuuc.78.3.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libicuuc.76.1.dylib
+ -output libicuuc.78.3.dylib
COMMAND lipo libjpeg.8.3.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libjpeg.8.3.2.dylib
COMMAND lipo libllwebrtc.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libllwebrtc.dylib
- COMMAND lipo liblzma.5.dylib
- -thin ${CMAKE_OSX_ARCHITECTURES}
- -output liblzma.5.dylib
COMMAND lipo libminizip.1.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libminizip.1.dylib
@@ -227,12 +224,12 @@ execute_process(
COMMAND lipo libvorbisfile.3.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
-output libvorbisfile.3.dylib
- COMMAND lipo libxml2.2.dylib
+ COMMAND lipo libxml2.16.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libxml2.2.dylib
- COMMAND lipo libz.1.3.1.dylib
+ -output libxml2.16.dylib
+ COMMAND lipo libz.1.3.2.dylib
-thin ${CMAKE_OSX_ARCHITECTURES}
- -output libz.1.3.1.dylib
+ -output libz.1.3.2.dylib
WORKING_DIRECTORY ${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Frameworks
ERROR_QUIET
)
@@ -261,16 +258,15 @@ execute_process(
Frameworks/libbrotlidec.1.2.0.dylib
Frameworks/libbz2.1.0.8.dylib
Frameworks/libdiscord_partner_sdk.dylib
- Frameworks/libexpat.1.11.1.dylib
+ Frameworks/libexpat.1.11.2.dylib
Frameworks/libfreetype.6.dylib
Frameworks/libhunspell-1.7.0.dylib
Frameworks/libiconv.2.dylib
- Frameworks/libicudata.76.1.dylib
- Frameworks/libicui18n.76.1.dylib
- Frameworks/libicuuc.76.1.dylib
+ Frameworks/libicudata.78.3.dylib
+ Frameworks/libicui18n.78.3.dylib
+ Frameworks/libicuuc.78.3.dylib
Frameworks/libjpeg.8.3.2.dylib
Frameworks/libllwebrtc.dylib
- Frameworks/liblzma.5.dylib
Frameworks/libminizip.1.dylib
Frameworks/libncurses.6.dylib
Frameworks/libndofdev.dylib
@@ -284,8 +280,8 @@ execute_process(
Frameworks/libvorbis.0.dylib
Frameworks/libvorbisenc.2.dylib
Frameworks/libvorbisfile.3.dylib
- Frameworks/libxml2.2.dylib
- Frameworks/libz.1.3.1.dylib
+ Frameworks/libxml2.16.dylib
+ Frameworks/libz.1.3.2.dylib
Resources/libndofdev.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_cef.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_libvlc.dylib
generated by cgit v1.3 (git 2.53.0) at 2026-04-03 15:41:55 +0000