diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-10-11 07:17:26 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-10-11 07:17:26 +0800 |
| commit | f67e0f4ce4c0d5e3e81fc6c9e33f10ce28596d9e (patch) | |
| tree | b703ba755bc4c1a74eea57803db0c61aaacdc528 /indra | |
| parent | 84c189533647804241d40ff9a7b2b6df32b04e2c (diff) | |
| parent | c3a323a8af4cf128b51898118c2b98a0d114a3f6 (diff) | |
Merge branch 'main' into 26.4
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/LibVLCPlugin.cmake | 8 | ||||
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 4 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake index 6fe6f89c99..c268d8d24e 100644 --- a/indra/cmake/LibVLCPlugin.cmake +++ b/indra/cmake/LibVLCPlugin.cmake @@ -16,16 +16,16 @@ if (LIBVLCPLUGIN) set(ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES}) endif () if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/vlc_installed OR NOT ${vlc_installed} EQUAL 0) - if (NOT EXISTS ${CMAKE_BINARY_DIR}/vlc-3.0.23-${ARCHITECTURE}.dmg) + if (NOT EXISTS ${CMAKE_BINARY_DIR}/vlc-3.0.24-${ARCHITECTURE}.dmg) file(DOWNLOAD - https://get.videolan.org/vlc/3.0.23/macosx/vlc-3.0.23-${ARCHITECTURE}.dmg - ${CMAKE_BINARY_DIR}/vlc-3.0.23-${ARCHITECTURE}.dmg + https://get.videolan.org/vlc/3.0.24/macosx/vlc-3.0.24-${ARCHITECTURE}.dmg + ${CMAKE_BINARY_DIR}/vlc-3.0.24-${ARCHITECTURE}.dmg ) endif () file(WRITE ${PREBUILD_TRACKING_DIR}/vlc_installed "0") endif () execute_process( - COMMAND hdiutil attach -noverify vlc-3.0.23-${ARCHITECTURE}.dmg + COMMAND hdiutil attach -noverify vlc-3.0.24-${ARCHITECTURE}.dmg WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) target_include_directories( ll::libvlc SYSTEM INTERFACE /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/include) diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index bf9ff67830..8e725f1c82 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -291,9 +291,9 @@ execute_process( COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib - COMMAND lipo libexpat.1.12.4.dylib + COMMAND lipo libexpat.1.13.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libexpat.1.12.4.dylib + -output libexpat.1.13.0.dylib COMMAND lipo libfreetype.6.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libfreetype.6.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index d7a854e841..36c042d991 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -174,9 +174,9 @@ execute_process( COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib - COMMAND lipo libexpat.1.12.4.dylib + COMMAND lipo libexpat.1.13.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libexpat.1.12.4.dylib + -output libexpat.1.13.0.dylib COMMAND lipo libfreetype.6.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libfreetype.6.dylib |