Accepting request 1235055 from science

OBS-URL: https://build.opensuse.org/request/show/1235055
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vtk?expand=0&rev=65

0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch

@@ -0,0 +1,22 @@
+From 11749efe6bbe30e8d9a88b624c356a45c3207fd2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Thu, 12 Dec 2024 17:27:49 +0100
+Subject: [PATCH] Add missing libm link library for bundled ExodusII
+
+---
+ ThirdParty/exodusII/vtkexodusII/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt b/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+index e3b10bb9..8e4ccd6e 100644
+--- a/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
++++ b/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+@@ -338,4 +338,5 @@ vtk_module_include(VTK::exodusII
+     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
+ vtk_module_link(VTK::exodusII
+   PRIVATE
++    m
+     Threads::Threads)
+-- 
+2.47.1
+

0001-Correct-GL_BACK-GL_BACK_LEFT-mapping-on-GLES.patch

@@ -1,4 +1,4 @@
-From 2b930f694c2275b892772857002724b9fdcae6c5 Mon Sep 17 00:00:00 2001
+From c048ec987bf06d76ca19a292af2b5d6641cf4587 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
 Date: Thu, 16 Jul 2020 03:52:23 +0200
 Subject: [PATCH 1/2] Correct GL_BACK/GL_BACK_LEFT mapping on GLES
@@ -8,26 +8,43 @@ just GL_BACK, so there is no need to remap it. Desktop GL may have
 LEFT and RIGHT attached at the simultaneously, so one of the buffers
 has to be selected when querying the attributes.
 ---
- Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx | 5 +++++
- 1 file changed, 5 insertions(+)
+ Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx | 8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 diff --git a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
-index 9bbbc2ba54..4bda9330b6 100644
+index 514e960b..394128b0 100644
 --- a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
 +++ b/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
-@@ -849,6 +849,10 @@ int vtkOpenGLRenderWindow::GetColorBufferSizes(int* rgba)
+@@ -890,6 +890,11 @@ bool vtkOpenGLRenderWindow::GetUsingSRGBColorSpace()
+   {
+     this->MakeCurrent();
+ 
++#ifdef GL_ES_VERSION_3_0
++    // GLES only has the GL_BACK color
++    // attachment for the default framebuffer
++    return this->UseSRGBColorSpace;
++#else
+     GLint attachment = GL_BACK_LEFT;
+ #ifdef GL_DRAW_BUFFER
+     glGetIntegerv(GL_DRAW_BUFFER, &attachment);
+@@ -923,6 +928,7 @@ bool vtkOpenGLRenderWindow::GetUsingSRGBColorSpace()
+     }
+     vtkDebugMacro(<< "Error getting color encoding!");
+     return false;
++#endif
+   }
+ 
+   vtkDebugMacro(<< "OpenGL is not initialized yet!");
+@@ -950,6 +956,7 @@ int vtkOpenGLRenderWindow::GetColorBufferSizes(int* rgba)
  #ifdef GL_DRAW_BUFFER
      glGetIntegerv(GL_DRAW_BUFFER, &attachment);
  #endif
 +#ifdef GL_ES_VERSION_3_0
-+    // GLES only has the GL_BACK color
-+    // attachment for the default framebuffer
-+#else
      // GL seems odd with its handling of left/right.
      // if it says we are using GL_FRONT or GL_BACK
      // then convert those to GL_FRONT_LEFT and
-@@ -861,6 +865,7 @@ int vtkOpenGLRenderWindow::GetColorBufferSizes(int* rgba)
-     {
+@@ -971,6 +978,7 @@ int vtkOpenGLRenderWindow::GetColorBufferSizes(int* rgba)
+       // before querying the color buffer sizes.
        attachment = GL_BACK_LEFT;
      }
 +#endif
@@ -35,5 +52,5 @@ index 9bbbc2ba54..4bda9330b6 100644
      // make sure we clear any errors before we start
      // otherwise we may get incorrect results
 -- 
-2.27.0
+2.47.1
 

0001-Fix-fmt-includes-again.patch

