Merge pull request opencv#1071 from asmorkalov:as/opencv_4.11_tags

asmorkalov · web-flow · commit 764c325d78cf · 2025-01-15T17:25:35.000+03:00
Switched to tag 4.11.0
diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
@@ -54,7 +54,7 @@ jobs:
         git submodule update --init multibuild
         echo $ENABLE_CONTRIB > contrib.enabled
         echo $ENABLE_HEADLESS > headless.enabled
-        export MACOSX_DEPLOYMENT_TARGET=11.0
+        export MACOSX_DEPLOYMENT_TARGET=13.0
         python${{ matrix.python-version }} -m pip install toml && python${{ matrix.python-version }} -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | python${{ matrix.python-version }} -m pip install -r /dev/stdin
         python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v
         delocate-wheel ${{ github.workspace }}/wheelhouse/opencv*
@@ -71,7 +71,7 @@ jobs:
 
   Test:
     needs: [Build]
-    runs-on: opencv-cn-mac-arm64-tests
+    runs-on: python-macos12-m1
     strategy:
       fail-fast: false
       matrix:
diff --git a/opencv b/opencv
@@ -1 +1 @@
-Subproject commit b42075f3e2c7eca4a12e55b32cfc95fa90982a21
+Subproject commit 31b0eeea0b44b370fd0712312df4214d4ae1b158
diff --git a/opencv_contrib b/opencv_contrib
@@ -1 +1 @@
-Subproject commit 3e776c876ef8527ad639d2c792521b6cede291e5
+Subproject commit 0e5254ebf54d2aed6e7eaf6660bf3b797cf50a02
