diff --git a/ports/armadillo/add-disable-find-package.patch b/ports/armadillo/add-disable-find-package.patch index b5d67d5c21a..69ff6c4babc 100644 --- a/ports/armadillo/add-disable-find-package.patch +++ b/ports/armadillo/add-disable-find-package.patch @@ -14,7 +14,7 @@ index 1a709ad..3029c25 100644 find_library(ARPACK_LIBRARY NAMES arpack diff --git a/cmake_aux/Modules/ARMA_FindATLAS.cmake b/cmake_aux/Modules/ARMA_FindATLAS.cmake -index 491a361..e40a0ff 100644 +index 6ad1eee..6dd372e 100644 --- a/cmake_aux/Modules/ARMA_FindATLAS.cmake +++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake @@ -1,3 +1,8 @@ @@ -23,11 +23,11 @@ index 491a361..e40a0ff 100644 + return() +endif() + - find_path(ATLAS_CBLAS_INCLUDE_DIR - NAMES cblas.h - PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/ + set(ATLAS_NAMES) + set(ATLAS_NAMES ${ATLAS_NAMES} tatlas) + set(ATLAS_NAMES ${ATLAS_NAMES} satlas) diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake -index 0fd5b06..d6bcd49 100644 +index 38f6675..4702ab4 100644 --- a/cmake_aux/Modules/ARMA_FindMKL.cmake +++ b/cmake_aux/Modules/ARMA_FindMKL.cmake @@ -6,6 +6,11 @@ @@ -43,7 +43,7 @@ index 0fd5b06..d6bcd49 100644 #set(MKL_NAMES ${MKL_NAMES} mkl_lapack) #set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread) diff --git a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake -index abf046d..e496cb0 100644 +index 88dcb9c..16a26b8 100644 --- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake @@ -5,6 +5,11 @@ @@ -56,5 +56,5 @@ index abf046d..e496cb0 100644 +endif() + find_path(SuperLU_INCLUDE_DIR slu_ddefs.h - /usr/include/superlu/ - /usr/include/SuperLU/ + PATHS ${CMAKE_SYSTEM_INCLUDE_PATH} /usr/include /usr/local/include /opt/local/include + PATH_SUFFIXES superlu SuperLU "" diff --git a/ports/armadillo/fix-CMakePath.patch b/ports/armadillo/fix-CMakePath.patch index cfafc4f289e..74eeeb3f774 100644 --- a/ports/armadillo/fix-CMakePath.patch +++ b/ports/armadillo/fix-CMakePath.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea5516e..ecd14bc 100644 +index c60cd53..855391a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -615,7 +615,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION +@@ -664,7 +664,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION # and install it set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}") set(ARMADILLO_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index aa501fc5d57..e293d56edc7 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO arma - FILENAME "armadillo-10.6.2.tar.xz" - SHA512 ae04e993830ca04e7eddfaf9c40a50fb9139b10b9667412f5a18707ac73ee529b8e3a5a91337782e4e01bae61207b44f24bdd8a77c6c2404011a06006d849aba + FILENAME "armadillo-11.2.3.tar.xz" + SHA512 db3457adbc799c68c928aaf22714598b4b9df91ec83aff33bf2d0096b755bd316d4bae12ac973bf1821759a71f3a58a7dd8dc64cbcb1f53ea2646d8bb0bc9a3b PATCHES remove_custom_modules.patch fix-CMakePath.patch diff --git a/ports/armadillo/remove_custom_modules.patch b/ports/armadillo/remove_custom_modules.patch index 88631b573aa..5937f6a649f 100644 --- a/ports/armadillo/remove_custom_modules.patch +++ b/ports/armadillo/remove_custom_modules.patch @@ -1,23 +1,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ab7dbed..ea5516e 100644 +index e5dcf54..c60cd53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -324,15 +324,15 @@ if(APPLE) - else() - - include(ARMA_FindMKL) -- include(ARMA_FindOpenBLAS) - include(ARMA_FindATLAS) -- include(ARMA_FindBLAS) -- include(ARMA_FindLAPACK) - - if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) - include(ARMA_FindFlexiBLAS) +@@ -335,13 +335,12 @@ else() + else() + set(FlexiBLAS_FOUND false) endif() - +- ++ + find_package(BLAS) + find_package(LAPACK) -+ + include(ARMA_FindMKL) +- include(ARMA_FindOpenBLAS) + include(ARMA_FindATLAS) # TODO: remove support for ATLAS in next major version +- include(ARMA_FindBLAS) +- include(ARMA_FindLAPACK) +- ++ + message(STATUS "FlexiBLAS_FOUND = ${FlexiBLAS_FOUND}" ) message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" ) - message(STATUS " ATLAS_FOUND = ${ATLAS_FOUND}" ) diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index 27e432049a8..4b641a135d0 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,9 +1,9 @@ { "name": "armadillo", - "version": "10.6.2", - "port-version": 5, + "version": "11.2.3", "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": "http://arma.sourceforge.net", + "license": "Apache-2.0", "dependencies": [ "blas", "lapack", diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 395d93271ec..02163cc409f 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4bc853e4132b3e2f8c13fa5cfc21030daa6d10a", + "version": "11.2.3", + "port-version": 0 + }, { "git-tree": "fb3b2fb5c5daeea857a0b9952dbef5c980fa14c9", "version": "10.6.2", diff --git a/versions/baseline.json b/versions/baseline.json index 36eebb71e69..5523c4a1ae3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -169,8 +169,8 @@ "port-version": 0 }, "armadillo": { - "baseline": "10.6.2", - "port-version": 5 + "baseline": "11.2.3", + "port-version": 0 }, "arrayfire": { "baseline": "3.8.0",