From ae90ee753908ae55fd3045719408441c6b18af67 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 24 Dec 2024 09:00:35 +0300 Subject: [PATCH] Submodules update to 4.11.0-pre --- .github/workflows/build_wheels_macos_m1.yml | 2 +- opencv | 2 +- opencv_contrib | 2 +- opencv_extra | 2 +- setup.py | 6 ------ 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml index a3bcac63..dd119fcb 100644 --- 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 index 03cedee0..b42075f3 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit 03cedee0b0258875eafd1576b59d686ba805da7a +Subproject commit b42075f3e2c7eca4a12e55b32cfc95fa90982a21 diff --git a/opencv_contrib b/opencv_contrib index 67337620..3e776c87 160000 --- a/opencv_contrib +++ b/opencv_contrib @@ -1 +1 @@ -Subproject commit 673376203b0a8371a31ec5e8f08910a9744c0f32 +Subproject commit 3e776c876ef8527ad639d2c792521b6cede291e5 diff --git a/opencv_extra b/opencv_extra index 08fe33c7..a74cf6ba 160000 --- a/opencv_extra +++ b/opencv_extra @@ -1 +1 @@ -Subproject commit 08fe33c733cabec70ffb6e5eac49708b073e5277 +Subproject commit a74cf6bae7fd75d91282b877c559168b3a62148a diff --git a/setup.py b/setup.py index 48d5a65f..fd4181d0 100644 --- 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//; in Linux, in just python/X.Y/. # Naming conventions vary so widely between versions and OSes # had to give up on checking them.