@@ -0,0 +1,39 @@
+From 18b733fb082bb98ba37d16e5b184f6d959d0f573 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Thu, 12 Dec 2024 20:02:38 +0100
+Subject: [PATCH] Fix fmt includes again
+
+Unfortunately, VTK upstream imports new releases and
+creates the same regressions again and again ...
+---
+ ThirdParty/ioss/vtkioss/Ioss_Field.C        | 1 +
+ ThirdParty/ioss/vtkioss/Ioss_VariableType.C | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_Field.C b/ThirdParty/ioss/vtkioss/Ioss_Field.C
+index fbb2100c..8909eef5 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_Field.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_Field.C
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_VariableType.C b/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+index b081dc36..4f1a841f 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
+-- 
+2.47.1
+

0001-Fix-missing-GLAD-symbol-mangling-in-Rendering-GL2PSO.patch

@@ -0,0 +1,26 @@
+From 0d9be7530127da2a42644a3c5b78faaaaec5c354 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Thu, 12 Dec 2024 23:19:22 +0100
+Subject: [PATCH] Fix missing GLAD symbol mangling in Rendering/GL2PSOpenGL2
+
+The library links to and uses symbols from the GLAD GL wrapper library,
+thus it must use the wrapped GL library calls.
+---
+ Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx b/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
+index eece0354..91a22275 100644
+--- a/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
++++ b/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx
+@@ -2,6 +2,7 @@
+ // SPDX-License-Identifier: BSD-3-Clause
+ 
+ #include "vtkOpenGLGL2PSHelperImpl.h"
++#include "vtk_glad.h"
+ 
+ #include "vtkActor.h"
+ #include "vtkCamera.h"
+-- 
+2.47.1
+

0002-Use-GL_DRAW_BUFFER0-instead-of-GL_DRAW_BUFFER-for-GL.patch

@@ -1,7 +1,7 @@
-From 068773541005f8d8f027b373a01c821788439c8b Mon Sep 17 00:00:00 2001
+From 59ad85c74a850736ad4fcdcb9dd00779a7fff0ed Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
 Date: Sun, 21 Nov 2021 22:51:36 +0100
-Subject: [PATCH] Use GL_DRAW_BUFFER0 instead of GL_DRAW_BUFFER for GLES
+Subject: [PATCH 2/2] Use GL_DRAW_BUFFER0 instead of GL_DRAW_BUFFER for GLES
  compatibility
 
 ARB_draw_buffers is part of GL 2.0, so GL_DRAW_BUFFERS0 is always
@@ -14,18 +14,18 @@ glDrawBuffer.
 At least with MESA, GL_DRAW_BUFFER and GL_DRAW_BUFFER0 always return the
 same value. GL_DRAW_BUFFERn is also used in several places already.
 ---
- .../ContextOpenGL2/vtkOpenGLContextBufferId.cxx      |  2 +-
- .../ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h |  2 +-
+ .../ContextOpenGL2/vtkOpenGLContextBufferId.cxx      |  4 ++--
+ .../ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h |  4 ++--
  Rendering/External/vtkExternalOpenGLRenderWindow.cxx |  2 +-
  Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx          |  8 ++++----
  Rendering/OpenGL2/vtkOpenGLState.cxx                 | 12 ++++++------
- 5 files changed, 13 insertions(+), 13 deletions(-)
+ 5 files changed, 15 insertions(+), 15 deletions(-)
 
 diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.cxx b/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.cxx
-index c0e0f8909f..dd6a93bde3 100644
+index 9b6c16d4..af9d5a11 100644
 --- a/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.cxx
 +++ b/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.cxx
-@@ -130,8 +130,8 @@ vtkIdType vtkOpenGLContextBufferId::GetPickedItem(int x, int y)
+@@ -129,8 +129,8 @@ vtkIdType vtkOpenGLContextBufferId::GetPickedItem(int x, int y)
        // pixel x,y (instead of pixel 0,0 to work around pixel ownership test).
        GLint savedDrawBuffer = GL_BACK_LEFT;
  
@@ -37,7 +37,7 @@ index c0e0f8909f..dd6a93bde3 100644
  
        vtkOpenGLState::ScopedglEnableDisable dsaver(ostate, GL_DEPTH_TEST);
 diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
-index 29e5f47671..7acb87e25f 100644
+index 0bd7332f..6ac52956 100644
 --- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
 +++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h
 @@ -306,8 +306,8 @@ public:
