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
- Add bcond for mysql, keep it disabled by default. Make libmysql
2025-01-07 19:51:34 +00:00 · 2025-01-05 17:15:24 +00:00 · 2025-01-05 14:31:10 +00:00 · 2025-01-04 05:07:06 +00:00 · 2024-12-29 10:56:09 +00:00 · 2024-12-25 00:53:14 +00:00
7 changed files with 82 additions and 112 deletions
--- a/0001-Fix-fmt-includes-again.patch
+++ b/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
+
--- a/0001-java-support-java-bindings-IO-Avmesh-and-LANLX3D.patch
+++ b/0001-java-support-java-bindings-IO-Avmesh-and-LANLX3D.patch
@@ -1,34 +0,0 @@
-From e1be51aecce8798a643abc4fd486e8beabf252ad Mon Sep 17 00:00:00 2001
-From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
-Date: Thu, 19 Jun 2025 21:53:51 -0400
-Subject: [PATCH] java: support java bindings IO Avmesh and LANLX3D
-
---
- IO/Avmesh/vtk.module  | 1 +
- IO/LANLX3D/vtk.module | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/IO/Avmesh/vtk.module b/IO/Avmesh/vtk.module
-index 3c2a3a7ad3..895f9817bc 100644
--- a/IO/Avmesh/vtk.module
-+++ b/IO/Avmesh/vtk.module
-@@ -14,6 +14,7 @@ DEPENDS
-   VTK::CommonCore
-   VTK::IOCore
- PRIVATE_DEPENDS
-+  VTK::CommonExecutionModel
-   VTK::CommonDataModel
- TEST_DEPENDS
-   VTK::CommonDataModel
-diff --git a/IO/LANLX3D/vtk.module b/IO/LANLX3D/vtk.module
-index 2ff7ee2e9e..4a84226d74 100644
--- a/IO/LANLX3D/vtk.module
-+++ b/IO/LANLX3D/vtk.module
-@@ -20,3 +20,4 @@ DEPENDS
-   VTK::FiltersCore
- PRIVATE_DEPENDS
-   VTK::CommonCore
-+  VTK::CommonExecutionModel
-- 
-2.43.0
-
--- a/VTK-9.4.1.tar.gz
+++ b/VTK-9.4.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c253b0c8d002aaf98871c6d0cb76afc4936c301b72358a08d5f3f72ef8bc4529
+size 118618515
--- a/VTK-9.5.0.tar.gz
+++ b/VTK-9.5.0.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04ae86246b9557c6b61afbc534a6df099244fbc8f3937f82e6bc0570953af87d
-size 50172790
--- a/bundled_libharu_add_missing_libm.patch
+++ b/bundled_libharu_add_missing_libm.patch
@@ -0,0 +1,13 @@
+Index: VTK-9.0.0/ThirdParty/libharu/vtklibharu/CMakeLists.txt
+===================================================================
+--- VTK-9.0.0.orig/ThirdParty/libharu/vtklibharu/CMakeLists.txt
+++ VTK-9.0.0/ThirdParty/libharu/vtklibharu/CMakeLists.txt
+@@ -68,6 +68,8 @@ if(PNG_FOUND)
+ find_library(M_LIB m)
+ endif ()
+ 
+link_libraries(m)
+
+ # =======================================================================
+ # configure header files, add compiler flags
+ # =======================================================================
--- a/vtk.changes
+++ b/vtk.changes
@@ -1,24 +1,3 @@
-------------------------------------------------------------------
-Mon Jun 24 19:54:00 UTC 2025 - Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
-
- Update to version 9.5.0, see:
-  https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.5.md
- Added upstream patches:
-  * 0001-java-support-java-bindings-IO-Avmesh-and-LANLX3D.patch
- Drop upstream patches:
-  * bundled_libharu_add_missing_libm.patch
-  * 0001-Fix-fmt-includes-again.patch
- Disable netcdf support for Leap 15.x to avoid hdf5 version conflicts
- Use Java 11 instead of Java 8 JDK.
- Use internal fmt package for leap 15 and 16.
- Drop leap 15.4 support.
-
-------------------------------------------------------------------
-Tue Apr 15 08:15:48 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
-
- Drop BuildRequires: pkgconfig(glew) as it is not used for build
-  (since version 9.4.0).
-
 -------------------------------------------------------------------
 Sun Jan  5 04:39:42 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

