diff --git a/opencv.yaml b/opencv.yaml index 8637d926241..b6d0f636ed2 100644 --- a/opencv.yaml +++ b/opencv.yaml @@ -1,7 +1,7 @@ package: name: opencv - version: "4.12.0" - epoch: 2 + version: "4.13.0" + epoch: 0 description: Open source computer vision and machine learning library copyright: - license: BSD-3-Clause @@ -56,21 +56,16 @@ pipeline: - uses: git-checkout with: repository: https://github.com/opencv/opencv - expected-commit: 49486f61fb25722cbcf586b7f4320921d46fb38e + expected-commit: fe38fc608f6acb8b68953438a62305d8318f4fcd tag: ${{package.version}} - working-directory: /home/build/opencv_contrib uses: git-checkout with: repository: https://github.com/opencv/opencv_contrib - expected-commit: d943e1d61c8bc556a13783e1546ee7c1a9e0b1cf + expected-commit: d99ad2a188210cc35067c2e60076eed7c2442bc3 tag: ${{package.version}} - # resolves this https://github.com/opencv/opencv/issues/27530 - - uses: patch - with: - patches: eigen-version-detection.patch - - if: ${{build.arch}} == 'x86_64' uses: cmake/configure name: Cmake Configure diff --git a/opencv/eigen-version-detection.patch b/opencv/eigen-version-detection.patch deleted file mode 100644 index a181c1a643d..00000000000 --- a/opencv/eigen-version-detection.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake -index dfc94597bb..e49126bce4 100644 ---- a/cmake/OpenCVFindLibsPerf.cmake -+++ b/cmake/OpenCVFindLibsPerf.cmake -@@ -84,7 +84,13 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) - set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION}) - set(EIGEN_MAJOR_VERSION ${EIGEN3_MAJOR_VERSION}) - set(EIGEN_MINOR_VERSION ${EIGEN3_MINOR_VERSION}) -- else() # Eigen config file -+ elseif(DEFINED Eigen3_VERSION_MAJOR) # Recommended package config variables -+ # see https://github.com/opencv/opencv/issues/27530 -+ set(EIGEN_WORLD_VERSION ${Eigen3_VERSION_MAJOR}) -+ set(EIGEN_MAJOR_VERSION ${Eigen3_VERSION_MINOR}) -+ set(EIGEN_MINOR_VERSION ${Eigen3_VERSION_PATCH}) -+ else() # Deprecated package config variables -+ # Removed on master at https://gitlab.com/libeigen/eigen/-/commit/f2984cd0778dd0a1d7e74216d826eaff2bc6bfab - set(EIGEN_WORLD_VERSION ${EIGEN3_VERSION_MAJOR}) - set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR}) - set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH})