[armadillo] Update to 15.4.2 (#53219)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
SunBlack 2026-08-06 22:31:11 +02:00 committed by GitHub
parent 234cab7922
commit 51175adca3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 20 additions and 13 deletions

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b27e3c..78d3952 100644
index ee702f83..c29fe1d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,7 +260,6 @@ message(STATUS "*** Looking for external libraries")
@@ -273,7 +273,6 @@ message(STATUS "*** Looking for external libraries")
## Find LAPACK and BLAS libraries, or their optimised versions
##
@ -10,7 +10,7 @@ index 5b27e3c..78d3952 100644
if(APPLE)
message(STATUS "Detected macOS")
@@ -331,11 +330,16 @@ else()
@@ -344,11 +343,16 @@ else()
set(FlexiBLAS_FOUND false)
endif()
@ -27,7 +27,7 @@ index 5b27e3c..78d3952 100644
message(STATUS "FlexiBLAS_FOUND = ${FlexiBLAS_FOUND}" )
message(STATUS " MKL_FOUND = ${MKL_FOUND}" )
@@ -449,7 +453,6 @@ else()
@@ -464,7 +468,6 @@ else()
endif()
@ -35,11 +35,11 @@ index 5b27e3c..78d3952 100644
message(STATUS "ARPACK_FOUND = ${ARPACK_FOUND}")
if(ARPACK_FOUND)
@@ -457,7 +460,6 @@ if(ARPACK_FOUND)
@@ -472,7 +475,6 @@ if(ARPACK_FOUND)
set(ARMA_LIBS ${ARMA_LIBS} ${ARPACK_LIBRARY})
endif()
-include(ARMA_FindSuperLU5)
-include(ARMA_FindSuperLU)
message(STATUS "SuperLU_FOUND = ${SuperLU_FOUND}")
if(SuperLU_FOUND)

View File

@ -4,7 +4,7 @@ vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO arma
FILENAME "armadillo-${VERSION}.tar.xz"
SHA512 E5983B109242F522561A16A4C5F095F25A8F5262E9E6A5C8AC9D7FA48B1F1B1C3A2E48D5671EB02C478B378BC1759BACE9AC061434C42E7338C0C2D21779F607
SHA512 f605678837c821b39273f64750e6398e0feff9ca4ec507a19712436ba8c0d07ab9901ffa01b96fe77a700ea49a6c19e7a75e66bfd9127c5a09bb20bfba3bbf68
PATCHES
cmake-config.patch
dependencies.patch
@ -53,4 +53,8 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/armadillo_bits/config.hpp"
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
vcpkg_install_copyright(
FILE_LIST
"${SOURCE_PATH}/LICENSE.txt"
"${SOURCE_PATH}/NOTICE.txt"
)

View File

@ -1,7 +1,6 @@
{
"name": "armadillo",
"version": "14.4.1",
"port-version": 1,
"version": "15.4.2",
"description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use",
"homepage": "https://arma.sourceforge.net/",
"license": "Apache-2.0",

View File

@ -96,7 +96,6 @@ aravis[introspection]:arm64-windows=skip # needs arm64 host
aravis[usb]:arm64-linux=cascade
armadillo:arm-neon-android=cascade
armadillo:arm64-android=cascade
armadillo:arm64-linux=cascade
armadillo:x64-android=cascade
arpack-ng:arm64-linux=cascade
arpack-ng:arm64-windows=cascade

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "91dd42817d9c5da731dfaa226083b201b6ab681e",
"version": "15.4.2",
"port-version": 0
},
{
"git-tree": "0f116cda098b88510f370ee379175762873550cb",
"version": "14.4.1",

View File

@ -277,8 +277,8 @@
"port-version": 0
},
"armadillo": {
"baseline": "14.4.1",
"port-version": 1
"baseline": "15.4.2",
"port-version": 0
},
"arp1it-minecraft-server-status": {
"baseline": "1.0.1",