diff --git a/.gitignore b/.gitignore index d576766..82280ce 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,3 @@ /opencv_contrib-clean-4.7.0.tar.gz /opencv-clean-4.10.0.tar.gz /opencv_contrib-clean-4.10.0.tar.gz -/opencv-clean-4.11.0.tar.gz -/opencv_contrib-clean-4.11.0.tar.gz -/opencv_contrib-clean-4.12.0.tar.gz -/opencv-clean-4.12.0.tar.gz diff --git a/a39db41390de546d18962ee1278bd6dbb715f466.patch b/a39db41390de546d18962ee1278bd6dbb715f466.patch new file mode 100644 index 0000000..a1e79d2 --- /dev/null +++ b/a39db41390de546d18962ee1278bd6dbb715f466.patch @@ -0,0 +1,12 @@ +diff -rupN --no-dereference opencv-4.10.0/3rdparty/openjpeg/openjp2/jp2.c opencv-4.10.0-new/3rdparty/openjpeg/openjp2/jp2.c +--- opencv-4.10.0/3rdparty/openjpeg/openjp2/jp2.c 2024-06-02 13:41:07.000000000 +0200 ++++ opencv-4.10.0-new/3rdparty/openjpeg/openjp2/jp2.c 2025-07-30 21:57:50.267496180 +0200 +@@ -2869,7 +2869,7 @@ OPJ_BOOL opj_jp2_read_header(opj_stream_ + p_image, + p_manager); + +- if (p_image && *p_image) { ++ if (ret && p_image && *p_image) { + /* Set Image Color Space */ + if (jp2->enumcs == 16) { + (*p_image)->color_space = OPJ_CLRSPC_SRGB; diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 2897a99..1a39022 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -3,8 +3,8 @@ %global pkgname opencv Name: mingw-%{pkgname} -Version: 4.12.0 -Release: 2%{?dist} +Version: 4.10.0 +Release: 6%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -23,8 +23,8 @@ Source2: %{pkgname}-clean.sh Patch0: opencv_unbundle.patch # Pass -mbig-obj to linker when linking python module, to prevent "too many sections" failure Patch1: opencv_bigobj.patch -# Fix CV_CheckGlError calling undefined function checkError if _DEBUG is not defined -Patch2: opencv-fix-build.patch +# Backport fix for CVE-2025-53644 +Patch2: https://github.com/opencv/opencv/commit/a39db41390de546d18962ee1278bd6dbb715f466.patch BuildRequires: make @@ -209,9 +209,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %files -n mingw32-%{pkgname} %license install_licenses/* -%{mingw32_bindir}/libopencv_*4120.dll +%{mingw32_bindir}/libopencv_*4100.dll %{mingw32_includedir}/opencv4/ -%{mingw32_libdir}/libopencv_*4120.dll.a +%{mingw32_libdir}/libopencv_*4100.dll.a %{mingw32_libdir}/cmake/OpenCV/ %{mingw32_datadir}/opencv4 @@ -224,9 +224,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %files -n mingw64-%{pkgname} %license install_licenses/* -%{mingw64_bindir}/libopencv_*4120.dll +%{mingw64_bindir}/libopencv_*4100.dll %{mingw64_includedir}/opencv4/ -%{mingw64_libdir}/libopencv_*4120.dll.a +%{mingw64_libdir}/libopencv_*4100.dll.a %{mingw64_libdir}/cmake/OpenCV/ %{mingw64_datadir}/opencv4 @@ -238,33 +238,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog -* Sun Jan 04 2026 Sandro Mani - 4.12.0-2 -- Rebuild (mingw-openexr) - -* Sat Dec 13 2025 Sandro Mani - 4.12.0-1 -- Update to 4.12.0 - -* Mon Dec 08 2025 Sandro Mani - 4.11.0-7 -- Rebuild (libtiff) - -* Sun Nov 23 2025 Sandro Mani - 4.11.0-6 -- Rebuild (gdal) - -* Fri Aug 01 2025 Sandro Mani - 4.11.0-5 -- Rebuild (gdal) - -* Wed Jul 30 2025 Sandro Mani - 4.11.0-4 +* Wed Jul 30 2025 Sandro Mani - 4.10.0-6 - Backport fix for CVE-2025-53644 -* Wed Jul 30 2025 Sandro Mani - 4.11.0-3 -- Rebuild (gdal) - -* Thu Jul 24 2025 Fedora Release Engineering - 4.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 11 2025 Sandro Mani - 4.11.0-1 -- Update to 4.11.0 - * Fri Jan 17 2025 Fedora Release Engineering - 4.10.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/opencv-fix-build.patch b/opencv-fix-build.patch deleted file mode 100644 index 67047b1..0000000 --- a/opencv-fix-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -rupN opencv-4.12.0/modules/core/src/opengl.cpp opencv-4.12.0-new/modules/core/src/opengl.cpp ---- opencv-4.12.0/modules/core/src/opengl.cpp 2025-07-02 09:54:13.000000000 +0200 -+++ opencv-4.12.0-new/modules/core/src/opengl.cpp 2025-12-13 11:37:02.935529963 +0100 -@@ -103,10 +103,12 @@ inline static bool checkError(const char - } - return true; - } -+#define CV_CheckGlError() CV_DbgAssert( (checkError(__FILE__, __LINE__, CV_Func)) ) -+#else -+#define CV_CheckGlError() - #endif // HAVE_OPENGL - } // namespace - --#define CV_CheckGlError() CV_DbgAssert( (checkError(__FILE__, __LINE__, CV_Func)) ) - - #ifdef HAVE_OPENGL - namespace diff --git a/opencv_bigobj.patch b/opencv_bigobj.patch index 3b2b139..d5359f4 100644 --- a/opencv_bigobj.patch +++ b/opencv_bigobj.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference opencv-4.12.0/modules/python/common.cmake opencv-4.12.0-new/modules/python/common.cmake ---- opencv-4.12.0/modules/python/common.cmake 2025-07-02 09:54:13.000000000 +0200 -+++ opencv-4.12.0-new/modules/python/common.cmake 2025-12-13 11:14:05.823873870 +0100 +diff -rupN --no-dereference opencv-4.10.0/modules/python/common.cmake opencv-4.10.0-new/modules/python/common.cmake +--- opencv-4.10.0/modules/python/common.cmake 2024-06-02 13:41:07.000000000 +0200 ++++ opencv-4.10.0-new/modules/python/common.cmake 2024-07-27 10:32:08.604920913 +0200 @@ -19,6 +19,11 @@ if(NOT WIN32 AND NOT APPLE AND NOT OPENC set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--exclude-libs=ALL") endif() diff --git a/opencv_unbundle.patch b/opencv_unbundle.patch index b008fc2..14f12dd 100644 --- a/opencv_unbundle.patch +++ b/opencv_unbundle.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference opencv-4.12.0/CMakeLists.txt opencv-4.12.0-new/CMakeLists.txt ---- opencv-4.12.0/CMakeLists.txt 2025-07-02 09:54:13.000000000 +0200 -+++ opencv-4.12.0-new/CMakeLists.txt 2025-12-13 11:14:05.364928138 +0100 -@@ -197,14 +197,14 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable +diff -rupN --no-dereference opencv-4.10.0/CMakeLists.txt opencv-4.10.0-new/CMakeLists.txt +--- opencv-4.10.0/CMakeLists.txt 2024-06-02 13:41:07.000000000 +0200 ++++ opencv-4.10.0-new/CMakeLists.txt 2024-07-27 10:32:08.035922757 +0200 +@@ -231,14 +231,14 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable # 3rd party libs OCV_OPTION(OPENCV_FORCE_3RDPARTY_BUILD "Force using 3rdparty code from source" OFF) diff --git a/sources b/sources index c7fc031..c872f4d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opencv_contrib-clean-4.12.0.tar.gz) = 2081ea87be342a09c272c0a0e6a7369ada115d4abaf416a910905800c5b1a00a239ad6c0174b7db71462111ae5ee28d5ebecaea8777f7619bdeff9c37b546000 -SHA512 (opencv-clean-4.12.0.tar.gz) = 59dc9230a9a63539d145571b97aa3f3f48f49bf399f9d50d1e1cda8bb5ed5708f256efa49772a6976ca33d8c085d93bacd0e3773cf4225a0201a52602520c9fd +SHA512 (opencv-clean-4.10.0.tar.gz) = a6b671d4fbb45d14e1cf601c18372ca25444ac2762a2a73d2900b3bebbcc83d46df976af1cd1ed6c46fa16a8dd038552f05766debc3bf5ba10bcab0c72388ccb +SHA512 (opencv_contrib-clean-4.10.0.tar.gz) = 91ebf77c1037122f3916a4b0fe5bfb6677b8c9d46fa1cc34d16160990b8b60184a53c476261be55efd9198b847580b66b3a7649aa6f1ec8e0676a7c172a3c85a