[vcpkg baseline][armadillo] Update to 10.2.0 and also update the repository (#15973)

* [armadillo] Update to 10.2.0 and also update the repository

* Update versions

* Remove NO_REMOVE_ONE_LEVEL and update patches

* Update versions/a-/armadillo.json

7 files changed, 109 insertions, 102 deletions

diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL
index dee179680..d903f6472 100644
--- a/ports/armadillo/CONTROL
+++ b/ports/armadillo/CONTROL
@@ -1,6 +1,5 @@
 Source: armadillo
-Version: 10.1.0
-Port-Version: 1
-Homepage: https://gitlab.com/conradsnicta/armadillo-code
+Version: 10.2.0
+Homepage: http://arma.sourceforge.net
 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
 Build-Depends: blas, lapack
diff --git a/ports/armadillo/add-disable-find-package.patch b/ports/armadillo/add-disable-find-package.patch
index a32628233..b5d67d5c2 100644
--- a/ports/armadillo/add-disable-find-package.patch
+++ b/ports/armadillo/add-disable-find-package.patch
@@ -1,60 +1,60 @@
-diff --git a/cmake_aux/Modules/ARMA_FindARPACK.cmake b/cmake_aux/Modules/ARMA_FindARPACK.cmake

-index 1a709ad..3029c25 100644

---- a/cmake_aux/Modules/ARMA_FindARPACK.cmake

-+++ b/cmake_aux/Modules/ARMA_FindARPACK.cmake

-@@ -4,6 +4,10 @@

- #  ARPACK_FOUND        - system has ARPACK

- #  ARPACK_LIBRARY      - Link this to use ARPACK

- 

-+if(CMAKE_DISABLE_FIND_PACKAGE_ARPACK)

-+  set(ARPACK_FOUND NO)

-+  return()

-+endif()

- 

- 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

---- a/cmake_aux/Modules/ARMA_FindATLAS.cmake

-+++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake

-@@ -1,3 +1,8 @@

-+if(CMAKE_DISABLE_FIND_PACKAGE_ATLAS)

-+  set(ATLAS_FOUND NO)

-+  return()

-+endif()

-+

- find_path(ATLAS_CBLAS_INCLUDE_DIR

- NAMES cblas.h

- PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/

-diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake

-index 0fd5b06..d6bcd49 100644

---- a/cmake_aux/Modules/ARMA_FindMKL.cmake

-+++ b/cmake_aux/Modules/ARMA_FindMKL.cmake

-@@ -6,6 +6,11 @@

- ## the link below explains why we're linking only with mkl_rt

- ## https://software.intel.com/en-us/articles/a-new-linking-model-single-dynamic-library-mkl_rt-since-intel-mkl-103

- 

-+if(CMAKE_DISABLE_FIND_PACKAGE_MKL)

-+  set(MKL_FOUND NO)

-+  return()

-+endif()

-+

- set(MKL_NAMES ${MKL_NAMES} mkl_rt)

- #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

---- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake

-+++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake

-@@ -5,6 +5,11 @@

- #  SuperLU_LIBRARY      - Link this to use SuperLU

- #  SuperLU_INCLUDE_DIR  - directory of SuperLU headers

- 

-+if(CMAKE_DISABLE_FIND_PACKAGE_SuperLU)

-+  set(SuperLU_FOUND OFF)

-+  return()

-+endif()

-+

- find_path(SuperLU_INCLUDE_DIR slu_ddefs.h

-   /usr/include/superlu/

-   /usr/include/SuperLU/

+diff --git a/cmake_aux/Modules/ARMA_FindARPACK.cmake b/cmake_aux/Modules/ARMA_FindARPACK.cmake
+index 1a709ad..3029c25 100644
+--- a/cmake_aux/Modules/ARMA_FindARPACK.cmake
++++ b/cmake_aux/Modules/ARMA_FindARPACK.cmake
+@@ -4,6 +4,10 @@
+ #  ARPACK_FOUND        - system has ARPACK
+ #  ARPACK_LIBRARY      - Link this to use ARPACK
+ 
++if(CMAKE_DISABLE_FIND_PACKAGE_ARPACK)
++  set(ARPACK_FOUND NO)
++  return()
++endif()
+ 
+ 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
+--- a/cmake_aux/Modules/ARMA_FindATLAS.cmake
++++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake
+@@ -1,3 +1,8 @@
++if(CMAKE_DISABLE_FIND_PACKAGE_ATLAS)
++  set(ATLAS_FOUND NO)
++  return()
++endif()
++
+ find_path(ATLAS_CBLAS_INCLUDE_DIR
+ NAMES cblas.h
+ PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/
+diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake
+index 0fd5b06..d6bcd49 100644
+--- a/cmake_aux/Modules/ARMA_FindMKL.cmake
++++ b/cmake_aux/Modules/ARMA_FindMKL.cmake
+@@ -6,6 +6,11 @@
+ ## the link below explains why we're linking only with mkl_rt
+ ## https://software.intel.com/en-us/articles/a-new-linking-model-single-dynamic-library-mkl_rt-since-intel-mkl-103
+ 
++if(CMAKE_DISABLE_FIND_PACKAGE_MKL)
++  set(MKL_FOUND NO)
++  return()
++endif()
++
+ set(MKL_NAMES ${MKL_NAMES} mkl_rt)
+ #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
+--- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake
++++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake
+@@ -5,6 +5,11 @@
+ #  SuperLU_LIBRARY      - Link this to use SuperLU
+ #  SuperLU_INCLUDE_DIR  - directory of SuperLU headers
+ 
++if(CMAKE_DISABLE_FIND_PACKAGE_SuperLU)
++  set(SuperLU_FOUND OFF)
++  return()
++endif()
++
+ find_path(SuperLU_INCLUDE_DIR slu_ddefs.h
+   /usr/include/superlu/
+   /usr/include/SuperLU/
diff --git a/ports/armadillo/fix-CMakePath.patch b/ports/armadillo/fix-CMakePath.patch
index 6d16a26f8..cfafc4f28 100644
--- a/ports/armadillo/fix-CMakePath.patch
+++ b/ports/armadillo/fix-CMakePath.patch
@@ -1,13 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 0fb228f..19cfdf8 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -611,7 +611,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION

- # and install it

- set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}")

- set(ARMADILLO_LIB_DIR      "${CMAKE_INSTALL_FULL_LIBDIR}")

--set(ARMADILLO_CMAKE_DIR    "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo/CMake")

-+set(ARMADILLO_CMAKE_DIR    "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo")

- 

- 

- message(STATUS "Generating '${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake'")

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea5516e..ecd14bc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -615,7 +615,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION
+ # and install it
+ set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+ set(ARMADILLO_LIB_DIR      "${CMAKE_INSTALL_FULL_LIBDIR}")
+-set(ARMADILLO_CMAKE_DIR    "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo/CMake")
++set(ARMADILLO_CMAKE_DIR    "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo")
+ 
+ 
+ message(STATUS "Generating '${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake'")
diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
index 40d8ab3d8..bc275cb66 100644
--- a/ports/armadillo/portfile.cmake
+++ b/ports/armadillo/portfile.cmake
@@ -1,9 +1,10 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-vcpkg_from_git(
+vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
-    URL https://gitlab.com/conradsnicta/armadillo-code
-    REF 24b4762cbfbd3ad14c99a4854acd3560559a3195 # v10.1.0
+    REPO arma
+    FILENAME "armadillo-10.2.0.tar.xz"
+    SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
     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 1ce5984bf..88631b573 100644
--- a/ports/armadillo/remove_custom_modules.patch
+++ b/ports/armadillo/remove_custom_modules.patch
@@ -1,21 +1,23 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 0fb228f..2275734 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -321,14 +321,13 @@ else()

-   set(ARMA_OS unix)

-   

-   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)

-   endif()

-+  find_package(BLAS)

-+  find_package(LAPACK)  

-   

-   message(STATUS "      MKL_FOUND = ${MKL_FOUND}"       )

-   message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}"  )

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ab7dbed..ea5516e 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)
+   endif()
+   
++  find_package(BLAS)
++  find_package(LAPACK) 
++
+   message(STATUS "      MKL_FOUND = ${MKL_FOUND}"       )
+   message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}"  )
+   message(STATUS "    ATLAS_FOUND = ${ATLAS_FOUND}"     )
diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json
index e696b6548..2dfbf6adf 100644
--- a/versions/a-/armadillo.json
+++ b/versions/a-/armadillo.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "8f9484de18ab042899bdf1fd033f6522ff091225",
+      "version-string": "10.2.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "3ec327570d6731dbd87ebdee5a0cebdd8bd62ed7",
       "version-string": "10.1.0",
       "port-version": 1
diff --git a/versions/baseline.json b/versions/baseline.json
index 5d83d0a89..3851f388c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -137,8 +137,8 @@
       "port-version": 0
     },
     "armadillo": {
-      "baseline": "10.1.0",
-      "port-version": 1
+      "baseline": "10.2.0",
+      "port-version": 0
     },
     "arrayfire": {
       "baseline": "3.7.3",