From 12347e33fb6b96772bc7d5d62a3829ff38d631d3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 1 Nov 2022 10:43:51 +0100 Subject: [PATCH 01/27] Rebuild (python3.11) --- mingw-opencv.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index c954b09..ebf3cc9 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -212,7 +212,7 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %files -n mingw32-python3-%{pkgname} -%{mingw32_python3_sitearch}/cv2-cpython-%{mingw32_python3_version_nodots}.dll +%{mingw32_python3_sitearch}/cv2.cpython-%{mingw32_python3_version_nodots}.dll %files -n mingw32-%{pkgname}-tools %{mingw32_bindir}/*.exe @@ -226,13 +226,16 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %{mingw64_datadir}/opencv4 %files -n mingw64-python3-%{pkgname} -%{mingw64_python3_sitearch}/cv2-cpython-%{mingw64_python3_version_nodots}.dll +%{mingw64_python3_sitearch}/cv2.cpython-%{mingw64_python3_version_nodots}.dll %files -n mingw64-%{pkgname}-tools %{mingw64_bindir}/*.exe %changelog +* Wed Oct 19 2022 Sandro Mani - 4.6.0-3 +- Rebuild (python-3.11) + * Thu Jul 21 2022 Fedora Release Engineering - 4.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2df89b40e2786189883c855f0451457278f03b93 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 12 Nov 2022 19:01:03 +0100 Subject: [PATCH 02/27] Rebuild (gdal) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index ebf3cc9..005616b 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -233,6 +233,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Sat Nov 12 2022 Sandro Mani - 4.6.0-4 +- Rebuild (gdal) + * Wed Oct 19 2022 Sandro Mani - 4.6.0-3 - Rebuild (python-3.11) From f0505465cc7f382f645e93118d82fa85866b580a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 17 Jan 2023 13:41:01 +0100 Subject: [PATCH 03/27] Update to 4.7.0 --- .gitignore | 2 ++ mingw-opencv.spec | 15 +++++++++------ opencv_bigobj.patch | 6 +++--- opencv_unbundle.patch | 6 +++--- sources | 4 ++-- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 84a7467..c2840ec 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /opencv_contrib-clean-4.5.5.tar.gz /opencv-clean-4.6.0.tar.gz /opencv_contrib-clean-4.6.0.tar.gz +/opencv-clean-4.7.0.tar.gz +/opencv_contrib-clean-4.7.0.tar.gz diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 005616b..a699992 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -3,8 +3,8 @@ %global pkgname opencv Name: mingw-%{pkgname} -Version: 4.6.0 -Release: 4%{?dist} +Version: 4.7.0 +Release: 1%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -204,9 +204,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %files -n mingw32-%{pkgname} %license install_licenses/* -%{mingw32_bindir}/libopencv_*460.dll +%{mingw32_bindir}/libopencv_*470.dll %{mingw32_includedir}/opencv4/ -%{mingw32_libdir}/libopencv_*460.dll.a +%{mingw32_libdir}/libopencv_*470.dll.a %{mingw32_libdir}/cmake/OpenCV/ %{mingw32_datadir}/opencv4 @@ -219,9 +219,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %files -n mingw64-%{pkgname} %license install_licenses/* -%{mingw64_bindir}/libopencv_*460.dll +%{mingw64_bindir}/libopencv_*470.dll %{mingw64_includedir}/opencv4/ -%{mingw64_libdir}/libopencv_*460.dll.a +%{mingw64_libdir}/libopencv_*470.dll.a %{mingw64_libdir}/cmake/OpenCV/ %{mingw64_datadir}/opencv4 @@ -233,6 +233,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Tue Jan 17 2023 Sandro Mani - 4.7.0-1 +- Update to 4.7.0 + * Sat Nov 12 2022 Sandro Mani - 4.6.0-4 - Rebuild (gdal) diff --git a/opencv_bigobj.patch b/opencv_bigobj.patch index 12585f3..fea59d5 100644 --- a/opencv_bigobj.patch +++ b/opencv_bigobj.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference opencv-4.6.0/modules/python/common.cmake opencv-4.6.0-new/modules/python/common.cmake ---- opencv-4.6.0/modules/python/common.cmake 2022-06-05 17:32:44.000000000 +0200 -+++ opencv-4.6.0-new/modules/python/common.cmake 2022-06-28 13:10:22.358006923 +0200 +diff -rupN --no-dereference opencv-4.7.0/modules/python/common.cmake opencv-4.7.0-new/modules/python/common.cmake +--- opencv-4.7.0/modules/python/common.cmake 2022-12-28 15:31:52.000000000 +0100 ++++ opencv-4.7.0-new/modules/python/common.cmake 2023-01-17 11:36:07.608025310 +0100 @@ -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 cb89f1e..c5cf64b 100644 --- a/opencv_unbundle.patch +++ b/opencv_unbundle.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference opencv-4.6.0/CMakeLists.txt opencv-4.6.0-new/CMakeLists.txt ---- opencv-4.6.0/CMakeLists.txt 2022-06-05 17:32:44.000000000 +0200 -+++ opencv-4.6.0-new/CMakeLists.txt 2022-06-28 13:10:21.922006920 +0200 +diff -rupN --no-dereference opencv-4.7.0/CMakeLists.txt opencv-4.7.0-new/CMakeLists.txt +--- opencv-4.7.0/CMakeLists.txt 2022-12-28 15:31:52.000000000 +0100 ++++ opencv-4.7.0-new/CMakeLists.txt 2023-01-17 11:36:07.041025106 +0100 @@ -217,14 +217,14 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable # 3rd party libs diff --git a/sources b/sources index 8360c85..624c4c5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opencv-clean-4.6.0.tar.gz) = 8c146fac6b1a8c3461564edb63b49757808efb732647432cadb645c61d4087fb4327b23e2074f1031ec57ac05462e34a3ec01d1341fcb01705a59fb31ce61fd8 -SHA512 (opencv_contrib-clean-4.6.0.tar.gz) = 64c1d9a391edba22edf34ed4a1c3ee2def22eabb41cd2535de48d995b2009068894ac7b5a30966073bab81756f2ce177c560f450fae48f3edcc09aebeed8858e +SHA512 (opencv-clean-4.7.0.tar.gz) = 20ef3b7a101306a64990459a82a0218b8a2d39f3a802f7b30fcd17c5c079bdd9ab901672029fe1b56801ca4e16255d9cab66dfc06f09a6859f69950ed35ea2c6 +SHA512 (opencv_contrib-clean-4.7.0.tar.gz) = aba9d13d1b835c8764249adacf94ae92133ffe0f18d15d7d2d09c76ce880f71e49746c0c2304db26ea3478300159d7ab6f3db785400e009232f0e68af4086746 From f164315d50ddea7aaca38d528ad6b03eeb4a2a14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 19:56:40 +0000 Subject: [PATCH 04/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index a699992..a1ff5e4 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -233,6 +233,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 17 2023 Sandro Mani - 4.7.0-1 - Update to 4.7.0 From 621af3d8e918f39f0ef0bdd8d61ad26db556edd5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 11 May 2023 14:41:21 +0200 Subject: [PATCH 05/27] Rebuild (gdal) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index a1ff5e4..ac11e01 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -233,6 +233,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Thu May 11 2023 Sandro Mani - 4.7.0-3 +- Rebuild (gdal) + * Thu Jan 19 2023 Fedora Release Engineering - 4.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From fb713e0730a9de7a8a3b98448925ed3884ec086b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 14 May 2023 12:24:53 +0200 Subject: [PATCH 06/27] Disable broken obsensor build --- mingw-opencv.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index ac11e01..28a3c1a 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -23,8 +23,6 @@ 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 missing -lgst_audio, -lopengl32 -#Patch2: opencv_mingw.patch BuildRequires: make @@ -183,7 +181,8 @@ MINGW64_CMAKE_ARGS="\ -DBUILD_TESTS=OFF \ -DBUILD_PROTOBUF=OFF \ -DPROTOBUF_UPDATE_FILES=ON \ - -DBUILD_opencv_rgbd=OFF + -DBUILD_opencv_rgbd=OFF \ + -DWITH_OBSENSOR=OFF %mingw_make_build From 64c56dd6532a2c845d40482cd9a63a224dcc7cbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 14:54:21 +0000 Subject: [PATCH 07/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 28a3c1a..c766616 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -232,6 +232,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 4.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu May 11 2023 Sandro Mani - 4.7.0-3 - Rebuild (gdal) From d573b4583b7f7ffa341efb3d0f8389dfa17e3a84 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 15 Nov 2023 18:30:18 +0100 Subject: [PATCH 08/27] Rebuild (gdal) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index c766616..6dd0a0a 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -232,6 +232,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Wed Nov 15 2023 Sandro Mani - 4.7.0-5 +- Rebuild (gdal) + * Thu Jul 20 2023 Fedora Release Engineering - 4.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9cbf72c28a312227ccc67683d7d046feb8b71d67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 07:53:14 +0000 Subject: [PATCH 09/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 6dd0a0a..d08b886 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -232,6 +232,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 4.7.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Nov 15 2023 Sandro Mani - 4.7.0-5 - Rebuild (gdal) From c82c93354fa47087a49e74f2cc4336219ea429e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 06:51:57 +0000 Subject: [PATCH 10/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index d08b886..e17ef7a 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -232,6 +232,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 4.7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 4.7.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 12641cd35ce4bb24aedd923eb06ef3c5b2cbb003 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 14 May 2024 15:34:23 +0200 Subject: [PATCH 11/27] Rebuild (gdal) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index e17ef7a..b53c6c5 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.7.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -232,6 +232,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Tue May 14 2024 Sandro Mani - 4.7.0-8 +- Rebuild (gdal) + * Thu Jan 25 2024 Fedora Release Engineering - 4.7.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From db81681c25b754f847a5686ff1606f4819c347e9 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 11 Jun 2024 19:20:04 +0200 Subject: [PATCH 12/27] Rebuild (openexr) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index b53c6c5..48906c0 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.7.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -232,6 +232,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Tue Jun 11 2024 Sandro Mani - 4.7.0-9 +- Rebuild (openexr) + * Tue May 14 2024 Sandro Mani - 4.7.0-8 - Rebuild (gdal) From 3c7c9e08be9fbadb60f673387eab2d61f231b3dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 17:47:39 +0000 Subject: [PATCH 13/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 48906c0..05c506b 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.7.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -232,6 +232,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 4.7.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 11 2024 Sandro Mani - 4.7.0-9 - Rebuild (openexr) From 8a4840b5d9cc44ba0a17462ac3b2dce1ce302ed8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 28 Jul 2024 11:35:22 +0200 Subject: [PATCH 14/27] Update to 4.10.0 --- .gitignore | 2 ++ mingw-opencv.spec | 23 +++++++++++++++-------- opencv_bigobj.patch | 6 +++--- opencv_unbundle.patch | 8 ++++---- sources | 4 ++-- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index c2840ec..82280ce 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ /opencv_contrib-clean-4.6.0.tar.gz /opencv-clean-4.7.0.tar.gz /opencv_contrib-clean-4.7.0.tar.gz +/opencv-clean-4.10.0.tar.gz +/opencv_contrib-clean-4.10.0.tar.gz diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 05c506b..847db6a 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -3,12 +3,12 @@ %global pkgname opencv Name: mingw-%{pkgname} -Version: 4.7.0 -Release: 10%{?dist} +Version: 4.10.0 +Release: 1%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch -License: BSD +License: BSD-3-Clause AND Apache-2.0 AND ISC URL: https://opencv.org # RUN opencv-clean.sh TO PREPARE TARBALLS FOR FEDORA # @@ -33,6 +33,7 @@ BuildRequires: protobuf-compiler BuildRequires: mingw32-filesystem >= 102 BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-eigen3 +# BuildRequires: mingw32-flatbuffers BuildRequires: mingw32-freetype BuildRequires: mingw32-gdal BuildRequires: mingw32-gstreamer1 @@ -58,6 +59,7 @@ BuildRequires: mingw32-zlib BuildRequires: mingw64-filesystem >= 102 BuildRequires: mingw64-gcc-c++ BuildRequires: mingw64-eigen3 +# BuildRequires: mingw64-flatbuffers BuildRequires: mingw64-freetype BuildRequires: mingw64-gdal BuildRequires: mingw64-gstreamer1 @@ -138,11 +140,13 @@ MinGW Windows OpenCV library tools. %prep %autosetup -p1 -n %{pkgname}-%{version} -a1 -# we don't use pre-built contribs except quirc +# we don't use pre-built contribs except quirc and flatbuffers mv 3rdparty/quirc/ . +mv 3rdparty/flatbuffers/ . rm -r 3rdparty/ mkdir 3rdparty/ mv quirc/ 3rdparty/ +mv flatbuffers/ 3rdparty/ %build @@ -203,9 +207,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %files -n mingw32-%{pkgname} %license install_licenses/* -%{mingw32_bindir}/libopencv_*470.dll +%{mingw32_bindir}/libopencv_*4100.dll %{mingw32_includedir}/opencv4/ -%{mingw32_libdir}/libopencv_*470.dll.a +%{mingw32_libdir}/libopencv_*4100.dll.a %{mingw32_libdir}/cmake/OpenCV/ %{mingw32_datadir}/opencv4 @@ -218,9 +222,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %files -n mingw64-%{pkgname} %license install_licenses/* -%{mingw64_bindir}/libopencv_*470.dll +%{mingw64_bindir}/libopencv_*4100.dll %{mingw64_includedir}/opencv4/ -%{mingw64_libdir}/libopencv_*470.dll.a +%{mingw64_libdir}/libopencv_*4100.dll.a %{mingw64_libdir}/cmake/OpenCV/ %{mingw64_datadir}/opencv4 @@ -232,6 +236,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Sat Jul 27 2024 Sandro Mani - 4.10.0-1 +- Update to 4.10.0 + * Thu Jul 18 2024 Fedora Release Engineering - 4.7.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/opencv_bigobj.patch b/opencv_bigobj.patch index fea59d5..d5359f4 100644 --- a/opencv_bigobj.patch +++ b/opencv_bigobj.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference opencv-4.7.0/modules/python/common.cmake opencv-4.7.0-new/modules/python/common.cmake ---- opencv-4.7.0/modules/python/common.cmake 2022-12-28 15:31:52.000000000 +0100 -+++ opencv-4.7.0-new/modules/python/common.cmake 2023-01-17 11:36:07.608025310 +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 c5cf64b..14f12dd 100644 --- a/opencv_unbundle.patch +++ b/opencv_unbundle.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference opencv-4.7.0/CMakeLists.txt opencv-4.7.0-new/CMakeLists.txt ---- opencv-4.7.0/CMakeLists.txt 2022-12-28 15:31:52.000000000 +0100 -+++ opencv-4.7.0-new/CMakeLists.txt 2023-01-17 11:36:07.041025106 +0100 -@@ -217,14 +217,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 624c4c5..c872f4d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opencv-clean-4.7.0.tar.gz) = 20ef3b7a101306a64990459a82a0218b8a2d39f3a802f7b30fcd17c5c079bdd9ab901672029fe1b56801ca4e16255d9cab66dfc06f09a6859f69950ed35ea2c6 -SHA512 (opencv_contrib-clean-4.7.0.tar.gz) = aba9d13d1b835c8764249adacf94ae92133ffe0f18d15d7d2d09c76ce880f71e49746c0c2304db26ea3478300159d7ab6f3db785400e009232f0e68af4086746 +SHA512 (opencv-clean-4.10.0.tar.gz) = a6b671d4fbb45d14e1cf601c18372ca25444ac2762a2a73d2900b3bebbcc83d46df976af1cd1ed6c46fa16a8dd038552f05766debc3bf5ba10bcab0c72388ccb +SHA512 (opencv_contrib-clean-4.10.0.tar.gz) = 91ebf77c1037122f3916a4b0fe5bfb6677b8c9d46fa1cc34d16160990b8b60184a53c476261be55efd9198b847580b66b3a7649aa6f1ec8e0676a7c172a3c85a From 9ce9bb743babb078380c55c46b546b2d69d85f64 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 9 Nov 2024 08:48:38 +0100 Subject: [PATCH 15/27] Rebuild (gdal) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 847db6a..2f22eed 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -236,6 +236,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Sat Nov 09 2024 Sandro Mani - 4.10.0-2 +- Rebuild (gdal) + * Sat Jul 27 2024 Sandro Mani - 4.10.0-1 - Update to 4.10.0 From 4f3011dbcde5b940eb3f36902580e56fc52de617 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 14 Nov 2024 12:49:34 +0100 Subject: [PATCH 16/27] Rebuild (openexr) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 2f22eed..711813f 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -236,6 +236,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Thu Nov 14 2024 Sandro Mani - 4.10.0-3 +- Rebuild (openexr) + * Sat Nov 09 2024 Sandro Mani - 4.10.0-2 - Rebuild (gdal) From 8c6eccfe98cfa34f5d77f798cff409bf16924253 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 18 Nov 2024 18:18:36 +0100 Subject: [PATCH 17/27] Rebuild (openexr) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 711813f..c2902d5 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -236,6 +236,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Mon Nov 18 2024 Sandro Mani - 4.10.0-4 +- Rebuild (openexr) + * Thu Nov 14 2024 Sandro Mani - 4.10.0-3 - Rebuild (openexr) From dcfc190834da965fb536e2c52d8138de404b4d4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 18:07:54 +0000 Subject: [PATCH 18/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index c2902d5..53d338f 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.10.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -236,6 +236,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 4.10.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Nov 18 2024 Sandro Mani - 4.10.0-4 - Rebuild (openexr) From b5d4f8c2e7529e9c338e9f67c7412ea386a71adc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 11 Feb 2025 14:34:36 +0100 Subject: [PATCH 19/27] Update to 4.11.0 --- .gitignore | 2 ++ mingw-opencv.spec | 15 +++++++++------ opencv_bigobj.patch | 6 +++--- opencv_unbundle.patch | 8 ++++---- sources | 4 ++-- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 82280ce..7f8a69b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /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 diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 53d338f..320cc03 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -3,8 +3,8 @@ %global pkgname opencv Name: mingw-%{pkgname} -Version: 4.10.0 -Release: 5%{?dist} +Version: 4.11.0 +Release: 1%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -207,9 +207,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %files -n mingw32-%{pkgname} %license install_licenses/* -%{mingw32_bindir}/libopencv_*4100.dll +%{mingw32_bindir}/libopencv_*4110.dll %{mingw32_includedir}/opencv4/ -%{mingw32_libdir}/libopencv_*4100.dll.a +%{mingw32_libdir}/libopencv_*4110.dll.a %{mingw32_libdir}/cmake/OpenCV/ %{mingw32_datadir}/opencv4 @@ -222,9 +222,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %files -n mingw64-%{pkgname} %license install_licenses/* -%{mingw64_bindir}/libopencv_*4100.dll +%{mingw64_bindir}/libopencv_*4110.dll %{mingw64_includedir}/opencv4/ -%{mingw64_libdir}/libopencv_*4100.dll.a +%{mingw64_libdir}/libopencv_*4110.dll.a %{mingw64_libdir}/cmake/OpenCV/ %{mingw64_datadir}/opencv4 @@ -236,6 +236,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* 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_bigobj.patch b/opencv_bigobj.patch index d5359f4..dc29440 100644 --- a/opencv_bigobj.patch +++ b/opencv_bigobj.patch @@ -1,6 +1,6 @@ -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 +diff -rupN --no-dereference opencv-4.11.0/modules/python/common.cmake opencv-4.11.0-new/modules/python/common.cmake +--- opencv-4.11.0/modules/python/common.cmake 2025-01-08 13:47:46.000000000 +0100 ++++ opencv-4.11.0-new/modules/python/common.cmake 2025-02-11 13:04:55.174783387 +0100 @@ -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 14f12dd..3d19135 100644 --- a/opencv_unbundle.patch +++ b/opencv_unbundle.patch @@ -1,7 +1,7 @@ -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 +diff -rupN --no-dereference opencv-4.11.0/CMakeLists.txt opencv-4.11.0-new/CMakeLists.txt +--- opencv-4.11.0/CMakeLists.txt 2025-01-08 13:47:46.000000000 +0100 ++++ opencv-4.11.0-new/CMakeLists.txt 2025-02-11 13:04:54.654783271 +0100 +@@ -197,14 +197,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 c872f4d..3e5965f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opencv-clean-4.10.0.tar.gz) = a6b671d4fbb45d14e1cf601c18372ca25444ac2762a2a73d2900b3bebbcc83d46df976af1cd1ed6c46fa16a8dd038552f05766debc3bf5ba10bcab0c72388ccb -SHA512 (opencv_contrib-clean-4.10.0.tar.gz) = 91ebf77c1037122f3916a4b0fe5bfb6677b8c9d46fa1cc34d16160990b8b60184a53c476261be55efd9198b847580b66b3a7649aa6f1ec8e0676a7c172a3c85a +SHA512 (opencv-clean-4.11.0.tar.gz) = 6ba73f366950a9fe967b4be090b4fb492470edf5f3677149a3225e8ca436410951879559d87029483f53971816e357d8c5a8b248d51e262f34935e00fb06c862 +SHA512 (opencv_contrib-clean-4.11.0.tar.gz) = 619428eaa06e947514ed24c973f95945cad981b6bb9aeeca42ca82084c23d283068f34af0531d6c40a26b7ec05a077993a5b574102e1be75e506fc250e1845dd From 531dfa436cbbcef99729497de577af3003581a00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:52:03 +0000 Subject: [PATCH 20/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 320cc03..4447b3a 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -236,6 +236,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* 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 From 52009929c04fd83cfea183f31dc05f5ead4a09ba Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 30 Jul 2025 08:57:20 +0200 Subject: [PATCH 21/27] Rebuild (gdal) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 4447b3a..efad305 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -236,6 +236,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* 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 From 2080932747eefc6099437bd3993e016e25ecec50 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 30 Jul 2025 21:52:45 +0200 Subject: [PATCH 22/27] Backport fix for CVE-2025-53644 --- a39db41390de546d18962ee1278bd6dbb715f466.patch | 12 ++++++++++++ mingw-opencv.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 a39db41390de546d18962ee1278bd6dbb715f466.patch diff --git a/a39db41390de546d18962ee1278bd6dbb715f466.patch b/a39db41390de546d18962ee1278bd6dbb715f466.patch new file mode 100644 index 0000000..0fba452 --- /dev/null +++ b/a39db41390de546d18962ee1278bd6dbb715f466.patch @@ -0,0 +1,12 @@ +diff -rupN --no-dereference opencv-4.11.0/3rdparty/openjpeg/openjp2/jp2.c opencv-4.11.0-new/3rdparty/openjpeg/openjp2/jp2.c +--- opencv-4.11.0/3rdparty/openjpeg/openjp2/jp2.c 2025-01-08 13:47:46.000000000 +0100 ++++ opencv-4.11.0-new/3rdparty/openjpeg/openjp2/jp2.c 2025-07-30 21:52:26.389022324 +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 efad305..edf8bfb 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.11.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -23,6 +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 +# Backport fix for CVE-2025-53644 +Patch2: https://github.com/opencv/opencv/commit/a39db41390de546d18962ee1278bd6dbb715f466.patch BuildRequires: make @@ -236,6 +238,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Wed Jul 30 2025 Sandro Mani - 4.11.0-4 +- Backport fix for CVE-2025-53644 + * Wed Jul 30 2025 Sandro Mani - 4.11.0-3 - Rebuild (gdal) From ba71a47ff987e4a904918098f67f16c160f08f3f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 1 Aug 2025 18:17:39 +0200 Subject: [PATCH 23/27] Rebuild (gdal) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index edf8bfb..502b0ea 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.11.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -238,6 +238,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Fri Aug 01 2025 Sandro Mani - 4.11.0-5 +- Rebuild (gdal) + * Wed Jul 30 2025 Sandro Mani - 4.11.0-4 - Backport fix for CVE-2025-53644 From 3812a69356b4b3e2e4bae341163f90d5e8ceaf7f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 23 Nov 2025 22:38:51 +0100 Subject: [PATCH 24/27] Rebuild (gdal) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 502b0ea..d331f38 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.11.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -238,6 +238,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Sun Nov 23 2025 Sandro Mani - 4.11.0-6 +- Rebuild (gdal) + * Fri Aug 01 2025 Sandro Mani - 4.11.0-5 - Rebuild (gdal) From dd84ec21467732dcfbacd22e0b57770d16952eb8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 8 Dec 2025 13:14:16 +0100 Subject: [PATCH 25/27] Rebuild (libtiff) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index d331f38..f9a5fcb 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.11.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -238,6 +238,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* Mon Dec 08 2025 Sandro Mani - 4.11.0-7 +- Rebuild (libtiff) + * Sun Nov 23 2025 Sandro Mani - 4.11.0-6 - Rebuild (gdal) From 73f2c5be156e3150f1011dc1f0f384fd651e0801 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 13 Dec 2025 23:05:35 +0100 Subject: [PATCH 26/27] Update to 4.12.0 --- .gitignore | 2 ++ ...b41390de546d18962ee1278bd6dbb715f466.patch | 12 ------------ mingw-opencv.spec | 19 +++++++++++-------- opencv-fix-build.patch | 17 +++++++++++++++++ opencv_bigobj.patch | 6 +++--- opencv_unbundle.patch | 6 +++--- sources | 4 ++-- 7 files changed, 38 insertions(+), 28 deletions(-) delete mode 100644 a39db41390de546d18962ee1278bd6dbb715f466.patch create mode 100644 opencv-fix-build.patch diff --git a/.gitignore b/.gitignore index 7f8a69b..d576766 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /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 deleted file mode 100644 index 0fba452..0000000 --- a/a39db41390de546d18962ee1278bd6dbb715f466.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN --no-dereference opencv-4.11.0/3rdparty/openjpeg/openjp2/jp2.c opencv-4.11.0-new/3rdparty/openjpeg/openjp2/jp2.c ---- opencv-4.11.0/3rdparty/openjpeg/openjp2/jp2.c 2025-01-08 13:47:46.000000000 +0100 -+++ opencv-4.11.0-new/3rdparty/openjpeg/openjp2/jp2.c 2025-07-30 21:52:26.389022324 +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 f9a5fcb..4039a1a 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -3,8 +3,8 @@ %global pkgname opencv Name: mingw-%{pkgname} -Version: 4.11.0 -Release: 7%{?dist} +Version: 4.12.0 +Release: 1%{?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 -# Backport fix for CVE-2025-53644 -Patch2: https://github.com/opencv/opencv/commit/a39db41390de546d18962ee1278bd6dbb715f466.patch +# Fix CV_CheckGlError calling undefined function checkError if _DEBUG is not defined +Patch2: opencv-fix-build.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_*4110.dll +%{mingw32_bindir}/libopencv_*4120.dll %{mingw32_includedir}/opencv4/ -%{mingw32_libdir}/libopencv_*4110.dll.a +%{mingw32_libdir}/libopencv_*4120.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_*4110.dll +%{mingw64_bindir}/libopencv_*4120.dll %{mingw64_includedir}/opencv4/ -%{mingw64_libdir}/libopencv_*4110.dll.a +%{mingw64_libdir}/libopencv_*4120.dll.a %{mingw64_libdir}/cmake/OpenCV/ %{mingw64_datadir}/opencv4 @@ -238,6 +238,9 @@ rm -f %{buildroot}%{mingw64_prefix}/{LICENSE,setup_vars_opencv4.cmd} %changelog +* 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) diff --git a/opencv-fix-build.patch b/opencv-fix-build.patch new file mode 100644 index 0000000..67047b1 --- /dev/null +++ b/opencv-fix-build.patch @@ -0,0 +1,17 @@ +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 dc29440..3b2b139 100644 --- a/opencv_bigobj.patch +++ b/opencv_bigobj.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference opencv-4.11.0/modules/python/common.cmake opencv-4.11.0-new/modules/python/common.cmake ---- opencv-4.11.0/modules/python/common.cmake 2025-01-08 13:47:46.000000000 +0100 -+++ opencv-4.11.0-new/modules/python/common.cmake 2025-02-11 13:04:55.174783387 +0100 +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 @@ -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 3d19135..b008fc2 100644 --- a/opencv_unbundle.patch +++ b/opencv_unbundle.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference opencv-4.11.0/CMakeLists.txt opencv-4.11.0-new/CMakeLists.txt ---- opencv-4.11.0/CMakeLists.txt 2025-01-08 13:47:46.000000000 +0100 -+++ opencv-4.11.0-new/CMakeLists.txt 2025-02-11 13:04:54.654783271 +0100 +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 # 3rd party libs diff --git a/sources b/sources index 3e5965f..c7fc031 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opencv-clean-4.11.0.tar.gz) = 6ba73f366950a9fe967b4be090b4fb492470edf5f3677149a3225e8ca436410951879559d87029483f53971816e357d8c5a8b248d51e262f34935e00fb06c862 -SHA512 (opencv_contrib-clean-4.11.0.tar.gz) = 619428eaa06e947514ed24c973f95945cad981b6bb9aeeca42ca82084c23d283068f34af0531d6c40a26b7ec05a077993a5b574102e1be75e506fc250e1845dd +SHA512 (opencv_contrib-clean-4.12.0.tar.gz) = 2081ea87be342a09c272c0a0e6a7369ada115d4abaf416a910905800c5b1a00a239ad6c0174b7db71462111ae5ee28d5ebecaea8777f7619bdeff9c37b546000 +SHA512 (opencv-clean-4.12.0.tar.gz) = 59dc9230a9a63539d145571b97aa3f3f48f49bf399f9d50d1e1cda8bb5ed5708f256efa49772a6976ca33d8c085d93bacd0e3773cf4225a0201a52602520c9fd From fa96ea0564c2b5e7bbb3a50c055b7906ea9a4cd3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 4 Jan 2026 20:12:17 +0100 Subject: [PATCH 27/27] Rebuild (mingw-openexr) --- mingw-opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-opencv.spec b/mingw-opencv.spec index 4039a1a..2897a99 100644 --- a/mingw-opencv.spec +++ b/mingw-opencv.spec @@ -4,7 +4,7 @@ Name: mingw-%{pkgname} Version: 4.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows OpenCV library BuildArch: noarch @@ -238,6 +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