automatic import of opencv

1 files changed, 29 insertions, 23 deletions

diff --git a/opencv.spec b/opencv.spec
index 87491e4..c2544dd 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -1,10 +1,23 @@
 Name:		opencv
-Version:	4.13.0
-Release:	1
+Version:	4.5.2
+Release:	9
 Summary:	OpenCV means Intel® Open Source Computer Vision Library.
 License:	Apache-2.0
 URL:		https://github.com/opencv/opencv
-Source0:	https://github.com/opencv/opencv/archive/refs/tags/%{version}.tar.gz
+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
 
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:	gcc-c++ gcc autoconf pkgconfig protobuf-compiler protobuf
@@ -22,7 +35,10 @@ and Computer Vision algorithms.
 %global debug_package %{nil}
 
 %prep
-%autosetup -n %{name}-%{version}
+cat %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} > %{SOURCE1}
+%autosetup -p1 -n %{name}-%{version}
+tar -xvf %{SOURCE1} -C .
+pwd
 
 %build
 mkdir -p cmake/build
@@ -36,12 +52,13 @@ cmake ../../ -DCMAKE_BUILD_TYPE=Release\
              -DBUILD_JPEG=ON\
              -DBUILD_PNG=ON\
              -DBUILD_OPENEXR=ON\
-             -DBUILD_TESTS=OFF\
+             -DBUILD_TESTS=ON\
              -DBUILD_PERF_TESTS=OFF\
              -DBUILD_opencv_apps=OFF\
              -DWITH_CUDA=OFF\
              -DBUILD_JAVA=ON\
              -DBUILD_opencv_dnn=ON\
+             -DBUILD_opencv_dnn_modern=ON\
              -DBUILD_opencv_face=ON\
              -DBUILD_opencv_python3=ON\
              -DBUILD_opencv_python2=OFF\
@@ -55,8 +72,9 @@ cmake ../../ -DCMAKE_BUILD_TYPE=Release\
              -DWITH_JASPER=OFF\
              -DBUILD_JASPER=OFF\
              -DBUILD_SHARED_LIBS=ON\
-             -DBUILD_EXAMPLES=OFF\
-             -DINSTALL_TESTS=OFF\
+             -DBUILD_EXAMPLES=ON\
+             -DOPENCV_TEST_DATA_PATH=%_builddir/%{name}-%{version}/opencv_extra-%{version}/testdata\
+             -DINSTALL_TESTS=ON\
              -DPYTHON3_EXECUTABLE=$(which python3)\
              -DPYTHON_EXECUTABLE=$(which python3)\
              -DPYTHON_DEFAULT_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")\
@@ -70,7 +88,9 @@ cmake ../../ -DCMAKE_BUILD_TYPE=Release\
              -DCMAKE_INSTALL_PREFIX=/usr \
              -DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \
              -DOPENCV_GENERATE_PKGCONFIG=ON
-make -j$(nproc) V=1
+make -j24 V=1
+ctest -E "opencv_test_objdetect|opencv_test_photo|opencv_test_highgui"
+
 
 %install
 cd cmake/build
@@ -86,20 +106,6 @@ make install DESTDIR=%{buildroot}
 %{python3_sitelib}/cv2/*
 
 %changelog
-* Tue Mar 25 2025 Claude Code <noreply@anthropic.com> - 4.13.0-1
-- Upgrade to 4.13.0
-- Remove all patches (fixed upstream):
-  - CVE-2022-0561_and_CVE-2022-0562.patch (libtiff CVE fixed)
-  - CVE-2022-0908.patch (libtiff CVE fixed)
-  - Fix-OpenCV-build-with-OpenEXR-before-2.2.0.patch (merged)
-  - Fix_compilation_of_copy_assignment_operators_with_GCC.patch (code improved)
-  - Repair_clang_abi.patch (code restructured)
-  - Merge-pull-request-21114-from-dwardor-patch-1.patch (OCV_LAPACK_FUNC merged)
-  - calib3d-use-OCV_LAPACK_FUNC.patch (merged)
-- Remove opencv_extra (not needed for BUILD_TESTS=OFF)
-- Remove deprecated BUILD_opencv_dnn_modern option
-- Use make -j$(nproc) for parallel build
-
 * Wed Nov 22 2023 konglidong <konglidong@uniontech.com> - 4.5.2-9
 - backport upstraem patch to fix build failed
 
@@ -114,7 +120,7 @@ make install DESTDIR=%{buildroot}
 - add pkgconfig file
 
 * Thu Jan 27 2022 douyan <douyan@kylinos.cn> - 4.5.2-5
-- use %%{python3_sitelib} instead of /usr/lib/python3.8/site-packages
+- use %{python3_sitelib} instead of /usr/lib/python3.8/site-packages
 
 * Wed Nov 17 2021 shenwei <shenwei41@huawei.com> - 4.5.2-4
 - repair Clang ABI