Skip to content

Commit adb02aa

Browse files
committed
opencv: update to 4.13.0
1 parent 9a4b24f commit adb02aa

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

src/opencv-1-fixes.patch

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH 1/1] MinGW build fixes
99

1010

1111
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
12-
index 1111111..2222222 100644
12+
index 512e6d1abd..d4d088ac47 100644
1313
--- a/cmake/OpenCVCompilerOptions.cmake
1414
+++ b/cmake/OpenCVCompilerOptions.cmake
15-
@@ -126,8 +126,6 @@ if(CV_GCC OR CV_CLANG)
15+
@@ -144,8 +144,6 @@ if(CV_GCC OR CV_CLANG OR CV_ICX)
1616
add_extra_compiler_option(-Wformat)
1717
add_extra_compiler_option(-Wformat-security -Wformat)
1818
add_extra_compiler_option(-Wmissing-declarations)
@@ -22,7 +22,7 @@ index 1111111..2222222 100644
2222
add_extra_compiler_option(-Winit-self)
2323
add_extra_compiler_option(-Wpointer-arith)
2424
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
25-
index 1111111..2222222 100644
25+
index c3c358f6fc..9139d10494 100644
2626
--- a/cmake/OpenCVFindLibsGrfmt.cmake
2727
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
2828
@@ -2,6 +2,11 @@
@@ -35,10 +35,10 @@ index 1111111..2222222 100644
3535
+endif()
3636
+
3737
# --- zlib (required) ---
38-
if(BUILD_ZLIB)
39-
ocv_clear_vars(ZLIB_FOUND)
38+
if(WITH_ZLIB_NG)
39+
ocv_clear_vars(ZLIB_LIBRARY ZLIB_LIBRARIES ZLIB_INCLUDE_DIR)
4040
diff --git a/cmake/OpenCVFindLibsVideo.cmake b/cmake/OpenCVFindLibsVideo.cmake
41-
index 1111111..2222222 100644
41+
index a4e52e13cf..fd998147d6 100644
4242
--- a/cmake/OpenCVFindLibsVideo.cmake
4343
+++ b/cmake/OpenCVFindLibsVideo.cmake
4444
@@ -1,6 +1,6 @@
@@ -50,10 +50,10 @@ index 1111111..2222222 100644
5050

5151
if(WITH_VA)
5252
diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
53-
index 1111111..2222222 100644
53+
index 84e8216fe0..e56ea45d82 100644
5454
--- a/cmake/OpenCVModule.cmake
5555
+++ b/cmake/OpenCVModule.cmake
56-
@@ -602,12 +602,16 @@ function(__ocv_resolve_dependencies)
56+
@@ -625,12 +625,16 @@ function(__ocv_resolve_dependencies)
5757
# process private deps
5858
foreach(m ${OPENCV_MODULES_BUILD})
5959
foreach(d ${OPENCV_MODULE_${m}_PRIVATE_REQ_DEPS})
@@ -73,10 +73,10 @@ index 1111111..2222222 100644
7373
list(APPEND deps_${m} ${d})
7474
endif()
7575
diff --git a/modules/core/src/lapack.cpp b/modules/core/src/lapack.cpp
76-
index 1111111..2222222 100644
76+
index 83adeeabc3..9ba5b1cb07 100644
7777
--- a/modules/core/src/lapack.cpp
7878
+++ b/modules/core/src/lapack.cpp
79-
@@ -628,7 +628,7 @@ void hal::SVD32f(float* At, size_t astep, float* W, float* U, size_t ustep, floa
79+
@@ -578,7 +578,7 @@ void hal::SVD32f(float* At, size_t astep, float* W, float* U, size_t ustep, floa
8080
void hal::SVD64f(double* At, size_t astep, double* W, double* U, size_t ustep, double* Vt, size_t vstep, int m, int n, int n1)
8181
{
8282
CALL_HAL(SVD64f, cv_hal_SVD64f, At, astep, W, U, ustep, Vt, vstep, m, n, decodeSVDParameters(U, Vt, m, n, n1))
@@ -86,7 +86,7 @@ index 1111111..2222222 100644
8686

8787
/* y[0:m,0:n] += diag(a[0:1,0:m]) * x[0:m,0:n] */
8888
diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp
89-
index 1111111..2222222 100644
89+
index 1b0945d412..e6845060f7 100644
9090
--- a/modules/core/src/precomp.hpp
9191
+++ b/modules/core/src/precomp.hpp
9292
@@ -63,7 +63,7 @@
@@ -99,10 +99,10 @@ index 1111111..2222222 100644
9999
#include <math.h>
100100
#include <stdarg.h>
101101
diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
102-
index 1111111..2222222 100644
102+
index 641beb71ad..e1bc2394cf 100644
103103
--- a/modules/dnn/CMakeLists.txt
104104
+++ b/modules/dnn/CMakeLists.txt
105-
@@ -67,7 +67,7 @@ if(MSVC)
105+
@@ -73,7 +73,7 @@ if(MSVC)
106106
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4592) # symbol will be dynamically initialized (implementation limitation)
107107
endif()
108108
else()

src/opencv.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ PKG := opencv
44
$(PKG)_WEBSITE := https://opencv.org/
55
$(PKG)_DESCR := OpenCV
66
$(PKG)_IGNORE :=
7-
$(PKG)_VERSION := 4.6.0
8-
$(PKG)_CHECKSUM := 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
7+
$(PKG)_VERSION := 4.13.0
8+
$(PKG)_CHECKSUM := 1d40ca017ea51c533cf9fd5cbde5b5fe7ae248291ddf2af99d4c17cf8e13017d
99
$(PKG)_GH_CONF := opencv/opencv/releases
1010
$(PKG)_DEPS := cc libjpeg-turbo
1111

0 commit comments

Comments
 (0)