diff --git a/ports/libinterpolate/0001-fix-eigen3.patch b/ports/libinterpolate/0001-fix-eigen3.patch new file mode 100644 index 0000000000..118fbb94e3 --- /dev/null +++ b/ports/libinterpolate/0001-fix-eigen3.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 45550a8..1f98148 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,7 +42,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + + find_package(Boost REQUIRED) +-find_package(Eigen3 3.3.7 REQUIRED) # v3.3.7 adds support for cmake targets ++find_package(Eigen3 CONFIG REQUIRED) + + add_library(Interpolate INTERFACE) + add_library(libInterpolate::Interpolate ALIAS Interpolate) +@@ -117,7 +117,7 @@ file( + WRITE ${CMAKE_CURRENT_BINARY_DIR}/libInterpolateConfig.cmake + "include(CMakeFindDependencyMacro) + find_dependency(Boost) +-find_dependency(Eigen3 3.3.7 REQUIRED) ++find_dependency(Eigen3 CONFIG REQUIRED) + include(\${CMAKE_CURRENT_LIST_DIR}/libInterpolateTargets.cmake) + ") + write_basic_package_version_file( + \ No newline at end of file diff --git a/ports/libinterpolate/0001-support-eigen3-5.patch b/ports/libinterpolate/0001-support-eigen3-5.patch deleted file mode 100644 index 130f729e82..0000000000 --- a/ports/libinterpolate/0001-support-eigen3-5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45550a8..0ebd2c7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} - set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - - find_package(Boost REQUIRED) --find_package(Eigen3 3.3.7 REQUIRED) # v3.3.7 adds support for cmake targets -+find_package(Eigen3 3.3.7...5 REQUIRED) # v3.3.7 adds support for cmake targets - - add_library(Interpolate INTERFACE) - add_library(libInterpolate::Interpolate ALIAS Interpolate) diff --git a/ports/libinterpolate/portfile.cmake b/ports/libinterpolate/portfile.cmake index 6b3bd90b91..76b2a9ba69 100644 --- a/ports/libinterpolate/portfile.cmake +++ b/ports/libinterpolate/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( SHA512 25abb4df8ea0648cd9cdd309f2491a9fc2cdbc5af3cc786fec39302680835bb1f29281628dd89323f353d377d9702d9b9f894c85c5cb0aa7cbae5590d05d3e27 HEAD_REF master PATCHES - 0001-support-eigen3-5.patch + 0001-fix-eigen3.patch ) set(VCPKG_BUILD_TYPE release) # header-only port diff --git a/ports/libinterpolate/vcpkg.json b/ports/libinterpolate/vcpkg.json index 967fafc3f1..90831579ca 100644 --- a/ports/libinterpolate/vcpkg.json +++ b/ports/libinterpolate/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libinterpolate", "version": "2.7.2", - "port-version": 1, + "port-version": 2, "description": "Header-only C++ interpolation library.", "homepage": "https://github.com/CD3/libInterpolate", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 9db6a6ef18..f198f0ce07 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5070,7 +5070,7 @@ }, "libinterpolate": { "baseline": "2.7.2", - "port-version": 1 + "port-version": 2 }, "libirecovery": { "baseline": "2023-05-13", diff --git a/versions/l-/libinterpolate.json b/versions/l-/libinterpolate.json index 7ec77e9a51..8119301c34 100644 --- a/versions/l-/libinterpolate.json +++ b/versions/l-/libinterpolate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d709cc815d23a98233d56f4c6047d8a0c9c559ac", + "version": "2.7.2", + "port-version": 2 + }, { "git-tree": "4b9be387780b7b39b6cd96ef064f9c79201bb1e3", "version": "2.7.2",