@@ -52,10 +52,10 @@ index 29e5f47671..7acb87e25f 100644
        this->SavedDrawBuffer = GL_BACK_LEFT;
  #endif
 diff --git a/Rendering/External/vtkExternalOpenGLRenderWindow.cxx b/Rendering/External/vtkExternalOpenGLRenderWindow.cxx
-index 445bfce802..5e1f2f4b24 100644
+index 265c7338..9ad4640b 100644
 --- a/Rendering/External/vtkExternalOpenGLRenderWindow.cxx
 +++ b/Rendering/External/vtkExternalOpenGLRenderWindow.cxx
-@@ -58,7 +58,7 @@ void vtkExternalOpenGLRenderWindow::Start()
+@@ -47,7 +47,7 @@ void vtkExternalOpenGLRenderWindow::Start()
  
    // For stereo, render the correct eye based on the OpenGL buffer mode
    GLint bufferType;
@@ -65,12 +65,12 @@ index 445bfce802..5e1f2f4b24 100644
    vtkRenderer* renderer;
    for (this->GetRenderers()->InitTraversal(sit);
 diff --git a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
-index 25b521bd0d..426aa69f08 100644
+index 394128b0..17d2004c 100644
 --- a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
 +++ b/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
-@@ -794,8 +794,8 @@ bool vtkOpenGLRenderWindow::GetUsingSRGBColorSpace()
-     this->MakeCurrent();
- 
+@@ -896,8 +896,8 @@ bool vtkOpenGLRenderWindow::GetUsingSRGBColorSpace()
+     return this->UseSRGBColorSpace;
+ #else
      GLint attachment = GL_BACK_LEFT;
 -#ifdef GL_DRAW_BUFFER
 -    glGetIntegerv(GL_DRAW_BUFFER, &attachment);
@@ -79,7 +79,7 @@ index 25b521bd0d..426aa69f08 100644
  #endif
      // GL seems odd with its handling of left/right.
      // if it says we are using GL_FRONT or GL_BACK
-@@ -854,8 +854,8 @@ int vtkOpenGLRenderWindow::GetColorBufferSizes(int* rgba)
+@@ -953,8 +953,8 @@ int vtkOpenGLRenderWindow::GetColorBufferSizes(int* rgba)
    {
      this->MakeCurrent();
      GLint attachment = GL_BACK_LEFT;
@@ -89,12 +89,12 @@ index 25b521bd0d..426aa69f08 100644
 +    glGetIntegerv(GL_DRAW_BUFFER0, &attachment);
  #endif
  #ifdef GL_ES_VERSION_3_0
-     // GLES only has the GL_BACK color
+     // GL seems odd with its handling of left/right.
 diff --git a/Rendering/OpenGL2/vtkOpenGLState.cxx b/Rendering/OpenGL2/vtkOpenGLState.cxx
-index 24f23a5c44..aca4e4f247 100644
+index bdafa26e..ecef68dd 100644
 --- a/Rendering/OpenGL2/vtkOpenGLState.cxx
 +++ b/Rendering/OpenGL2/vtkOpenGLState.cxx
-@@ -217,8 +217,8 @@ void vtkOpenGLState::CheckState()
+@@ -206,8 +206,8 @@ void vtkOpenGLState::CheckState()
      error = true;
    }
    unsigned int sval;
@@ -105,7 +105,7 @@ index 24f23a5c44..aca4e4f247 100644
    sval = cs.DrawBinding.GetDrawBuffer(0);
    if (sval == GL_BACK_LEFT)
    {
-@@ -504,8 +504,8 @@ void vtkOpenGLState::vtkglBindFramebuffer(unsigned int target, unsigned int val)
+@@ -495,8 +495,8 @@ void vtkOpenGLState::vtkglBindFramebuffer(unsigned int target, unsigned int val)
      {
        cs.DrawBinding.Binding = val;
        ::glBindFramebuffer(GL_DRAW_FRAMEBUFFER, val);
@@ -116,7 +116,7 @@ index 24f23a5c44..aca4e4f247 100644
  #endif
      }
    }
-@@ -1626,8 +1626,8 @@ void vtkOpenGLState::ResetFramebufferBindings()
+@@ -1625,8 +1625,8 @@ void vtkOpenGLState::ResetFramebufferBindings()
  {
    auto& cs = this->Stack.top();
    ::glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, (int*)&cs.DrawBinding.Binding);
@@ -128,5 +128,5 @@ index 24f23a5c44..aca4e4f247 100644
  
    ::glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, (int*)&cs.ReadBinding.Binding);
 -- 