@@ -42,11 +21,6 @@ Sun Dec 22 03:31:28 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 - Drop obsolete patch:
  * Do-not-request-CUBE_MAP_SEAMLESS-on-GLES.patch

-------------------------------------------------------------------
-Mon Dec 16 16:16:25 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
-
- Normalize jar mtimes for reproducible builds (boo#1134568)
-
 -------------------------------------------------------------------
 Thu Dec 12 16:28:03 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

--- a/vtk.spec
+++ b/vtk.spec
@@ -32,30 +32,27 @@
 %define pkgname vtk

 # pugixml in Leap 15.x is too old
-# fmt in Leap 15.x and 16.x is too old
+# fmt in Leap 15.x is too old
 # Need haru/hpdf version with HPDF_SHADING, i.e. >= 2.4.0
 # PEGTL >= 3.0 not supported, https://gitlab.kitware.com/vtk/vtk/-/issues/18151
-# netcdf in Leap 15.6 has hdf5 version conflicts
 %if 0%{?suse_version} <= 1500
 %bcond_with    fast_float
-%bcond_with    haru
-%bcond_with    netcdf
 %bcond_with    fmt
+%bcond_with    haru
+%if 0%{?sle_version} <= 150400
+%bcond_without system_pegtl
+%else
+%bcond_with    system_pegtl
+%endif
 %bcond_with    pugixml
 %else
 %bcond_without fast_float
-%bcond_without haru
-%bcond_without netcdf
-%bcond_without pugixml
-%if 0%{?suse_version} == 1600
-%bcond_with    fmt
-%else
 %bcond_without fmt
-%endif
-%define have_strip_nondeterminism 1
+%bcond_without haru
+%bcond_with    system_pegtl
+%bcond_without pugixml
 %endif

-%bcond_with    system_pegtl
 %bcond_without gl2ps
 %bcond_without java

@@ -96,9 +93,9 @@
 %define shlib   %{vtklib}

 Name:           vtk%{?my_suffix}
-Version:        9.5.0
+Version:        9.4.1
 Release:        0
-%define series  9.5
+%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.
@@ -110,6 +107,8 @@ Source:         https://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.g
 # FIXME See if packaging can be tweaked to accommodate python-vtk's devel files in a devel package later
 # We need to use the compat conditionals here to avoid Factory's source validator from tripping up
 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-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
@@ -123,19 +122,15 @@ 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-missing-GLAD-symbol-mangling-in-Rendering-GL2PSO.patch
-# PATCH-FIX-UPSTREAM -- Support java bindings for modules IO Avmesh and LANLX3D
-Patch21:        0001-java-support-java-bindings-IO-Avmesh-and-LANLX3D.patch
+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
 BuildRequires:  double-conversion-devel
 BuildRequires:  fdupes
-%if 0%{?suse_version} <= 1500
-BuildRequires:  gcc14-c++
-%else
 BuildRequires:  gcc-c++
-%endif
 BuildRequires:  hdf5-devel
 BuildRequires:  libboost_graph-devel
 BuildRequires:  libboost_graph_parallel-devel
@@ -161,6 +156,7 @@ BuildRequires:  pkgconfig(eigen3) >= 3.3.9
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(freetype2) >= 2.11.0
 BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glew)
 BuildRequires:  pkgconfig(jsoncpp)
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavdevice)
@@ -171,9 +167,7 @@ BuildRequires:  pkgconfig(liblz4) >= 1.8.0
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libxml-2.0)
-%if %{with netcdf}
 BuildRequires:  pkgconfig(netcdf)
-%endif
 BuildRequires:  pkgconfig(proj) >= 5.0.0
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(theora)
@@ -185,7 +179,7 @@ BuildRequires:  gnuplot
 BuildRequires:  graphviz
 %endif
 %if %{with fmt}
