Merge branch 'opencv:4.x' into 4.x

HelloBroBro · web-flow · commit b0c366aabd30 · 2024-06-04T07:01:29.000+02:00
diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt
@@ -3063,3 +3063,28 @@ courts sitting in the State of Delaware, and each party agrees that it submits
 to the personal jurisdiction and venue of those courts and waives any
 objections. THE UNITED NATIONS CONVENTION ON CONTRACTS FOR THE INTERNATIONAL
 SALE OF GOODS (1980) IS SPECIFICALLY EXCLUDED AND WILL NOT APPLY TO THE SOFTWARE.
+
+------------------------------------------------------------------------------
+Orbbec SDK distributed with arm64 MacOS packages.
+
+MIT License
+
+Copyright (c) 2023 OrbbecDeveloper
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/opencv b/opencv
@@ -1 +1 @@
-Subproject commit dad8af6b17f8e60d7b95a1203a1b4d22f56574cf
+Subproject commit 71d3237a093b60a27601c20e9ee6c3e52154e8b1
diff --git a/opencv_contrib b/opencv_contrib
@@ -1 +1 @@
-Subproject commit c7602a8f74205e44389bd6a4e8d727d32e7e27b4
+Subproject commit 1ed3dd2c53888e3289afdb22ec4e9ebbff3dba87
diff --git a/opencv_extra b/opencv_extra
@@ -1 +1 @@
-Subproject commit 7f0ba7adefcbbbe3df7d939f5246ba0382c7c629
+Subproject commit dd1fbd0717ef4d83f86899b4144fdd9bc0364a5f
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,8 @@ requires = [
   "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
   "numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'",
   "numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'",
-  "numpy==1.22.2; python_version>='3.11'",
+  "numpy==1.23.5; python_version=='3.11'",
+  "numpy>=1.26.4; python_version>='3.12'",
   "pip",
   "scikit-build>=0.14.0",
   "setuptools==59.2.0",
diff --git a/setup.py b/setup.py
@@ -110,11 +110,17 @@ def main():
     # Path regexes with forward slashes relative to CMake install dir.
     rearrange_cmake_output_data = {
         "cv2": (
-            [r"bin/opencv_videoio_ffmpeg\d{3}%s\.dll" % ("_64" if is64 else "")]
+            [r"bin/opencv_videoio_ffmpeg\d{4}%s\.dll" % ("_64" if is64 else "")]
             if os.name == "nt"
             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.
@@ -310,7 +316,7 @@ def main():
         cmake_source_dir=cmake_source_dir,
     )
 
-    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#/")
+    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")
 
 class RearrangeCMakeOutput:
     """
