From be77e92cc5948385382bba8a1dfef2eb8f0ef6e6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 11 Mar 2025 08:30:52 -0400 Subject: [PATCH 1/2] Use Qt6 in highgui and cvv Qt5 is deprecated, and kstars (the only package which uses both opencv-highgui and Qt) is now using Qt6 in F42+. Other dependents of highgui are not using Qt directly otherwise, and cvv has no dependents. --- opencv.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opencv.spec b/opencv.spec index 1309be3..1e1b35e 100644 --- a/opencv.spec +++ b/opencv.spec @@ -178,7 +178,8 @@ BuildRequires: python3-beautifulsoup4 #for doc/doxygen/bib2xhtml.pl #BuildRequires: perl-open BuildRequires: gflags-devel -BuildRequires: qt5-qtbase-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qt5compat-devel BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: hdf5-devel From 411eb8d6cd5cf2b8ccbf8a5ea1058a9c3182fa9f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 21 Mar 2025 22:08:27 +0100 Subject: [PATCH 2/2] Update changelog --- opencv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opencv.spec b/opencv.spec index 1e1b35e..8f78ddd 100644 --- a/opencv.spec +++ b/opencv.spec @@ -77,7 +77,7 @@ Version: 4.10.0 %global minorver %(foo=%{version}; a=(${foo//./ }); echo ${a[1]} ) %global padding %(digits=00; num=%{minorver}; echo ${digits:${#num}:${#digits}} ) %global abiver %(echo %{majorver}%{padding}%{minorver} ) -Release: 7%{?dist} +Release: 8%{?dist} Summary: Collection of algorithms for computer vision # This is normal three clause BSD. License: BSD-3-Clause AND Apache-2.0 AND ISC @@ -580,6 +580,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %changelog +* Fri Mar 21 2025 Nicolas Chauvet - 4.10.0-8 +- Backport switch to qt6 for epel10 + * Tue Nov 12 2024 Sandro Mani - 4.10.0-7 - Rebuild (tesseract)