-BuildRequires:  fmt-devel > 11.0
+BuildRequires:  fmt-devel > 9.0
 %endif
 %if %{with gl2ps}
 BuildRequires:  gl2ps-devel > 1.4.0
@@ -194,18 +188,13 @@ BuildRequires:  gl2ps-devel > 1.4.0
 BuildRequires:  libharu-devel >= 2.4.0
 %endif
 %if %{with java}
-BuildRequires:  java-devel >= 11
-%if 0%?have_strip_nondeterminism > 0
-BuildRequires:  strip-nondeterminism
-%endif
+BuildRequires:  java-devel >= 1.8
 %endif
 %if %{with mpi}
 BuildRequires:  %{mpi_flavor}-devel
 BuildRequires:  hdf5-%{mpi_flavor}-devel
 BuildRequires:  libboost_mpi-devel
-%if %{with netcdf}
 BuildRequires:  netcdf-%{mpi_flavor}-devel
-%endif
 BuildRequires:  python3-mpi4py-devel
 %endif
 %if %{with fast_float}
@@ -286,9 +275,7 @@ Requires:       pkgconfig(liblz4) >= 1.7.3
 Requires:       pkgconfig(liblzma)
 Requires:       pkgconfig(libpng)
 Requires:       pkgconfig(libswscale)
-%if %{with netcdf}
 Requires:       pkgconfig(netcdf)
-%endif
 Requires:       pkgconfig(theora)
 Requires:       pkgconfig(zlib)
 %if %{with pegtl}
@@ -314,7 +301,7 @@ Summary:        Develoment files for VTK Java bindings
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
 Requires:       %{name}-java = %{version}
-Requires:       java-devel >= 11
+Requires:       java-devel >= 1.8
 Provides:       %{name}-devel:%{my_libdir}/libvtkJava.so

 %description    java-devel
@@ -414,6 +401,7 @@ languages.

 %prep
 %setup -n VTK-%{version}
+%patch -P 1 -p1
 %if %{with gles}
 %autopatch -m 7 -M 10 -p1
 %endif
@@ -432,24 +420,18 @@ 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
 export CC=mpicc
 export CXX=mpicxx
-%if 0%{?suse_version} <= 1500
-export OMPI_CC=gcc-14
-export OMPI_CXX=g++-14
-%endif
-%else
-%if 0%{?suse_version} <= 1500
-export CC=gcc-14
-export CXX=g++-14
 %else
 export CC=gcc
 export CXX=g++
 %endif
-%endif

 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
@@ -493,7 +475,8 @@ export CXXFLAGS="%{optflags}"
    -DVTK_GROUP_ENABLE_Views=WANT \
    -DVTK_PYTHON_VERSION=3 \
    -DVTK_WRAP_JAVA:BOOL=%{?with_java:ON}%{!?with_java:OFF} \
-    -DVTK_JAVA_RELEASE_VERSION:STRING='11' \
+    -DVTK_JAVA_SOURCE_VERSION:STRING='1.8' \
+    -DVTK_JAVA_TARGET_VERSION:STRING='1.8' \
    -DVTK_WRAP_PYTHON:BOOL=ON \
    -DOpenGL_GL_PREFERENCE:STRING='GLVND' \
    -DVTK_OPENGL_USE_GLES:BOOL=%{?with_gles:ON}%{!?with_gles:OFF} \
@@ -504,7 +487,6 @@ 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_netcdf:BOOL=%{?with_netcdf:ON}%{!?with_netcdf: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_USE_EXTERNAL_VTK_token:BOOL=OFF \
@@ -587,10 +569,6 @@ python3 setup.py install_egg_info -d %{buildroot}%{python3_sitearch}
 popd
 %endif

-%if %{with java} && 0%?have_strip_nondeterminism > 0
-    strip-all-nondeterminism %{buildroot}%{my_libdir}/java/
-%endif
-
 %fdupes %{buildroot}

 %check