diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /graphics/vv/files/patch-vv_vv.cxx | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'graphics/vv/files/patch-vv_vv.cxx')
| -rw-r--r-- | graphics/vv/files/patch-vv_vv.cxx | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/graphics/vv/files/patch-vv_vv.cxx b/graphics/vv/files/patch-vv_vv.cxx index b3517f001de0..1167955d887f 100644 --- a/graphics/vv/files/patch-vv_vv.cxx +++ b/graphics/vv/files/patch-vv_vv.cxx @@ -1,11 +1,36 @@ ---- vv/vv.cxx.orig 2020-09-19 05:31:12 UTC +Update for VTK 9 and fix platform-specific code. + +- Replace QVTKOpenGLWidget with QVTKOpenGLNativeWidget (VTK 9 API change) +- Wrap Windows-specific #pragma in #ifdef _WIN32 to prevent linking errors + on non-Windows platforms + +--- vv/vv.cxx.orig 2025-04-17 12:54:38 UTC +++ vv/vv.cxx -@@ -53,7 +53,7 @@ +@@ -43,7 +43,7 @@ + #include "vvToolsList.h" + #include "vvConfiguration.h" + #if (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION >= 2) || VTK_MAJOR_VERSION >= 9 +-#include <QVTKOpenGLWidget.h> ++#include <QVTKOpenGLNativeWidget.h> + #endif + + #include <vtkFileOutputWindow.h> +@@ -56,7 +56,9 @@ #include <sys/types.h> #include <sys/stat.h> #include <errno.h> --#pragma comment(lib, "ws2_32.lib") -+//#pragma comment(lib, "ws2_32.lib") ++#ifdef _WIN32 + #pragma comment(lib, "ws2_32.lib") ++#endif typedef enum {O_BASE,O_OVERLAY,O_FUSION,O_VF,O_CONTOUR,O_LANDMARKS} OpenModeType; typedef enum {P_NORMAL,P_SEQUENCE,P_WINDOW,P_LEVEL} ParseModeType; +@@ -119,7 +121,7 @@ int main( int argc, char** argv ) + #endif + + #if (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION >= 2) || VTK_MAJOR_VERSION >= 9 +- QSurfaceFormat::setDefaultFormat(QVTKOpenGLWidget::defaultFormat()); ++ QSurfaceFormat::setDefaultFormat(QVTKOpenGLNativeWidget::defaultFormat()); + #endif + CLITK_INIT; + |