Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package opencv for openSUSE:Factory checked
in at 2025-04-18 16:15:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opencv (Old)
and /work/SRC/openSUSE:Factory/.opencv.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv"
Fri Apr 18 16:15:06 2025 rev:106 rq:1270562 version:4.11.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2025-04-07
17:35:17.877512918 +0200
+++ /work/SRC/openSUSE:Factory/.opencv.new.30101/opencv.changes 2025-04-20
20:05:17.266381197 +0200
@@ -1,0 +2,8 @@
+Wed Apr 9 17:59:51 UTC 2025 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Add opencv-qt6_9-highgui-linking-test.patch: Fix highgui module
+ linkage with Qt 6.9 libraries [gh#opencv/opencv#27223,
+ QTBUG-134774].
+- Build with ninja; add BuildRequires: ninja.
+
+-------------------------------------------------------------------
New:
----
opencv-qt6_9-highgui-linking-test.patch
BETA DEBUG BEGIN:
New:
- Add opencv-qt6_9-highgui-linking-test.patch: Fix highgui module
linkage with Qt 6.9 libraries [gh#opencv/opencv#27223,
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opencv.spec ++++++
--- /var/tmp/diff_new_pack.QxdXZV/_old 2025-04-20 20:05:18.218420895 +0200
+++ /var/tmp/diff_new_pack.QxdXZV/_new 2025-04-20 20:05:18.222421063 +0200
@@ -60,6 +60,7 @@
# Enable python311 for SLE15 in addition to the regular python3 which is
python 3.6
%{?sle15allpythons}
%endif
+%define __builder ninja
Name: %{pname}%{psuffix}
Version: 4.11.0
@@ -73,11 +74,14 @@
# Several modules from the opencv_contrib package
Source1:
https://github.com/opencv/opencv_contrib/archive/%{version}.tar.gz#/opencv_contrib-%{version}.tar.gz
Source99: opencv-rpmlintrc
+# PATCH-FIX-UPSTREAM opencv-qt6_9-highgui-linking-test.patch
gh#opencv/opencv#27223 badshah...@gmail.com -- Fix highgui module linking
against Qt 6.9; patch sent upstream
+Patch0: opencv-qt6_9-highgui-linking-test.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: libeigen3-devel
BuildRequires: libjpeg-devel
BuildRequires: memory-constraints
+BuildRequires: ninja
BuildRequires: pkgconfig
# OpenJPEGTargets.cmake erroneously requires the binaries
BuildRequires: openjpeg2
@@ -386,7 +390,7 @@
This package contains the documentation and examples for the OpenCV library.
%prep
-%autosetup -n %{pname}-%{version} -a 1
+%autosetup -p1 -n %{pname}-%{version} -a 1
# Only copy over modules we need
mv
opencv_contrib-%{version}/modules/{aruco,face,tracking,optflow,plot,shape,superres,videostab,ximgproc}
modules/
@@ -409,9 +413,7 @@
%cmake \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_WITH_DEBUG_INFO=ON \
-%if %{with tests}
- -DBUILD_TESTS=ON \
-%endif
+ -DBUILD_TESTS:BOOL=%{?with_tests:ON}%{!?with_tests:OFF} \
-DOPENCV_INCLUDE_INSTALL_PATH=%{_includedir} \
-DOPENCV_LICENSES_INSTALL_PATH=%{_licensedir}/%{name} \
-DOPENCV_GENERATE_PKGCONFIG=ON \
++++++ opencv-qt6_9-highgui-linking-test.patch ++++++
---
modules/highgui/CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Index: opencv-4.11.0/modules/highgui/CMakeLists.txt
===================================================================
--- opencv-4.11.0.orig/modules/highgui/CMakeLists.txt
+++ opencv-4.11.0/modules/highgui/CMakeLists.txt
@@ -125,7 +125,11 @@ elseif(HAVE_QT)
endif()
foreach(dt_dep ${qt_deps})
- add_definitions(${Qt${QT_VERSION_MAJOR}${dt_dep}_DEFINITIONS})
+ if((QT_VERSION_MAJOR GREATER 5) AND (QT_VERSION_MINOR GREATER 8))
+ link_libraries(${Qt${QT_VERSION_MAJOR}${dt_dep}})
+ else()
+ add_definitions(${Qt${QT_VERSION_MAJOR}${dt_dep}_DEFINITIONS})
+ endif()
include_directories(${Qt${QT_VERSION_MAJOR}${dt_dep}_INCLUDE_DIRS})
list(APPEND HIGHGUI_LIBRARIES
${Qt${QT_VERSION_MAJOR}${dt_dep}_LIBRARIES})
endforeach()
++++++ opencv-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.QxdXZV/_old 2025-04-20 20:05:18.290423898 +0200
+++ /var/tmp/diff_new_pack.QxdXZV/_new 2025-04-20 20:05:18.290423898 +0200
@@ -1,3 +1,4 @@
addFilter("opencv.*SUSE_Backports_policy-SLE_conflict")
addFilter("libopencv_highgui411-qt6.*: E: shlib-policy-name-error")
+addFilter("libopencv_highgui411-gtk3.*: E: shlib-policy-name-error")