-2.33.1
+2.47.1
 

Do-not-request-CUBE_MAP_SEAMLESS-on-GLES.patch

@@ -1,16 +0,0 @@
---- a/Rendering/CellGrid/vtkDGOpenGLRenderer.cxx_orig	2023-12-28 06:22:40.696501865 +0100
-+++ b/Rendering/CellGrid/vtkDGOpenGLRenderer.cxx	2023-12-28 06:23:24.633470522 +0100
-@@ -1046,11 +1046,13 @@
-   }
- 
-   // III. Render draw
-+#ifndef GL_ES_VERSION_3_0
-   if (renderer->GetUseImageBasedLighting() && renderer->GetEnvironmentTexture())
-   {
-     vtkOpenGLState* ostate = oglRenWin->GetState();
-     ostate->vtkglEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
-   }
-+#endif
-   //      a. Update shaders
-   state->CellBO.VAO->Bind();
-   // state->LastBoundBO = &state->CellBO; // We only bind the one...

VTK-9.3.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
-size 99932810

VTK-9.4.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c253b0c8d002aaf98871c6d0cb76afc4936c301b72358a08d5f3f72ef8bc4529
+size 118618515

fix_rendering_core_linkage.patch

@@ -1,18 +0,0 @@
---- a/Rendering/LICOpenGL2/vtk.module_orig	2023-12-27 17:36:03.966016939 +0100
-+++ b/Rendering/LICOpenGL2/vtk.module	2023-12-27 17:36:40.199591808 +0100
-@@ -14,6 +14,7 @@
-   VTK::CommonDataModel
-   VTK::CommonExecutionModel
-   VTK::RenderingOpenGL2
-+  VTK::RenderingCore
- PRIVATE_DEPENDS
-   VTK::CommonMath
-   VTK::CommonSystem
-@@ -22,7 +23,6 @@
-   VTK::IOXML
-   VTK::ImagingCore
-   VTK::ImagingSources
--  VTK::RenderingCore
-   VTK::glew
-   VTK::opengl
-   VTK::vtksys

vtk.changes

@@ -1,3 +1,60 @@
+-------------------------------------------------------------------
+Sun Jan  5 04:39:42 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Add bcond for mysql, keep it disabled by default. Make libmysql
+  devel dependency conditional.
+- Remove obsolete netcdf-c++ dependency from devel package.
+
+-------------------------------------------------------------------
+Mon Dec 30 18:53:44 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Update to version 9.4.1, see:
+  https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.4.md
+
+-------------------------------------------------------------------
+Sun Dec 22 03:31:28 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Fix broken LD_LIBRARY_PATH mangling for openmpi builds
+- Rebase GLES patches:
+  * 0001-Correct-GL_BACK-GL_BACK_LEFT-mapping-on-GLES.patch
+  * 0002-Use-GL_DRAW_BUFFER0-instead-of-GL_DRAW_BUFFER-for-GL.patch
+- Drop obsolete patch:
+  * Do-not-request-CUBE_MAP_SEAMLESS-on-GLES.patch
+
+-------------------------------------------------------------------
+Thu Dec 12 16:28:03 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- - Update to version 9.4.0, see:
+  https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.4.md
+- Drop upstream patches:
+  * 0001-ioss-update-fmt-includes.patch
+- Add patches:
+  * 0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch
+  * 0001-Fix-fmt-includes-again.patch
+  * 0001-Fix-missing-GLAD-symbol-mangling-in-Rendering-GL2PSO.patch
+
+-------------------------------------------------------------------
+Fri Jun 29 00:00:00 UTC 2024 - Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
+
+- Update to version 9.3.1, see:
+  https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.3.md
+- Add patches:
+  * 0001-ioss-update-fmt-includes.patch
+- Drop upstream patches:
+  * fix_rendering_core_linkage.patch
+- New features and bugfixes:
+  * The vendored `fmt` library has been updated to 10.1.1.
+  * Fix SIGSEGV on `vtkCompositeDataProbeFilter`.
+  * Add `ComponentName` in `vtkImageAlgorithm` and subclasses.
+  * Fix UT record support in `vtkDICOMParser`
+  * Fix for reading binary XML files > 2Gb on Windows.
+  * Fix `ResampleWithDataSet` with an HTG source using MPI.
+  * Fix `HyperTree` iterator in `ExtractElements` method.
+  * Fix `vtkOpenGLRenderWindow::GetZBufferData` in OpenGL ES 3.
+  * Fix GPU Ray Cast Volume Rendering with `ModelTransformMatrix`.
+  * Fix Off-axis stereo image separation issue.
+  * Fix Display Attribute Inheritance `vtkOpenGLGlyph3DMapper`.
+
 -------------------------------------------------------------------
 Tue Feb 20 13:26:32 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

