From ec3604aae5cd0bee4b05dbf102dc3956728b4eff Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com>
Date: Tue, 3 Dec 2024 15:39:28 +0300
Subject: [PATCH] Revert "5.x merge 4.x and submodules update"
---
.gitmodules | 3 ---
find_version.py | 2 +-
opencv | 2 +-
opencv_contrib | 2 +-
opencv_extra | 2 +-
pyproject.toml | 2 +-
setup.py | 2 +-
7 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 99476363..7193d3b9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,12 @@
[submodule "opencv"]
path = opencv
url = https://github.com/opencv/opencv.git
- branch = 5.x
[submodule "opencv_contrib"]
path = opencv_contrib
url = https://github.com/opencv/opencv_contrib.git
- branch = 5.x
[submodule "multibuild"]
path = multibuild
url = https://github.com/multi-build/multibuild.git
[submodule "opencv_extra"]
path = opencv_extra
url = https://github.com/opencv/opencv_extra.git
- branch = 5.x
diff --git a/find_version.py b/find_version.py
index 274c93e6..13e8003c 100644
--- a/find_version.py
+++ b/find_version.py
@@ -65,7 +65,7 @@
else:
# local version identifier, not to be published on PyPI
version = git_hash
- opencv_version += ".{}".format(version)
+ opencv_version += "+{}".format(version)
with open("cv2/version.py", "w") as f:
f.write('opencv_version = "{}"\n'.format(opencv_version))
diff --git a/opencv b/opencv
index b31bc1a2..71d3237a 160000
--- a/opencv
+++ b/opencv
@@ -1 +1 @@
-Subproject commit b31bc1a2954e22d87f8384212c5e3dfbe7024f16
+Subproject commit 71d3237a093b60a27601c20e9ee6c3e52154e8b1
diff --git a/opencv_contrib b/opencv_contrib
index f7d6288a..1ed3dd2c 160000
--- a/opencv_contrib
+++ b/opencv_contrib
@@ -1 +1 @@
-Subproject commit f7d6288aeb38ff1b8af70ecf50a98258e8cd1bef
+Subproject commit 1ed3dd2c53888e3289afdb22ec4e9ebbff3dba87
diff --git a/opencv_extra b/opencv_extra
index 0e3b933a..dd1fbd07 160000
--- a/opencv_extra
+++ b/opencv_extra
@@ -1 +1 @@
-Subproject commit 0e3b933aa762b28b54a40034c58f8c734f1ed759
+Subproject commit dd1fbd0717ef4d83f86899b4144fdd9bc0364a5f
diff --git a/pyproject.toml b/pyproject.toml
index 270a25d1..71de7f9b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[build-system]
requires = [
- "cmake>=3.13",
+ "cmake>=3.1",
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
diff --git a/setup.py b/setup.py
index edf813b4..48d5a65f 100644
--- a/setup.py
+++ b/setup.py
@@ -140,7 +140,7 @@ def main():
[ r"python/cv2/py.typed" ] if sys.version_info >= (3, 6) else []
,
"cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
- ("etc" if os.name == "nt" else "share/opencv5") + r"/haarcascades/.*\.xml"
+ ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
],
"cv2.gapi": [
"python/cv2" + r"/gapi/.*\.py"