8000 Update submodules to 4.10.0-pre for testing. by asmorkalov · Pull Request #990 · opencv/opencv-python · GitHub
[go: up one dir, main page]
Skip to content

Update submodules to 4.10.0-pre for testing. #990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 3, 2024
Merged

Update submodules to 4.10.0-pre for testing. #990

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
375b19b
Update submodules to 4.10.0-pre for testing.
asmorkalov May 30, 2024
4cd2687
Update donation link.
asmorkalov May 30, 2024
30ee36b
Use 4 digits in OpenCV version since 4.10.0
asmorkalov May 31, 2024
882af5b
Add OrbbecSDK library to package for MacOS ARM. It's aways enabled du…
asmorkalov May 31, 2024
22c0895
Alternative solution for Orbbec on MacOS
asmorkalov May 31, 2024
7638be6
Bug fixes.
asmorkalov Jun 2, 2024
6839a27
Abs file names for OrbbecSDK.
asmorkalov Jun 2, 2024
bb7ad9b
Restored Darwin check.
asmorkalov Jun 2, 2024
fcbd6dd
Another try
asmorkalov Jun 2, 2024
da63b3d
Syntax fix.
asmorkalov Jun 2, 2024
215cda6
Fix mac intel.
asmorkalov Jun 2, 2024
b56e0f5
Typo
asmorkalov Jun 2, 2024
12bf0c3
Submodules update to tag 4.10.0.
asmorkalov Jun 3, 2024
9c3fee1
Typo fix.
asmorkalov Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bug fixes.
  • Loading branch information
@asmorkalov
asmorkalov committed Jun 2, 2024
commit 7638be6d13b1a163742a96e2437ad8ff58f036b1
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def main():
package_data = {
"cv2": ["*%s" % sysconfig.get_config_vars().get("SO"), "version.py"]
+ (["*.dll"] if os.name == "nt" else [])
+ (["*.dynlib"] if os.name == "Darwin" else [])
+ (["*.dylib"] if os.name == "Darwin" else [])
+ ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"],
"cv2.data": ["*.xml"],
}
Expand All @@ -117,7 +117,7 @@ def main():
)
+
(
[r"lib/libOrbbecSDK\..*\.dylib"]
[r"bin/libOrbbecSDK.*\.dylib"]
if os.name == "Darwin"
else []
)
Expand Down
Loading
0