Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 43c1105

Browse filesBrowse files
asmorkalovasmorkalov
authored
Merge pull request opencv#1065 from asmorkalov:pre_4.11
Submodules update to 4.11.0-pre
2 parents 6b45caa + ae90ee7 commit 43c1105
Copy full SHA for 43c1105

File tree

Expand file treeCollapse file tree

5 files changed

+4
-10
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+4
-10
lines changed

‎.github/workflows/build_wheels_macos_m1.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels_macos_m1.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020

2121
jobs:
2222
Build:
23-
runs-on: python-macos11-m1
23+
runs-on: python-macos12-m1
2424
strategy:
2525
fail-fast: false
2626
matrix:

‎opencv

Copy file name to clipboard
Submodule opencv updated 122 files

‎opencv_contrib

Copy file name to clipboard
Submodule opencv_contrib updated 67 files

‎opencv_extra

Copy file name to clipboard
Submodule opencv_extra updated 95 files

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
-6Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,6 @@ def main():
115115
else []
116116
)
117117
+
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-
+
124118
# In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
125119
# Naming conventions vary so widely between versions and OSes
126120
# had to give up on checking them.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.