diff --git a/Fix-OpenCV-build-with-OpenEXR-before-2.2.0.patch b/Fix-OpenCV-build-with-OpenEXR-before-2.2.0.patch deleted file mode 100644 index 3e8126ab56d0b0784c093b345d9d5d379fc7c545..0000000000000000000000000000000000000000 --- a/Fix-OpenCV-build-with-OpenEXR-before-2.2.0.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 083a7c8f0a71076d4f2f5130d70abaedb2f8c8a5 Mon Sep 17 00:00:00 2001 -From: Alexander Smorkalov -Date: Wed, 28 Apr 2021 10:41:59 +0300 -Subject: [PATCH] Fix OpenCV build with OpenEXR before 2.2.0. - ---- - modules/imgcodecs/include/opencv2/imgcodecs.hpp | 4 ++-- - modules/imgcodecs/src/grfmt_exr.cpp | 3 +++ - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/modules/imgcodecs/include/opencv2/imgcodecs.hpp b/modules/imgcodecs/include/opencv2/imgcodecs.hpp -index 42227f3788..101a944146 100644 ---- a/modules/imgcodecs/include/opencv2/imgcodecs.hpp -+++ b/modules/imgcodecs/include/opencv2/imgcodecs.hpp -@@ -120,8 +120,8 @@ enum ImwriteEXRCompressionFlags { - IMWRITE_EXR_COMPRESSION_PXR24 = 5, //!< lossy 24-bit float compression - IMWRITE_EXR_COMPRESSION_B44 = 6, //!< lossy 4-by-4 pixel block compression, fixed compression rate - IMWRITE_EXR_COMPRESSION_B44A = 7, //!< lossy 4-by-4 pixel block compression, flat fields are compressed more -- IMWRITE_EXR_COMPRESSION_DWAA = 8, //!< lossy DCT based compression, in blocks of 32 scanlines. More efficient for partial buffer access. -- IMWRITE_EXR_COMPRESSION_DWAB = 9, //!< lossy DCT based compression, in blocks of 256 scanlines. More efficient space wise and faster to decode full frames than DWAA_COMPRESSION. -+ IMWRITE_EXR_COMPRESSION_DWAA = 8, //!< lossy DCT based compression, in blocks of 32 scanlines. More efficient for partial buffer access. Supported since OpenEXR 2.2.0. -+ IMWRITE_EXR_COMPRESSION_DWAB = 9, //!< lossy DCT based compression, in blocks of 256 scanlines. More efficient space wise and faster to decode full frames than DWAA_COMPRESSION. Supported since OpenEXR 2.2.0. - }; - - //! Imwrite PNG specific flags used to tune the compression algorithm. -diff --git a/modules/imgcodecs/src/grfmt_exr.cpp b/modules/imgcodecs/src/grfmt_exr.cpp -index aaf28eead6..7acaf434c6 100644 ---- a/modules/imgcodecs/src/grfmt_exr.cpp -+++ b/modules/imgcodecs/src/grfmt_exr.cpp -@@ -64,6 +64,7 @@ - #include - #include - #include "grfmt_exr.hpp" -+#include "OpenEXRConfig.h" - - #if defined _WIN32 - -@@ -649,12 +650,14 @@ bool ExrEncoder::write( const Mat& img, const std::vector& params ) - case IMWRITE_EXR_COMPRESSION_B44A: - header.compression() = B44A_COMPRESSION; - break; -+#if ((OPENEXR_VERSION_MAJOR * 1000 + OPENEXR_VERSION_MINOR) >= (2 * 1000 + 2)) // available since version 2.2.0 - case IMWRITE_EXR_COMPRESSION_DWAA: - header.compression() = DWAA_COMPRESSION; - break; - case IMWRITE_EXR_COMPRESSION_DWAB: - header.compression() = DWAB_COMPRESSION; - break; -+#endif - default: - CV_Error(Error::StsBadArg, "IMWRITE_EXR_COMPRESSION is invalid or not supported"); - } --- -2.29.2.windows.2 - diff --git a/Fix_compilation_of_copy_assignment_operators_with_GCC.patch b/Fix_compilation_of_copy_assignment_operators_with_GCC.patch deleted file mode 100644 index ca13ff69c87affddb499533322994da904f6c66b..0000000000000000000000000000000000000000 --- a/Fix_compilation_of_copy_assignment_operators_with_GCC.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -Npur opencv-4.5.2/modules/core/include/opencv2/core/types.hpp opencv-4.5.2-new/modules/core/include/opencv2/core/types.hpp ---- opencv-4.5.2/modules/core/include/opencv2/core/types.hpp 2021-04-02 19:23:54.000000000 +0800 -+++ opencv-4.5.2-new/modules/core/include/opencv2/core/types.hpp 2021-11-13 16:24:25.592720089 +0800 -@@ -162,13 +162,23 @@ public: - //! default constructor - Point_(); - Point_(_Tp _x, _Tp _y); -+#if (defined(__GNUC__) && __GNUC__ < 5) -+ Point_(const Point_& pt); -+ Point_(Point_&& pt) CV_NOEXCEPT = default; -+#elif OPENCV_ABI_COMPATIBILITY < 500 - Point_(const Point_& pt); - Point_(Point_&& pt) CV_NOEXCEPT; -+#endif - Point_(const Size_<_Tp>& sz); - Point_(const Vec<_Tp, 2>& v); - -+#if (defined(__GNUC__) && __GNUC__ < 5) -+ Point_& operator = (const Point_& pt); -+ Point_& operator = (Point_&& pt) CV_NOEXCEPT = default; -+#elif OPENCV_ABI_COMPATIBILITY < 500 - Point_& operator = (const Point_& pt); - Point_& operator = (Point_&& pt) CV_NOEXCEPT; -+#endif - //! conversion to another data type - template operator Point_<_Tp2>() const; - -@@ -244,13 +254,17 @@ public: - //! default constructor - Point3_(); - Point3_(_Tp _x, _Tp _y, _Tp _z); -+#if OPENCV_ABI_COMPATIBILITY < 500 - Point3_(const Point3_& pt); - Point3_(Point3_&& pt) CV_NOEXCEPT; -+#endif - explicit Point3_(const Point_<_Tp>& pt); - Point3_(const Vec<_Tp, 3>& v); - -+#if OPENCV_ABI_COMPATIBILITY < 500 - Point3_& operator = (const Point3_& pt); - Point3_& operator = (Point3_&& pt) CV_NOEXCEPT; -+#endif - //! conversion to another data type - template operator Point3_<_Tp2>() const; - //! conversion to cv::Vec<> -@@ -320,12 +334,16 @@ public: - //! default constructor - Size_(); - Size_(_Tp _width, _Tp _height); -+#if OPENCV_ABI_COMPATIBILITY < 500 - Size_(const Size_& sz); - Size_(Size_&& sz) CV_NOEXCEPT; -+#endif - Size_(const Point_<_Tp>& pt); - -+#if OPENCV_ABI_COMPATIBILITY < 500 - Size_& operator = (const Size_& sz); - Size_& operator = (Size_&& sz) CV_NOEXCEPT; -+#endif - //! the area (width*height) - _Tp area() const; - //! aspect ratio (width/height) -@@ -425,13 +443,17 @@ public: - //! default constructor - Rect_(); - Rect_(_Tp _x, _Tp _y, _Tp _width, _Tp _height); -+#if OPENCV_ABI_COMPATIBILITY < 500 - Rect_(const Rect_& r); - Rect_(Rect_&& r) CV_NOEXCEPT; -+#endif - Rect_(const Point_<_Tp>& org, const Size_<_Tp>& sz); - Rect_(const Point_<_Tp>& pt1, const Point_<_Tp>& pt2); - -+#if OPENCV_ABI_COMPATIBILITY < 500 - Rect_& operator = ( const Rect_& r ); - Rect_& operator = ( Rect_&& r ) CV_NOEXCEPT; -+#endif - //! the top-left corner - Point_<_Tp> tl() const; - //! the bottom-right corner -@@ -1164,6 +1186,12 @@ template inline - Point_<_Tp>::Point_(_Tp _x, _Tp _y) - : x(_x), y(_y) {} - -+#if (defined(__GNUC__) && __GNUC__ < 5) -+template inline -+Point_<_Tp>::Point_(const Point_& pt) -+ : x(pt.x), y(pt.y) {} -+#endif -+ - template inline - Point_<_Tp>::Point_(const Point_& pt) - : x(pt.x), y(pt.y) {} -@@ -1180,6 +1208,15 @@ template inline - Point_<_Tp>::Point_(const Vec<_Tp,2>& v) - : x(v[0]), y(v[1]) {} - -+#if (defined(__GNUC__) && __GNUC__ < 5) -+template inline -+Point_<_Tp>& Point_<_Tp>::operator = (const Point_& pt) -+{ -+ x = pt.x; y = pt.y; -+ return *this; -+} -+#endif -+ - template inline - Point_<_Tp>& Point_<_Tp>::operator = (const Point_& pt) - { diff --git a/Merge-pull-request-21114-from-dwardor-patch-1.patch b/Merge-pull-request-21114-from-dwardor-patch-1.patch deleted file mode 100644 index af1ef49106e36aa565a0c5c2affccceb9bbc4f93..0000000000000000000000000000000000000000 --- a/Merge-pull-request-21114-from-dwardor-patch-1.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 54c180092d2ca02e0460eac7176cab23890fc11e Mon Sep 17 00:00:00 2001 -From: dwardor <50771662+dwardor@users.noreply.github.com> -Date: Wed, 22 Dec 2021 13:00:00 +0100 -Subject: [PATCH] Merge pull request #21114 from dwardor:patch-1 - -* Fix compile against lapack-3.10.0 - -Fix compilation against lapack >= 3.9.1 and 3.10.0 while not breaking older versions - -OpenCVFindLAPACK.cmake & CMakeLists.txt: determine OPENCV_USE_LAPACK_PREFIX from LAPACK_VERSION - -hal_internal.cpp : Only apply LAPACK_FUNC to functions whose number of inputs depends on LAPACK_FORTRAN_STR_LEN in lapack >= 3.9.1 - -lapack_check.cpp : remove LAPACK_FUNC which is not OK as function are not used with input parameters (so lapack.h preprocessing of "LAPACK_xxxx(...)" is not applicable with lapack >= 3.9.1 -If not removed lapack_check fails so LAPACK is deactivated in build (not want we want) - -use OCV_ prefix and don't use Global, instead generate OCV_LAPACK_FUNC depending on CMake Conditions - -Remove CONFIG from find_package(LAPACK) and use LAPACK_GLOBAL and LAPACK_NAME to figure out if using netlib's reference LAPACK implementation and how to #define OCV_LAPACK_FUNC(f) - -* Fix typos and grammar in comments ---- - cmake/OpenCVFindLAPACK.cmake | 17 +++++++++++++++ - modules/core/src/hal_internal.cpp | 36 +++++++++++++++---------------- - 2 files changed, 35 insertions(+), 18 deletions(-) - -diff --git a/cmake/OpenCVFindLAPACK.cmake b/cmake/OpenCVFindLAPACK.cmake -index 342bebc723..3f17b7b289 100644 ---- a/cmake/OpenCVFindLAPACK.cmake -+++ b/cmake/OpenCVFindLAPACK.cmake -@@ -51,6 +51,23 @@ macro(ocv_lapack_check) - if(NOT "${OPENCV_CBLAS_H_PATH_${_lapack_impl}}" STREQUAL "${OPENCV_LAPACKE_H_PATH_${_lapack_impl}}") - list(APPEND _lapack_content "#include \"${OPENCV_LAPACKE_H_PATH_${_lapack_impl}}\"") - endif() -+ list(APPEND _lapack_content " -+#if defined(LAPACK_GLOBAL) || defined(LAPACK_NAME) -+/* -+ * Using netlib's reference LAPACK implementation version >= 3.4.0 (first with C interface). -+ * Use LAPACK_xxxx to transparently (via predefined lapack macros) deal with pre and post 3.9.1 versions. -+ * LAPACK 3.9.1 introduces LAPACK_FORTRAN_STRLEN_END and modifies (through preprocessing) the declarations of the following functions used in opencv -+ * sposv_, dposv_, spotrf_, dpotrf_, sgesdd_, dgesdd_, sgels_, dgels_ -+ * which end up with an extra parameter. -+ * So we also need to preprocess the function calls in opencv coding by prefixing them with LAPACK_. -+ * The good news is the preprocessing works fine whatever netlib's LAPACK version. -+ */ -+#define OCV_LAPACK_FUNC(f) LAPACK_##f -+#else -+/* Using other LAPACK implementations so fall back to opencv's assumption until now */ -+#define OCV_LAPACK_FUNC(f) f##_ -+#endif -+") - if(${_lapack_add_extern_c}) - list(APPEND _lapack_content "}") - endif() -diff --git a/modules/core/src/hal_internal.cpp b/modules/core/src/hal_internal.cpp -index 483281d1f7..cbe02780d2 100644 ---- a/modules/core/src/hal_internal.cpp -+++ b/modules/core/src/hal_internal.cpp -@@ -163,9 +163,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n - if(n == 1 && b_step == sizeof(fptype)) - { - if(typeid(fptype) == typeid(float)) -- sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus); -+ OCV_LAPACK_FUNC(sposv)(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus); - else if(typeid(fptype) == typeid(double)) -- dposv_(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus); -+ OCV_LAPACK_FUNC(dposv)(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus); - } - else - { -@@ -174,9 +174,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n - transpose(b, ldb, tmpB, m, m, n); - - if(typeid(fptype) == typeid(float)) -- sposv_(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus); -+ OCV_LAPACK_FUNC(sposv)(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus); - else if(typeid(fptype) == typeid(double)) -- dposv_(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus); -+ OCV_LAPACK_FUNC(dposv)(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus); - - transpose(tmpB, m, b, ldb, n, m); - delete[] tmpB; -@@ -185,9 +185,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype* b, size_t b_step, int n - else - { - if(typeid(fptype) == typeid(float)) -- spotrf_(L, &m, (float*)a, &lda, &lapackStatus); -+ OCV_LAPACK_FUNC(spotrf)(L, &m, (float*)a, &lda, &lapackStatus); - else if(typeid(fptype) == typeid(double)) -- dpotrf_(L, &m, (double*)a, &lda, &lapackStatus); -+ OCV_LAPACK_FUNC(dpotrf)(L, &m, (double*)a, &lda, &lapackStatus); - } - - if(lapackStatus == 0) *info = true; -@@ -227,17 +227,17 @@ lapack_SVD(fptype* a, size_t a_step, fptype *w, fptype* u, size_t u_step, fptype - } - - if(typeid(fptype) == typeid(float)) -- sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info); -+ OCV_LAPACK_FUNC(sgesdd)(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info); - else if(typeid(fptype) == typeid(double)) -- dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info); -+ OCV_LAPACK_FUNC(dgesdd)(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info); - - lwork = (int)round(work1); //optimal buffer size - fptype* buffer = new fptype[lwork + 1]; - - if(typeid(fptype) == typeid(float)) -- sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info); -+ OCV_LAPACK_FUNC(sgesdd)(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info); - else if(typeid(fptype) == typeid(double)) -- dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info); -+ OCV_LAPACK_FUNC(dgesdd)(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info); - - if(!(flags & CV_HAL_SVD_NO_UV)) - transpose_square_inplace(vt, ldv, n); -@@ -288,18 +288,18 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste - if (k == 1 && b_step == sizeof(fptype)) - { - if (typeid(fptype) == typeid(float)) -- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info); -+ OCV_LAPACK_FUNC(sgels)(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info); - else if (typeid(fptype) == typeid(double)) -- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info); -+ OCV_LAPACK_FUNC(dgels)(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info); - - lwork = cvRound(work1); //optimal buffer size - std::vector workBufMemHolder(lwork + 1); - fptype* buffer = &workBufMemHolder.front(); - - if (typeid(fptype) == typeid(float)) -- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info); -+ OCV_LAPACK_FUNC(sgels)(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info); - else if (typeid(fptype) == typeid(double)) -- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info); -+ OCV_LAPACK_FUNC(dgels)(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info); - } - else - { -@@ -309,18 +309,18 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k, fptype* b, size_t b_ste - transpose(b, ldb, tmpB, m, m, k); - - if (typeid(fptype) == typeid(float)) -- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info); -+ OCV_LAPACK_FUNC(sgels)(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info); - else if (typeid(fptype) == typeid(double)) -- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info); -+ OCV_LAPACK_FUNC(dgels)(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info); - - lwork = cvRound(work1); //optimal buffer size - std::vector workBufMemHolder(lwork + 1); - fptype* buffer = &workBufMemHolder.front(); - - if (typeid(fptype) == typeid(float)) -- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info); -+ OCV_LAPACK_FUNC(sgels)(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info); - else if (typeid(fptype) == typeid(double)) -- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info); -+ OCV_LAPACK_FUNC(dgels)(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info); - - transpose(tmpB, m, b, ldb, k, m); - } --- -2.20.1 - diff --git a/Repair_clang_abi.patch b/Repair_clang_abi.patch deleted file mode 100644 index e05dd088182386c47888536a4213d3e99a206465..0000000000000000000000000000000000000000 --- a/Repair_clang_abi.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Npur opencv-4.5.2/modules/core/include/opencv2/core/types.hpp opencv-4.5.2-new/modules/core/include/opencv2/core/types.hpp ---- opencv-4.5.2/modules/core/include/opencv2/core/types.hpp 2021-11-17 10:30:22.631203192 +0800 -+++ opencv-4.5.2-new/modules/core/include/opencv2/core/types.hpp 2021-11-17 10:34:53.117761924 +0800 -@@ -162,7 +162,7 @@ public: - //! default constructor - Point_(); - Point_(_Tp _x, _Tp _y); --#if (defined(__GNUC__) && __GNUC__ < 5) -+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) - Point_(const Point_& pt); - Point_(Point_&& pt) CV_NOEXCEPT = default; - #elif OPENCV_ABI_COMPATIBILITY < 500 -@@ -172,7 +172,7 @@ public: - Point_(const Size_<_Tp>& sz); - Point_(const Vec<_Tp, 2>& v); - --#if (defined(__GNUC__) && __GNUC__ < 5) -+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) - Point_& operator = (const Point_& pt); - Point_& operator = (Point_&& pt) CV_NOEXCEPT = default; - #elif OPENCV_ABI_COMPATIBILITY < 500 -@@ -1186,7 +1186,7 @@ template inline - Point_<_Tp>::Point_(_Tp _x, _Tp _y) - : x(_x), y(_y) {} - --#if (defined(__GNUC__) && __GNUC__ < 5) -+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) - template inline - Point_<_Tp>::Point_(const Point_& pt) - : x(pt.x), y(pt.y) {} -@@ -1208,7 +1208,7 @@ template inline - Point_<_Tp>::Point_(const Vec<_Tp,2>& v) - : x(v[0]), y(v[1]) {} - --#if (defined(__GNUC__) && __GNUC__ < 5) -+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) - template inline - Point_<_Tp>& Point_<_Tp>::operator = (const Point_& pt) - { diff --git a/calib3d-use-OCV_LAPACK_FUNC.patch b/calib3d-use-OCV_LAPACK_FUNC.patch deleted file mode 100644 index 52f608325ecee91b59fb1116f3693dce15cf6919..0000000000000000000000000000000000000000 --- a/calib3d-use-OCV_LAPACK_FUNC.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 70779d4e66946dca4e0da602f10ec37573b9ac88 Mon Sep 17 00:00:00 2001 -From: Pavel Rojtberg -Date: Sat, 17 Sep 2022 13:04:42 +0200 -Subject: [PATCH] calib3d: use OCV_LAPACK_FUNC - ---- - modules/calib3d/src/usac/dls_solver.cpp | 2 +- - modules/calib3d/src/usac/essential_solver.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/calib3d/src/usac/dls_solver.cpp b/modules/calib3d/src/usac/dls_solver.cpp -index 0abb26cecc..8f109d51bf 100644 ---- a/modules/calib3d/src/usac/dls_solver.cpp -+++ b/modules/calib3d/src/usac/dls_solver.cpp -@@ -160,7 +160,7 @@ public: - double wr[27], wi[27] = {0}; // 27 = mat_order - std::vector work(lwork), eig_vecs(729); - char jobvl = 'N', jobvr = 'V'; // only left eigen vectors are computed -- dgeev_(&jobvl, &jobvr, &mat_order, (double*)solution_polynomial.data, &lda, wr, wi, nullptr, &ldvl, -+ OCV_LAPACK_FUNC(dgeev)(&jobvl, &jobvr, &mat_order, (double*)solution_polynomial.data, &lda, wr, wi, nullptr, &ldvl, - &eig_vecs[0], &ldvr, &work[0], &lwork, &info); - if (info != 0) return 0; - #endif -diff --git a/modules/calib3d/src/usac/essential_solver.cpp b/modules/calib3d/src/usac/essential_solver.cpp -index 0adca0966f..014cd36f40 100644 ---- a/modules/calib3d/src/usac/essential_solver.cpp -+++ b/modules/calib3d/src/usac/essential_solver.cpp -@@ -161,7 +161,7 @@ public: - int mat_order = 10, info, lda = 10, ldvl = 10, ldvr = 1, lwork = 100; - double wr[10], wi[10] = {0}, eig_vecs[100], work[100]; // 10 = mat_order, 100 = lwork - char jobvl = 'V', jobvr = 'N'; // only left eigen vectors are computed -- dgeev_(&jobvl, &jobvr, &mat_order, action_mat_data, &lda, wr, wi, eig_vecs, &ldvl, -+ OCV_LAPACK_FUNC(dgeev)(&jobvl, &jobvr, &mat_order, action_mat_data, &lda, wr, wi, eig_vecs, &ldvl, - nullptr, &ldvr, work, &lwork, &info); - if (info != 0) return 0; - #endif --- -2.20.1 - diff --git a/opencv-4.5.2.tar.gz b/opencv-4.9.0.tar.gz similarity index 83% rename from opencv-4.5.2.tar.gz rename to opencv-4.9.0.tar.gz index cd63e5b3cc627068875a11f6a19502d4fdefa68a..db89e2a299b155dfda4d24557199d706b3fe9555 100644 Binary files a/opencv-4.5.2.tar.gz and b/opencv-4.9.0.tar.gz differ diff --git a/opencv.spec b/opencv.spec index c2544ddfbe5d5efa52afb88e67e0328f6beb5cde..61994a4399c81be26aee2a9782a338a32852a05c 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,23 +1,19 @@ Name: opencv -Version: 4.5.2 -Release: 9 +Version: 4.9.0 +Release: 1 Summary: OpenCV means Intel® Open Source Computer Vision Library. License: Apache-2.0 URL: https://github.com/opencv/opencv Source0: %{name}-%{version}.tar.gz Source1: %{name}_extra-%{version}.tar.gz -Source2: opencv_extra-4.5.2.tar.gz.aa -Source3: opencv_extra-4.5.2.tar.gz.ab -Source4: opencv_extra-4.5.2.tar.gz.ac -Source5: opencv_extra-4.5.2.tar.gz.ad -Source6: opencv_extra-4.5.2.tar.gz.ae -Patch1: Fix-OpenCV-build-with-OpenEXR-before-2.2.0.patch -Patch2: Fix_compilation_of_copy_assignment_operators_with_GCC.patch -Patch3: Repair_clang_abi.patch -Patch4: CVE-2022-0561_and_CVE-2022-0562.patch -Patch5: CVE-2022-0908.patch -Patch6: Merge-pull-request-21114-from-dwardor-patch-1.patch -Patch7: calib3d-use-OCV_LAPACK_FUNC.patch +Source2: %{name}_extra-%{version}.tar.gz.aa +Source3: %{name}_extra-%{version}.tar.gz.ab +Source4: %{name}_extra-%{version}.tar.gz.ac +Source5: %{name}_extra-%{version}.tar.gz.ad +Source6: %{name}_extra-%{version}.tar.gz.ae + +Patch1: CVE-2022-0561_and_CVE-2022-0562.patch +Patch2: CVE-2022-0908.patch BuildRequires: qt5-qtbase-devel BuildRequires: gcc-c++ gcc autoconf pkgconfig protobuf-compiler protobuf @@ -88,9 +84,11 @@ cmake ../../ -DCMAKE_BUILD_TYPE=Release\ -DCMAKE_INSTALL_PREFIX=/usr \ -DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \ -DOPENCV_GENERATE_PKGCONFIG=ON -make -j24 V=1 -ctest -E "opencv_test_objdetect|opencv_test_photo|opencv_test_highgui" +%make_build +%check +cd cmake/build +ctest -E "opencv_test_objdetect|opencv_test_photo|opencv_test_highgui" %install cd cmake/build @@ -106,6 +104,9 @@ make install DESTDIR=%{buildroot} %{python3_sitelib}/cv2/* %changelog +* Wed May 22 2024 weiqingsong - 4.9.0-1 +- update opencv to 4.9.0 + * Wed Nov 22 2023 konglidong - 4.5.2-9 - backport upstraem patch to fix build failed diff --git a/opencv_extra-4.5.2.tar.gz b/opencv_extra-4.5.2.tar.gz deleted file mode 100644 index 5bd66f1a6f4c4c5bd7209bc5d1e8b4f42cf8cb52..0000000000000000000000000000000000000000 Binary files a/opencv_extra-4.5.2.tar.gz and /dev/null differ diff --git a/opencv_extra-4.5.2.tar.gz.ae b/opencv_extra-4.9.0.tar.gz similarity index 83% rename from opencv_extra-4.5.2.tar.gz.ae rename to opencv_extra-4.9.0.tar.gz index 6a117010b5f56a3b402b0ba4a43bfee1edd198ff..80f2550ed42257f9112d84cb15b39a29737f4b3c 100644 Binary files a/opencv_extra-4.5.2.tar.gz.ae and b/opencv_extra-4.9.0.tar.gz differ diff --git a/opencv_extra-4.5.2.tar.gz.ab b/opencv_extra-4.9.0.tar.gz.aa similarity index 86% rename from opencv_extra-4.5.2.tar.gz.ab rename to opencv_extra-4.9.0.tar.gz.aa index abe5197a4aeb09cca981a232579509ef8c9967c0..d0ce0b799548dc45dcbd66dd77c93e4f77b34fff 100644 Binary files a/opencv_extra-4.5.2.tar.gz.ab and b/opencv_extra-4.9.0.tar.gz.aa differ diff --git a/opencv_extra-4.5.2.tar.gz.aa b/opencv_extra-4.9.0.tar.gz.ab similarity index 87% rename from opencv_extra-4.5.2.tar.gz.aa rename to opencv_extra-4.9.0.tar.gz.ab index a412056c6efd7dc306323b89fd61a621dd989979..eb67c0c85208e56319d39ba7479bfbe6196a6ba1 100644 Binary files a/opencv_extra-4.5.2.tar.gz.aa and b/opencv_extra-4.9.0.tar.gz.ab differ diff --git a/opencv_extra-4.5.2.tar.gz.ac b/opencv_extra-4.9.0.tar.gz.ac similarity index 86% rename from opencv_extra-4.5.2.tar.gz.ac rename to opencv_extra-4.9.0.tar.gz.ac index 6d79a33e5a0c32decee390d35f910f921fad45bb..3e19105a87ae8e72364eeeae7415414086d2e99f 100644 Binary files a/opencv_extra-4.5.2.tar.gz.ac and b/opencv_extra-4.9.0.tar.gz.ac differ diff --git a/opencv_extra-4.5.2.tar.gz.ad b/opencv_extra-4.9.0.tar.gz.ad similarity index 86% rename from opencv_extra-4.5.2.tar.gz.ad rename to opencv_extra-4.9.0.tar.gz.ad index ee942f848d5667df9dab937a3bdb256d93c6f74e..b316fbf045c06392f3ae631dfbc44bbe2ab66261 100644 Binary files a/opencv_extra-4.5.2.tar.gz.ad and b/opencv_extra-4.9.0.tar.gz.ad differ diff --git a/opencv_extra-4.9.0.tar.gz.ae b/opencv_extra-4.9.0.tar.gz.ae new file mode 100644 index 0000000000000000000000000000000000000000..80f2550ed42257f9112d84cb15b39a29737f4b3c Binary files /dev/null and b/opencv_extra-4.9.0.tar.gz.ae differ