From 16c72e2223aae482320b929657280a0e7966d5197eb7c52977cb070aa18cf24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sat, 28 Jan 2023 00:11:30 +0000 Subject: [PATCH] Accepting request 1061449 from home:StefanBruens:branches:science - Update to version 9.2.5, see: https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.2.md - Rebase 0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch - Use system fmt on Tumbleweed OBS-URL: https://build.opensuse.org/request/show/1061449 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=178 --- ...HON_SITE_PACKAGES_SUFFIX-for-Python-.patch | 11 +++++++++- VTK-9.2.2.tar.gz | 3 --- VTK-9.2.5.tar.gz | 3 +++ vtk.changes | 9 ++++++++ vtk.spec | 22 ++++++++++--------- 5 files changed, 34 insertions(+), 14 deletions(-) delete mode 100644 VTK-9.2.2.tar.gz create mode 100644 VTK-9.2.5.tar.gz diff --git a/0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch b/0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch index 6768209..e16877e 100644 --- a/0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch +++ b/0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch @@ -54,13 +54,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 90c90f9d46..03f5836a0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -417,7 +417,7 @@ if (VTK_WRAP_PYTHON) +@@ -450,15 +450,15 @@ if (VTK_WRAP_PYTHON) list(REMOVE_DUPLICATES vtk_required_python_modules) endif () string(REPLACE ";" "\n" vtk_required_python_modules "${vtk_required_python_modules}") - file(WRITE "${CMAKE_BINARY_DIR}/requirements.txt" + file(WRITE "${CMAKE_BINARY_DIR}/${VTK_PYTHON_SITE_PACKAGES_SUFFIX}/requirements.txt" "${vtk_required_python_modules}\n") + get_property(vtk_web_python_modules GLOBAL + PROPERTY vtk_web_python_modules) + if (vtk_web_python_modules) + list(REMOVE_DUPLICATES vtk_web_python_modules) + endif () + string(REPLACE ";" "\n" vtk_web_python_modules "${vtk_web_python_modules}") +- file(WRITE "${CMAKE_BINARY_DIR}/requirements_web.txt" ++ file(WRITE "${CMAKE_BINARY_DIR}/${VTK_PYTHON_SITE_PACKAGES_SUFFIX}/requirements_web.txt" + "${vtk_web_python_modules}\n") get_property(vtk_soabi GLOBAL PROPERTY _vtk_python_soabi) -- diff --git a/VTK-9.2.2.tar.gz b/VTK-9.2.2.tar.gz deleted file mode 100644 index af900e0..0000000 --- a/VTK-9.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075 -size 53801737 diff --git a/VTK-9.2.5.tar.gz b/VTK-9.2.5.tar.gz new file mode 100644 index 0000000..b24b2bd --- /dev/null +++ b/VTK-9.2.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:128d601baa980e98ee034207974b33fb38d2c98ab9cf4a5756efdb09ed6c0949 +size 53807732 diff --git a/vtk.changes b/vtk.changes index 9d157a3..12fadf5 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 27 03:50:47 UTC 2023 - Stefan Brüns + +- Update to version 9.2.5, see: + https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.2.md +- Rebase + 0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch +- Use system fmt on Tumbleweed + ------------------------------------------------------------------- Fri Oct 14 18:07:34 UTC 2022 - Stefan Brüns diff --git a/vtk.spec b/vtk.spec index cbf07ba..0f5c975 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,9 +31,15 @@ %define pkgname vtk # pugixml in Leap 15.x is too old +# fmt in Leap 15.x is too old +# Need haru/hpdf version with HPDF_SHADING, i.e. >= 2.4.0 %if 0%{?suse_version} <= 1500 +%bcond_with fmt +%bcond_with haru %bcond_with pugixml %else +%bcond_without fmt +%bcond_without haru %bcond_without pugixml %endif @@ -41,13 +47,6 @@ %bcond_without java %bcond_without pegtl -# Need version with HPDF_SHADING, i.e. >= 2.4.0 -%if 0%{?suse_version} <= 1500 -%bcond_with haru -%else -%bcond_without haru -%endif - %if "%{flavor}" == "" %define my_suffix %{nil} %define my_prefix %_prefix @@ -91,7 +90,7 @@ %define shlib %{vtklib} Name: vtk%{?my_suffix} -Version: 9.2.2 +Version: 9.2.5 Release: 0 %define series 9.2 Summary: The Visualization Toolkit - A high level 3D visualization library @@ -170,6 +169,9 @@ BuildRequires: doxygen BuildRequires: gnuplot BuildRequires: graphviz %endif +%if %{with fmt} +BuildRequires: fmt-devel > 9.0 +%endif %if %{with gl2ps} BuildRequires: gl2ps-devel > 1.4.0 %endif @@ -463,7 +465,7 @@ export CXXFLAGS="%{optflags}" -DVTK_OPENGL_USE_GLES:BOOL=%{?with_gles:ON}%{!?with_gles:OFF} \ -DVTK_USE_EXTERNAL:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \ - -DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \ + -DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=%{?with_fmt:ON}%{!?with_fmt:OFF} \ -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} \