Update OpenCV to current 4.x to get PR #20370

asmorkalov · asmorkalov · commit 9ac1294db4db · 2023-06-02T18:32:20.000+03:00
diff --git a/opencv b/opencv
@@ -1 +1 @@
-Subproject commit 725e440d278aca07d35a5e8963ef990572b07316
+Subproject commit 2104d61d4a3fb363e5c7d29a8d14eac038e2b3b2
diff --git a/opencv_contrib b/opencv_contrib
@@ -1 +1 @@
-Subproject commit e247b680a6bd396f110274b6c214406a93171350
+Subproject commit 8dfeed73b9389ba09411498dc1e923431d7fe292
diff --git a/opencv_extra b/opencv_extra
@@ -1 +1 @@
-Subproject commit 5abbd7e0546bbb34ae7487170383d3e571fb1dd1
+Subproject commit 847035ec7e1d388def99ecee4905fb9b01d1cabf
diff --git a/setup.py b/setup.py
@@ -132,7 +132,11 @@ def main():
         ]
         +
         [
-            r"python/cv2/.*\.pyi"
+            r"python/cv2/.*.pyi",
+            r"python/cv2/.*/.*.pyi",
+            r"python/cv2/.*/.*/*.pyi",
+            r"python/cv2/.*/.*/.*/*.pyi",
+            r"python/cv2/.*/.*/.*/.*/*.pyi"
         ],
         "cv2.data": [  # OPENCV_OTHER_INSTALL_PATH
             ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,11 @@ def main():`
`132`	`132`	`]`
`133`	`133`	`+`
`134`	`134`	`[`
`135`		`- r"python/cv2/.*\.pyi"`
	`135`	`+ r"python/cv2/.*.pyi",`
	`136`	`+ r"python/cv2/./..pyi",`
	`137`	`+ r"python/cv2/././*.pyi",`
	`138`	`+ r"python/cv2/./././.pyi",`
	`139`	`+ r"python/cv2/././././*.pyi"`
`136`	`140`	`],`
`137`	`141`	`"cv2.data": [ # OPENCV_OTHER_INSTALL_PATH`
`138`	`142`	`("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"`