summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/LibVLCPlugin.cmake8
-rw-r--r--indra/cmake/Meshoptimizer.cmake14
-rw-r--r--indra/newview/CMakeLists.txt4
-rw-r--r--indra/newview/English.lproj/InfoPlist.strings2
-rw-r--r--indra/newview/licenses-linux.txt2
-rw-r--r--indra/newview/licenses-mac.txt2
-rw-r--r--indra/newview/licenses-win32.txt2
-rwxr-xr-xindra/newview/res/viewerRes.rc2
-rw-r--r--indra/newview/skins/default/xui/en/floater_about.xml4
9 files changed, 20 insertions, 20 deletions
diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
index 45ef25a63c..981f020745 100644
--- a/indra/cmake/LibVLCPlugin.cmake
+++ b/indra/cmake/LibVLCPlugin.cmake
@@ -12,16 +12,16 @@ if (DARWIN)
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.21-${ARCHITECTURE}.dmg)
+ if (NOT EXISTS ${CMAKE_BINARY_DIR}/vlc-3.0.23-${ARCHITECTURE}.dmg)
file(DOWNLOAD
- https://get.videolan.org/vlc/3.0.21/macosx/vlc-3.0.21-${ARCHITECTURE}.dmg
- ${CMAKE_BINARY_DIR}/vlc-3.0.21-${ARCHITECTURE}.dmg
+ https://get.videolan.org/vlc/3.0.23/macosx/vlc-3.0.23-${ARCHITECTURE}.dmg
+ ${CMAKE_BINARY_DIR}/vlc-3.0.23-${ARCHITECTURE}.dmg
)
endif ()
file(WRITE ${PREBUILD_TRACKING_DIR}/vlc_installed "0")
endif ()
execute_process(
- COMMAND hdiutil attach -noverify vlc-3.0.21-${ARCHITECTURE}.dmg
+ COMMAND hdiutil attach -noverify vlc-3.0.23-${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/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index b1d2796915..225f44b1fb 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -16,20 +16,20 @@ if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu) OR CMAKE_
elseif (LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 AND NOT (${LINUX_DISTRO} MATCHES gentoo))
use_prebuilt_binary(meshoptimizer)
elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed OR NOT ${meshoptimizer_installed} EQUAL 0)
- if (NOT EXISTS ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz)
+ if (NOT EXISTS ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz)
file(DOWNLOAD
- https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.21.tar.gz
- ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz
+ https://github.com/zeux/meshoptimizer/archive/refs/tags/v1.0.1.tar.gz
+ ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz
)
endif ()
file(ARCHIVE_EXTRACT
- INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz
+ INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz
DESTINATION ${CMAKE_BINARY_DIR}
)
try_compile(MESHOPTIMIZER_RESULT
PROJECT meshoptimizer
- SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
- BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+ SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1
+ BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1
TARGET meshoptimizer
CMAKE_FLAGS
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -42,7 +42,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
if (${MESHOPTIMIZER_RESULT})
execute_process(
COMMAND ${CMAKE_MAKE_PROGRAM} install
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1
OUTPUT_VARIABLE meshoptimizer_installed
)
file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}")
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c75ad7a144..9a7e66fb97 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2400,7 +2400,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_89_0, libboost_program_options1_89_0, libboost_regex1_89_0, libboost_thread1_89_0, libboost_url1_89_0, libboost_url1_89_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, vlc-codecs, libvorbis0"
CACHE STRING "RPM package requirements.")
endif ()
endif ()
@@ -2480,7 +2480,7 @@ if (DARWIN)
set(MACOSX_BUNDLE_BUNDLE_NAME "Megapahit")
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
set(MACOSX_BUNDLE_BUNDLE_VERSION "${VIEWER_SHORT_VERSION}${VIEWER_MACOSX_PHASE}${VIEWER_REVISION}")
- set(MACOSX_BUNDLE_COPYRIGHT "Copyright © Megapahit 2025")
+ set(MACOSX_BUNDLE_COPYRIGHT "Copyright © Megapahit 2026")
set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "SecondLife.nib")
set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "LLApplication")
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 25f517d364..8a053f87c3 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -3,5 +3,5 @@
CFBundleName = "Megapahit";
CFBundleShortVersionString = "Megapahit version ${MACOSX_BUNDLE_SHORT_VERSION_STRING}";
-CFBundleGetInfoString = "Megapahit version ${MACOSX_BUNDLE_SHORT_VERSION_STRING}, Copyright 2025 Megapahit.";
+CFBundleGetInfoString = "Megapahit version ${MACOSX_BUNDLE_SHORT_VERSION_STRING}, Copyright 2026 Megapahit.";
diff --git a/indra/newview/licenses-linux.txt b/indra/newview/licenses-linux.txt
index 22b9e4b449..e83989b4a7 100644
--- a/indra/newview/licenses-linux.txt
+++ b/indra/newview/licenses-linux.txt
@@ -412,7 +412,7 @@ sse2neon
/*
* sse2neon is freely redistributable under the MIT License.
*
- * Copyright (c) 2015-2024 SSE2NEON Contributors.
+ * Copyright (c) 2015-2026 SSE2NEON Contributors.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/indra/newview/licenses-mac.txt b/indra/newview/licenses-mac.txt
index a51bc12abf..b1336f1bc4 100644
--- a/indra/newview/licenses-mac.txt
+++ b/indra/newview/licenses-mac.txt
@@ -651,7 +651,7 @@ sse2neon
/*
* sse2neon is freely redistributable under the MIT License.
*
- * Copyright (c) 2015-2024 SSE2NEON Contributors.
+ * Copyright (c) 2015-2026 SSE2NEON Contributors.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/indra/newview/licenses-win32.txt b/indra/newview/licenses-win32.txt
index f7b8cb74be..946743f789 100644
--- a/indra/newview/licenses-win32.txt
+++ b/indra/newview/licenses-win32.txt
@@ -590,7 +590,7 @@ sse2neon
/*
* sse2neon is freely redistributable under the MIT License.
*
- * Copyright (c) 2015-2024 SSE2NEON Contributors.
+ * Copyright (c) 2015-2026 SSE2NEON Contributors.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index 08e381ebc5..b88390d78c 100755
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -157,7 +157,7 @@ BEGIN
VALUE "FileDescription", "Megapahit viewer"
VALUE "FileVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}"
VALUE "InternalName", "Megapahit"
- VALUE "LegalCopyright", "Copyright (c) 2025, Megapahit."
+ VALUE "LegalCopyright", "Copyright (c) 2026, Megapahit."
VALUE "OriginalFilename", "Megapahit.exe"
VALUE "ProductName", "Megapahit viewer"
VALUE "ProductVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}"
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index ae78e968ad..9c932ac034 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -220,7 +220,7 @@ jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
llphysicsextensions_tpv Copyright (c) 2010, Linden Research, Inc.
-Megapahit Copyright (c) 2023-2025 Megapahit.
+Megapahit Copyright (c) 2023-2026 Megapahit.
meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
@@ -232,7 +232,7 @@ PCRE Copyright (c) 1997-2012 University of Cambridge
SDL Copyright (C) 1997-2024 Sam Lantinga
-sse2neon Copyright (c) 2015-2024 SSE2NEON Contributors.
+sse2neon Copyright (c) 2015-2026 SSE2NEON Contributors.
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)