Merge pull request #1065 from asmorkalov:pre_4.11

asmorkalov · web-flow · commit 43c110551a6a · 2024-12-31T12:11:39.000+03:00
Submodules update to 4.11.0-pre
diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   Build:
-    runs-on: python-macos11-m1
+    runs-on: python-macos12-m1
     strategy:
       fail-fast: false
       matrix:
diff --git a/opencv b/opencv
@@ -1 +1 @@
-Subproject commit 03cedee0b0258875eafd1576b59d686ba805da7a
+Subproject commit b42075f3e2c7eca4a12e55b32cfc95fa90982a21
diff --git a/opencv_contrib b/opencv_contrib
@@ -1 +1 @@
-Subproject commit 673376203b0a8371a31ec5e8f08910a9744c0f32
+Subproject commit 3e776c876ef8527ad639d2c792521b6cede291e5
diff --git a/opencv_extra b/opencv_extra
@@ -1 +1 @@
-Subproject commit 08fe33c733cabec70ffb6e5eac49708b073e5277
+Subproject commit a74cf6bae7fd75d91282b877c559168b3a62148a
diff --git a/setup.py b/setup.py
@@ -115,12 +115,6 @@ def main():
             else []
         )
         +
-        (
-            [r"lib/libOrbbecSDK.dylib", r"lib/libOrbbecSDK.\d.\d.dylib", r"lib/libOrbbecSDK.\d.\d.\d.dylib"]
-            if platform.system() == "Darwin" and platform.machine() == "arm64"
-            else []
-        )
-        +
         # In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
         # Naming conventions vary so widely between versions and OSes
         # had to give up on checking them.

Original file line number	Diff line number	Diff line change
`@@ -115,12 +115,6 @@ def main():`
`115`	`115`	`else []`
`116`	`116`	`)`
`117`	`117`	`+`
`118`		`- (`
`119`		`- [r"lib/libOrbbecSDK.dylib", r"lib/libOrbbecSDK.\d.\d.dylib", r"lib/libOrbbecSDK.\d.\d.\d.dylib"]`
`120`		`- if platform.system() == "Darwin" and platform.machine() == "arm64"`
`121`		`- else []`
`122`		`- )`
`123`		`- +`
`124`	`118`	`# In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.`
`125`	`119`	`# Naming conventions vary so widely between versions and OSes`
`126`	`120`	`# had to give up on checking them.`