diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml index b1a98d26..4ef6da44 100644 --- a/.github/workflows/build_wheels_windows.yml +++ b/.github/workflows/build_wheels_windows.yml @@ -61,7 +61,16 @@ jobs: uses: microsoft/setup-msbuild@v1.1 - name: Build a package # CMake 3.25 regression fix. See https://stackoverflow.com/questions/74162633/problem-compiling-from-source-opencv-with-mvsc2019-in-64-bit-version + # OpenBLAS package bug on Windows: https://github.com/xianyi/OpenBLAS/issues/4227 run: | + mkdir openblas + cd openblas + curl -o OpenBLAS-0.3.24-x64.zip https://altushost-swe.dl.sourceforge.net/project/openblas/v0.3.24/OpenBLAS-0.3.24-x64.zip + unzip OpenBLAS-0.3.24-x64.zip + cp bin/libopenblas.dll libopenblas.exp.dll + set OpenBLAS_HOME=$PWD + set PAPTH=$PWD/bin:$PATH + cd - python --version python -m pip install --upgrade pip python -m pip install --upgrade setuptools diff --git a/opencv b/opencv index f9a59f25..fa81936a 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit f9a59f2592993d3dcc080e495f4f5e02dd8ec7ef +Subproject commit fa81936a5b3bc8eb5b32924bac80b78416202ee8 diff --git a/opencv_contrib b/opencv_contrib index f10c84d4..c82dea11 160000 --- a/opencv_contrib +++ b/opencv_contrib @@ -1 +1 @@ -Subproject commit f10c84d48b0714f2b408c9e5cccfac1277c8e6cc +Subproject commit c82dea114536083019a957c8906c64eef5f05d61 diff --git a/opencv_extra b/opencv_extra index fdd66bfc..02e875ed 160000 --- a/opencv_extra +++ b/opencv_extra @@ -1 +1 @@ -Subproject commit fdd66bfcc3ced243d682fe03f0858bf43867656c +Subproject commit 02e875ed87285c93f7c59222bd6e41fdf6931738