vtk.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package vtk
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,6 +21,7 @@
 %bcond_with examples
 %bcond_with documentation
 %bcond_with testing
+%bcond_with mysql
 
 %ifarch %arm aarch64
 %bcond_without gles
@@ -39,16 +40,16 @@
 %bcond_with    fmt
 %bcond_with    haru
 %if 0%{?sle_version} <= 150400
-%bcond_without pegtl
+%bcond_without system_pegtl
 %else
-%bcond_with    pegtl
+%bcond_with    system_pegtl
 %endif
 %bcond_with    pugixml
 %else
 %bcond_without fast_float
 %bcond_without fmt
 %bcond_without haru
-%bcond_with    pegtl
+%bcond_with    system_pegtl
 %bcond_without pugixml
 %endif
 
@@ -92,9 +93,9 @@
 %define shlib   %{vtklib}
 
 Name:           vtk%{?my_suffix}
-Version:        9.3.0
+Version:        9.4.1
 Release:        0
-%define series  9.3
+%define series  9.4
 Summary:        The Visualization Toolkit - A high level 3D visualization library
 # This is a variant BSD license, a cross between BSD and ZLIB.
 # For all intents, it has the same rights and restrictions as BSD.
@@ -108,20 +109,22 @@ Source:         https://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.g
 Source99:       vtk-rpmlintrc
 # PATCH-FIX-OPENSUSE bundled_libharu_add_missing_libm.patch stefan.bruens@rwth-aachen.de -- Add missing libm for linking (gh#libharu/libharu#213)
 Patch1:         bundled_libharu_add_missing_libm.patch
-# PATCH-FIX-UPSTREAM
-Patch2:         fix_rendering_core_linkage.patch
 # PATCH-FIX-OPENSUSE -- Fix building with Qt GLES builds
 Patch7:         0001-Add-missing-guard-required-for-GLES-to-disable-stere.patch
 # PATCH-FIX-UPSTREAM -- Fix building with Qt GLES builds
 Patch8:         0001-Correct-GL_BACK-GL_BACK_LEFT-mapping-on-GLES.patch
 # PATCH-FIX-UPSTREAM -- Fix building with Qt GLES builds
 Patch9:         0002-Use-GL_DRAW_BUFFER0-instead-of-GL_DRAW_BUFFER-for-GL.patch
-# PATCH-FIX-OPENSUSE -- Fix building with Qt GLES builds
-Patch10:        Do-not-request-CUBE_MAP_SEAMLESS-on-GLES.patch
 # PATCH-FIX-UPSTREAM -- Always create python package metadata (egg-info)
 Patch17:        0001-Always-generate-Python-Metadata-when-WRAP_PYTHON-is-.patch
 # PATCH-FIX-UPSTREAM -- Copy generated metadata to the right directory
 Patch18:        0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch
+# PATCH-FIX-UPSTREAM
+Patch19:        0001-Add-missing-libm-link-library-for-bundled-ExodusII.patch
+# PATCH-FIX-OPENSUSE
+Patch20:        0001-Fix-fmt-includes-again.patch
+# PATCH-FIX-OPENSUSE
+Patch21:        0001-Fix-missing-GLAD-symbol-mangling-in-Rendering-GL2PSO.patch
 BuildRequires:  cgns-devel
 BuildRequires:  chrpath
 BuildRequires:  cmake >= 3.12
