Replace MacPorts' Boost 1.81 with 1.87

and therefore LL's Collada DOM can be upgraded to something newer than r4, and therefore PCRE can be no longer depended on. Have to set the C++ standard so it doesn't use anything old, but also it wasn't ready for something as new as C++20 yet, that's why it's explicitly set to C++17. Have to set the architecture too when you're cross-compiling, it would use the native architecture.
author: Erik Kundiman <erik@megapahit.org> 2025-03-11 05:56:21 +0800
committer: Erik Kundiman <erik@megapahit.org> 2025-03-11 07:00:07 +0800
commit: b038c1e2f5d881c1907252a2f3c0e72e24418534 (patch)
tree: bce37fae729aebb2af69410e773df4b93b0b590c
parent: 8f99590d58e02705d7baf799c3c4db6863eb36a4 (diff)
7 files changed, 53 insertions, 73 deletions
diff --git a/README.md b/README.md
index 0d3938bfd3..0b510833f7 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ $ cd build-`uname -s|tr '[:upper:]' '[:lower:]'`-`uname -m`
 ### macOS
 
 ```
-$ sudo port install cmake pkgconfig freealut +universal apr-util +universal boost181 +universal glm hunspell +universal freetype +universal minizip +universal pcre +universal uriparser +universal libvorbis +universal xxhashlib
+$ sudo port install cmake pkgconfig freealut +universal apr-util +universal boost187 +universal glm hunspell +universal freetype +universal minizip +universal uriparser +universal libvorbis +universal xxhashlib
 $ export LL_BUILD="-O3 -gdwarf-2 -stdlib=libc++ -mmacosx-version-min=11 -iwithsysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -std=c++20 -fPIC -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG -DPIC -DLL_DARWIN=1"
 $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:STRING=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -DENABLE_MEDIA_PLUGINS:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=ON -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=newview/Megapahit.app/Contents/Resources -DCMAKE_OSX_ARCHITECTURES:STRING=`uname -m` -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11 -DENABLE_SIGNING:BOOL=ON -DSIGNING_IDENTITY:STRING=- ../indra
 $ make -j`sysctl -n hw.ncpu`
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 26c0843300..c9688d0fe0 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -15,8 +15,8 @@ elseif( NOT USE_AUTOBUILD_3P )
     target_link_directories( ll::boost INTERFACE /opt/local/x86_64-w64-mingw32/lib)
   elseif (DARWIN)
     set(sfx -mt)
-    target_include_directories( ll::boost SYSTEM INTERFACE /opt/local/libexec/boost/1.81/include)
-    target_link_directories( ll::boost INTERFACE /opt/local/libexec/boost/1.81/lib)
+    target_include_directories( ll::boost SYSTEM INTERFACE /opt/local/libexec/boost/1.87/include)
+    target_link_directories( ll::boost INTERFACE /opt/local/libexec/boost/1.87/lib)
   else (WINDOWS)
     find_package( Boost REQUIRED )
   endif (WINDOWS)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 39c07e3377..8055435c27 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -35,49 +35,48 @@ if( USESYSTEMLIBS )
     include(FindPkgConfig)
     pkg_check_modules(Minizip REQUIRED minizip)
     pkg_check_modules(Libxml2 REQUIRED libxml-2.0)
-    pkg_check_modules(Libpcrecpp libpcrecpp)
     target_link_libraries( ll::minizip-ng INTERFACE ${Minizip_LIBRARIES} )
     target_link_libraries( ll::libxml INTERFACE ${Libxml2_LIBRARIES} )
     if( ${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/colladadom_installed OR NOT ${colladadom_installed} EQUAL 0 )
-      if( NOT EXISTS ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz )
+      if( NOT EXISTS ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8.tar.gz )
         file(DOWNLOAD
-          https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r4.tar.gz
-          ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz
+          https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r8.tar.gz
+          ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8.tar.gz
           )
-      endif( NOT EXISTS ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz )
+      endif( NOT EXISTS ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8.tar.gz )
       file(ARCHIVE_EXTRACT
-        INPUT ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz
+        INPUT ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8.tar.gz
         DESTINATION ${CMAKE_BINARY_DIR}
         )
       file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/collada/1.4)
       if( DARWIN )
         try_compile(COLLADADOM_RESULT
           PROJECT colladadom
-          SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
-          BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
+          SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
+          BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
           TARGET collada14dom
           CMAKE_FLAGS
+            -DCMAKE_CXX_STANDARD:STRING=17
             -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
-            "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} -L${Minizip_LIBRARY_DIRS}exec/boost/1.81/lib"
-            -Dlibpcrecpp_LIBRARIES:STRING=pcrecpp
+            "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} -L${Minizip_LIBRARY_DIRS}exec/boost/1.87/lib"
+            -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
             -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
             -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem-mt
             -DBoost_SYSTEM_LIBRARY:STRING=boost_system-mt
-            -Dlibpcrecpp_CFLAGS_OTHERS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}
             -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
-            -DBoost_CFLAGS:STRING=-I${Libpcrecpp_LIBRARY_DIRS}exec/boost/1.81/include
+            -DBoost_CFLAGS:STRING=-I${Libxml2_LIBRARY_DIRS}exec/boost/1.87/include
             -DOPT_COLLADA14:BOOL=ON
             -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada
             -DCOLLADA_DOM_SOVERSION:STRING=0
-            -DCOLLADA_DOM_VERSION:STRING=2.3-r4
+            -DCOLLADA_DOM_VERSION:STRING=2.3-r8
           OUTPUT_VARIABLE colladadom_installed
           )
         if( ${COLLADADOM_RESULT} )
           file(
             COPY
-              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.2.3-r4.dylib
-              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.0.dylib
-              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.dylib
+              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src/1.4/libcollada14dom.2.3-r8.dylib
+              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src/1.4/libcollada14dom.0.dylib
+              ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src/1.4/libcollada14dom.dylib
             DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
             FOLLOW_SYMLINK_CHAIN
             )
@@ -85,31 +84,30 @@ if( USESYSTEMLIBS )
       else( DARWIN )
         execute_process(
           COMMAND sed -i "" -e "s/SHARED/STATIC/g" 1.4/CMakeLists.txt
-          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src
+          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src
           )
         try_compile(COLLADADOM_RESULT
           PROJECT colladadom
-          SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
-          BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4
+          SOURCE_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
+          BINARY_DIR ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8
           TARGET collada14dom
           CMAKE_FLAGS
+            -DCMAKE_CXX_STANDARD:STRING=17
             -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS}
             -DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS}
-            -Dlibpcrecpp_LIBRARIES:STRING=pcrecpp
             -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}
             -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem
             -DBoost_SYSTEM_LIBRARY:STRING=boost_system
-            -Dlibpcrecpp_CFLAGS_OTHERS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}
             -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}
             -DOPT_COLLADA14:BOOL=ON
             -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada
             -DCOLLADA_DOM_SOVERSION:STRING=0
-            -DCOLLADA_DOM_VERSION:STRING=2.3-r4
+            -DCOLLADA_DOM_VERSION:STRING=2.3-r8
           OUTPUT_VARIABLE colladadom_installed
           )
         if( ${COLLADADOM_RESULT} )
           file(
-            COPY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src/1.4/libcollada14dom.a
+            COPY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/src/1.4/libcollada14dom.a
             DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
             )
         endif( ${COLLADADOM_RESULT} )
@@ -118,12 +116,12 @@ if( USESYSTEMLIBS )
         file(REMOVE_RECURSE ${LIBS_PREBUILT_DIR}/include/collada/1.4)
         file(
           COPY
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/1.4
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/1.5
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/dae
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/dae.h
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/dom.h
-            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/modules
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/1.4
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/1.5
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/dae
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/dae.h
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/dom.h
+            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8/include/modules
           DESTINATION ${LIBS_PREBUILT_DIR}/include/collada
           )
         file(WRITE ${PREBUILD_TRACKING_DIR}/colladadom_installed "${colladadom_installed}")
@@ -156,8 +154,6 @@ target_include_directories( ll::colladadom SYSTEM INTERFACE
         )
 if (WINDOWS)
     target_link_libraries(ll::colladadom INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom23-s.lib ll::libxml ll::minizip-ng )
-elseif (DARWIN)
-    target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml ll::minizip-ng)
 else ()
-    target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml ll::minizip-ng ${Libpcrecpp_LIBRARIES})
+    target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml ll::minizip-ng)
 endif()
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 4c0abcda97..7590ff08a5 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -119,14 +119,14 @@ if (DARWIN)
         -change "/opt/local/lib/libiconv.2.dylib" "@loader_path/../../Frameworks/libiconv.2.dylib"
         -change "/opt/local/lib/libapr-1.0.dylib" "@loader_path/../../Frameworks/libapr-1.0.dylib"
         -change "/opt/local/lib/libexpat.1.dylib" "@loader_path/../../Frameworks/libexpat.1.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_context-mt.dylib" "@loader_path/../../Frameworks/libboost_context-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_fiber-mt.dylib" "@loader_path/../../Frameworks/libboost_fiber-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_filesystem-mt.dylib" "@loader_path/../../Frameworks/libboost_filesystem-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_program_options-mt.dylib" "@loader_path/../../Frameworks/libboost_program_options-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_regex-mt.dylib" "@loader_path/../../Frameworks/libboost_regex-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_system-mt.dylib" "@loader_path/../../Frameworks/libboost_system-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_thread-mt.dylib" "@loader_path/../../Frameworks/libboost_thread-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_url-mt.dylib" "@loader_path/../../Frameworks/libboost_url-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_context-mt.dylib" "@loader_path/../../Frameworks/libboost_context-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_fiber-mt.dylib" "@loader_path/../../Frameworks/libboost_fiber-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_filesystem-mt.dylib" "@loader_path/../../Frameworks/libboost_filesystem-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_program_options-mt.dylib" "@loader_path/../../Frameworks/libboost_program_options-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_regex-mt.dylib" "@loader_path/../../Frameworks/libboost_regex-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_system-mt.dylib" "@loader_path/../../Frameworks/libboost_system-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_thread-mt.dylib" "@loader_path/../../Frameworks/libboost_thread-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_url-mt.dylib" "@loader_path/../../Frameworks/libboost_url-mt.dylib"
         -change "/opt/local/lib/libz.1.dylib" "@loader_path/../../Frameworks/libz.1.dylib"
         -change "/opt/local/lib/libnghttp2.14.dylib" "@loader_path/../../Frameworks/libnghttp2.14.dylib"
         "$<TARGET_FILE:media_plugin_cef>"
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index 84e0d1da59..91e6df92de 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -56,14 +56,14 @@ if (DARWIN)
         -change "/opt/local/lib/libiconv.2.dylib" "@loader_path/../../Frameworks/libiconv.2.dylib"
         -change "/opt/local/lib/libapr-1.0.dylib" "@loader_path/../../Frameworks/libapr-1.0.dylib"
         -change "/opt/local/lib/libexpat.1.dylib" "@loader_path/../../Frameworks/libexpat.1.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_context-mt.dylib" "@loader_path/../../Frameworks/libboost_context-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_fiber-mt.dylib" "@loader_path/../../Frameworks/libboost_fiber-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_filesystem-mt.dylib" "@loader_path/../../Frameworks/libboost_filesystem-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_program_options-mt.dylib" "@loader_path/../../Frameworks/libboost_program_options-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_regex-mt.dylib" "@loader_path/../../Frameworks/libboost_regex-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_system-mt.dylib" "@loader_path/../../Frameworks/libboost_system-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_thread-mt.dylib" "@loader_path/../../Frameworks/libboost_thread-mt.dylib"
-        -change "/opt/local/libexec/boost/1.81/lib/libboost_url-mt.dylib" "@loader_path/../../Frameworks/libboost_url-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_context-mt.dylib" "@loader_path/../../Frameworks/libboost_context-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_fiber-mt.dylib" "@loader_path/../../Frameworks/libboost_fiber-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_filesystem-mt.dylib" "@loader_path/../../Frameworks/libboost_filesystem-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_program_options-mt.dylib" "@loader_path/../../Frameworks/libboost_program_options-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_regex-mt.dylib" "@loader_path/../../Frameworks/libboost_regex-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_system-mt.dylib" "@loader_path/../../Frameworks/libboost_system-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_thread-mt.dylib" "@loader_path/../../Frameworks/libboost_thread-mt.dylib"
+        -change "/opt/local/libexec/boost/1.87/lib/libboost_url-mt.dylib" "@loader_path/../../Frameworks/libboost_url-mt.dylib"
         -change "/opt/local/lib/libz.1.dylib" "@loader_path/../../Frameworks/libz.1.dylib"
         -change "/opt/local/lib/libnghttp2.14.dylib" "@loader_path/../../Frameworks/libnghttp2.14.dylib"
         -change "@rpath/libvlc.dylib" "@loader_path/plugins/libvlc.dylib"
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index 066cdc1a1b..7f06249224 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -187,9 +187,9 @@ execute_process(
     COMMAND lipo libbz2.1.0.8.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libbz2.1.0.8.dylib
-    COMMAND lipo libcollada14dom.2.3-r4.dylib
+    COMMAND lipo libcollada14dom.2.3-r8.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
-        -output libcollada14dom.2.3-r4.dylib
+        -output libcollada14dom.2.3-r8.dylib
     COMMAND lipo libexpat.1.10.0.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libexpat.1.10.0.dylib
@@ -238,12 +238,6 @@ execute_process(
     COMMAND lipo libopenal.1.24.2.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libopenal.1.24.2.dylib
-    COMMAND lipo libpcre.1.dylib
-        -thin ${CMAKE_OSX_ARCHITECTURES}
-        -output libpcre.1.dylib
-    COMMAND lipo libpcrecpp.0.dylib
-        -thin ${CMAKE_OSX_ARCHITECTURES}
-        -output libpcrecpp.0.dylib
     COMMAND lipo libpng16.16.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libpng16.16.dylib
@@ -294,7 +288,7 @@ execute_process(
         Frameworks/libbrotlicommon.1.1.0.dylib
         Frameworks/libbrotlidec.1.1.0.dylib
         Frameworks/libbz2.1.0.8.dylib
-        Frameworks/libcollada14dom.2.3-r4.dylib
+        Frameworks/libcollada14dom.2.3-r8.dylib
         Frameworks/libexpat.1.10.0.dylib
         Frameworks/libfreetype.6.dylib
         Frameworks/libhunspell-1.7.0.dylib
@@ -311,8 +305,6 @@ execute_process(
         Frameworks/libnghttp2.14.dylib
         Frameworks/libogg.0.dylib
         Frameworks/libopenal.1.24.2.dylib
-        Frameworks/libpcre.1.dylib
-        Frameworks/libpcrecpp.0.dylib
         Frameworks/libpng16.16.dylib
         Frameworks/libvlc.5.dylib
         Frameworks/libvlccore.9.dylib
diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in
index 1cff561ea6..074a6e5815 100644
--- a/indra/newview/FixPackage.cmake.in
+++ b/indra/newview/FixPackage.cmake.in
@@ -187,9 +187,9 @@ execute_process(
     COMMAND lipo libbz2.1.0.8.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libbz2.1.0.8.dylib
-    COMMAND lipo libcollada14dom.2.3-r4.dylib
+    COMMAND lipo libcollada14dom.2.3-r8.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
-        -output libcollada14dom.2.3-r4.dylib
+        -output libcollada14dom.2.3-r8.dylib
     COMMAND lipo libexpat.1.10.0.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libexpat.1.10.0.dylib
@@ -238,12 +238,6 @@ execute_process(
     COMMAND lipo libopenal.1.24.2.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libopenal.1.24.2.dylib
-    COMMAND lipo libpcre.1.dylib
-        -thin ${CMAKE_OSX_ARCHITECTURES}
-        -output libpcre.1.dylib
-    COMMAND lipo libpcrecpp.0.dylib
-        -thin ${CMAKE_OSX_ARCHITECTURES}
-        -output libpcrecpp.0.dylib
     COMMAND lipo libpng16.16.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libpng16.16.dylib
@@ -294,7 +288,7 @@ execute_process(
         Frameworks/libbrotlicommon.1.1.0.dylib
         Frameworks/libbrotlidec.1.1.0.dylib
         Frameworks/libbz2.1.0.8.dylib
-        Frameworks/libcollada14dom.2.3-r4.dylib
+        Frameworks/libcollada14dom.2.3-r8.dylib
         Frameworks/libexpat.1.10.0.dylib
         Frameworks/libfreetype.6.dylib
         Frameworks/libhunspell-1.7.0.dylib
@@ -311,8 +305,6 @@ execute_process(
         Frameworks/libnghttp2.14.dylib
         Frameworks/libogg.0.dylib
         Frameworks/libopenal.1.24.2.dylib
-        Frameworks/libpcre.1.dylib
-        Frameworks/libpcrecpp.0.dylib
         Frameworks/libpng16.16.dylib
         Frameworks/libvlc.5.dylib
         Frameworks/libvlccore.9.dylib
author	Erik Kundiman <erik@megapahit.org>	2025-03-11 05:56:21 +0800
committer	Erik Kundiman <erik@megapahit.org>	2025-03-11 07:00:07 +0800
commit	b038c1e2f5d881c1907252a2f3c0e72e24418534 (patch)
tree	bce37fae729aebb2af69410e773df4b93b0b590c
parent	8f99590d58e02705d7baf799c3c4db6863eb36a4 (diff)