Skip to content

Commit 63eed93

Browse files
authored
Update submodules to 4.10.0-pre for testing. (#990)
* Submodules update to tag 4.10.0. * Update donation link. * Use 4 digits in OpenCV version since 4.10.0 * Add OrbbecSDK library to package for MacOS ARM. It's aways enabled during library build.
1 parent 5f132ad commit 63eed93

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

opencv

Submodule opencv updated 1305 files

opencv_contrib

Submodule opencv_contrib updated 236 files

opencv_extra

Submodule opencv_extra updated 76 files

setup.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,17 @@ def main():
110110
# Path regexes with forward slashes relative to CMake install dir.
111111
rearrange_cmake_output_data = {
112112
"cv2": (
113-
[r"bin/opencv_videoio_ffmpeg\d{3}%s\.dll" % ("_64" if is64 else "")]
113+
[r"bin/opencv_videoio_ffmpeg\d{4}%s\.dll" % ("_64" if is64 else "")]
114114
if os.name == "nt"
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+
+
118124
# In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
119125
# Naming conventions vary so widely between versions and OSes
120126
# had to give up on checking them.
@@ -310,7 +316,7 @@ def main():
310316
cmake_source_dir=cmake_source_dir,
311317
)
312318

313-
print("OpenCV is raising funds to keep the library free for everyone, and we need the support of the entire community to do it. Donate to OpenCV on IndieGoGo:\nhttps://www.indiegogo.com/projects/opencv-5-support-non-profit-open-source-cv-ai#/")
319+
print("OpenCV is raising funds to keep the library free for everyone, and we need the support of the entire community to do it. Donate to OpenCV on GitHub:\nhttps://github.com/sponsors/opencv\n")
314320

315321
class RearrangeCMakeOutput:
316322
"""

0 commit comments

Comments
 (0)