@@ -133,7 +136,9 @@ BuildRequires:  libboost_graph-devel
 BuildRequires:  libboost_graph_parallel-devel
 BuildRequires:  libboost_serialization-devel
 BuildRequires:  libjpeg-devel
+%if %{with mysql}
 BuildRequires:  libmysqlclient-devel
+%endif
 BuildRequires:  libtiff-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-numpy-devel
@@ -198,7 +203,7 @@ BuildRequires:  cmake(FastFloat)
 %if %{with pugixml}
 BuildRequires:  pkgconfig(pugixml) >= 1.11
 %endif
-%if %{with pegtl}
+%if %{with system_pegtl}
 BuildRequires:  (pegtl-devel >= 2.0.0 with pegtl-devel < 3.0)
 %endif
 %if %{with testing}
@@ -242,8 +247,7 @@ Requires:       gcc-c++
 Requires:       hdf5-devel
 %{?with_mpi:Requires:       hdf5-%{mpi_flavor}-devel}
 Requires:       libjpeg-devel
-Requires:       libmysqlclient-devel
-Requires:       libnetcdf_c++-devel
+%{?with_mysql:Requires:       libmysqlclient-devel}
 Requires:       libtiff-devel
 # not strictly necessary, but required by VTKs cmake files
 Requires:       python3-%{name} = %{version}
@@ -398,15 +402,10 @@ languages.
 %prep
 %setup -n VTK-%{version}
 %patch -P 1 -p1
-%patch -P 2 -p1
 %if %{with gles}
-%patch -P 7 -p1
-%patch -P 8 -p1
-%patch -P 9 -p1
-%patch -P 10 -p1
+%autopatch -m 7 -M 10 -p1
 %endif
-%patch -P 17 -p1
-%patch -P 18 -p1
+%autopatch -m 17 -p1
 
 # Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata
 # otherwise it will break on symlinks.
@@ -421,6 +420,9 @@ sed -i -e '/set(vtk_enable_tests "OFF")/ s/.*/#\0/' CMakeLists.txt
 # Allow other versions for fast_float
 sed -i -e '/VERSION .*/ d' ThirdParty/fast_float/CMakeLists.txt
 
+# Keep LD_LIBRARY_PATH intact from mpivars
+sed -i -e '/LD_LIBRARY_PATH/ s/"$/:$ENV{LD_LIBRARY_PATH}"/' GUISupport/QtQuick/qml/CMakeLists.txt
+
 %build
 %if %{with mpi}
 source %{mpiprefix}/bin/mpivars.sh
@@ -485,10 +487,13 @@ export CXXFLAGS="%{optflags}"
     -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=%{?with_gl2ps:ON}%{!?with_gl2ps:OFF} \
     -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \
     -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=%{?with_haru:ON}%{!?with_haru:OFF} \
+    -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=%{?with_system_pegtl:YES}%{!?with_system_pegtl:NO} \
     -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \
-    -DVTK_MODULE_ENABLE_VTK_ioss:BOOL=%{!?with_mpi:WANT}%{?with_mpi:NO} \
-    -DVTK_MODULE_ENABLE_VTK_pegtl=%{?with_pegtl:YES}%{!?with_pegtl:NO} \
-    -DVTK_MODULE_ENABLE_VTK_zfp:BOOL=NO \
+    -DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF \
+    -DVTK_MODULE_ENABLE_VTK_ioss:STRING=%{!?with_mpi:WANT}%{?with_mpi:NO} \
+    -DVTK_MODULE_ENABLE_VTK_pegtl:STRING=YES \
+    -DVTK_MODULE_ENABLE_VTK_zfp:STRING=NO \
+    -DVTK_MODULE_ENABLE_VTK_IOMySQL=%{?with_mysql:ON}%{!?with_mysql:NO} \
     %{nil}
 
 %cmake_build
@@ -611,6 +616,7 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl
 %{my_bindir}/%{pkgname}ParseJava
 %{my_bindir}/%{pkgname}WrapPython
 %{my_bindir}/%{pkgname}WrapPythonInit
+%{my_bindir}/%{pkgname}WrapSerDes
 %{my_libdir}/*.so
 %{my_libdir}/vtk-%{series}
 %{?with_mpi: %dir %{my_libdir}/cmake/}