public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/opencv] opencv5: Rebuild with vtk 9.6.0
@ 2026-08-28 13:33 Orion Poplawski
  0 siblings, 0 replies; only message in thread
From: Orion Poplawski @ 2026-08-28 13:33 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/opencv
Branch : opencv5
Commit : 0774afc94602021730dd1f1db9152c01834ee1b8
Author : Orion Poplawski <orion@nwra.com>
Date   : 2026-03-16T17:37:55-06:00
Stats  : +55/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/opencv/c/0774afc94602021730dd1f1db9152c01834ee1b8?branch=opencv5

Log:
Rebuild with vtk 9.6.0

---
diff --git a/opencv-vtk.patch b/opencv-vtk.patch
new file mode 100644
index 0000000..c6f2e73
--- /dev/null
+++ b/opencv-vtk.patch
@@ -0,0 +1,48 @@
+diff --git a/modules/viz/src/vtk/vtkVizInteractorStyle.cpp b/modules/viz/src/vtk/vtkVizInteractorStyle.cpp
+index e2d33806..8943cb9f 100644
+--- a/modules/viz/src/vtk/vtkVizInteractorStyle.cpp
++++ b/modules/viz/src/vtk/vtkVizInteractorStyle.cpp
+@@ -44,6 +44,7 @@
+ //M*/
+ 
+ #include "../precomp.hpp"
++#include <iostream>
+ 
+ namespace cv { namespace viz
+ {
+@@ -96,7 +97,7 @@ void cv::viz::vtkVizInteractorStyle::saveScreenshot(const String &file)
+     snapshot_writer->SetFileName(file.c_str());
+     snapshot_writer->Write();
+ 
+-    cout << "Screenshot successfully captured (" << file.c_str() << ")" << endl;
++    std::cout << "Screenshot successfully captured (" << file.c_str() << ")" << endl;
+ }
+ 
+ //////////////////////////////////////////////////////////////////////////////////////////////
+@@ -118,7 +119,7 @@ void cv::viz::vtkVizInteractorStyle::exportScene(const String &file)
+     exporter->SetInput(Interactor->GetRenderWindow());
+     exporter->Write();
+ 
+-    cout << "Scene successfully exported (" << file.c_str() << ")" << endl;
++    std::cout << "Scene successfully exported (" << file.c_str() << ")" << endl;
+ }
+ 
+ void cv::viz::vtkVizInteractorStyle::exportScene()
+commit fe8a6898e5c013be30ae9216e0a43b42aa9bfc78
+Author: Orion Poplawski <orion@nwra.com>
+Date:   Wed Feb 25 20:51:05 2026 -0700
+
+    Include iostream for cerr in widget.cpp
+
+diff --git a/modules/viz/src/widget.cpp b/modules/viz/src/widget.cpp
+index b46d3d1c..44ce4d5c 100644
+--- a/modules/viz/src/widget.cpp
++++ b/modules/viz/src/widget.cpp
+@@ -44,6 +44,7 @@
+ //M*/
+ 
+ #include "precomp.hpp"
++#include <iostream>
+ 
+ ///////////////////////////////////////////////////////////////////////////////////////////////
+ /// widget implementation

diff --git a/opencv.spec b/opencv.spec
index 6f818f3..075ebeb 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -73,7 +73,7 @@ Version:        4.13.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:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Collection of algorithms for computer vision
 # This is normal three clause BSD.
 License:        BSD-3-Clause AND Apache-2.0 AND ISC
@@ -99,6 +99,8 @@ Source5:        xorg.conf
 Source6:        https://github.com/WeChatCV/opencv_3rdparty/archive/%{wechat_commit}/wechat-%{wechat_gitdate}.git%{wechat_shortcommit}.tar.gz
 
 Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch
+# Fix build with vtk 9.6 - https://github.com/opencv/opencv_contrib/pull/4085
+Patch1:         opencv-vtk.patch
 Patch3:         opencv.python.patch
 Patch4:         Fix-macro-definition-for-Power10-architecture.patch
 
@@ -401,7 +403,7 @@ popd &>/dev/null
 %patch -P 4 -p1 -b .ppc_macro
 
 pushd %{name}_contrib-%{version}
-#patch1 -p1 -b .install_cvv
+%patch -P 1 -p1 -b .vtk
 popd
 
 # Install face_landmark_model
@@ -607,6 +609,9 @@ cp config-*.py %{buildroot}/%{python3_sitelib}/cv2/
 
 
 %changelog
+* Mon Mar 16 2026 Orion Poplawski <orion@nwra.com> - 4.13.0-2
+- Rebuild with vtk 9.6.0
+
 * Wed Jan 28 2026 Nicolas Chauvet <kwizart@gmail.com> - 4.13.0-1
 - Update to 4.13.0
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-28 13:33 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-28 13:33 [rpms/opencv] opencv5: Rebuild with vtk 9.6.0 Orion Poplawski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox