diff --git a/ports/libscran-umappp/0001-make-find-dependency-not-required.diff b/ports/libscran-umappp/0001-make-find-dependency-not-required.diff new file mode 100644 index 00000000000000..0352666155d768 --- /dev/null +++ b/ports/libscran-umappp/0001-make-find-dependency-not-required.diff @@ -0,0 +1,22 @@ +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index 54ae53d..603cf93 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -1,11 +1,11 @@ + @PACKAGE_INIT@ + + include(CMakeFindDependencyMacro) +-find_dependency(ltla_aarand 1.1.0 CONFIG REQUIRED) +-find_dependency(ltla_sanisizer 0.2.0 CONFIG REQUIRED) +-find_dependency(ltla_subpar 0.5.0 CONFIG REQUIRED) +-find_dependency(ltla_irlba 3.1.0 CONFIG REQUIRED) +-find_dependency(Eigen3 5.0.0 CONFIG REQUIRED) +-find_dependency(knncolle_knncolle 3.1.0 CONFIG REQUIRED) ++find_dependency(ltla_aarand 1.1.0 CONFIG) ++find_dependency(ltla_irlba 3.1.0 CONFIG) ++find_dependency(Eigen3 5.0.0 CONFIG) ++find_dependency(ltla_subpar 0.5.0 CONFIG) ++find_dependency(ltla_sanisizer 0.2.0 CONFIG) ++find_dependency(knncolle_knncolle 3.1.0 CONFIG) + + include("${CMAKE_CURRENT_LIST_DIR}/libscran_umapppTargets.cmake") diff --git a/ports/libscran-umappp/0001-fix-eigen3-dependency.patch b/ports/libscran-umappp/0002-remove-eigen3-version-constraint.diff similarity index 55% rename from ports/libscran-umappp/0001-fix-eigen3-dependency.patch rename to ports/libscran-umappp/0002-remove-eigen3-version-constraint.diff index a1280d671b4f8e..58fee1f98bbc66 100644 --- a/ports/libscran-umappp/0001-fix-eigen3-dependency.patch +++ b/ports/libscran-umappp/0002-remove-eigen3-version-constraint.diff @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5d1e04b..9c40958 100644 +index 942157c..8b4ee79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ if(UMAPPP_FETCH_EXTERN) @@ -12,15 +12,15 @@ index 5d1e04b..9c40958 100644 find_package(ltla_sanisizer 0.2.0 CONFIG REQUIRED) find_package(knncolle_knncolle 3.1.0 CONFIG REQUIRED) diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -index 8e51dd2..e588153 100644 +index 603cf93..c4f72ab 100644 --- a/cmake/Config.cmake.in +++ b/cmake/Config.cmake.in -@@ -5,7 +5,7 @@ find_dependency(ltla_aarand 1.1.0 CONFIG REQUIRED) - find_dependency(ltla_sanisizer 0.2.0 CONFIG REQUIRED) - find_dependency(ltla_subpar 0.5.0 CONFIG REQUIRED) - find_dependency(ltla_irlba 3.0.0 CONFIG REQUIRED) --find_dependency(Eigen3 5.0.0 CONFIG REQUIRED) -+find_dependency(Eigen3 CONFIG REQUIRED) - find_dependency(knncolle_knncolle 3.1.0 CONFIG REQUIRED) - - include("${CMAKE_CURRENT_LIST_DIR}/libscran_umapppTargets.cmake") +@@ -3,7 +3,7 @@ + include(CMakeFindDependencyMacro) + find_dependency(ltla_aarand 1.1.0 CONFIG) + find_dependency(ltla_irlba 3.1.0 CONFIG) +-find_dependency(Eigen3 5.0.0 CONFIG) ++find_dependency(Eigen3 CONFIG) + find_dependency(ltla_subpar 0.5.0 CONFIG) + find_dependency(ltla_sanisizer 0.2.0 CONFIG) + find_dependency(knncolle_knncolle 3.1.0 CONFIG) diff --git a/ports/libscran-umappp/portfile.cmake b/ports/libscran-umappp/portfile.cmake index baca9054dfc3aa..bc4f7ee040181a 100644 --- a/ports/libscran-umappp/portfile.cmake +++ b/ports/libscran-umappp/portfile.cmake @@ -2,10 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libscran/umappp REF "v${VERSION}" - SHA512 a4706321d6129194520e909b7978b297cb114dffe7a3a449960cf1c3f06ca1dc1903ca8f1a23c924706d9fc44e3af7479f9fac05b3d5f710414b37b0cca9fdf6 + SHA512 73f4979a0d8b15fc7bc62de04210fba2a95dd8a30480882c3e88a8e2ea3b48e2e9f37d02f39c09648a79ad27a10906b0b1c26600afe573539070d77696ef44f7 HEAD_REF master PATCHES - 0001-fix-eigen3-dependency.patch + 0001-make-find-dependency-not-required.diff # https://github.com/libscran/umappp/pull/35 + 0002-remove-eigen3-version-constraint.diff ) set(VCPKG_BUILD_TYPE "release") # header-only port diff --git a/ports/libscran-umappp/vcpkg.json b/ports/libscran-umappp/vcpkg.json index d470ce36ad0e23..03c8b75840ac79 100644 --- a/ports/libscran-umappp/vcpkg.json +++ b/ports/libscran-umappp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libscran-umappp", - "version": "3.2.1", + "version": "3.3.0", "description": "UMAP C++ implementation", "homepage": "https://github.com/libscran/umappp", "license": "BSD-2-Clause", diff --git a/ports/ltla-cppirlba/portfile.cmake b/ports/ltla-cppirlba/portfile.cmake index cb821aaeed1a39..7963106a18577b 100644 --- a/ports/ltla-cppirlba/portfile.cmake +++ b/ports/ltla-cppirlba/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LTLA/CppIrlba REF "v${VERSION}" - SHA512 17e84cf3d5de06dc9c599695a9d2b5b6d48f9ec1c3f04b6c1f875ab809d42dfddc7a97e400d02e7fd55e88e708df6162ba4e7aadf0a47f8eea6004e3efbb4dd3 + SHA512 a060c12a6d2c00efb632ab89f14f12fd57598e6e563aa50d4bfd44100c29f3178509e9bd0f3b2cd34c82042caa1b8c2dc6dab3c0f6c3da2c4d169175064605fe HEAD_REF master PATCHES 0001-fix-eigen3.patch diff --git a/ports/ltla-cppirlba/vcpkg.json b/ports/ltla-cppirlba/vcpkg.json index 7251492190acf4..42a144ad147a0d 100644 --- a/ports/ltla-cppirlba/vcpkg.json +++ b/ports/ltla-cppirlba/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ltla-cppirlba", - "version": "3.0.1", - "port-version": 1, + "version": "3.1.0", "description": "A C++ port of the IRLBA algorithm, based on the C code in the R package.", "homepage": "https://github.com/LTLA/CppIrlba", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 77533eef16426c..cccba9c61012d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5541,7 +5541,7 @@ "port-version": 0 }, "libscran-umappp": { - "baseline": "3.2.1", + "baseline": "3.3.0", "port-version": 0 }, "libsecret": { @@ -6133,8 +6133,8 @@ "port-version": 0 }, "ltla-cppirlba": { - "baseline": "3.0.1", - "port-version": 1 + "baseline": "3.1.0", + "port-version": 0 }, "ltla-cppkmeans": { "baseline": "4.0.6", diff --git a/versions/l-/libscran-umappp.json b/versions/l-/libscran-umappp.json index b9723b9f3af685..20055f3d8be892 100644 --- a/versions/l-/libscran-umappp.json +++ b/versions/l-/libscran-umappp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ab13a4280e75342a69be6abbb01d8384f793d6d", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "fda71d1c69700a3fc9de5dd81153647dd4966fca", "version": "3.2.1", diff --git a/versions/l-/ltla-cppirlba.json b/versions/l-/ltla-cppirlba.json index f0ea4144875913..74cd464b915250 100644 --- a/versions/l-/ltla-cppirlba.json +++ b/versions/l-/ltla-cppirlba.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78cc7dce411f7977354df995cbb338cba48043c6", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "3b0436e9ba1d03149bc0c83f9e81b61d2d596fe1", "version": "3.0.1",