From 48b5f15e37ddafedf650a8186abd59e1e2633e4d Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 6 Sep 2018 10:30:37 +0200 Subject: [PATCH 001/158] BuildRequires: s/postgresql-devel/libpq-devel/ That's because we moved libpq.so.5 into libpq package. Related: rhbz#1618698, rhbz#1623764 Version: 7.1.1-13 --- vtk.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/vtk.spec b/vtk.spec index 02c003c..6b15316 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 7.1.1 -Release: 12%{?dist} +Release: 13%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -71,7 +71,7 @@ BuildRequires: mariadb-connector-c-devel BuildRequires: mysql-devel %endif BuildRequires: netcdf-cxx-devel -BuildRequires: postgresql-devel +BuildRequires: libpq-devel BuildRequires: R-devel BuildRequires: sip-devel BuildRequires: sqlite-devel @@ -169,7 +169,7 @@ Requires: libogg-devel%{?_isa} Requires: libtheora-devel%{?_isa} Requires: libtiff-devel%{?_isa} Requires: libxml2-devel%{?_isa} -Requires: postgresql-devel%{?_isa} +Requires: libpq-devel%{?_isa} Requires: mysql-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} Requires: qt4-devel%{?_isa} @@ -273,7 +273,7 @@ Requires: libogg-devel%{?_isa} Requires: libtheora-devel%{?_isa} Requires: libtiff-devel%{?_isa} Requires: libxml2-devel%{?_isa} -Requires: postgresql-devel%{?_isa} +Requires: libpq-devel%{?_isa} Requires: mysql-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} Requires: netcdf-mpich-devel%{?_isa} @@ -371,7 +371,7 @@ Requires: libogg-devel%{?_isa} Requires: libtheora-devel%{?_isa} Requires: libtiff-devel%{?_isa} Requires: libxml2-devel%{?_isa} -Requires: postgresql-devel%{?_isa} +Requires: libpq-devel%{?_isa} Requires: mysql-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} Requires: netcdf-openmpi-devel%{?_isa} @@ -951,6 +951,9 @@ cat xorg.log %changelog +* Thu Sep 06 2018 Pavel Raiskup - 7.1.1-13 +- rebuild against libpq (rhbz#1618698, rhbz#1623764) + * Sat Jul 14 2018 Fedora Release Engineering - 7.1.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 1a2f805dad5679d7a8a50e11d40cd0b2eb5da0de Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 3 Oct 2018 13:33:11 -0600 Subject: [PATCH 002/158] Update to 8.1.1 Use Qt 5 Use Python 3 --- .gitignore | 2 + 4490.patch | 40 +++++++ sources | 4 +- vtk.spec | 336 ++++++++++++++++++++++++++++++++++++++--------------- 4 files changed, 284 insertions(+), 98 deletions(-) create mode 100644 4490.patch diff --git a/.gitignore b/.gitignore index 14146ed..8eded30 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ vtk-5.6.0.tar.gz /VTKData-7.1.0.tar.gz /VTK-7.1.1.tar.gz /VTKData-7.1.1.tar.gz +/VTK-8.1.1.tar.gz +/VTKData-8.1.1.tar.gz diff --git a/4490.patch b/4490.patch new file mode 100644 index 0000000..3f6d845 --- /dev/null +++ b/4490.patch @@ -0,0 +1,40 @@ +From 706f1b397df09a27ab8981ab9464547028d0c322 Mon Sep 17 00:00:00 2001 +From: David Gobbi +Date: Wed, 11 Jul 2018 17:14:50 -0600 +Subject: [PATCH] Fix compilation issue due to Python3.7 API change + +The PyUnicode_AsUTF8() method returns a "const char *" in Py37. +--- + Wrapping/PythonCore/vtkPythonArgs.cxx | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Wrapping/PythonCore/vtkPythonArgs.cxx b/Wrapping/PythonCore/vtkPythonArgs.cxx +index 1a82af0802..b733458975 100644 +--- a/Wrapping/PythonCore/vtkPythonArgs.cxx ++++ b/Wrapping/PythonCore/vtkPythonArgs.cxx +@@ -95,13 +95,21 @@ bool vtkPythonGetStringValue(PyObject *o, T *&a, const char *exctext) + { + if (PyBytes_Check(o)) + { ++#if PY_VERSION_HEX >= 0x03070000 ++ a = const_cast(PyBytes_AS_STRING(o)); ++ return true; ++#else + a = PyBytes_AS_STRING(o); + return true; ++#endif + } + #ifdef Py_USING_UNICODE + else if (PyUnicode_Check(o)) + { +-#if PY_VERSION_HEX >= 0x03030000 ++#if PY_VERSION_HEX >= 0x03070000 ++ a = const_cast(PyUnicode_AsUTF8(o)); ++ return true; ++#elif PY_VERSION_HEX >= 0x03030000 + a = PyUnicode_AsUTF8(o); + return true; + #else +-- +2.18.1 + diff --git a/sources b/sources index e6782b7..0dbdc48 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-7.1.1.tar.gz) = 34a068801fe45f98325e5334d2569fc9b15ed38620386f1b5b860c9735e5fb8510953b50a3340d3ef9795e22fecf798c25bf750215b2ff1ff1eb7a1ecd87b623 -SHA512 (VTKData-7.1.1.tar.gz) = 9fb2d10ee87d4aaa57aa31941ba2753d844658fb39fe84808500690ca4f74b87fdd68a31f4680789b7e57bb1edd3de9163ca533e54a7121348de7eac6165b988 +SHA512 (VTK-8.1.1.tar.gz) = 7ab38042f6d94d1580125b3a68a6d17cdc3de925d0e886ebfc8c414adfba1438f5783d896a4cd1bb7e15462450107ab5773a3a749195b357f062e91d5c410060 +SHA512 (VTKData-8.1.1.tar.gz) = 6c20cfb9dda9d64c27946693f22357f38699d2ff014c2f33e3b05573935eaf3b7a4e30a8cf5747772a6dafe39c20e90b78a0267620ff6b6d5b487edf8ef4f975 diff --git a/vtk.spec b/vtk.spec index 6b15316..d46c2f4 100644 --- a/vtk.spec +++ b/vtk.spec @@ -2,8 +2,7 @@ %bcond_without OSMesa %bcond_without java %bcond_without mpich -# Need to coordinate with other qt users first -%bcond_with qt5 +%bcond_without qt5 %bcond_without openmpi # VTK currently is carrying local modifications to gl2ps %bcond_with gl2ps @@ -16,17 +15,17 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 7.1.1 -Release: 13%{?dist} +Version: 8.1.1 +Release: 1%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant License: BSD -Source0: http://www.vtk.org/files/release/7.1/VTK-%{version}.tar.gz -Source1: http://www.vtk.org/files/release/7.1/VTKData-%{version}.tar.gz +Source0: http://www.vtk.org/files/release/8.1/VTK-%{version}.tar.gz +Source1: http://www.vtk.org/files/release/8.1/VTKData-%{version}.tar.gz Source2: xorg.conf -# Also set -Wno-format-security when setting -Wno-format -Patch0: vtk-format.patch +# Python 3.7 compat +Patch0: https://gitlab.kitware.com/vtk/vtk/merge_requests/4490.patch # Fix tcl library loading # http://www.vtk.org/Bug/view.php?id=15279 Patch5: vtk-tcllib.patch @@ -40,7 +39,11 @@ BuildRequires: libX11-devel, libXt-devel, libXext-devel BuildRequires: libICE-devel, libGL-devel %{?with_OSMesa:BuildRequires: mesa-libOSMesa-devel} BuildRequires: tk-devel, tcl-devel +%if 0%{?fedora} >= 30 +BuildRequires: python%{python3_pkgversion}-devel +%else BuildRequires: python2-devel +%endif BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel %if 0%{with gl2ps} BuildRequires: gl2ps-devel @@ -52,7 +55,11 @@ BuildRequires: cmake(Qt5) BuildRequires: cmake(Qt5UiPlugin) BuildRequires: cmake(Qt5X11Extras) BuildRequires: qt5-qtwebkit-devel +%if 0%{?fedora} >= 30 +BuildRequires: python%{python3_pkgversion}-qt5 +%else BuildRequires: python-qt5 +%endif %else BuildRequires: PyQt4-devel BuildRequires: qt4-devel @@ -79,14 +86,25 @@ BuildRequires: wget BuildRequires: %{_includedir}/Xm BuildRequires: blas-devel BuildRequires: lapack-devel +# Requires patched libharu https://github.com/libharu/libharu/pull/157 +#BuildRequires: libharu-devel +BuildRequires: lz4-devel %if %{with mpich} BuildRequires: mpich-devel -BuildRequires: mpi4py-mpich +%if 0%{?fedora} >= 30 +BuildRequires: python%{?python3_pkgversion}-mpi4py-mpich +%else +BuildRequires: python2-mpi4py-mpich +%endif BuildRequires: netcdf-mpich-devel %endif %if %{with openmpi} BuildRequires: openmpi-devel -BuildRequires: mpi4py-openmpi +%if 0%{?fedora} >= 30 +BuildRequires: python%{?python3_pkgversion}-mpi4py-openmpi +%else +BuildRequires: python2-mpi4py-openmpi +%endif BuildRequires: netcdf-openmpi-devel %endif # For %check @@ -120,6 +138,7 @@ Provides: bundled(ftgl) = 1.32 Provides: bundled(gl2ps) = 1.4.0 %endif Provides: bundled(glew) +Provides: bundled(libharu) Provides: bundled(metaio) Provides: bundled(sqlite) = 3.6.22 Provides: bundled(utf8cpp) @@ -128,9 +147,6 @@ Provides: bundled(vpic) Provides: bundled(xdmf2) = 2.1 Provides: bundled(xdmf3) -# Do not check .so files in the python2_sitearch directory -%global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ - %description VTK is an open-source software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many @@ -149,8 +165,13 @@ Install the %{name}-openmpi package to get a version compiled with openmpi. %package devel Summary: VTK header files for building C++ code Requires: vtk%{?_isa} = %{version}-%{release} -Requires: vtk-python%{?_isa} = %{version}-%{release} -Requires: vtk-qt-python%{?_isa} = %{version}-%{release} +%if 0%{?fedora} >= 30 +Requires: python%{python3_pkgversion}-vtk%{?_isa} = %{version}-%{release} +Requires: python%{python3_pkgversion}-vtk-qt%{?_isa} = %{version}-%{release} +%else +Requires: python2-vtk%{?_isa} = %{version}-%{release} +Requires: python2-vtk-qt%{?_isa} = %{version}-%{release} +%endif Requires: vtk-qt-tcl%{?_isa} = %{version}-%{release} Requires: vtk-tcl%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} @@ -164,19 +185,33 @@ Requires: freetype-devel%{?_isa} Requires: hdf5-devel%{?_isa} Requires: lapack-devel%{?_isa} Requires: libjpeg-devel%{?_isa} +Requires: lz4-devel%{?_isa} Requires: libpng-devel%{?_isa} Requires: libogg-devel%{?_isa} +Requires: libSM-devel%{?_isa} Requires: libtheora-devel%{?_isa} Requires: libtiff-devel%{?_isa} Requires: libxml2-devel%{?_isa} Requires: libpq-devel%{?_isa} +Requires: libXt-devel%{?_isa} Requires: mysql-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} +%if %{with qt5} +Requires: cmake(Qt5) +Requires: cmake(Qt5UiPlugin) +Requires: cmake(Qt5X11Extras) +Requires: qt5-qtwebkit-devel%{?_isa} +%else Requires: qt4-devel%{?_isa} Requires: qtwebkit-devel%{?_isa} +%endif Requires: jsoncpp-devel%{?_isa} # bz #1183210 + #1183530 +%if 0%{?fedora} >= 30 +Requires: python%{python3_pkgversion}-devel +%else Requires: python2-devel +%endif %description devel This provides the VTK header files required to compile C++ programs that @@ -189,17 +224,23 @@ Requires: vtk%{?_isa} = %{version}-%{release} %description tcl tcl bindings for VTK. +%if 0%{?fedora} >= 30 +%package -n python%{python3_pkgversion}-vtk +Summary: Python 3 bindings for VTK +Requires: vtk%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-vtk} + +%description -n python%{python3_pkgversion}-vtk +Python 3 bindings for VTK. +%else %package -n python2-vtk -Summary: Python bindings for VTK +Summary: Python 2 bindings for VTK Requires: vtk%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python2-vtk} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} %description -n python2-vtk -python bindings for VTK. +Python 2 bindings for VTK. +%endif %if %{with java} %package java @@ -217,17 +258,23 @@ Requires: vtk%{?_isa} = %{version}-%{release} %description qt Qt bindings for VTK. +%if 0%{?fedora} >= 30 +%package -n python%{python3_pkgversion}-vtk-qt +Summary: Qt Python 3 bindings for VTK +Requires: vtk%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-vtk-qt} + +%description -n python%{python3_pkgversion}-vtk-qt +Qt Python 3 bindings for VTK. +%else %package -n python2-vtk-qt -Summary: Qt Python bindings for VTK +Summary: Qt Python 2 bindings for VTK Requires: vtk%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python2-vtk-qt} -# Remove before F30 -Provides: %{name}-qt-python = %{version}-%{release} -Provides: %{name}-qt-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-qt-python < %{version}-%{release} %description -n python2-vtk-qt -Qt Python bindings for VTK. +Qt Python 2 bindings for VTK. +%endif %package qt-tcl Summary: Qt TCL bindings for VTK @@ -252,8 +299,8 @@ NOTE: The version in this package has been compiled with mpich support. %package mpich-devel Summary: VTK header files for building C++ code with mpich Requires: vtk-mpich%{?_isa} = %{version}-%{release} -#Requires: vtk-python%{?_isa} = %{version}-%{release} -#Requires: vtk-qt-python%{?_isa} = %{version}-%{release} +#Requires: python2-vtk%{?_isa} = %{version}-%{release} +#Requires: python2-vtk-qt%{?_isa} = %{version}-%{release} #Requires: vtk-qt-tcl%{?_isa} = %{version}-%{release} #Requires: vtk-tcl%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} @@ -277,11 +324,22 @@ Requires: libpq-devel%{?_isa} Requires: mysql-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} Requires: netcdf-mpich-devel%{?_isa} +%if %{with qt5} +Requires: cmake(Qt5) +Requires: cmake(Qt5UiPlugin) +Requires: cmake(Qt5X11Extras) +Requires: qt5-qtwebkit-devel%{?_isa} +%else Requires: qt4-devel%{?_isa} Requires: qtwebkit-devel%{?_isa} +%endif Requires: jsoncpp-devel%{?_isa} # bz #1183210 + #1183530 +%if 0%{?fedora} >= 30 +Requires: python%{python3_pkgversion}-devel +%else Requires: python2-devel +%endif %description mpich-devel This provides the VTK header files required to compile C++ programs that @@ -296,12 +354,21 @@ Requires: vtk-mpich%{?_isa} = %{version}-%{release} %description mpich-tcl tcl bindings for VTK with mpich. -%package mpich-python -Summary: Python bindings for VTK with mpich +%if 0%{?fedora} >= 30 +%package -n python%{python3_pkgversion}-vtk-mpich +Summary: Python 3 bindings for VTK with mpich Requires: vtk-mpich%{?_isa} = %{version}-%{release} -%description mpich-python -python bindings for VTK with mpich. +%description -n python%{python3_pkgversion}-vtk-mpich +python 3 bindings for VTK with mpich. +%else +%package -n python2-vtk-mpich +Summary: Python 2 bindings for VTK with mpich +Requires: vtk-mpich%{?_isa} = %{version}-%{release} + +%description -n python2-vtk-mpich +python 2 bindings for VTK with mpich. +%endif %if %{with java} %package mpich-java @@ -319,12 +386,21 @@ Requires: vtk-mpich%{?_isa} = %{version}-%{release} %description mpich-qt Qt bindings for VTK with mpich. -%package mpich-qt-python -Summary: Qt Python bindings for VTK with mpich +%if 0%{?fedora} >= 30 +%package -n python%{python3_pkgversion}-vtk-mpich-qt +Summary: Qt Python 3 bindings for VTK with mpich Requires: vtk-mpich%{?_isa} = %{version}-%{release} -%description mpich-qt-python -Qt Python bindings for VTK with mpich. +%description -n python%{python3_pkgversion}-vtk-mpich-qt +Qt Python 3 bindings for VTK with mpich. +%else +%package -n python2-vtk-mpich-qt +Summary: Qt Python 2 bindings for VTK with mpich +Requires: vtk-mpich%{?_isa} = %{version}-%{release} + +%description -n python2-vtk-mpich-qt +Qt Python 2 bindings for VTK with mpich. +%endif %package mpich-qt-tcl Summary: Qt TCL bindings for VTK with mpich @@ -350,8 +426,8 @@ NOTE: The version in this package has been compiled with openmpi support. %package openmpi-devel Summary: VTK header files for building C++ code with openmpi Requires: vtk-openmpi%{?_isa} = %{version}-%{release} -#Requires: vtk-python%{?_isa} = %{version}-%{release} -#Requires: vtk-qt-python%{?_isa} = %{version}-%{release} +#Requires: python2-vtk%{?_isa} = %{version}-%{release} +#Requires: python2-vtk-qt%{?_isa} = %{version}-%{release} #Requires: vtk-qt-tcl%{?_isa} = %{version}-%{release} #Requires: vtk-tcl%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} @@ -375,11 +451,22 @@ Requires: libpq-devel%{?_isa} Requires: mysql-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} Requires: netcdf-openmpi-devel%{?_isa} +%if %{with qt5} +Requires: cmake(Qt5) +Requires: cmake(Qt5UiPlugin) +Requires: cmake(Qt5X11Extras) +Requires: qt5-qtwebkit-devel%{?_isa} +%else Requires: qt4-devel%{?_isa} Requires: qtwebkit-devel%{?_isa} +%endif Requires: jsoncpp-devel%{?_isa} # bz #1183210 + #1183530 +%if 0%{?fedora} >= 30 +Requires: python%{python3_pkgversion}-devel +%else Requires: python2-devel +%endif %description openmpi-devel This provides the VTK header files required to compile C++ programs that @@ -394,12 +481,21 @@ Requires: vtk-openmpi%{?_isa} = %{version}-%{release} %description openmpi-tcl tcl bindings for VTK with openmpi. -%package openmpi-python -Summary: Python bindings for VTK with openmpi +%if 0%{?fedora} >= 30 +%package -n python%{python3_pkgversion}-vtk-openmpi +Summary: Python 3 bindings for VTK with openmpi Requires: vtk-openmpi%{?_isa} = %{version}-%{release} -%description openmpi-python -python bindings for VTK with openmpi. +%description -n python%{python3_pkgversion}-vtk-openmpi +Python 3 bindings for VTK with openmpi. +%else +%package -n python2-vtk-openmpi +Summary: Python 2 bindings for VTK with openmpi +Requires: vtk-openmpi%{?_isa} = %{version}-%{release} + +%description -n python2-vtk-openmpi +Python 2 bindings for VTK with openmpi. +%endif %if %{with java} %package openmpi-java @@ -417,12 +513,21 @@ Requires: vtk-openmpi%{?_isa} = %{version}-%{release} %description openmpi-qt Qt bindings for VTK with openmpi. -%package openmpi-qt-python -Summary: Qt Python bindings for VTK with openmpi +%if 0%{?fedora} >= 30 +%package -n python%{python3_pkgversion}-vtk-openmpi-qt +Summary: Qt Python 3 bindings for VTK with openmpi Requires: vtk-openmpi%{?_isa} = %{version}-%{release} -%description openmpi-qt-python -Qt Python bindings for VTK with openmpi. +%description -n python%{python3_pkgversion}-vtk-openmpi-qt +Qt Python 3 bindings for VTK with openmpi. +%else +%package -n python2-vtk-openmpi-qt +Summary: Qt Python 2 bindings for VTK with openmpi +Requires: vtk-openmpi%{?_isa} = %{version}-%{release} + +%description -n python2-vtk-openmpi-qt +Qt Python 2 bindings for VTK with openmpi. +%endif %package openmpi-qt-tcl Summary: Qt TCL bindings for VTK with openmpi @@ -459,7 +564,7 @@ programming languages. %prep %setup -q -b 1 -n VTK-%{version} -%patch0 -p1 -b .format +%patch0 -p1 -b .py37 %patch5 -p1 -b .tcllib # Remove included thirdparty sources just to be sure # TODO - alglib - http://www.vtk.org/Bug/view.php?id=15729 @@ -470,7 +575,7 @@ programming languages. # TODO - VPIC - not yet packaged # TODO - vtkxdmf2 - not yet packaged # TODO - vtkxdmf3 - not yet packaged -for x in autobahn %{?_with_gl2ps:vtkgl2ps} vtkexpat vtkfreetype vtkhdf5 vtkjpeg vtkjsoncpp vtklibxml2 vtkmpi4py vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope +for x in vtk{Autobahn%{?_with_gl2ps:,gl2ps},expat,freetype,hdf5,jpeg,jsoncpp,libxml2,lz4,mpi4py,netcdf,oggtheora,png,tiff,Twisted,zlib,ZopeInterface} do rm -r ThirdParty/*/${x} done @@ -503,7 +608,13 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \\\ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \\\ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \\\ +%if 0%{?fedora} >= 30 \ + -DVTK_PYTHON_VERSION=3 \\\ + -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{python3_version}/site-packages \\\ +%else \ + -DVTK_PYTHON_VERSION=2 \\\ -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{python2_version}/site-packages \\\ +%endif \ %if %{with qt5} \ -DVTK_INSTALL_QT_DIR:PATH=%{_lib}/qt5/plugins/designer \\\ %else \ @@ -524,7 +635,11 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %endif \ -DVTK_WRAP_PYTHON:BOOL=ON \\\ -DVTK_WRAP_PYTHON_SIP:BOOL=ON \\\ +%if 0%{?fedora} >= 30 \ + -DSIP_INCLUDE_DIR:PATH=/usr/include/python%{python3_version} \\\ +%else \ -DSIP_INCLUDE_DIR:PATH=/usr/include/python%{python2_version} \\\ +%endif \ -DVTK_WRAP_TCL:BOOL=ON \\\ -DVTK_Group_Imaging:BOOL=ON \\\ -DVTK_Group_Qt:BOOL=ON \\\ @@ -532,7 +647,6 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DVTK_Group_StandAlone:BOOL=ON \\\ -DVTK_Group_Tk:BOOL=ON \\\ -DVTK_Group_Views:BOOL=ON \\\ - -DModule_vtkFiltersStatisticsGnuR:BOOL=ON \\\ -DModule_vtkIOExportOpenGL2:BOOL=ON \\\ -DModule_vtkIOMySQL:BOOL=ON \\\ -DModule_vtkIOPostgreSQL:BOOL=ON \\\ @@ -544,9 +658,9 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %endif \ -DVTK_USE_OGGTHEORA_ENCODER=ON \\\ -DVTK_USE_SYSTEM_LIBRARIES=ON \\\ - -DVTK_USE_SYSTEM_DIY2:BOOL=OFF \\\ %{?vtk_use_system_gl2ps} \\\ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \\\ + -DVTK_USE_SYSTEM_LIBHARU=OFF \\\ -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \\\ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON # Commented old flags in case we'd like to reactive some of them @@ -559,7 +673,8 @@ pushd build -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_TESTING:BOOL=ON -make %{?_smp_mflags} +%make_build +%make_build DoxygenDoc vtkMyDoxygenDoc popd %if %{with mpich} @@ -575,7 +690,11 @@ export CXX=mpic++ -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib \ -DVTK_INSTALL_LIBRARY_DIR:PATH=lib \ -DVTK_INSTALL_PACKAGE_DIR:PATH=lib/cmake \ +%if 0%{?fedora} >= 30 + -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=lib/python%{python3_version}/site-packages \ +%else -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=lib/python%{python2_version}/site-packages \ +%endif %if %{with qt5} -DVTK_INSTALL_QT_DIR:PATH=lib/qt5/plugins/designer \ %else @@ -584,8 +703,9 @@ export CXX=mpic++ -DVTK_Group_MPI:BOOL=ON \ -DModule_vtkRenderingParallel:BOOL=ON \ -DVTK_USE_PARALLEL:BOOL=ON \ + -DVTK_USE_SYSTEM_DIY2:BOOL=OFF \ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON -make %{?_smp_mflags} +%make_build %_mpich_unload popd %endif @@ -603,7 +723,11 @@ export CXX=mpic++ -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib \ -DVTK_INSTALL_LIBRARY_DIR:PATH=lib \ -DVTK_INSTALL_PACKAGE_DIR:PATH=lib/cmake \ +%if 0%{?fedora} >= 30 + -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=lib/python%{python3_version}/site-packages \ +%else -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=lib/python%{python2_version}/site-packages \ +%endif %if %{with qt5} -DVTK_INSTALL_QT_DIR:PATH=lib/qt5/plugins/designer \ %else @@ -612,8 +736,9 @@ export CXX=mpic++ -DVTK_Group_MPI:BOOL=ON \ -DModule_vtkRenderingParallel:BOOL=ON \ -DVTK_USE_PARALLEL:BOOL=ON \ + -DVTK_USE_SYSTEM_DIY2:BOOL=OFF \ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON -make %{?_smp_mflags} +%make_build %_openmpi_unload popd %endif @@ -629,7 +754,7 @@ pushd build # Gather list of non-python/tcl libraries ls %{buildroot}%{_libdir}/vtk/*.so.* \ - | grep -Ev '(Java|Qt|Python27D|TCL)' | sed -e's,^%{buildroot},,' > libs.list + | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list # List of executable examples cat > examples.list << EOF @@ -689,7 +814,7 @@ pushd build-mpich # Gather list of non-python/tcl libraries ls %{buildroot}%{_libdir}/mpich/lib/*.so.* \ - | grep -Ev '(Java|Qt|Python27D|TCL)' | sed -e's,^%{buildroot},,' > libs.list + | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list popd %_mpich_unload %endif @@ -701,7 +826,7 @@ pushd build-openmpi # Gather list of non-python/tcl libraries ls %{buildroot}%{_libdir}/openmpi/lib/*.so.* \ - | grep -Ev '(Java|Qt|Python27D|TCL)' | sed -e's,^%{buildroot},,' > libs.list + | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list %_openmpi_unload popd %endif @@ -744,36 +869,16 @@ ctest %{_smp_mflags} -V || : kill %1 || : cat xorg.log -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%post tcl -p /sbin/ldconfig - -%postun tcl -p /sbin/ldconfig - -%post -n python2-vtk -p /sbin/ldconfig - -%postun -n python2-vtk -p /sbin/ldconfig - -%if %{with java} -%post java -p /sbin/ldconfig - -%postun java -p /sbin/ldconfig +%if 0%{?fedora} < 28 +%ldconfig_scriptlets +%ldconfig_scriptlets java +%ldconfig_scriptlets python2-vtk +%ldconfig_scriptlets python2-vtk-qt +%ldconfig_scriptlets qt +%ldconfig_scriptlets qt-tcl +%ldconfig_scriptlets tcl %endif -%post qt -p /sbin/ldconfig - -%postun qt -p /sbin/ldconfig - -%post -n python2-vtk-qt -p /sbin/ldconfig - -%postun -n python2-vtk-qt -p /sbin/ldconfig - -%post qt-tcl -p /sbin/ldconfig - -%postun qt-tcl -p /sbin/ldconfig - %files -f build/libs.list %license Copyright.txt %doc README.md vtkLogo.jpg vtkBanner.gif _docs/Wrapping @@ -789,7 +894,7 @@ cat xorg.log %{_libdir}/vtk/*.so %{_libdir}/vtk/libvtkWrappingTools.a %{_libdir}/cmake/vtk/ -%{_docdir}/vtk-7.1/ +%{_docdir}/vtk-8.1/ %{tcl_sitelib}/vtk/vtktcl.c %files tcl @@ -801,10 +906,17 @@ cat xorg.log %{tcl_sitelib}/vtk/ %exclude %{tcl_sitelib}/vtk/vtktcl.c +%if 0%{?fedora} >= 30 +%files -n python%{python3_pkgversion}-vtk +%{python3_sitearch}/* +%{_libdir}/vtk/*Python3?D.so.* +%exclude %{_libdir}/vtk/*QtPython3?D.so.* +%else %files -n python2-vtk %{python2_sitearch}/* %{_libdir}/vtk/*Python27D.so.* %exclude %{_libdir}/vtk/*QtPython27D.so.* +%endif %{_bindir}/vtkpython %{_bindir}/vtkWrapPython %{_bindir}/vtkWrapPythonInit @@ -820,11 +932,16 @@ cat xorg.log %files qt %{_libdir}/vtk/lib*Qt*.so.* %exclude %{_libdir}/vtk/*TCL.so.* -%exclude %{_libdir}/vtk/*Python27D.so.* +%exclude %{_libdir}/vtk/*Python??D.so.* %{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so +%if 0%{?fedora} >= 30 +%files -n python%{python3_pkgversion}-vtk-qt +%{_libdir}/vtk/*QtPython3?D.so.* +%else %files -n python2-vtk-qt %{_libdir}/vtk/*QtPython27D.so.* +%endif %files qt-tcl %{_libdir}/vtk/*QtTCL.so.* @@ -842,7 +959,7 @@ cat xorg.log %{_libdir}/mpich/lib/*.so %{_libdir}/mpich/lib/libvtkWrappingTools.a %{_libdir}/mpich/lib/cmake/ -%{_libdir}/mpich/share/doc/vtk-7.1/ +%{_libdir}/mpich/share/doc/vtk-8.1/ %{_libdir}/mpich/share/tcl%{tcl_version}/vtk/vtktcl.c %files mpich-tcl @@ -855,10 +972,16 @@ cat xorg.log %{_libdir}/mpich/share/tcl%{tcl_version}/ %exclude %{_libdir}/mpich/share/tcl%{tcl_version}/vtk/vtktcl.c -%files mpich-python +%if 0%{?fedora} >= 30 +%files -n python%{python3_pkgversion}-vtk-mpich +%{_libdir}/mpich/lib/python%{python3_version}/ +%{_libdir}/mpich/lib/*Python3?D.so.* +%else +%files -n python2-vtk-mpich %{_libdir}/mpich/lib/python%{python2_version}/ %{_libdir}/mpich/lib/*Python27D.so.* -%exclude %{_libdir}/mpich/lib/*QtPython27D.so.* +%endif +%exclude %{_libdir}/mpich/lib/*QtPython??D.so.* %{_libdir}/mpich/bin/pvtkpython %{_libdir}/mpich/bin/vtkpython %{_libdir}/mpich/bin/vtkWrapPython @@ -875,11 +998,16 @@ cat xorg.log %files mpich-qt %{_libdir}/mpich/lib/lib*Qt*.so.* %exclude %{_libdir}/mpich/lib/*TCL.so.* -%exclude %{_libdir}/mpich/lib/*Python27D.so.* +%exclude %{_libdir}/mpich/lib/*Python??D.so.* %{_libdir}/mpich/lib/qt?/ -%files mpich-qt-python +%if 0%{fedora} >= 30 +%files -n python%{python3_pkgversion}-vtk-mpich-qt +%{_libdir}/mpich/lib/*QtPython3?D.so.* +%else +%files -n python2-vtk-mpich-qt %{_libdir}/mpich/lib/*QtPython27D.so.* +%endif %files mpich-qt-tcl %{_libdir}/mpich/lib/*QtTCL.so.* @@ -898,7 +1026,7 @@ cat xorg.log %{_libdir}/openmpi/lib/*.so %{_libdir}/openmpi/lib/libvtkWrappingTools.a %{_libdir}/openmpi/lib/cmake/ -%{_libdir}/openmpi/share/doc/vtk-7.1/ +%{_libdir}/openmpi/share/doc/vtk-8.1/ %{_libdir}/openmpi/share/tcl%{tcl_version}/vtk/vtktcl.c %files openmpi-tcl @@ -911,10 +1039,16 @@ cat xorg.log %{_libdir}/openmpi/share/tcl%{tcl_version}/ %exclude %{_libdir}/openmpi/share/tcl%{tcl_version}/vtk/vtktcl.c -%files openmpi-python +%if 0%{fedora} >= 30 +%files -n python%{python3_pkgversion}-vtk-openmpi +%{_libdir}/openmpi/lib/python%{python3_version}/ +%{_libdir}/openmpi/lib/*Python3?D.so.* +%else +%files -n python2-vtk-openmpi %{_libdir}/openmpi/lib/python%{python2_version}/ %{_libdir}/openmpi/lib/*Python27D.so.* -%exclude %{_libdir}/openmpi/lib/*QtPython27D.so.* +%endif +%exclude %{_libdir}/openmpi/lib/*QtPython??D.so.* %{_libdir}/openmpi/bin/pvtkpython %{_libdir}/openmpi/bin/vtkpython %{_libdir}/openmpi/bin/vtkWrapPython @@ -934,8 +1068,13 @@ cat xorg.log %exclude %{_libdir}/openmpi/lib/*Python27D.so.* %{_libdir}/openmpi/lib/qt?/ -%files openmpi-qt-python +%if 0%{fedora} >= 30 +%files -n python%{python3_pkgversion}-vtk-openmpi-qt +%{_libdir}/openmpi/lib/*QtPython3?D.so.* +%else +%files -n python2-vtk-openmpi-qt %{_libdir}/openmpi/lib/*QtPython27D.so.* +%endif %files openmpi-qt-tcl %{_libdir}/openmpi/lib/*QtTCL.so.* @@ -951,6 +1090,11 @@ cat xorg.log %changelog +* Fri Oct 26 2018 Orion Poplawski - 8.1.1-1 +- Update to 8.1.1 (bug #1460059) +- Use Qt 5 (bug #1319504) +- Use Python 3 for Fedora 30+ (bug #1549034) + * Thu Sep 06 2018 Pavel Raiskup - 7.1.1-13 - rebuild against libpq (rhbz#1618698, rhbz#1623764) From c3d0dd10ecabe886adb7df970292e2816e31003c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Nov 2018 12:53:57 +0100 Subject: [PATCH 003/158] https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 --- vtk.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vtk.spec b/vtk.spec index d46c2f4..99b6370 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,3 +1,7 @@ +# This package depends on automagic byte compilation +# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 +%global _python_bytecompile_extra 1 + # Disable OSMesa builds for now - see Bug 744434 %bcond_without OSMesa %bcond_without java From ff465380c5072fd308506d49cffc2d6cf13cf938 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:28:48 +0000 Subject: [PATCH 004/158] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 99b6370..5a0b473 100644 --- a/vtk.spec +++ b/vtk.spec @@ -20,7 +20,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.1.1 -Release: 1%{?dist} +Release: 2%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -1094,6 +1094,9 @@ cat xorg.log %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 8.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Oct 26 2018 Orion Poplawski - 8.1.1-1 - Update to 8.1.1 (bug #1460059) - Use Qt 5 (bug #1319504) From da7173c6de1b7cb945ea18747e0e9c0e8c05e7b2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 15 Feb 2019 08:06:48 -0700 Subject: [PATCH 005/158] Rebuild for openmpi 3.1.3 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 5a0b473..87f048f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -20,7 +20,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.1.1 -Release: 2%{?dist} +Release: 3%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -1094,6 +1094,9 @@ cat xorg.log %changelog +* Fri Feb 15 2019 Orion Poplawski - 8.1.1-3 +- Rebuild for openmpi 3.1.3 + * Sun Feb 03 2019 Fedora Release Engineering - 8.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ac996192fd1752519e50fc21486e80293a19251b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 23 Feb 2019 09:12:39 -0700 Subject: [PATCH 006/158] Update to 8.2.0 --- .gitignore | 2 + FindPEGTL.cmake | 66 ++++++++++++++++ sources | 4 +- vtk.spec | 201 +++++++++++------------------------------------- 4 files changed, 117 insertions(+), 156 deletions(-) create mode 100644 FindPEGTL.cmake diff --git a/.gitignore b/.gitignore index 8eded30..bc82043 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ vtk-5.6.0.tar.gz /VTKData-7.1.1.tar.gz /VTK-8.1.1.tar.gz /VTKData-8.1.1.tar.gz +/VTK-8.2.0.tar.gz +/VTKData-8.2.0.tar.gz diff --git a/FindPEGTL.cmake b/FindPEGTL.cmake new file mode 100644 index 0000000..28ae5c5 --- /dev/null +++ b/FindPEGTL.cmake @@ -0,0 +1,66 @@ +# - Try to find PEGTL lib +# +# This module supports requiring a minimum version, e.g. you can do +# find_package(PEGTL 3.1.2) +# to require version 3.1.2 or newer of PEGTL. +# +# Once done this will define +# +# PEGTL_FOUND - system has eigen lib with correct version +# PEGTL_INCLUDE_DIR - the eigen include directory +# PEGTL_VERSION - eigen version + +# Copyright (c) 2006, 2007 Montel Laurent, +# Copyright (c) 2008, 2009 Gael Guennebaud, +# Copyright (c) 2009 Benoit Jacob +# Redistribution and use is allowed according to the terms of the 2-clause BSD license. + +if(NOT PEGTL_FIND_VERSION) + if(NOT PEGTL_FIND_VERSION_MAJOR) + set(PEGTL_FIND_VERSION_MAJOR 2) + endif() + if(NOT PEGTL_FIND_VERSION_MINOR) + set(PEGTL_FIND_VERSION_MINOR 4) + endif() + if(NOT PEGTL_FIND_VERSION_PATCH) + set(PEGTL_FIND_VERSION_PATCH 0) + endif() + + set(PEGTL_FIND_VERSION "${PEGTL_FIND_VERSION_MAJOR}.${PEGTL_FIND_VERSION_MINOR}.${PEGTL_FIND_VERSION_PATCH}") +endif() + +macro(_pegtl_check_version) + file(READ "${PEGTL_INCLUDE_DIR}/tao/pegtl/version.hpp" _pegtl_version_header) + string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") + set(PEGTL_VERSION ${CMAKE_MATCH_1}) + if(${PEGTL_VERSION} VERSION_LESS ${PEGTL_FIND_VERSION}) + set(PEGTL_VERSION_OK FALSE) + else() + set(PEGTL_VERSION_OK TRUE) + endif() + + if(NOT PEGTL_VERSION_OK) + message(STATUS "PEGTL version ${PEGTL_VERSION} found in ${PEGTL_INCLUDE_DIR}, " + "but at least version ${PEGTL_FIND_VERSION} is required") + endif() +endmacro() + +if (PEGTL_INCLUDE_DIR) + # in cache already + _pegtl_check_version() + set(PEGTL_FOUND ${PEGTL_VERSION_OK}) +else () + find_path(PEGTL_INCLUDE_DIR NAMES tao + PATHS + ${CMAKE_INSTALL_PREFIX}/include + ) + + if(PEGTL_INCLUDE_DIR) + _pegtl_check_version() + endif() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(PEGTL DEFAULT_MSG PEGTL_INCLUDE_DIR PEGTL_VERSION_OK) + + mark_as_advanced(PEGTL_INCLUDE_DIR) +endif() diff --git a/sources b/sources index 0dbdc48..2538b0d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-8.1.1.tar.gz) = 7ab38042f6d94d1580125b3a68a6d17cdc3de925d0e886ebfc8c414adfba1438f5783d896a4cd1bb7e15462450107ab5773a3a749195b357f062e91d5c410060 -SHA512 (VTKData-8.1.1.tar.gz) = 6c20cfb9dda9d64c27946693f22357f38699d2ff014c2f33e3b05573935eaf3b7a4e30a8cf5747772a6dafe39c20e90b78a0267620ff6b6d5b487edf8ef4f975 +SHA512 (VTK-8.2.0.tar.gz) = 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286 +SHA512 (VTKData-8.2.0.tar.gz) = 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b diff --git a/vtk.spec b/vtk.spec index 87f048f..3645fdb 100644 --- a/vtk.spec +++ b/vtk.spec @@ -15,24 +15,21 @@ %endif %{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} -%{!?tcl_sitelib: %global tcl_sitelib %{_datadir}/tcl%{tcl_version}} Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 8.1.1 -Release: 3%{?dist} +Version: 8.2.0 +Release: 1%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant License: BSD -Source0: http://www.vtk.org/files/release/8.1/VTK-%{version}.tar.gz -Source1: http://www.vtk.org/files/release/8.1/VTKData-%{version}.tar.gz +Source0: http://www.vtk.org/files/release/8.2/VTK-%{version}.tar.gz +Source1: http://www.vtk.org/files/release/8.2/VTKData-%{version}.tar.gz Source2: xorg.conf +Source3: FindPEGTL.cmake # Python 3.7 compat Patch0: https://gitlab.kitware.com/vtk/vtk/merge_requests/4490.patch -# Fix tcl library loading -# http://www.vtk.org/Bug/view.php?id=15279 -Patch5: vtk-tcllib.patch URL: http://vtk.org/ @@ -73,6 +70,9 @@ BuildRequires: chrpath BuildRequires: doxygen, graphviz BuildRequires: gnuplot BuildRequires: boost-devel +BuildRequires: double-conversion-devel +BuildRequires: eigen3-devel +BuildRequires: glew-devel BuildRequires: hdf5-devel BuildRequires: jsoncpp-devel BuildRequires: libtheora-devel @@ -83,6 +83,9 @@ BuildRequires: mysql-devel %endif BuildRequires: netcdf-cxx-devel BuildRequires: libpq-devel +BuildRequires: PEGTL-devel +BuildRequires: proj-devel +BuildRequires: pugixml-devel BuildRequires: R-devel BuildRequires: sip-devel BuildRequires: sqlite-devel @@ -141,7 +144,6 @@ Provides: bundled(ftgl) = 1.32 %if !%{with gl2ps} Provides: bundled(gl2ps) = 1.4.0 %endif -Provides: bundled(glew) Provides: bundled(libharu) Provides: bundled(metaio) Provides: bundled(sqlite) = 3.6.22 @@ -151,6 +153,9 @@ Provides: bundled(vpic) Provides: bundled(xdmf2) = 2.1 Provides: bundled(xdmf3) +Obsoletes: %{name}-tcl < 8.2.0-1 +Obsoletes: %{name}-qt-tcl < 8.2.0-1 + %description VTK is an open-source software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many @@ -176,8 +181,6 @@ Requires: python%{python3_pkgversion}-vtk-qt%{?_isa} = %{version}-%{release} Requires: python2-vtk%{?_isa} = %{version}-%{release} Requires: python2-vtk-qt%{?_isa} = %{version}-%{release} %endif -Requires: vtk-qt-tcl%{?_isa} = %{version}-%{release} -Requires: vtk-tcl%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake Requires: blas-devel%{?_isa} @@ -221,13 +224,6 @@ Requires: python2-devel This provides the VTK header files required to compile C++ programs that use VTK to do 3D visualization. -%package tcl -Summary: Tcl bindings for VTK -Requires: vtk%{?_isa} = %{version}-%{release} - -%description tcl -tcl bindings for VTK. - %if 0%{?fedora} >= 30 %package -n python%{python3_pkgversion}-vtk Summary: Python 3 bindings for VTK @@ -280,17 +276,13 @@ Requires: vtk%{?_isa} = %{version}-%{release} Qt Python 2 bindings for VTK. %endif -%package qt-tcl -Summary: Qt TCL bindings for VTK -Requires: vtk%{?_isa} = %{version}-%{release} - -%description qt-tcl -Qt TCL bindings for VTK. - %if %{with mpich} %package mpich Summary: The Visualization Toolkit - mpich version +Obsoletes: %{name}-mpich-tcl < 8.2.0-1 +Obsoletes: %{name}-mpich-qt-tcl < 8.2.0-1 + %description mpich VTK is an open-source software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many @@ -305,8 +297,6 @@ Summary: VTK header files for building C++ code with mpich Requires: vtk-mpich%{?_isa} = %{version}-%{release} #Requires: python2-vtk%{?_isa} = %{version}-%{release} #Requires: python2-vtk-qt%{?_isa} = %{version}-%{release} -#Requires: vtk-qt-tcl%{?_isa} = %{version}-%{release} -#Requires: vtk-tcl%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake Requires: mpich-devel @@ -351,13 +341,6 @@ use VTK to do 3D visualization. NOTE: The version in this package has been compiled with mpich support. -%package mpich-tcl -Summary: Tcl bindings for VTK with mpich -Requires: vtk-mpich%{?_isa} = %{version}-%{release} - -%description mpich-tcl -tcl bindings for VTK with mpich. - %if 0%{?fedora} >= 30 %package -n python%{python3_pkgversion}-vtk-mpich Summary: Python 3 bindings for VTK with mpich @@ -405,19 +388,15 @@ Requires: vtk-mpich%{?_isa} = %{version}-%{release} %description -n python2-vtk-mpich-qt Qt Python 2 bindings for VTK with mpich. %endif - -%package mpich-qt-tcl -Summary: Qt TCL bindings for VTK with mpich -Requires: vtk-mpich%{?_isa} = %{version}-%{release} - -%description mpich-qt-tcl -Qt TCL bindings for VTK with mpich. %endif %if %{with openmpi} %package openmpi Summary: The Visualization Toolkit - openmpi version +Obsoletes: %{name}-openmpi-tcl < 8.2.0-1 +Obsoletes: %{name}-openmpi-qt-tcl < 8.2.0-1 + %description openmpi VTK is an open-source software system for image processing, 3D graphics, volume rendering and visualization. VTK includes many @@ -432,8 +411,6 @@ Summary: VTK header files for building C++ code with openmpi Requires: vtk-openmpi%{?_isa} = %{version}-%{release} #Requires: python2-vtk%{?_isa} = %{version}-%{release} #Requires: python2-vtk-qt%{?_isa} = %{version}-%{release} -#Requires: vtk-qt-tcl%{?_isa} = %{version}-%{release} -#Requires: vtk-tcl%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake Requires: openmpi-devel @@ -478,13 +455,6 @@ use VTK to do 3D visualization. NOTE: The version in this package has been compiled with openmpi support. -%package openmpi-tcl -Summary: Tcl bindings for VTK with openmpi -Requires: vtk-openmpi%{?_isa} = %{version}-%{release} - -%description openmpi-tcl -tcl bindings for VTK with openmpi. - %if 0%{?fedora} >= 30 %package -n python%{python3_pkgversion}-vtk-openmpi Summary: Python 3 bindings for VTK with openmpi @@ -532,13 +502,6 @@ Requires: vtk-openmpi%{?_isa} = %{version}-%{release} %description -n python2-vtk-openmpi-qt Qt Python 2 bindings for VTK with openmpi. %endif - -%package openmpi-qt-tcl -Summary: Qt TCL bindings for VTK with openmpi -Requires: vtk-openmpi%{?_isa} = %{version}-%{release} - -%description openmpi-qt-tcl -Qt TCL bindings for VTK with openmpi. %endif %package data @@ -568,8 +531,7 @@ programming languages. %prep %setup -q -b 1 -n VTK-%{version} -%patch0 -p1 -b .py37 -%patch5 -p1 -b .tcllib +#patch0 -p1 -b .py37 # Remove included thirdparty sources just to be sure # TODO - alglib - http://www.vtk.org/Bug/view.php?id=15729 # TODO - vtkexodusII - not yet packaged @@ -579,11 +541,14 @@ programming languages. # TODO - VPIC - not yet packaged # TODO - vtkxdmf2 - not yet packaged # TODO - vtkxdmf3 - not yet packaged -for x in vtk{Autobahn%{?_with_gl2ps:,gl2ps},expat,freetype,hdf5,jpeg,jsoncpp,libxml2,lz4,mpi4py,netcdf,oggtheora,png,tiff,Twisted,zlib,ZopeInterface} +for x in vtk{doubleconversion,eigen,expat,freetype,%{?_with_gl2ps:gl2ps,}hdf5,jpeg,jsoncpp,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,sqlite,theora,tiff,zlib} do rm -r ThirdParty/*/${x} done +# Needed to find PEGTL +cp %SOURCE3 CMake/FindPEGTL.cmake + # Remove unused KWSys items find Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm @@ -607,17 +572,15 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %global vtk_cmake_options \\\ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \\\ - -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/vtk \\\ + -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib} \\\ -DVTK_INSTALL_DATA_DIR=share/vtk \\\ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \\\ - -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \\\ + -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \\\ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \\\ %if 0%{?fedora} >= 30 \ -DVTK_PYTHON_VERSION=3 \\\ - -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{python3_version}/site-packages \\\ %else \ -DVTK_PYTHON_VERSION=2 \\\ - -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=%{_lib}/python%{python2_version}/site-packages \\\ %endif \ %if %{with qt5} \ -DVTK_INSTALL_QT_DIR:PATH=%{_lib}/qt5/plugins/designer \\\ @@ -638,13 +601,11 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DVTK_WRAP_JAVA:BOOL=OFF \\\ %endif \ -DVTK_WRAP_PYTHON:BOOL=ON \\\ - -DVTK_WRAP_PYTHON_SIP:BOOL=ON \\\ %if 0%{?fedora} >= 30 \ -DSIP_INCLUDE_DIR:PATH=/usr/include/python%{python3_version} \\\ %else \ -DSIP_INCLUDE_DIR:PATH=/usr/include/python%{python2_version} \\\ %endif \ - -DVTK_WRAP_TCL:BOOL=ON \\\ -DVTK_Group_Imaging:BOOL=ON \\\ -DVTK_Group_Qt:BOOL=ON \\\ -DVTK_Group_Rendering:BOOL=ON \\\ @@ -694,11 +655,6 @@ export CXX=mpic++ -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib \ -DVTK_INSTALL_LIBRARY_DIR:PATH=lib \ -DVTK_INSTALL_PACKAGE_DIR:PATH=lib/cmake \ -%if 0%{?fedora} >= 30 - -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=lib/python%{python3_version}/site-packages \ -%else - -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=lib/python%{python2_version}/site-packages \ -%endif %if %{with qt5} -DVTK_INSTALL_QT_DIR:PATH=lib/qt5/plugins/designer \ %else @@ -727,11 +683,6 @@ export CXX=mpic++ -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib \ -DVTK_INSTALL_LIBRARY_DIR:PATH=lib \ -DVTK_INSTALL_PACKAGE_DIR:PATH=lib/cmake \ -%if 0%{?fedora} >= 30 - -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=lib/python%{python3_version}/site-packages \ -%else - -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=lib/python%{python2_version}/site-packages \ -%endif %if %{with qt5} -DVTK_INSTALL_QT_DIR:PATH=lib/qt5/plugins/designer \ %else @@ -757,7 +708,7 @@ pushd build %make_install # Gather list of non-python/tcl libraries -ls %{buildroot}%{_libdir}/vtk/*.so.* \ +ls %{buildroot}%{_libdir}/*.so.* \ | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list # List of executable examples @@ -835,14 +786,6 @@ ls %{buildroot}%{_libdir}/openmpi/lib/*.so.* \ popd %endif -# ld config -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo %{_libdir}/vtk > %{buildroot}%{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf - -# Make scripts executable -#chmod a+x %{buildroot}%{_libdir}/vtk/doxygen/*.pl -#chmod a+x %{buildroot}%{_libdir}/vtk/testing/*.{py,tcl} - # Remove exec bit from non-scripts and %%doc for file in `find %{buildroot} -type f -perm 0755 \ | xargs -r file | grep ASCII | awk -F: '{print $1}'`; do @@ -879,47 +822,31 @@ cat xorg.log %ldconfig_scriptlets python2-vtk %ldconfig_scriptlets python2-vtk-qt %ldconfig_scriptlets qt -%ldconfig_scriptlets qt-tcl -%ldconfig_scriptlets tcl %endif %files -f build/libs.list %license Copyright.txt -%doc README.md vtkLogo.jpg vtkBanner.gif _docs/Wrapping -%config(noreplace) %{_sysconfdir}/ld.so.conf.d/vtk-%{_arch}.conf -%{_bindir}/vtkEncodeString -%dir %{_libdir}/vtk +%doc README.md _docs/Wrapping %files devel %doc Utilities/Upgrading -%{_bindir}/vtkHashSource %{_bindir}/vtkWrapHierarchy %{_includedir}/vtk -%{_libdir}/vtk/*.so -%{_libdir}/vtk/libvtkWrappingTools.a +%{_libdir}/*.so +%{_libdir}/libvtkWrappingTools.a %{_libdir}/cmake/vtk/ -%{_docdir}/vtk-8.1/ -%{tcl_sitelib}/vtk/vtktcl.c - -%files tcl -%{_libdir}/vtk/*TCL.so.* -%exclude %{_libdir}/vtk/*QtTCL.so.* -%{_bindir}/vtk -%{_bindir}/vtkWrapTcl -%{_bindir}/vtkWrapTclInit -%{tcl_sitelib}/vtk/ -%exclude %{tcl_sitelib}/vtk/vtktcl.c +%{_docdir}/vtk-8.2/ %if 0%{?fedora} >= 30 %files -n python%{python3_pkgversion}-vtk %{python3_sitearch}/* -%{_libdir}/vtk/*Python3?D.so.* -%exclude %{_libdir}/vtk/*QtPython3?D.so.* +%{_libdir}/*Python3?D.so.* +%exclude %{_libdir}/*QtPython3?D.so.* %else %files -n python2-vtk %{python2_sitearch}/* -%{_libdir}/vtk/*Python27D.so.* -%exclude %{_libdir}/vtk/*QtPython27D.so.* +%{_libdir}/*Python27D.so.* +%exclude %{_libdir}/*QtPython27D.so.* %endif %{_bindir}/vtkpython %{_bindir}/vtkWrapPython @@ -927,54 +854,38 @@ cat xorg.log %if %{with java} %files java -%{_libdir}/vtk/*Java.so.* -%{_libdir}/vtk/vtk.jar +%{_libdir}/*Java.so.* +%{_libdir}/vtk.jar %{_bindir}/vtkParseJava %{_bindir}/vtkWrapJava %endif %files qt -%{_libdir}/vtk/lib*Qt*.so.* -%exclude %{_libdir}/vtk/*TCL.so.* -%exclude %{_libdir}/vtk/*Python??D.so.* +%{_libdir}/lib*Qt*.so.* +%exclude %{_libdir}/*TCL.so.* +%exclude %{_libdir}/*Python??D.so.* %{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so %if 0%{?fedora} >= 30 %files -n python%{python3_pkgversion}-vtk-qt -%{_libdir}/vtk/*QtPython3?D.so.* +%{_libdir}/*QtPython3?D.so.* %else %files -n python2-vtk-qt -%{_libdir}/vtk/*QtPython27D.so.* +%{_libdir}/*QtPython27D.so.* %endif -%files qt-tcl -%{_libdir}/vtk/*QtTCL.so.* - %if %{with mpich} %files mpich -f build-mpich/libs.list %license Copyright.txt -%doc README.md vtkLogo.jpg vtkBanner.gif _docs/Wrapping -%{_libdir}/mpich/bin/vtkEncodeString +%doc README.md _docs/Wrapping %files mpich-devel -%{_libdir}/mpich/bin/vtkHashSource %{_libdir}/mpich/bin/vtkWrapHierarchy %{_libdir}/mpich/include/ %{_libdir}/mpich/lib/*.so %{_libdir}/mpich/lib/libvtkWrappingTools.a %{_libdir}/mpich/lib/cmake/ -%{_libdir}/mpich/share/doc/vtk-8.1/ -%{_libdir}/mpich/share/tcl%{tcl_version}/vtk/vtktcl.c - -%files mpich-tcl -%{_libdir}/mpich/lib/*TCL.so.* -%exclude %{_libdir}/mpich/lib/*QtTCL.so.* -%{_libdir}/mpich/bin/pvtk -%{_libdir}/mpich/bin/vtk -%{_libdir}/mpich/bin/vtkWrapTcl -%{_libdir}/mpich/bin/vtkWrapTclInit -%{_libdir}/mpich/share/tcl%{tcl_version}/ -%exclude %{_libdir}/mpich/share/tcl%{tcl_version}/vtk/vtktcl.c +%{_libdir}/mpich/share/doc/vtk-8.2/ %if 0%{?fedora} >= 30 %files -n python%{python3_pkgversion}-vtk-mpich @@ -1012,36 +923,21 @@ cat xorg.log %files -n python2-vtk-mpich-qt %{_libdir}/mpich/lib/*QtPython27D.so.* %endif - -%files mpich-qt-tcl -%{_libdir}/mpich/lib/*QtTCL.so.* %endif %if %{with openmpi} %files openmpi -f build-openmpi/libs.list %license Copyright.txt -%doc README.md vtkLogo.jpg vtkBanner.gif _docs/Wrapping -%{_libdir}/openmpi/bin/vtkEncodeString +%doc README.md _docs/Wrapping %files openmpi-devel -%{_libdir}/openmpi/bin/vtkHashSource %{_libdir}/openmpi/bin/vtkWrapHierarchy %{_libdir}/openmpi/include/ %{_libdir}/openmpi/lib/*.so %{_libdir}/openmpi/lib/libvtkWrappingTools.a %{_libdir}/openmpi/lib/cmake/ -%{_libdir}/openmpi/share/doc/vtk-8.1/ -%{_libdir}/openmpi/share/tcl%{tcl_version}/vtk/vtktcl.c +%{_libdir}/openmpi/share/doc/vtk-8.2/ -%files openmpi-tcl -%{_libdir}/openmpi/lib/*TCL.so.* -%exclude %{_libdir}/openmpi/lib/*QtTCL.so.* -%{_libdir}/openmpi/bin/pvtk -%{_libdir}/openmpi/bin/vtk -%{_libdir}/openmpi/bin/vtkWrapTcl -%{_libdir}/openmpi/bin/vtkWrapTclInit -%{_libdir}/openmpi/share/tcl%{tcl_version}/ -%exclude %{_libdir}/openmpi/share/tcl%{tcl_version}/vtk/vtktcl.c %if 0%{fedora} >= 30 %files -n python%{python3_pkgversion}-vtk-openmpi @@ -1079,9 +975,6 @@ cat xorg.log %files -n python2-vtk-openmpi-qt %{_libdir}/openmpi/lib/*QtPython27D.so.* %endif - -%files openmpi-qt-tcl -%{_libdir}/openmpi/lib/*QtTCL.so.* %endif %files data From bce6413e7aa2bab5f3ac8c875b0aa1380afa6ac2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 16 Mar 2019 09:02:31 -0600 Subject: [PATCH 007/158] Update to 8.2.0 TCL wrapping has been dropped upstream Build with system glew --- vtk.spec | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/vtk.spec b/vtk.spec index 3645fdb..c87de85 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,8 +14,6 @@ %global vtk_use_system_gl2ps -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF %endif -%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} - Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 @@ -137,16 +135,15 @@ Provides: bundled(kwsys-system) Provides: bundled(kwsys-systeminformation) Provides: bundled(kwsys-systemtools) # Other bundled libraries -Provides: bundled(alglib) -Provides: bundled(exodusII) = 2.0.0 Provides: bundled(diy2) +Provides: bundled(exodusII) = 2.0.0 Provides: bundled(ftgl) = 1.32 %if !%{with gl2ps} Provides: bundled(gl2ps) = 1.4.0 %endif Provides: bundled(libharu) Provides: bundled(metaio) -Provides: bundled(sqlite) = 3.6.22 +Provides: bundled(pugixml) = 1.8 Provides: bundled(utf8cpp) Provides: bundled(verdict) = 1.2.0 Provides: bundled(vpic) @@ -184,11 +181,15 @@ Requires: python2-vtk-qt%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake Requires: blas-devel%{?_isa} +Requires: double-conversion-devel%{?_isa} +# eigen3 is noarch +Requires: eigen3-devel +Requires: expat-devel%{?_isa} +Requires: freetype-devel%{?_isa} %if %{with gl2ps} Requires: gl2ps-devel%{?_isa} %endif -Requires: expat-devel%{?_isa} -Requires: freetype-devel%{?_isa} +Requires: glew-devel%{?_isa} Requires: hdf5-devel%{?_isa} Requires: lapack-devel%{?_isa} Requires: libjpeg-devel%{?_isa} @@ -200,6 +201,10 @@ Requires: libtheora-devel%{?_isa} Requires: libtiff-devel%{?_isa} Requires: libxml2-devel%{?_isa} Requires: libpq-devel%{?_isa} +Requires: PEGTL-devel%{?_isa} +Requires: proj-devel%{?_isa} +Requires: pugixml-devel%{?_isa} +Requires: sqlite-devel%{?_isa} Requires: libXt-devel%{?_isa} Requires: mysql-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} @@ -531,17 +536,16 @@ programming languages. %prep %setup -q -b 1 -n VTK-%{version} -#patch0 -p1 -b .py37 # Remove included thirdparty sources just to be sure -# TODO - alglib - http://www.vtk.org/Bug/view.php?id=15729 -# TODO - vtkexodusII - not yet packaged -# TODO - vtksqlite - http://www.vtk.org/Bug/view.php?id=14154 +# TODO - diy2 - not yet packaged +# TODO - exodusII - not yet packaged +# TODO - pugixml - https://gitlab.kitware.com/vtk/vtk/issues/17538 # TODO - utf8cpp(source) - http://www.vtk.org/Bug/view.php?id=15730 -# TODO - vtkverdict - not yet packaged +# TODO - verdict - not yet packaged # TODO - VPIC - not yet packaged -# TODO - vtkxdmf2 - not yet packaged -# TODO - vtkxdmf3 - not yet packaged -for x in vtk{doubleconversion,eigen,expat,freetype,%{?_with_gl2ps:gl2ps,}hdf5,jpeg,jsoncpp,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,sqlite,theora,tiff,zlib} +# TODO - xdmf2 - not yet packaged +# TODO - xdmf3 - not yet packaged +for x in vtk{doubleconversion,eigen,expat,freetype,%{?_with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,kissfft,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,sqlite,theora,tiff,zfp,zlib} do rm -r ThirdParty/*/${x} done @@ -587,7 +591,6 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %else \ -DVTK_INSTALL_QT_DIR:PATH=%{_lib}/qt4/plugins/designer \\\ %endif \ - -DVTK_INSTALL_TCL_DIR:PATH=share/tcl%{tcl_version}/vtk \\\ -DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \\\ %if %{with OSMesa} \ -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\ @@ -601,11 +604,6 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DVTK_WRAP_JAVA:BOOL=OFF \\\ %endif \ -DVTK_WRAP_PYTHON:BOOL=ON \\\ -%if 0%{?fedora} >= 30 \ - -DSIP_INCLUDE_DIR:PATH=/usr/include/python%{python3_version} \\\ -%else \ - -DSIP_INCLUDE_DIR:PATH=/usr/include/python%{python2_version} \\\ -%endif \ -DVTK_Group_Imaging:BOOL=ON \\\ -DVTK_Group_Qt:BOOL=ON \\\ -DVTK_Group_Rendering:BOOL=ON \\\ @@ -626,7 +624,6 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %{?vtk_use_system_gl2ps} \\\ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \\\ -DVTK_USE_SYSTEM_LIBHARU=OFF \\\ - -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \\\ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON # Commented old flags in case we'd like to reactive some of them # -DVTK_USE_DISPLAY:BOOL=OFF \ # This prevents building of graphics tests @@ -987,6 +984,11 @@ cat xorg.log %changelog +* Sat Mar 16 2019 Orion Poplawski - 8.2.0-1 +- Update to 8.2.0 +- TCL wrapping has been dropped upstream +- Build with system glew + * Fri Feb 15 2019 Orion Poplawski - 8.1.1-3 - Rebuild for openmpi 3.1.3 From 43f44a45a6fca69108299ea92da859d8aaae125c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 16 Apr 2019 19:30:26 -0600 Subject: [PATCH 008/158] Provide standard python 3 dist name (bugz#1700307) --- vtk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index c87de85..92b07f0 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 1%{?dist} +Release: 2%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -234,6 +234,7 @@ use VTK to do 3D visualization. Summary: Python 3 bindings for VTK Requires: vtk%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python%{python3_pkgversion}-vtk} +Provides: %{py3_dist vtk} = %{version} %description -n python%{python3_pkgversion}-vtk Python 3 bindings for VTK. @@ -984,6 +985,9 @@ cat xorg.log %changelog +* Tue Apr 16 2019 Orion Poplawski - 8.2.0-2 +- Provide standard python 3 dist name (bugz#1700307) + * Sat Mar 16 2019 Orion Poplawski - 8.2.0-1 - Update to 8.2.0 - TCL wrapping has been dropped upstream From f46de28d6a4ec14115aa616ba62747622db2d490 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 18 Apr 2019 17:37:47 -0600 Subject: [PATCH 009/158] Provide starndard python 3.Y dist name (bugz#1700307) --- vtk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 92b07f0..1f218e3 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 2%{?dist} +Release: 3%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -235,6 +235,7 @@ Summary: Python 3 bindings for VTK Requires: vtk%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python%{python3_pkgversion}-vtk} Provides: %{py3_dist vtk} = %{version} +Provides: python%{python3_version}dist(vtk) = %{version} %description -n python%{python3_pkgversion}-vtk Python 3 bindings for VTK. @@ -985,6 +986,9 @@ cat xorg.log %changelog +* Thu Apr 18 2019 Orion Poplawski - 8.2.0-3 +- Provide starndard python 3.Y dist name (bugz#1700307) + * Tue Apr 16 2019 Orion Poplawski - 8.2.0-2 - Provide standard python 3 dist name (bugz#1700307) From 79c5bd8348f924010fceddf9fbaa5278b38121db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Jul 2019 13:30:35 +0200 Subject: [PATCH 010/158] Rebuild (jsoncpp) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 1f218e3..16f2e37 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 3%{?dist} +Release: 4%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -986,6 +986,9 @@ cat xorg.log %changelog +* Wed Jul 03 2019 Björn Esser - 8.2.0-4 +- Rebuild (jsoncpp) + * Thu Apr 18 2019 Orion Poplawski - 8.2.0-3 - Provide starndard python 3.Y dist name (bugz#1700307) From ef355e1f393921b233723244ccba1787ae022a98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:13:03 +0000 Subject: [PATCH 011/158] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 16f2e37..f631562 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 4%{?dist} +Release: 5%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -986,6 +986,9 @@ cat xorg.log %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 8.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jul 03 2019 Björn Esser - 8.2.0-4 - Rebuild (jsoncpp) From 9c6c2d7f869b36870962708f79156a8b082399b1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 31 Jul 2019 22:05:46 -0600 Subject: [PATCH 012/158] BR motif-devel instead of /usr/include/Xm (bugz#1731728) --- vtk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index f631562..fbd19af 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 5%{?dist} +Release: 6%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -88,12 +88,12 @@ BuildRequires: R-devel BuildRequires: sip-devel BuildRequires: sqlite-devel BuildRequires: wget -BuildRequires: %{_includedir}/Xm BuildRequires: blas-devel BuildRequires: lapack-devel # Requires patched libharu https://github.com/libharu/libharu/pull/157 #BuildRequires: libharu-devel BuildRequires: lz4-devel +BuildRequires: motif-devel %if %{with mpich} BuildRequires: mpich-devel %if 0%{?fedora} >= 30 @@ -986,6 +986,9 @@ cat xorg.log %changelog +* Wed Jul 31 2019 Orion Poplawski - 8.2.0-6 +- BR motif-devel instead of /usr/include/Xm (bugz#1731728) + * Sat Jul 27 2019 Fedora Release Engineering - 8.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From d727be173a36be4423fe8dfd1d17bbc8e91e3a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:09:24 +0200 Subject: [PATCH 013/158] Rebuilt for Python 3.8 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index fbd19af..9dce1b1 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 6%{?dist} +Release: 7%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -986,6 +986,9 @@ cat xorg.log %changelog +* Mon Aug 19 2019 Miro Hrončok - 8.2.0-7 +- Rebuilt for Python 3.8 + * Wed Jul 31 2019 Orion Poplawski - 8.2.0-6 - BR motif-devel instead of /usr/include/Xm (bugz#1731728) From 2639d96baa0eca205bcc650364910c25fef5ef3a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 20 Aug 2019 19:40:13 -0600 Subject: [PATCH 014/158] Add upstream patch to support Python 3.8 --- 4490.patch | 40 ------------ 5883.patch | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++ vtk.spec | 10 ++- 3 files changed, 183 insertions(+), 43 deletions(-) delete mode 100644 4490.patch create mode 100644 5883.patch diff --git a/4490.patch b/4490.patch deleted file mode 100644 index 3f6d845..0000000 --- a/4490.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 706f1b397df09a27ab8981ab9464547028d0c322 Mon Sep 17 00:00:00 2001 -From: David Gobbi -Date: Wed, 11 Jul 2018 17:14:50 -0600 -Subject: [PATCH] Fix compilation issue due to Python3.7 API change - -The PyUnicode_AsUTF8() method returns a "const char *" in Py37. ---- - Wrapping/PythonCore/vtkPythonArgs.cxx | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Wrapping/PythonCore/vtkPythonArgs.cxx b/Wrapping/PythonCore/vtkPythonArgs.cxx -index 1a82af0802..b733458975 100644 ---- a/Wrapping/PythonCore/vtkPythonArgs.cxx -+++ b/Wrapping/PythonCore/vtkPythonArgs.cxx -@@ -95,13 +95,21 @@ bool vtkPythonGetStringValue(PyObject *o, T *&a, const char *exctext) - { - if (PyBytes_Check(o)) - { -+#if PY_VERSION_HEX >= 0x03070000 -+ a = const_cast(PyBytes_AS_STRING(o)); -+ return true; -+#else - a = PyBytes_AS_STRING(o); - return true; -+#endif - } - #ifdef Py_USING_UNICODE - else if (PyUnicode_Check(o)) - { --#if PY_VERSION_HEX >= 0x03030000 -+#if PY_VERSION_HEX >= 0x03070000 -+ a = const_cast(PyUnicode_AsUTF8(o)); -+ return true; -+#elif PY_VERSION_HEX >= 0x03030000 - a = PyUnicode_AsUTF8(o); - return true; - #else --- -2.18.1 - diff --git a/5883.patch b/5883.patch new file mode 100644 index 0000000..f749d3c --- /dev/null +++ b/5883.patch @@ -0,0 +1,176 @@ +From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001 +From: David Gobbi +Date: Tue, 20 Aug 2019 17:02:24 -0600 +Subject: [PATCH] Compatibility for Python 3.8 + +The PyTypeObject struct was modified in Python 3.8, this change is +required to avoid compile errors. +--- + .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h | 6 ++++++ + Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 2 +- + Wrapping/PythonCore/PyVTKNamespace.cxx | 2 +- + Wrapping/PythonCore/PyVTKReference.cxx | 8 ++++---- + Wrapping/PythonCore/PyVTKTemplate.cxx | 2 +- + Wrapping/PythonCore/vtkPythonCompatibility.h | 8 +++++++- + Wrapping/Tools/vtkWrapPythonClass.c | 2 +- + Wrapping/Tools/vtkWrapPythonEnum.c | 2 +- + Wrapping/Tools/vtkWrapPythonType.c | 2 +- + 9 files changed, 23 insertions(+), 11 deletions(-) + +diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h +index b1c12c83de..14ccfbe928 100644 +--- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h ++++ b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h +@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = { + #if PY_VERSION_HEX >= 0x03040000 + 0, // tp_finalize + #endif ++#if PY_VERSION_HEX >= 0x03080000 ++ 0, // tp_vectorcall ++#if PY_VERSION_HEX < 0x03090000 ++ 0, // tp_print ++#endif ++#endif + }; + + static PyObject* vtkWrite(PyObject* self, PyObject* args) +diff --git a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx +index 2b0d443537..3840038498 100644 +--- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx ++++ b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx +@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = { + sizeof(PyMethodDescrObject), // tp_basicsize + 0, // tp_itemsize + PyVTKMethodDescriptor_Delete, // tp_dealloc +- nullptr, // tp_print ++ 0, // tp_vectorcall_offset + nullptr, // tp_getattr + nullptr, // tp_setattr + nullptr, // tp_compare +diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx +index 71ee2a3516..5cf5bfbe6b 100644 +--- a/Wrapping/PythonCore/PyVTKNamespace.cxx ++++ b/Wrapping/PythonCore/PyVTKNamespace.cxx +@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = { + 0, // tp_basicsize + 0, // tp_itemsize + PyVTKNamespace_Delete, // tp_dealloc +- nullptr, // tp_print ++ 0, // tp_vectorcall_offset + nullptr, // tp_getattr + nullptr, // tp_setattr + nullptr, // tp_compare +diff --git a/Wrapping/PythonCore/PyVTKReference.cxx b/Wrapping/PythonCore/PyVTKReference.cxx +index 943ac71080..b7104091c0 100644 +--- a/Wrapping/PythonCore/PyVTKReference.cxx ++++ b/Wrapping/PythonCore/PyVTKReference.cxx +@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = { + sizeof(PyVTKReference), // tp_basicsize + 0, // tp_itemsize + PyVTKReference_Delete, // tp_dealloc +- nullptr, // tp_print ++ 0, // tp_vectorcall_offset + nullptr, // tp_getattr + nullptr, // tp_setattr + nullptr, // tp_compare +@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = { + sizeof(PyVTKReference), // tp_basicsize + 0, // tp_itemsize + PyVTKReference_Delete, // tp_dealloc +- nullptr, // tp_print ++ 0, // tp_vectorcall_offset + nullptr, // tp_getattr + nullptr, // tp_setattr + nullptr, // tp_compare +@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = { + sizeof(PyVTKReference), // tp_basicsize + 0, // tp_itemsize + PyVTKReference_Delete, // tp_dealloc +- nullptr, // tp_print ++ 0, // tp_vectorcall_offset + nullptr, // tp_getattr + nullptr, // tp_setattr + nullptr, // tp_compare +@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = { + sizeof(PyVTKReference), // tp_basicsize + 0, // tp_itemsize + PyVTKReference_Delete, // tp_dealloc +- nullptr, // tp_print ++ 0, // tp_vectorcall_offset + nullptr, // tp_getattr + nullptr, // tp_setattr + nullptr, // tp_compare +diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx +index be200985b3..340fe7953b 100644 +--- a/Wrapping/PythonCore/PyVTKTemplate.cxx ++++ b/Wrapping/PythonCore/PyVTKTemplate.cxx +@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = { + 0, // tp_basicsize + 0, // tp_itemsize + nullptr, // tp_dealloc +- nullptr, // tp_print ++ 0, // tp_vectorcall_offset + nullptr, // tp_getattr + nullptr, // tp_setattr + nullptr, // tp_compare +diff --git a/Wrapping/PythonCore/vtkPythonCompatibility.h b/Wrapping/PythonCore/vtkPythonCompatibility.h +index 4a767844a6..be208faeef 100644 +--- a/Wrapping/PythonCore/vtkPythonCompatibility.h ++++ b/Wrapping/PythonCore/vtkPythonCompatibility.h +@@ -64,7 +64,13 @@ + #endif + + // PyTypeObject compatibility +-#if PY_VERSION_HEX >= 0x03040000 ++#if PY_VERSION_HEX >= 0x03090000 ++#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ ++ 0, 0, 0, 0, ++#elif PY_VERSION_HEX >= 0x03080000 ++#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ ++ 0, 0, 0, 0, 0, ++#elif PY_VERSION_HEX >= 0x03040000 + #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ + 0, 0, 0, + #else +diff --git a/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c +index b1e45f8e80..4d558ea081 100644 +--- a/Wrapping/Tools/vtkWrapPythonClass.c ++++ b/Wrapping/Tools/vtkWrapPythonClass.c +@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType( + " sizeof(PyVTKObject), // tp_basicsize\n" + " 0, // tp_itemsize\n" + " PyVTKObject_Delete, // tp_dealloc\n" +- " nullptr, // tp_print\n" ++ " 0, // tp_vectorcall_offset\n" + " nullptr, // tp_getattr\n" + " nullptr, // tp_setattr\n" + " nullptr, // tp_compare\n" +diff --git a/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c +index b933702242..1249362854 100644 +--- a/Wrapping/Tools/vtkWrapPythonEnum.c ++++ b/Wrapping/Tools/vtkWrapPythonEnum.c +@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType( + " sizeof(PyIntObject), // tp_basicsize\n" + " 0, // tp_itemsize\n" + " nullptr, // tp_dealloc\n" +- " nullptr, // tp_print\n" ++ " 0, // tp_vectorcall_offset\n" + " nullptr, // tp_getattr\n" + " nullptr, // tp_setattr\n" + " nullptr, // tp_compare\n" +diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c +index 744cb1b9d3..0a1375e541 100644 +--- a/Wrapping/Tools/vtkWrapPythonType.c ++++ b/Wrapping/Tools/vtkWrapPythonType.c +@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType( + " sizeof(PyVTKSpecialObject), // tp_basicsize\n" + " 0, // tp_itemsize\n" + " Py%s_Delete, // tp_dealloc\n" +- " nullptr, // tp_print\n" ++ " 0, // tp_vectorcall_offset\n" + " nullptr, // tp_getattr\n" + " nullptr, // tp_setattr\n" + " nullptr, // tp_compare\n" +-- +2.21.0 + diff --git a/vtk.spec b/vtk.spec index 9dce1b1..70d3e82 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 7%{?dist} +Release: 8%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -26,8 +26,8 @@ Source0: http://www.vtk.org/files/release/8.2/VTK-%{version}.tar.gz Source1: http://www.vtk.org/files/release/8.2/VTKData-%{version}.tar.gz Source2: xorg.conf Source3: FindPEGTL.cmake -# Python 3.7 compat -Patch0: https://gitlab.kitware.com/vtk/vtk/merge_requests/4490.patch +# Python 3.8 support +Patch0: https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch URL: http://vtk.org/ @@ -538,6 +538,7 @@ programming languages. %prep %setup -q -b 1 -n VTK-%{version} +%patch0 -p1 -b .py38 # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged @@ -986,6 +987,9 @@ cat xorg.log %changelog +* Tue Aug 20 2019 Orion Poplawski - 8.2.0-8 +- Add upstream patch to support Python 3.8 + * Mon Aug 19 2019 Miro Hrončok - 8.2.0-7 - Rebuilt for Python 3.8 From 8fe6b10a699e6ad19135ab16f785d5024ba93c7d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 8 Sep 2019 20:53:59 -0600 Subject: [PATCH 015/158] Rebuild for proj 6.2.0 Add patch and flags for proj 6 support --- vtk-proj6.patch | 12 ++++++++++++ vtk.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 vtk-proj6.patch diff --git a/vtk-proj6.patch b/vtk-proj6.patch new file mode 100644 index 0000000..95ac37f --- /dev/null +++ b/vtk-proj6.patch @@ -0,0 +1,12 @@ +diff -up VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in.proj6 VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in +--- VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in.proj6 2019-01-30 10:15:13.000000000 -0700 ++++ VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in 2019-09-08 20:17:31.848988325 -0600 +@@ -18,7 +18,7 @@ + /* Use the libproj library configured for VTK. */ + #cmakedefine VTK_USE_SYSTEM_LIBPROJ + #ifdef VTK_USE_SYSTEM_LIBPROJ +-# include ++# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H + # include + # include + #else diff --git a/vtk.spec b/vtk.spec index 70d3e82..82b025d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 8%{?dist} +Release: 9%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -28,6 +28,8 @@ Source2: xorg.conf Source3: FindPEGTL.cmake # Python 3.8 support Patch0: https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch +# Proj 6 support +Patch1: vtk-proj6.patch URL: http://vtk.org/ @@ -539,6 +541,7 @@ programming languages. %prep %setup -q -b 1 -n VTK-%{version} %patch0 -p1 -b .py38 +%patch1 -p1 -b .proj6 # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged @@ -569,6 +572,7 @@ find vtk-examples -type f | xargs chmod -R a-x %build export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" +export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H %if %{with java} export JAVA_HOME=/usr/lib/jvm/java %ifarch %{arm} s390x @@ -987,6 +991,10 @@ cat xorg.log %changelog +* Mon Sep 09 2019 Orion Poplawski - 8.2.0-9 +- Rebuild for proj 6.2.0 +- Add patch and flags for proj 6 support + * Tue Aug 20 2019 Orion Poplawski - 8.2.0-8 - Add upstream patch to support Python 3.8 From a1d022bddf9e956e4d0e9c7a7fd90d47c4e40df7 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 10 Sep 2019 21:12:09 -0500 Subject: [PATCH 016/158] Update fix for proj6 and other spec file cleanup. --- vtk-format.patch | 12 ---- vtk-proj6.patch | 12 ---- vtk-proj6_compat.patch | 143 +++++++++++++++++++++++++++++++++++++++++ vtk-tcllib.patch | 36 ----------- vtk.spec | 11 ++-- 5 files changed, 149 insertions(+), 65 deletions(-) delete mode 100644 vtk-format.patch delete mode 100644 vtk-proj6.patch create mode 100644 vtk-proj6_compat.patch delete mode 100644 vtk-tcllib.patch diff --git a/vtk-format.patch b/vtk-format.patch deleted file mode 100644 index 2af447e..0000000 --- a/vtk-format.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt.format VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt ---- VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt.format 2017-03-20 09:26:17.000000000 -0600 -+++ VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt 2017-05-07 14:10:46.231254800 -0600 -@@ -10,7 +10,7 @@ endif() - # Suppress printf/scanf format warnings; we test if the sizes match. - foreach(lang C CXX) - if(KWIML_LANGUAGE_${lang} AND CMAKE_${lang}_COMPILER_ID STREQUAL "GNU") -- set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format") -+ set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format -Wno-format-security") - endif() - endforeach() - diff --git a/vtk-proj6.patch b/vtk-proj6.patch deleted file mode 100644 index 95ac37f..0000000 --- a/vtk-proj6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in.proj6 VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in ---- VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in.proj6 2019-01-30 10:15:13.000000000 -0700 -+++ VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in 2019-09-08 20:17:31.848988325 -0600 -@@ -18,7 +18,7 @@ - /* Use the libproj library configured for VTK. */ - #cmakedefine VTK_USE_SYSTEM_LIBPROJ - #ifdef VTK_USE_SYSTEM_LIBPROJ --# include -+# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H - # include - # include - #else diff --git a/vtk-proj6_compat.patch b/vtk-proj6_compat.patch new file mode 100644 index 0000000..4380cc3 --- /dev/null +++ b/vtk-proj6_compat.patch @@ -0,0 +1,143 @@ +--- a/CMake/FindLibPROJ.cmake ++++ b/CMake/FindLibPROJ.cmake +@@ -30,7 +30,7 @@ if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibP + ) + + find_path( LibPROJ_INCLUDE_DIR +- NAMES proj_api.h ++ NAMES proj_api.h proj.h + HINTS + ${_LibPROJ_DIR} + ${_LibPROJ_DIR}/include +--- a/Geovis/Core/vtkGeoProjection.cxx ++++ b/Geovis/Core/vtkGeoProjection.cxx +@@ -72,6 +72,9 @@ public: + } + + std::map< std::string, std::string > OptionalParameters; ++#if PROJ_VERSION_MAJOR >= 5 ++ PJ_PROJ_INFO ProjInfo; ++#endif + }; + + //----------------------------------------------------------------------------- +@@ -80,7 +83,7 @@ int vtkGeoProjection::GetNumberOfProject + if ( vtkGeoProjectionNumProj < 0 ) + { + vtkGeoProjectionNumProj = 0; +- for ( const PJ_LIST* pj = pj_get_list_ref(); pj && pj->id; ++ pj ) ++ for ( const PJ_LIST* pj = proj_list_operations(); pj && pj->id; ++ pj ) + ++ vtkGeoProjectionNumProj; + } + return vtkGeoProjectionNumProj; +@@ -91,7 +94,7 @@ const char* vtkGeoProjection::GetProject + if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() ) + return nullptr; + +- return pj_get_list_ref()[projection].id; ++ return proj_list_operations()[projection].id; + } + //----------------------------------------------------------------------------- + const char* vtkGeoProjection::GetProjectionDescription( int projection ) +@@ -99,7 +102,7 @@ const char* vtkGeoProjection::GetProject + if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() ) + return nullptr; + +- return pj_get_list_ref()[projection].descr[0]; ++ return proj_list_operations()[projection].descr[0]; + } + //----------------------------------------------------------------------------- + vtkGeoProjection::vtkGeoProjection() +@@ -144,7 +147,7 @@ void vtkGeoProjection::PrintSelf( ostrea + int vtkGeoProjection::GetIndex() + { + int i = 0; +- for ( const PJ_LIST* proj = pj_get_list_ref(); proj && proj->id; ++ proj, ++ i ) ++ for ( const PJ_LIST* proj = proj_list_operations(); proj && proj->id; ++ proj, ++ i ) + { + if ( ! strcmp( proj->id, this->Name ) ) + { +@@ -161,7 +164,11 @@ const char* vtkGeoProjection::GetDescrip + { + return nullptr; + } ++#if PROJ_VERSION_MAJOR >= 5 ++ return this->Internals->ProjInfo.description; ++#else + return this->Projection->descr; ++#endif + } + //----------------------------------------------------------------------------- + projPJ vtkGeoProjection::GetProjection() +@@ -232,6 +239,9 @@ int vtkGeoProjection::UpdateProjection() + this->ProjectionMTime = this->GetMTime(); + if ( this->Projection ) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ this->Internals->ProjInfo = proj_pj_info(this->Projection); ++#endif + return 0; + } + return 1; +--- a/Geovis/Core/vtkGeoTransform.cxx ++++ b/Geovis/Core/vtkGeoTransform.cxx +@@ -167,9 +167,17 @@ void vtkGeoTransform::InternalTransformP + double* coord = x; + for ( vtkIdType i = 0; i < numPts; ++ i ) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ xy.x = coord[0]; xy.y = coord[1]; ++#else + xy.u = coord[0]; xy.v = coord[1]; ++#endif + lp = pj_inv( xy, src ); ++#if PROJ_VERSION_MAJOR >= 5 ++ coord[0] = lp.lam; coord[1] = lp.phi; ++#else + coord[0] = lp.u; coord[1] = lp.v; ++#endif + coord += stride; + } + } +@@ -191,9 +199,17 @@ void vtkGeoTransform::InternalTransformP + double* coord = x; + for ( vtkIdType i = 0; i < numPts; ++ i ) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ lp.lam = coord[0]; lp.phi = coord[1]; ++#else + lp.u = coord[0]; lp.v = coord[1]; ++#endif + xy = pj_fwd( lp, dst ); ++#if PROJ_VERSION_MAJOR >= 5 ++ coord[0] = xy.x; coord[1] = xy.y; ++#else + coord[0] = xy.u; coord[1] = xy.v; ++#endif + coord += stride; + } + } +--- a/ThirdParty/libproj/vtk_libproj.h.in ++++ b/ThirdParty/libproj/vtk_libproj.h.in +@@ -15,10 +15,20 @@ + #ifndef vtk_libproj_h + #define vtk_libproj_h + ++#define VTK_LibPROJ_MAJOR_VERSION @LibPROJ_MAJOR_VERSION@ ++ + /* Use the libproj library configured for VTK. */ + #cmakedefine VTK_USE_SYSTEM_LIBPROJ + #ifdef VTK_USE_SYSTEM_LIBPROJ +-# include ++# if VTK_LibPROJ_MAJOR_VERSION >= 5 ++# include ++# endif ++# if VTK_LibPROJ_MAJOR_VERSION < 6 ++# include ++# endif ++# if VTK_LibPROJ_MAJOR_VERSION >= 6 ++# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1 ++# endif + # include + # include + #else diff --git a/vtk-tcllib.patch b/vtk-tcllib.patch deleted file mode 100644 index 9a37e46..0000000 --- a/vtk-tcllib.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt.tcllib VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt ---- VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt.tcllib 2015-02-16 15:08:49.121229694 -0700 -+++ VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt 2015-02-16 15:09:38.793971979 -0700 -@@ -264,7 +264,7 @@ endforeach() - # Configure the Tcl package index file for the install tree. - SET(VTK_TCL_SCRIPT_DIR "[file dirname [info script]]") - IF(UNIX) -- SET(VTK_TCL_LIBRARY_DIR "[file dirname [file dirname [file dirname [info script]]]]") -+ SET(VTK_TCL_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/${VTK_INSTALL_LIBRARY_DIR}") - ELSE() - SET(VTK_TCL_LIBRARY_DIR - "[file join [file dirname [file dirname [file dirname [file dirname [info script]]]]] bin]") -diff -up VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in.tcllib VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in ---- VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in.tcllib 2015-02-16 12:03:08.000000000 -0700 -+++ VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in 2015-02-16 15:08:49.121229694 -0700 -@@ -7,7 +7,7 @@ package ifneeded vtkinit {@VTK_MAJOR_VER - if {[catch "load {} $libName"]} { - set libExt [info sharedlibextension] - set currentDirectory [pwd] -- set libFile [file join $libPath "$libPrefix$libName-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@$libExt"] -+ set libFile [file join $libPath "$libPrefix$libName$libExt"] - if {[catch "cd {$libPath}; load {$libFile}" errorMessage]} { - puts $errorMessage - } -diff -up VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in.tcllib VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in ---- VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in.tcllib 2015-02-16 12:03:08.000000000 -0700 -+++ VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in 2015-02-16 15:08:49.122229706 -0700 -@@ -44,7 +44,7 @@ namespace eval ::vtk { - } - - foreach dir $dirs { -- set libname [file join $dir ${prefix}${name}-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@${ext}] -+ set libname [file join $dir ${prefix}${name}${ext}] - if {[file exists $libname]} { - if {![catch {load $libname} errormsg]} { - # WARNING: it HAS to be "" so that pkg_mkIndex work (since diff --git a/vtk.spec b/vtk.spec index 82b025d..6303f11 100644 --- a/vtk.spec +++ b/vtk.spec @@ -29,7 +29,7 @@ Source3: FindPEGTL.cmake # Python 3.8 support Patch0: https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch # Proj 6 support -Patch1: vtk-proj6.patch +Patch1: vtk-proj6_compat.patch URL: http://vtk.org/ @@ -631,7 +631,8 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %{?vtk_use_system_gl2ps} \\\ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \\\ -DVTK_USE_SYSTEM_LIBHARU=OFF \\\ - -DVTK_USE_SYSTEM_NETCDF:BOOL=ON + -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \\\ + -DLibPROJ_MAJOR_VERSION=6 # Commented old flags in case we'd like to reactive some of them # -DVTK_USE_DISPLAY:BOOL=OFF \ # This prevents building of graphics tests @@ -866,7 +867,7 @@ cat xorg.log %files qt %{_libdir}/lib*Qt*.so.* -%exclude %{_libdir}/*TCL.so.* +#exclude %{_libdir}/*TCL.so.* %exclude %{_libdir}/*Python??D.so.* %{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so @@ -916,7 +917,7 @@ cat xorg.log %files mpich-qt %{_libdir}/mpich/lib/lib*Qt*.so.* -%exclude %{_libdir}/mpich/lib/*TCL.so.* +#exclude %{_libdir}/mpich/lib/*TCL.so.* %exclude %{_libdir}/mpich/lib/*Python??D.so.* %{_libdir}/mpich/lib/qt?/ @@ -968,7 +969,7 @@ cat xorg.log %files openmpi-qt %{_libdir}/openmpi/lib/lib*Qt*.so.* -%exclude %{_libdir}/openmpi/lib/*TCL.so.* +#exclude %{_libdir}/openmpi/lib/*TCL.so.* %exclude %{_libdir}/openmpi/lib/*Python27D.so.* %{_libdir}/openmpi/lib/qt?/ From 6911e8921c0f5804119fa7d2ee8bd0dab232912d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 12 Sep 2019 08:23:55 -0600 Subject: [PATCH 017/158] Update FindLibPROJ.cmake from master to set LibPROJ_MAJOR_VERSION --- vtk-proj6_compat.patch | 121 +++++++++++++++++++++++++++++++++++++++++ vtk.spec | 6 +- 2 files changed, 122 insertions(+), 5 deletions(-) diff --git a/vtk-proj6_compat.patch b/vtk-proj6_compat.patch index 4380cc3..95e4a6d 100644 --- a/vtk-proj6_compat.patch +++ b/vtk-proj6_compat.patch @@ -141,3 +141,124 @@ # include # include #else +--- VTK-8.2.0/CMake/FindLibPROJ.cmake 2019-09-11 22:13:29.493741215 -0600 ++++ vtk/CMake/FindLibPROJ.cmake 2019-09-11 19:56:57.465802610 -0600 +@@ -1,55 +1,67 @@ +-# Find LibPROJ library and header file +-# Sets +-# LibPROJ_FOUND to 0 or 1 depending on the result +-# LibPROJ_INCLUDE_DIR to directories required for using libproj4 +-# LibPROJ_LIBRARIES to libproj4 and any dependent libraries +-# If LibPROJ_REQUIRED is defined, then a fatal error message will be generated if libproj4 is not found +- +-if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibPROJ_LIBRARIES OR NOT LibPROJ_FOUND ) ++find_path(LibPROJ_INCLUDE_DIR ++ NAMES proj_api.h proj.h ++ DOC "libproj include directories") ++mark_as_advanced(LibPROJ_INCLUDE_DIR) + +- if ( $ENV{LibPROJ_DIR} ) +- file( TO_CMAKE_PATH "$ENV{LibPROJ_DIR}" _LibPROJ_DIR ) ++find_library(LibPROJ_LIBRARY_RELEASE ++ NAMES proj ++ DOC "libproj release library") ++mark_as_advanced(LibPROJ_LIBRARY_RELEASE) ++ ++find_library(LibPROJ_LIBRARY_DEBUG ++ NAMES projd ++ DOC "libproj debug library") ++mark_as_advanced(LibPROJ_LIBRARY_DEBUG) ++ ++include(SelectLibraryConfigurations) ++select_library_configurations(LibPROJ) ++ ++if (LibPROJ_INCLUDE_DIR) ++ if (EXISTS "${LibPROJ_INCLUDE_DIR}/proj.h") ++ file(STRINGS "${LibPROJ_INCLUDE_DIR}/proj.h" _libproj_version_lines REGEX "#define[ \t]+PROJ_VERSION_(MAJOR|MINOR|PATCH)") ++ string(REGEX REPLACE ".*PROJ_VERSION_MAJOR *\([0-9]*\).*" "\\1" _libproj_version_major "${_libproj_version_lines}") ++ string(REGEX REPLACE ".*PROJ_VERSION_MINOR *\([0-9]*\).*" "\\1" _libproj_version_minor "${_libproj_version_lines}") ++ string(REGEX REPLACE ".*PROJ_VERSION_PATCH *\([0-9]*\).*" "\\1" _libproj_version_patch "${_libproj_version_lines}") ++ else () ++ file(STRINGS "${LibPROJ_INCLUDE_DIR}/proj_api.h" _libproj_version_lines REGEX "#define[ \t]+PJ_VERSION") ++ string(REGEX REPLACE ".*PJ_VERSION *\([0-9]*\).*" "\\1" _libproj_version "${_libproj_version_lines}") ++ math(EXPR _libproj_version_major "${_libproj_version} / 100") ++ math(EXPR _libproj_version_minor "(${_libproj_version} % 100) / 10") ++ math(EXPR _libproj_version_patch "${_libproj_version} % 10") + endif () +- +- set(LibPROJ_LIBRARY_SEARCH_PATHS +- ${_LibPROJ_DIR} +- ${_LibPROJ_DIR}/lib64 +- ${_LibPROJ_DIR}/lib +- ) +- +- find_library( LibPROJ_LIBRARY_RELEASE +- NAMES proj +- HINTS +- ${LibPROJ_LIBRARY_SEARCH_PATHS} +- ) +- +- find_library( LibPROJ_LIBRARY_DEBUG +- NAMES projd +- PATHS +- ${LibPROJ_LIBRARY_SEARCH_PATHS} +- ) +- +- find_path( LibPROJ_INCLUDE_DIR +- NAMES proj_api.h proj.h +- HINTS +- ${_LibPROJ_DIR} +- ${_LibPROJ_DIR}/include +- ) +- +- include(SelectLibraryConfigurations) +- select_library_configurations(LibPROJ) +- +- include(FindPackageHandleStandardArgs) +- find_package_handle_standard_args(LibPROJ +- REQUIRED_VARS LibPROJ_LIBRARY LibPROJ_INCLUDE_DIR) +- +- if(LibPROJ_FOUND) +- set(LibPROJ_INCLUDE_DIRS ${LibPROJ_INCLUDE_DIR}) +- +- if(NOT LibPROJ_LIBRARIES) +- set(LibPROJ_LIBRARIES ${LibPROJ_LIBRARY}) +- endif() +- endif() ++ set(LibPROJ_VERSION "${_libproj_version_major}.${_libproj_version_minor}.${_libproj_version_patch}") ++ set(LibPROJ_MAJOR_VERSION "${_libproj_version_major}") ++ unset(_libproj_version_major) ++ unset(_libproj_version_minor) ++ unset(_libproj_version_patch) ++ unset(_libproj_version) ++ unset(_libproj_version_lines) + endif () + +-mark_as_advanced(LibPROJ_INCLUDE_DIR) ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(LibPROJ ++ REQUIRED_VARS LibPROJ_LIBRARY LibPROJ_INCLUDE_DIR ++ VERSION_VAR LibPROJ_VERSION) ++ ++if (LibPROJ_FOUND) ++ set(LibPROJ_INCLUDE_DIRS "${LibPROJ_INCLUDE_DIR}") ++ set(LibPROJ_LIBRARIES "${LibPROJ_LIBRARY}") ++ ++ if (NOT TARGET LibPROJ::LibPROJ) ++ add_library(LibPROJ::LibPROJ UNKNOWN IMPORTED) ++ set_target_properties(LibPROJ::LibPROJ PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${LibPROJ_INCLUDE_DIR}") ++ if (LibPROJ_LIBRARY_RELEASE) ++ set_property(TARGET LibPROJ::LibPROJ APPEND PROPERTY ++ IMPORTED_CONFIGURATIONS RELEASE) ++ set_target_properties(LibPROJ::LibPROJ PROPERTIES ++ IMPORTED_LOCATION_RELEASE "${LibPROJ_LIBRARY_RELEASE}") ++ endif () ++ if (LibPROJ_LIBRARY_DEBUG) ++ set_property(TARGET LibPROJ::LibPROJ APPEND PROPERTY ++ IMPORTED_CONFIGURATIONS DEBUG) ++ set_target_properties(LibPROJ::LibPROJ PROPERTIES ++ IMPORTED_LOCATION_DEBUG "${LibPROJ_LIBRARY_DEBUG}") ++ endif () ++ endif () ++endif () diff --git a/vtk.spec b/vtk.spec index 6303f11..7033563 100644 --- a/vtk.spec +++ b/vtk.spec @@ -631,8 +631,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %{?vtk_use_system_gl2ps} \\\ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \\\ -DVTK_USE_SYSTEM_LIBHARU=OFF \\\ - -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \\\ - -DLibPROJ_MAJOR_VERSION=6 + -DVTK_USE_SYSTEM_NETCDF:BOOL=ON # Commented old flags in case we'd like to reactive some of them # -DVTK_USE_DISPLAY:BOOL=OFF \ # This prevents building of graphics tests @@ -867,7 +866,6 @@ cat xorg.log %files qt %{_libdir}/lib*Qt*.so.* -#exclude %{_libdir}/*TCL.so.* %exclude %{_libdir}/*Python??D.so.* %{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so @@ -917,7 +915,6 @@ cat xorg.log %files mpich-qt %{_libdir}/mpich/lib/lib*Qt*.so.* -#exclude %{_libdir}/mpich/lib/*TCL.so.* %exclude %{_libdir}/mpich/lib/*Python??D.so.* %{_libdir}/mpich/lib/qt?/ @@ -969,7 +966,6 @@ cat xorg.log %files openmpi-qt %{_libdir}/openmpi/lib/lib*Qt*.so.* -#exclude %{_libdir}/openmpi/lib/*TCL.so.* %exclude %{_libdir}/openmpi/lib/*Python27D.so.* %{_libdir}/openmpi/lib/qt?/ From 4888dabcbbc32f4dcbcabd89b7e3c05aa30ab984 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 22 Sep 2019 17:10:40 -0600 Subject: [PATCH 018/158] Rebuild for double-conversion 3.1.5 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 7033563..67a4989 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 9%{?dist} +Release: 10%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -988,6 +988,9 @@ cat xorg.log %changelog +* Sun Sep 22 2019 Orion Poplawski +- Rebuild for double-conversion 3.1.5 + * Mon Sep 09 2019 Orion Poplawski - 8.2.0-9 - Rebuild for proj 6.2.0 - Add patch and flags for proj 6 support From 1d043a43e02e9b79c34bacde83c1b2163f8403da Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 9 Nov 2019 20:51:21 -0700 Subject: [PATCH 019/158] Drop BR on sip-devel (python2) --- vtk.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/vtk.spec b/vtk.spec index 67a4989..b78cfff 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 10%{?dist} +Release: 11%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -87,7 +87,6 @@ BuildRequires: PEGTL-devel BuildRequires: proj-devel BuildRequires: pugixml-devel BuildRequires: R-devel -BuildRequires: sip-devel BuildRequires: sqlite-devel BuildRequires: wget BuildRequires: blas-devel @@ -988,7 +987,10 @@ cat xorg.log %changelog -* Sun Sep 22 2019 Orion Poplawski +* Sat Nov 9 2019 Orion Poplawski - 8.2.0-11 +- Drop BR on sip-devel (python2) + +* Sun Sep 22 2019 Orion Poplawski - 8.2.0-10 - Rebuild for double-conversion 3.1.5 * Mon Sep 09 2019 Orion Poplawski - 8.2.0-9 From 29345ab693ccc42df447a35a6f052f0f1ff38b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 14 Nov 2019 20:39:25 +0100 Subject: [PATCH 020/158] Rebuild (jsoncpp) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index b78cfff..4c23d79 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 11%{?dist} +Release: 12%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -987,6 +987,9 @@ cat xorg.log %changelog +* Thu Nov 14 2019 Björn Esser - 8.2.0-12 +- Rebuild (jsoncpp) + * Sat Nov 9 2019 Orion Poplawski - 8.2.0-11 - Drop BR on sip-devel (python2) From 722af9e012c3c91232536d24bd837af2ba9f751d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:25:27 +0000 Subject: [PATCH 021/158] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 4c23d79..9fbd506 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 12%{?dist} +Release: 13%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -987,6 +987,9 @@ cat xorg.log %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 8.2.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Nov 14 2019 Björn Esser - 8.2.0-12 - Rebuild (jsoncpp) From 6c207e504cf3746f48752b813eca4774ea9738ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 26 Mar 2020 18:18:57 +0100 Subject: [PATCH 022/158] Rebuild (proj) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 9fbd506..7ded979 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 13%{?dist} +Release: 14%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -987,6 +987,9 @@ cat xorg.log %changelog +* Thu Mar 26 2020 Björn Esser - 8.2.0-14 +- Rebuild (proj) + * Fri Jan 31 2020 Fedora Release Engineering - 8.2.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 5b6573e318a7999c2cfb8cd66a29419bfd941c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 26 Mar 2020 18:27:01 +0100 Subject: [PATCH 023/158] Revert "Rebuild (proj)" This reverts commit 6c207e504cf3746f48752b813eca4774ea9738ed. --- vtk.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vtk.spec b/vtk.spec index 7ded979..9fbd506 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 14%{?dist} +Release: 13%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -987,9 +987,6 @@ cat xorg.log %changelog -* Thu Mar 26 2020 Björn Esser - 8.2.0-14 -- Rebuild (proj) - * Fri Jan 31 2020 Fedora Release Engineering - 8.2.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 322fa6f351c72c42cb960783393b8a983a7def5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:54:47 +0200 Subject: [PATCH 024/158] Rebuilt for Python 3.9 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 9fbd506..7f2bd7b 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 13%{?dist} +Release: 14%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -987,6 +987,9 @@ cat xorg.log %changelog +* Tue May 26 2020 Miro Hrončok - 8.2.0-14 +- Rebuilt for Python 3.9 + * Fri Jan 31 2020 Fedora Release Engineering - 8.2.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8877cff15380b31860a1e7fd8c84f7229c585a6a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 26 May 2020 20:51:43 -0600 Subject: [PATCH 025/158] Add patch to fix building with GCC 10 (bz#1800240) --- vtk-gcc10.patch | 32 ++++++++++++++++++++++++++++++++ vtk.spec | 7 +++++++ 2 files changed, 39 insertions(+) create mode 100644 vtk-gcc10.patch diff --git a/vtk-gcc10.patch b/vtk-gcc10.patch new file mode 100644 index 0000000..27b15cd --- /dev/null +++ b/vtk-gcc10.patch @@ -0,0 +1,32 @@ +diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c +--- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 2019-01-30 10:15:13.000000000 -0700 ++++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c 2020-05-08 21:38:46.401363001 -0600 +@@ -614,5 +614,5 @@ int ex_create_par_int(const char *path, + * Prevent warning in some versions of ranlib(1) because the object + * file has no symbols. + */ +-const char exodus_unused_symbol_dummy_1; ++const char exodus_unused_symbol_dummy_ex_create_par; + #endif +diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c +--- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 2019-01-30 10:15:13.000000000 -0700 ++++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c 2020-05-08 21:38:46.402363007 -0600 +@@ -474,5 +474,5 @@ int ex_open_par_int(const char *path, in + * Prevent warning in some versions of ranlib(1) because the object + * file has no symbols. + */ +-const char exodus_unused_symbol_dummy_1; ++const char exodus_unused_symbol_dummy_ex_open_par; + #endif +diff -up VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake +--- VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 2019-01-30 10:15:13.000000000 -0700 ++++ VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake 2020-05-26 21:07:24.625840251 -0600 +@@ -174,7 +174,7 @@ macro(_vtk_test_compiler_hidden_visibili + execute_process(COMMAND ${CMAKE_C_COMPILER} --version + OUTPUT_VARIABLE _gcc_version_info + ERROR_VARIABLE _gcc_version_info) +- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" ++ string(REGEX MATCH "[1-9][0-9]*\\.[0-9]+\\.[0-9]+" + _gcc_version "${_gcc_version_info}") + # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the + # patch level, handle this here: diff --git a/vtk.spec b/vtk.spec index 7f2bd7b..3e50123 100644 --- a/vtk.spec +++ b/vtk.spec @@ -30,6 +30,9 @@ Source3: FindPEGTL.cmake Patch0: https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch # Proj 6 support Patch1: vtk-proj6_compat.patch +# GCC 10 support based on: +# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6420 +Patch2: vtk-gcc10.patch URL: http://vtk.org/ @@ -541,6 +544,7 @@ programming languages. %setup -q -b 1 -n VTK-%{version} %patch0 -p1 -b .py38 %patch1 -p1 -b .proj6 +%patch2 -p1 -b .gcc10 # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged @@ -987,6 +991,9 @@ cat xorg.log %changelog +* Wed May 27 2020 Orion Poplawski - 8.2.0-14 +- Add patch to fix building with GCC 10 (bz#1800240) + * Tue May 26 2020 Miro Hrončok - 8.2.0-14 - Rebuilt for Python 3.9 From cb07a45afbcefa86eab1b8241ffb5ab0484dd972 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 27 May 2020 07:45:37 -0600 Subject: [PATCH 026/158] Add missing -devel requires on libXext/X11 --- vtk.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vtk.spec b/vtk.spec index 3e50123..27fd3b6 100644 --- a/vtk.spec +++ b/vtk.spec @@ -209,6 +209,8 @@ Requires: PEGTL-devel%{?_isa} Requires: proj-devel%{?_isa} Requires: pugixml-devel%{?_isa} Requires: sqlite-devel%{?_isa} +Requires: libX11-devel%{?_isa} +Requires: libXext-devel%{?_isa} Requires: libXt-devel%{?_isa} Requires: mysql-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} From f4b5ee3a0937e80cb800ca6b36c098b043bb1886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 30 May 2020 15:02:30 +0200 Subject: [PATCH 027/158] Rebuild (jsoncpp) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 27fd3b6..91860ec 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,7 +17,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 14%{?dist} +Release: 15%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -993,6 +993,9 @@ cat xorg.log %changelog +* Sat May 30 2020 Björn Esser - 8.2.0-15 +- Rebuild (jsoncpp) + * Wed May 27 2020 Orion Poplawski - 8.2.0-14 - Add patch to fix building with GCC 10 (bz#1800240) From 7e7a9f7afefb827a5d583ad7eeaf8f729abc61ca Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 19 Jun 2020 20:39:30 -0600 Subject: [PATCH 028/158] Drop _python_bytecompile_extra, python2 conditionals --- vtk.spec | 149 ++----------------------------------------------------- 1 file changed, 5 insertions(+), 144 deletions(-) diff --git a/vtk.spec b/vtk.spec index 91860ec..633c57d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,7 +1,3 @@ -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - # Disable OSMesa builds for now - see Bug 744434 %bcond_without OSMesa %bcond_without java @@ -17,7 +13,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 15%{?dist} +Release: 16%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -43,11 +39,7 @@ BuildRequires: libX11-devel, libXt-devel, libXext-devel BuildRequires: libICE-devel, libGL-devel %{?with_OSMesa:BuildRequires: mesa-libOSMesa-devel} BuildRequires: tk-devel, tcl-devel -%if 0%{?fedora} >= 30 BuildRequires: python%{python3_pkgversion}-devel -%else -BuildRequires: python2-devel -%endif BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel %if 0%{with gl2ps} BuildRequires: gl2ps-devel @@ -59,12 +51,8 @@ BuildRequires: cmake(Qt5) BuildRequires: cmake(Qt5UiPlugin) BuildRequires: cmake(Qt5X11Extras) BuildRequires: qt5-qtwebkit-devel -%if 0%{?fedora} >= 30 BuildRequires: python%{python3_pkgversion}-qt5 %else -BuildRequires: python-qt5 -%endif -%else BuildRequires: PyQt4-devel BuildRequires: qt4-devel BuildRequires: qtwebkit-devel @@ -79,11 +67,7 @@ BuildRequires: glew-devel BuildRequires: hdf5-devel BuildRequires: jsoncpp-devel BuildRequires: libtheora-devel -%if 0%{?fedora} >= 28 -BuildRequires: mariadb-connector-c-devel -%else -BuildRequires: mysql-devel -%endif +BuildRequires: mariadb-connector-c-devel BuildRequires: netcdf-cxx-devel BuildRequires: libpq-devel BuildRequires: PEGTL-devel @@ -100,20 +84,12 @@ BuildRequires: lz4-devel BuildRequires: motif-devel %if %{with mpich} BuildRequires: mpich-devel -%if 0%{?fedora} >= 30 BuildRequires: python%{?python3_pkgversion}-mpi4py-mpich -%else -BuildRequires: python2-mpi4py-mpich -%endif BuildRequires: netcdf-mpich-devel %endif %if %{with openmpi} BuildRequires: openmpi-devel -%if 0%{?fedora} >= 30 BuildRequires: python%{?python3_pkgversion}-mpi4py-openmpi -%else -BuildRequires: python2-mpi4py-openmpi -%endif BuildRequires: netcdf-openmpi-devel %endif # For %check @@ -175,13 +151,8 @@ Install the %{name}-openmpi package to get a version compiled with openmpi. %package devel Summary: VTK header files for building C++ code Requires: vtk%{?_isa} = %{version}-%{release} -%if 0%{?fedora} >= 30 Requires: python%{python3_pkgversion}-vtk%{?_isa} = %{version}-%{release} Requires: python%{python3_pkgversion}-vtk-qt%{?_isa} = %{version}-%{release} -%else -Requires: python2-vtk%{?_isa} = %{version}-%{release} -Requires: python2-vtk-qt%{?_isa} = %{version}-%{release} -%endif %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake Requires: blas-devel%{?_isa} @@ -225,17 +196,12 @@ Requires: qtwebkit-devel%{?_isa} %endif Requires: jsoncpp-devel%{?_isa} # bz #1183210 + #1183530 -%if 0%{?fedora} >= 30 Requires: python%{python3_pkgversion}-devel -%else -Requires: python2-devel -%endif %description devel This provides the VTK header files required to compile C++ programs that use VTK to do 3D visualization. -%if 0%{?fedora} >= 30 %package -n python%{python3_pkgversion}-vtk Summary: Python 3 bindings for VTK Requires: vtk%{?_isa} = %{version}-%{release} @@ -245,15 +211,6 @@ Provides: python%{python3_version}dist(vtk) = %{version} %description -n python%{python3_pkgversion}-vtk Python 3 bindings for VTK. -%else -%package -n python2-vtk -Summary: Python 2 bindings for VTK -Requires: vtk%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python2-vtk} - -%description -n python2-vtk -Python 2 bindings for VTK. -%endif %if %{with java} %package java @@ -271,7 +228,6 @@ Requires: vtk%{?_isa} = %{version}-%{release} %description qt Qt bindings for VTK. -%if 0%{?fedora} >= 30 %package -n python%{python3_pkgversion}-vtk-qt Summary: Qt Python 3 bindings for VTK Requires: vtk%{?_isa} = %{version}-%{release} @@ -279,15 +235,6 @@ Requires: vtk%{?_isa} = %{version}-%{release} %description -n python%{python3_pkgversion}-vtk-qt Qt Python 3 bindings for VTK. -%else -%package -n python2-vtk-qt -Summary: Qt Python 2 bindings for VTK -Requires: vtk%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python2-vtk-qt} - -%description -n python2-vtk-qt -Qt Python 2 bindings for VTK. -%endif %if %{with mpich} %package mpich @@ -342,11 +289,7 @@ Requires: qtwebkit-devel%{?_isa} %endif Requires: jsoncpp-devel%{?_isa} # bz #1183210 + #1183530 -%if 0%{?fedora} >= 30 Requires: python%{python3_pkgversion}-devel -%else -Requires: python2-devel -%endif %description mpich-devel This provides the VTK header files required to compile C++ programs that @@ -354,21 +297,12 @@ use VTK to do 3D visualization. NOTE: The version in this package has been compiled with mpich support. -%if 0%{?fedora} >= 30 %package -n python%{python3_pkgversion}-vtk-mpich Summary: Python 3 bindings for VTK with mpich Requires: vtk-mpich%{?_isa} = %{version}-%{release} %description -n python%{python3_pkgversion}-vtk-mpich python 3 bindings for VTK with mpich. -%else -%package -n python2-vtk-mpich -Summary: Python 2 bindings for VTK with mpich -Requires: vtk-mpich%{?_isa} = %{version}-%{release} - -%description -n python2-vtk-mpich -python 2 bindings for VTK with mpich. -%endif %if %{with java} %package mpich-java @@ -386,21 +320,12 @@ Requires: vtk-mpich%{?_isa} = %{version}-%{release} %description mpich-qt Qt bindings for VTK with mpich. -%if 0%{?fedora} >= 30 %package -n python%{python3_pkgversion}-vtk-mpich-qt Summary: Qt Python 3 bindings for VTK with mpich Requires: vtk-mpich%{?_isa} = %{version}-%{release} %description -n python%{python3_pkgversion}-vtk-mpich-qt Qt Python 3 bindings for VTK with mpich. -%else -%package -n python2-vtk-mpich-qt -Summary: Qt Python 2 bindings for VTK with mpich -Requires: vtk-mpich%{?_isa} = %{version}-%{release} - -%description -n python2-vtk-mpich-qt -Qt Python 2 bindings for VTK with mpich. -%endif %endif %if %{with openmpi} @@ -456,11 +381,7 @@ Requires: qtwebkit-devel%{?_isa} %endif Requires: jsoncpp-devel%{?_isa} # bz #1183210 + #1183530 -%if 0%{?fedora} >= 30 Requires: python%{python3_pkgversion}-devel -%else -Requires: python2-devel -%endif %description openmpi-devel This provides the VTK header files required to compile C++ programs that @@ -468,21 +389,12 @@ use VTK to do 3D visualization. NOTE: The version in this package has been compiled with openmpi support. -%if 0%{?fedora} >= 30 %package -n python%{python3_pkgversion}-vtk-openmpi Summary: Python 3 bindings for VTK with openmpi Requires: vtk-openmpi%{?_isa} = %{version}-%{release} %description -n python%{python3_pkgversion}-vtk-openmpi Python 3 bindings for VTK with openmpi. -%else -%package -n python2-vtk-openmpi -Summary: Python 2 bindings for VTK with openmpi -Requires: vtk-openmpi%{?_isa} = %{version}-%{release} - -%description -n python2-vtk-openmpi -Python 2 bindings for VTK with openmpi. -%endif %if %{with java} %package openmpi-java @@ -500,21 +412,12 @@ Requires: vtk-openmpi%{?_isa} = %{version}-%{release} %description openmpi-qt Qt bindings for VTK with openmpi. -%if 0%{?fedora} >= 30 %package -n python%{python3_pkgversion}-vtk-openmpi-qt Summary: Qt Python 3 bindings for VTK with openmpi Requires: vtk-openmpi%{?_isa} = %{version}-%{release} %description -n python%{python3_pkgversion}-vtk-openmpi-qt Qt Python 3 bindings for VTK with openmpi. -%else -%package -n python2-vtk-openmpi-qt -Summary: Qt Python 2 bindings for VTK with openmpi -Requires: vtk-openmpi%{?_isa} = %{version}-%{release} - -%description -n python2-vtk-openmpi-qt -Qt Python 2 bindings for VTK with openmpi. -%endif %endif %package data @@ -593,11 +496,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \\\ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \\\ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \\\ -%if 0%{?fedora} >= 30 \ -DVTK_PYTHON_VERSION=3 \\\ -%else \ - -DVTK_PYTHON_VERSION=2 \\\ -%endif \ %if %{with qt5} \ -DVTK_INSTALL_QT_DIR:PATH=%{_lib}/qt5/plugins/designer \\\ %else \ @@ -825,13 +724,6 @@ ctest %{_smp_mflags} -V || : kill %1 || : cat xorg.log -%if 0%{?fedora} < 28 -%ldconfig_scriptlets -%ldconfig_scriptlets java -%ldconfig_scriptlets python2-vtk -%ldconfig_scriptlets python2-vtk-qt -%ldconfig_scriptlets qt -%endif %files -f build/libs.list %license Copyright.txt @@ -846,17 +738,10 @@ cat xorg.log %{_libdir}/cmake/vtk/ %{_docdir}/vtk-8.2/ -%if 0%{?fedora} >= 30 %files -n python%{python3_pkgversion}-vtk %{python3_sitearch}/* %{_libdir}/*Python3?D.so.* %exclude %{_libdir}/*QtPython3?D.so.* -%else -%files -n python2-vtk -%{python2_sitearch}/* -%{_libdir}/*Python27D.so.* -%exclude %{_libdir}/*QtPython27D.so.* -%endif %{_bindir}/vtkpython %{_bindir}/vtkWrapPython %{_bindir}/vtkWrapPythonInit @@ -874,13 +759,8 @@ cat xorg.log %exclude %{_libdir}/*Python??D.so.* %{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so -%if 0%{?fedora} >= 30 %files -n python%{python3_pkgversion}-vtk-qt %{_libdir}/*QtPython3?D.so.* -%else -%files -n python2-vtk-qt -%{_libdir}/*QtPython27D.so.* -%endif %if %{with mpich} %files mpich -f build-mpich/libs.list @@ -895,15 +775,9 @@ cat xorg.log %{_libdir}/mpich/lib/cmake/ %{_libdir}/mpich/share/doc/vtk-8.2/ -%if 0%{?fedora} >= 30 %files -n python%{python3_pkgversion}-vtk-mpich %{_libdir}/mpich/lib/python%{python3_version}/ %{_libdir}/mpich/lib/*Python3?D.so.* -%else -%files -n python2-vtk-mpich -%{_libdir}/mpich/lib/python%{python2_version}/ -%{_libdir}/mpich/lib/*Python27D.so.* -%endif %exclude %{_libdir}/mpich/lib/*QtPython??D.so.* %{_libdir}/mpich/bin/pvtkpython %{_libdir}/mpich/bin/vtkpython @@ -923,13 +797,8 @@ cat xorg.log %exclude %{_libdir}/mpich/lib/*Python??D.so.* %{_libdir}/mpich/lib/qt?/ -%if 0%{fedora} >= 30 %files -n python%{python3_pkgversion}-vtk-mpich-qt %{_libdir}/mpich/lib/*QtPython3?D.so.* -%else -%files -n python2-vtk-mpich-qt -%{_libdir}/mpich/lib/*QtPython27D.so.* -%endif %endif %if %{with openmpi} @@ -946,15 +815,9 @@ cat xorg.log %{_libdir}/openmpi/share/doc/vtk-8.2/ -%if 0%{fedora} >= 30 %files -n python%{python3_pkgversion}-vtk-openmpi %{_libdir}/openmpi/lib/python%{python3_version}/ %{_libdir}/openmpi/lib/*Python3?D.so.* -%else -%files -n python2-vtk-openmpi -%{_libdir}/openmpi/lib/python%{python2_version}/ -%{_libdir}/openmpi/lib/*Python27D.so.* -%endif %exclude %{_libdir}/openmpi/lib/*QtPython??D.so.* %{_libdir}/openmpi/bin/pvtkpython %{_libdir}/openmpi/bin/vtkpython @@ -974,13 +837,8 @@ cat xorg.log %exclude %{_libdir}/openmpi/lib/*Python27D.so.* %{_libdir}/openmpi/lib/qt?/ -%if 0%{fedora} >= 30 %files -n python%{python3_pkgversion}-vtk-openmpi-qt %{_libdir}/openmpi/lib/*QtPython3?D.so.* -%else -%files -n python2-vtk-openmpi-qt -%{_libdir}/openmpi/lib/*QtPython27D.so.* -%endif %endif %files data @@ -993,6 +851,9 @@ cat xorg.log %changelog +* Sat Jun 20 2020 Orion Poplawski - 8.2.0-16 +- Drop _python_bytecompile_extra, python2 conditionals + * Sat May 30 2020 Björn Esser - 8.2.0-15 - Rebuild (jsoncpp) From 699b032dab9b8f58d77b12c714c8bd725ba124bd Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 19 Jun 2020 21:18:17 -0600 Subject: [PATCH 029/158] No xorg-x11-drv-dummy on EL8 s390x --- vtk.spec | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/vtk.spec b/vtk.spec index 633c57d..57ef7a3 100644 --- a/vtk.spec +++ b/vtk.spec @@ -4,6 +4,17 @@ %bcond_without mpich %bcond_without qt5 %bcond_without openmpi +# s390x on EL8 does not have xorg-x11-drv-dummy +%if 0%{?rhel} +%ifarch s390x +%bcond_with xdummy +%else +%bcond_without xdummy +%endif +%else +%bcond_without xdummy +%endif + # VTK currently is carrying local modifications to gl2ps %bcond_with gl2ps %if !%{with gl2ps} @@ -93,7 +104,9 @@ BuildRequires: python%{?python3_pkgversion}-mpi4py-openmpi BuildRequires: netcdf-openmpi-devel %endif # For %check +%if %{with xdummy} BuildRequires: xorg-x11-drv-dummy +%endif %{!?with_java:Conflicts: vtk-java} Requires: hdf5 = %{_hdf5_version} @@ -713,6 +726,7 @@ cp -al build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ %check cd build cp %SOURCE2 . +%if %{with xdummy} if [ -x /usr/libexec/Xorg ]; then Xorg=/usr/libexec/Xorg else @@ -720,9 +734,12 @@ else fi $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 & export DISPLAY=:99 +%endif ctest %{_smp_mflags} -V || : +%if %{with xdummy} kill %1 || : cat xorg.log +%endif %files -f build/libs.list From f893d0e5ef1895e84cb36adb92cbfe962abba907 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 25 Jun 2020 14:31:23 -0600 Subject: [PATCH 030/158] Rebuild for hdf5 1.10.6 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 57ef7a3..602850d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -24,7 +24,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 16%{?dist} +Release: 17%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -868,6 +868,9 @@ cat xorg.log %changelog +* Thu Jun 25 2020 Orion Poplawski - 8.2.0-17 +- Rebuild for hdf5 1.10.6 + * Sat Jun 20 2020 Orion Poplawski - 8.2.0-16 - Drop _python_bytecompile_extra, python2 conditionals From 036cf8cd7be928e37783b79097a77ed272681c83 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 08:18:02 +0200 Subject: [PATCH 031/158] Rebuilt for JDK-11 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 602850d..6e95402 100644 --- a/vtk.spec +++ b/vtk.spec @@ -24,7 +24,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 17%{?dist} +Release: 18%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -868,6 +868,9 @@ cat xorg.log %changelog +* Sat Jul 11 2020 Jiri Vanek - 8.2.0-18 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Thu Jun 25 2020 Orion Poplawski - 8.2.0-17 - Rebuild for hdf5 1.10.6 From 2630b5a139487f3d339ad2bad973b2b95cb9a0b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 13 Jul 2020 21:04:44 +0200 Subject: [PATCH 032/158] Replace Python version glob with macro (needed for Python 3.10+) See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/PQIGCQCRNBYNXBX2ICWEM3PLDLNOG2ZT/ Co-authored-by: Tomas Hrnciar --- vtk.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vtk.spec b/vtk.spec index 6e95402..811dbcb 100644 --- a/vtk.spec +++ b/vtk.spec @@ -773,7 +773,7 @@ cat xorg.log %files qt %{_libdir}/lib*Qt*.so.* -%exclude %{_libdir}/*Python??D.so.* +%exclude %{_libdir}/*Python%{python3_version_nodots}D.so.* %{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so %files -n python%{python3_pkgversion}-vtk-qt @@ -795,7 +795,7 @@ cat xorg.log %files -n python%{python3_pkgversion}-vtk-mpich %{_libdir}/mpich/lib/python%{python3_version}/ %{_libdir}/mpich/lib/*Python3?D.so.* -%exclude %{_libdir}/mpich/lib/*QtPython??D.so.* +%exclude %{_libdir}/mpich/lib/*QtPython%{python3_version_nodots}D.so.* %{_libdir}/mpich/bin/pvtkpython %{_libdir}/mpich/bin/vtkpython %{_libdir}/mpich/bin/vtkWrapPython @@ -811,7 +811,7 @@ cat xorg.log %files mpich-qt %{_libdir}/mpich/lib/lib*Qt*.so.* -%exclude %{_libdir}/mpich/lib/*Python??D.so.* +%exclude %{_libdir}/mpich/lib/*Python%{python3_version_nodots}D.so.* %{_libdir}/mpich/lib/qt?/ %files -n python%{python3_pkgversion}-vtk-mpich-qt @@ -835,7 +835,7 @@ cat xorg.log %files -n python%{python3_pkgversion}-vtk-openmpi %{_libdir}/openmpi/lib/python%{python3_version}/ %{_libdir}/openmpi/lib/*Python3?D.so.* -%exclude %{_libdir}/openmpi/lib/*QtPython??D.so.* +%exclude %{_libdir}/openmpi/lib/*QtPython%{python3_version_nodots}D.so.* %{_libdir}/openmpi/bin/pvtkpython %{_libdir}/openmpi/bin/vtkpython %{_libdir}/openmpi/bin/vtkWrapPython From 0a0d428878a8cce583f9c9ae045079c9c3784dda Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 24 Jul 2020 15:29:42 -0600 Subject: [PATCH 033/158] Use __cmake_in_source_build --- vtk.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 811dbcb..b5ca4d9 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,3 +1,5 @@ +%global __cmake_in_source_build 1 + # Disable OSMesa builds for now - see Bug 744434 %bcond_without OSMesa %bcond_without java @@ -24,7 +26,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 18%{?dist} +Release: 19%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -868,6 +870,9 @@ cat xorg.log %changelog +* Fri Jul 24 2020 Jeff Law - 8.2.0-19 +- Use __cmake_in_source_build + * Sat Jul 11 2020 Jiri Vanek - 8.2.0-18 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 76ab4b7c848332eab16691f60a206df743aa098c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:54:52 +0000 Subject: [PATCH 034/158] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index b5ca4d9..84d33cd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -26,7 +26,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 19%{?dist} +Release: 20%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -870,6 +870,9 @@ cat xorg.log %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 8.2.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 24 2020 Jeff Law - 8.2.0-19 - Use __cmake_in_source_build From 6931f8d6ee8bc7f21ca330011cab1408a3922636 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 4 Aug 2020 09:41:37 -0600 Subject: [PATCH 035/158] Use new cmake macros --- vtk.spec | 56 ++++++++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/vtk.spec b/vtk.spec index 84d33cd..e6260f0 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,4 +1,4 @@ -%global __cmake_in_source_build 1 +%undefine __cmake_in_source_build # Disable OSMesa builds for now - see Bug 744434 %bcond_without OSMesa @@ -26,7 +26,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 20%{?dist} +Release: 21%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -554,24 +554,21 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m # Commented old flags in case we'd like to reactive some of them # -DVTK_USE_DISPLAY:BOOL=OFF \ # This prevents building of graphics tests -mkdir build -pushd build -%cmake .. \ +%global _vpath_builddir build +%cmake \ %{vtk_cmake_options} \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_TESTING:BOOL=ON -%make_build -%make_build DoxygenDoc vtkMyDoxygenDoc -popd +%cmake_build +%cmake_build --target DoxygenDoc vtkMyDoxygenDoc %if %{with mpich} -mkdir build-mpich -pushd build-mpich +%global _vpath_builddir build-mpich %_mpich_load export CC=mpicc export CXX=mpic++ -%cmake .. \ +%cmake \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ @@ -588,18 +585,16 @@ export CXX=mpic++ -DVTK_USE_PARALLEL:BOOL=ON \ -DVTK_USE_SYSTEM_DIY2:BOOL=OFF \ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON -%make_build +%cmake_build %_mpich_unload -popd %endif %if %{with openmpi} -mkdir build-openmpi -pushd build-openmpi +%global _vpath_builddir build-openmpi %_openmpi_load export CC=mpicc export CXX=mpic++ -%cmake .. \ +%cmake \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ @@ -616,9 +611,8 @@ export CXX=mpic++ -DVTK_USE_PARALLEL:BOOL=ON \ -DVTK_USE_SYSTEM_DIY2:BOOL=OFF \ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON -%make_build +%cmake_build %_openmpi_unload -popd %endif # Remove executable bits from sources (some of which are generated) @@ -627,9 +621,10 @@ find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or \ %install -pushd build -%make_install +%global _vpath_builddir build +%cmake_install +pushd build # Gather list of non-python/tcl libraries ls %{buildroot}%{_libdir}/*.so.* \ | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list @@ -686,27 +681,25 @@ cat libs.list popd %if %{with mpich} -pushd build-mpich %_mpich_load -%make_install +%global _vpath_builddir build-mpich +%cmake_install # Gather list of non-python/tcl libraries ls %{buildroot}%{_libdir}/mpich/lib/*.so.* \ - | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list -popd + | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > build-mpich/libs.list %_mpich_unload %endif %if %{with openmpi} -pushd build-openmpi %_openmpi_load -%make_install +%global _vpath_builddir build-openmpi +%cmake_install # Gather list of non-python/tcl libraries ls %{buildroot}%{_libdir}/openmpi/lib/*.so.* \ - | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list + | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > build-openmpi/libs.list %_openmpi_unload -popd %endif # Remove exec bit from non-scripts and %%doc @@ -726,7 +719,6 @@ mkdir -p %{buildroot}%{_datadir}/vtkdata cp -al build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ %check -cd build cp %SOURCE2 . %if %{with xdummy} if [ -x /usr/libexec/Xorg ]; then @@ -737,7 +729,8 @@ fi $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 & export DISPLAY=:99 %endif -ctest %{_smp_mflags} -V || : +%global _vpath_builddir build +%ctest --verbose || : %if %{with xdummy} kill %1 || : cat xorg.log @@ -870,6 +863,9 @@ cat xorg.log %changelog +* Tue Aug 4 2020 Orion Poplawski - 8.2.0-21 +- Use new cmake macros + * Wed Jul 29 2020 Fedora Release Engineering - 8.2.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d745277c3fcc8b01d0a26eb3d4afb80cb89b17a6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 10 Aug 2020 07:40:21 -0600 Subject: [PATCH 036/158] Fix ExternalData in vtk-data (bz#1783622) --- vtk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index e6260f0..5b81d49 100644 --- a/vtk.spec +++ b/vtk.spec @@ -26,7 +26,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 21%{?dist} +Release: 22%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -716,7 +716,7 @@ cp -pr --parents Wrapping/*/README* _docs/ #Install data mkdir -p %{buildroot}%{_datadir}/vtkdata -cp -al build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ +cp -alL build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ %check cp %SOURCE2 . @@ -863,6 +863,9 @@ cat xorg.log %changelog +* Sun Aug 9 2020 Orion Poplawski - 8.2.0-22 +- Fix ExternalData in vtk-data (bz#1783622) + * Tue Aug 4 2020 Orion Poplawski - 8.2.0-21 - Use new cmake macros From f74442445e31d3c7e0868c7428eaaa623bd9006f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Fri, 28 Aug 2020 10:30:36 +0200 Subject: [PATCH 037/158] https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager --- vtk.spec | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/vtk.spec b/vtk.spec index 5b81d49..c437beb 100644 --- a/vtk.spec +++ b/vtk.spec @@ -17,6 +17,10 @@ %bcond_without xdummy %endif +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%bcond_without flexiblas +%endif + # VTK currently is carrying local modifications to gl2ps %bcond_with gl2ps %if !%{with gl2ps} @@ -26,7 +30,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 22%{?dist} +Release: 23%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -89,8 +93,12 @@ BuildRequires: pugixml-devel BuildRequires: R-devel BuildRequires: sqlite-devel BuildRequires: wget +%if %{with flexiblas} +BuildRequires: flexiblas-devel +%else BuildRequires: blas-devel BuildRequires: lapack-devel +%endif # Requires patched libharu https://github.com/libharu/libharu/pull/157 #BuildRequires: libharu-devel BuildRequires: lz4-devel @@ -170,7 +178,12 @@ Requires: python%{python3_pkgversion}-vtk%{?_isa} = %{version}-%{release} Requires: python%{python3_pkgversion}-vtk-qt%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake +%if %{with flexiblas} +Requires: flexiblas-devel%{?_isa} +%else Requires: blas-devel%{?_isa} +Requires: lapack-devel%{?_isa} +%endif Requires: double-conversion-devel%{?_isa} # eigen3 is noarch Requires: eigen3-devel @@ -181,7 +194,6 @@ Requires: gl2ps-devel%{?_isa} %endif Requires: glew-devel%{?_isa} Requires: hdf5-devel%{?_isa} -Requires: lapack-devel%{?_isa} Requires: libjpeg-devel%{?_isa} Requires: lz4-devel%{?_isa} Requires: libpng-devel%{?_isa} @@ -275,14 +287,18 @@ Requires: vtk-mpich%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake Requires: mpich-devel +%if %{with flexiblas} +Requires: flexiblas-devel%{?_isa} +%else Requires: blas-devel%{?_isa} +Requires: lapack-devel%{?_isa} +%endif %if 0%{with gl2ps} Requires: gl2ps-devel%{?_isa} %endif Requires: expat-devel%{?_isa} Requires: freetype-devel%{?_isa} Requires: hdf5-mpich-devel%{?_isa} -Requires: lapack-devel%{?_isa} Requires: libjpeg-devel%{?_isa} Requires: libpng-devel%{?_isa} Requires: libogg-devel%{?_isa} @@ -367,14 +383,18 @@ Requires: vtk-openmpi%{?_isa} = %{version}-%{release} %{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} Requires: cmake Requires: openmpi-devel +%if %{with flexiblas} +Requires: flexiblas-devel%{?_isa} +%else Requires: blas-devel%{?_isa} +Requires: lapack-devel%{?_isa} +%endif %if 0%{with gl2ps} Requires: gl2ps-devel%{?_isa} %endif Requires: expat-devel%{?_isa} Requires: freetype-devel%{?_isa} Requires: hdf5-openmpi-devel%{?_isa} -Requires: lapack-devel%{?_isa} Requires: libjpeg-devel%{?_isa} Requires: libpng-devel%{?_isa} Requires: libogg-devel%{?_isa} @@ -557,6 +577,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %global _vpath_builddir build %cmake \ %{vtk_cmake_options} \ + %{?with_flexiblas:-DBLAS_LIBRARIES=-lflexiblas} \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_TESTING:BOOL=ON @@ -730,6 +751,7 @@ $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg export DISPLAY=:99 %endif %global _vpath_builddir build +export FLEXIBLAS=netlib %ctest --verbose || : %if %{with xdummy} kill %1 || : @@ -863,6 +885,9 @@ cat xorg.log %changelog +* Thu Aug 27 2020 Iñaki Úcar - 8.2.0-23 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + * Sun Aug 9 2020 Orion Poplawski - 8.2.0-22 - Fix ExternalData in vtk-data (bz#1783622) From 75caa56d8ac5889abf3c722dc7be7161745ce979 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 17 Sep 2020 21:40:06 -0600 Subject: [PATCH 038/158] Add patch to fix build with Qt 5.15 --- vtk-qt5.15.patch | 11 +++++++++++ vtk.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 vtk-qt5.15.patch diff --git a/vtk-qt5.15.patch b/vtk-qt5.15.patch new file mode 100644 index 0000000..1b66e63 --- /dev/null +++ b/vtk-qt5.15.patch @@ -0,0 +1,11 @@ +diff -up VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx +--- VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 2019-01-30 10:15:13.000000000 -0700 ++++ VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx 2020-09-17 21:36:06.985605614 -0600 +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/vtk.spec b/vtk.spec index c437beb..c91f8f3 100644 --- a/vtk.spec +++ b/vtk.spec @@ -30,7 +30,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 23%{?dist} +Release: 24%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -46,6 +46,9 @@ Patch1: vtk-proj6_compat.patch # GCC 10 support based on: # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6420 Patch2: vtk-gcc10.patch +# Qt 5.15 support +# https://gitlab.kitware.com/vtk/vtk/-/issues/18005 +Patch3: vtk-qt5.15.patch URL: http://vtk.org/ @@ -485,6 +488,7 @@ programming languages. %patch0 -p1 -b .py38 %patch1 -p1 -b .proj6 %patch2 -p1 -b .gcc10 +%patch3 -p1 -b .qt5.15 # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged @@ -885,6 +889,9 @@ cat xorg.log %changelog +* Thu Sep 17 2020 Orion Poplawski - 8.2.0-24 +- Add patch to fix build with Qt 5.15 + * Thu Aug 27 2020 Iñaki Úcar - 8.2.0-23 - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager From b89744ffb24bc5b8861a1e66c147009d9fedffad Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 17 Sep 2020 21:46:18 -0600 Subject: [PATCH 039/158] Add another missing include --- vtk-qt5.15.patch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/vtk-qt5.15.patch b/vtk-qt5.15.patch index 1b66e63..cff62f8 100644 --- a/vtk-qt5.15.patch +++ b/vtk-qt5.15.patch @@ -1,6 +1,6 @@ diff -up VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx --- VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 2019-01-30 10:15:13.000000000 -0700 -+++ VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx 2020-09-17 21:36:06.985605614 -0600 ++++ VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx 2020-09-17 21:44:08.125697274 -0600 @@ -41,6 +41,7 @@ #include #include @@ -9,3 +9,14 @@ diff -up VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 VTK-8.2.0/Re #include #include #include +diff -up VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx.qt5.15 VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx +--- VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx.qt5.15 2020-09-17 21:44:08.125697274 -0600 ++++ VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx 2020-09-17 21:45:46.126513263 -0600 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include From 7fc639d0d5214667715e548eb0a9e191af48db11 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 5 Oct 2020 13:55:28 +0000 Subject: [PATCH 040/158] Use mariadb-devel instead of mysql-devel Since we are building with mariadb instead of mysql, we should be requiring mariadb-devel instead of mysql-devel. Signed-off-by: Troy Dawson --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index c91f8f3..5296e65 100644 --- a/vtk.spec +++ b/vtk.spec @@ -213,7 +213,7 @@ Requires: sqlite-devel%{?_isa} Requires: libX11-devel%{?_isa} Requires: libXext-devel%{?_isa} Requires: libXt-devel%{?_isa} -Requires: mysql-devel%{?_isa} +Requires: mariadb-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} %if %{with qt5} Requires: cmake(Qt5) From 044a38d63715821492f345d24a453a347a6e59c6 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 19 Oct 2020 06:43:21 -0700 Subject: [PATCH 041/158] Small fix for ELN rebuild --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 5296e65..be84ebb 100644 --- a/vtk.spec +++ b/vtk.spec @@ -30,7 +30,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 24%{?dist} +Release: 24%{?dist}.1 # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant From 1d385fd45ca7d7a2762f8a3c12bc0f47c85af2ba Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 19 Oct 2020 15:00:04 -0700 Subject: [PATCH 042/158] Undo ELN mini-bump --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index be84ebb..5296e65 100644 --- a/vtk.spec +++ b/vtk.spec @@ -30,7 +30,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 24%{?dist}.1 +Release: 24%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant From b55a281f5037117544a1d7cc9c9c606545130709 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Mon, 26 Oct 2020 09:34:47 +0100 Subject: [PATCH 043/158] Replace 3? glob with python3_version_nodots macro With the upcoming Python 3.10 Python version will be one character longer so the 3? glob won't work anymore. --- vtk.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vtk.spec b/vtk.spec index 5296e65..e95127b 100644 --- a/vtk.spec +++ b/vtk.spec @@ -778,8 +778,8 @@ cat xorg.log %files -n python%{python3_pkgversion}-vtk %{python3_sitearch}/* -%{_libdir}/*Python3?D.so.* -%exclude %{_libdir}/*QtPython3?D.so.* +%{_libdir}/*Python%{python3_version_nodots}D.so.* +%exclude %{_libdir}/*QtPython%{python3_version_nodots}D.so.* %{_bindir}/vtkpython %{_bindir}/vtkWrapPython %{_bindir}/vtkWrapPythonInit @@ -798,7 +798,7 @@ cat xorg.log %{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so %files -n python%{python3_pkgversion}-vtk-qt -%{_libdir}/*QtPython3?D.so.* +%{_libdir}/*QtPython%{python3_version_nodots}D.so.* %if %{with mpich} %files mpich -f build-mpich/libs.list @@ -815,7 +815,7 @@ cat xorg.log %files -n python%{python3_pkgversion}-vtk-mpich %{_libdir}/mpich/lib/python%{python3_version}/ -%{_libdir}/mpich/lib/*Python3?D.so.* +%{_libdir}/mpich/lib/*Python%{python3_version_nodots}D.so.* %exclude %{_libdir}/mpich/lib/*QtPython%{python3_version_nodots}D.so.* %{_libdir}/mpich/bin/pvtkpython %{_libdir}/mpich/bin/vtkpython @@ -836,7 +836,7 @@ cat xorg.log %{_libdir}/mpich/lib/qt?/ %files -n python%{python3_pkgversion}-vtk-mpich-qt -%{_libdir}/mpich/lib/*QtPython3?D.so.* +%{_libdir}/mpich/lib/*QtPython%{python3_version_nodots}D.so.* %endif %if %{with openmpi} @@ -855,7 +855,7 @@ cat xorg.log %files -n python%{python3_pkgversion}-vtk-openmpi %{_libdir}/openmpi/lib/python%{python3_version}/ -%{_libdir}/openmpi/lib/*Python3?D.so.* +%{_libdir}/openmpi/lib/*Python%{python3_version_nodots}D.so.* %exclude %{_libdir}/openmpi/lib/*QtPython%{python3_version_nodots}D.so.* %{_libdir}/openmpi/bin/pvtkpython %{_libdir}/openmpi/bin/vtkpython @@ -876,7 +876,7 @@ cat xorg.log %{_libdir}/openmpi/lib/qt?/ %files -n python%{python3_pkgversion}-vtk-openmpi-qt -%{_libdir}/openmpi/lib/*QtPython3?D.so.* +%{_libdir}/openmpi/lib/*QtPython%{python3_version_nodots}D.so.* %endif %files data From a3837fb8e080c2e545c7a0df94d47f553240f463 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 11 Nov 2020 11:07:19 +0100 Subject: [PATCH 044/158] Disable LTO --- vtk.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vtk.spec b/vtk.spec index e95127b..d667f8a 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,5 +1,10 @@ %undefine __cmake_in_source_build +# State Nov 11 2020, LTO causes +# TestXMLHyperTreeGridIO.cxx.o (symbol from plugin): undefined reference to symbol +# '_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits@@LLVM_11' +%global _lto_cflags %{nil} + # Disable OSMesa builds for now - see Bug 744434 %bcond_without OSMesa %bcond_without java From 00964b32afb5e933ba39b9cf81f72dbf998b1ca7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 11 Nov 2020 11:08:45 +0100 Subject: [PATCH 045/158] Add temporary patch for building against freetype-2.10.4 --- vtk.spec | 4 ++++ vtk_freetype-2.10.4.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 vtk_freetype-2.10.4.patch diff --git a/vtk.spec b/vtk.spec index d667f8a..2137f7b 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,6 +54,9 @@ Patch2: vtk-gcc10.patch # Qt 5.15 support # https://gitlab.kitware.com/vtk/vtk/-/issues/18005 Patch3: vtk-qt5.15.patch +# Temporary patch for building against freetype-2.10.4, which removed FT_CALLBACK_DEF, +# but was later re-added in https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=b0667d2d36fb134d48030b2a560eaaa37810d6ba +Patch4: vtk_freetype-2.10.4.patch URL: http://vtk.org/ @@ -494,6 +497,7 @@ programming languages. %patch1 -p1 -b .proj6 %patch2 -p1 -b .gcc10 %patch3 -p1 -b .qt5.15 +%patch4 -p1 -b .freetype # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged diff --git a/vtk_freetype-2.10.4.patch b/vtk_freetype-2.10.4.patch new file mode 100644 index 0000000..d8469a5 --- /dev/null +++ b/vtk_freetype-2.10.4.patch @@ -0,0 +1,34 @@ +diff -rupN VTK-8.2.0/Rendering/FreeType/vtkFreeTypeTools.cxx VTK-8.2.0-new/Rendering/FreeType/vtkFreeTypeTools.cxx +--- VTK-8.2.0/Rendering/FreeType/vtkFreeTypeTools.cxx 2019-01-30 18:15:13.000000000 +0100 ++++ VTK-8.2.0-new/Rendering/FreeType/vtkFreeTypeTools.cxx 2020-11-06 00:21:07.259999338 +0100 +@@ -387,6 +387,13 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMap + } + + //---------------------------------------------------------------------------- ++#ifndef FT_CALLBACK_DEF ++#ifdef __cplusplus ++#define FT_CALLBACK_DEF( x ) extern "C" x ++#else ++#define FT_CALLBACK_DEF( x ) static x ++#endif ++#endif /* FT_CALLBACK_DEF */ + FT_CALLBACK_DEF(FT_Error) + vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, + FT_Library lib, +diff -rupN VTK-8.2.0/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx VTK-8.2.0-new/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +--- VTK-8.2.0/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx 2019-01-30 18:15:13.000000000 +0100 ++++ VTK-8.2.0-new/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx 2020-11-06 00:21:25.588991839 +0100 +@@ -29,6 +29,13 @@ vtkStandardNewMacro(vtkFontConfigFreeTyp + namespace + { + // The FreeType face requester callback: ++#ifndef FT_CALLBACK_DEF ++#ifdef __cplusplus ++#define FT_CALLBACK_DEF( x ) extern "C" x ++#else ++#define FT_CALLBACK_DEF( x ) static x ++#endif ++#endif /* FT_CALLBACK_DEF */ + FT_CALLBACK_DEF(FT_Error) + vtkFontConfigFreeTypeToolsFaceRequester(FTC_FaceID face_id, + FT_Library lib, From d977685ddf4db73173a536f7c4d495d5c831ba39 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 12 Nov 2020 00:17:34 +0100 Subject: [PATCH 046/158] Rebuild (proj) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 2137f7b..a913341 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 24%{?dist} +Release: 25%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -898,6 +898,9 @@ cat xorg.log %changelog +* Thu Nov 5 20:45:48 CET 2020 Sandro Mani - 8.2.0-25 +- Rebuild (proj) + * Thu Sep 17 2020 Orion Poplawski - 8.2.0-24 - Add patch to fix build with Qt 5.15 From 1ddf899112852dae14249388029853483c5e4ab5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 25 Jan 2021 19:53:58 -0700 Subject: [PATCH 047/158] Change mysql-devel to mariadb-devel in other places --- vtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index a913341..e10a9d6 100644 --- a/vtk.spec +++ b/vtk.spec @@ -317,7 +317,7 @@ Requires: libtheora-devel%{?_isa} Requires: libtiff-devel%{?_isa} Requires: libxml2-devel%{?_isa} Requires: libpq-devel%{?_isa} -Requires: mysql-devel%{?_isa} +Requires: mariadb-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} Requires: netcdf-mpich-devel%{?_isa} %if %{with qt5} @@ -413,7 +413,7 @@ Requires: libtheora-devel%{?_isa} Requires: libtiff-devel%{?_isa} Requires: libxml2-devel%{?_isa} Requires: libpq-devel%{?_isa} -Requires: mysql-devel%{?_isa} +Requires: mariadb-devel%{?_isa} Requires: netcdf-cxx-devel%{?_isa} Requires: netcdf-openmpi-devel%{?_isa} %if %{with qt5} From f699e8b5524f0b09c281ee52c9bd38981d7ffea5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:16:15 +0000 Subject: [PATCH 048/158] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index e10a9d6..e137a55 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.2.0 -Release: 25%{?dist} +Release: 26%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -898,6 +898,9 @@ cat xorg.log %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 8.2.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Nov 5 20:45:48 CET 2020 Sandro Mani - 8.2.0-25 - Rebuild (proj) From 54e9010e38e2f1ca6b085cc435eccc1211eb6473 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 29 Jan 2021 20:41:12 -0700 Subject: [PATCH 049/158] Upload sources --- .gitignore | 2 ++ sources | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bc82043..56e40bd 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ vtk-5.6.0.tar.gz /VTKData-8.1.1.tar.gz /VTK-8.2.0.tar.gz /VTKData-8.2.0.tar.gz +/VTK-9.0.1.tar.gz +/VTKData-9.0.1.tar.gz diff --git a/sources b/sources index 2538b0d..4ae1996 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-8.2.0.tar.gz) = 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286 -SHA512 (VTKData-8.2.0.tar.gz) = 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b +SHA512 (VTK-9.0.1.tar.gz) = eb2508e2409ad302cc5db65282a9c1ff4477ac8a93e0fee898ad8f0974d72decc7d5d444dc825a3c2f7952ebf59853616097ebe0d134649cab0d49a9619065bf +SHA512 (VTKData-9.0.1.tar.gz) = d2ebe6abaef0a7003d834ce65ea2b9f967e35b6c392bf6e46cea161f0ea5c1f03d0b7da5cbe3f2bbf8253bcc124c50a907c6edffe6108d0fab6d28b316b48658 From a6fa95ab4cf8c0149b86c8a35d9ed7760e35e156 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 10 May 2020 07:37:43 -0600 Subject: [PATCH 050/158] Update to 9.0.1 Disable OSMesa - conflicts with X support Build against Fedora gl2ps, libharu, utf8cpp Drop python3-vtk-qt packages No longer ship compiled examples Install jar file into /usr/share/java Fix JNI install location Drop Qt4 build option Drop gcc10 patch --- .gitignore | 2 + 5883.patch | 176 ---------- vtk-AllValues.patch | 137 ++++++++ vtk-gcc10.patch | 32 -- vtk-includes.patch | 71 ++++ vtk-libharu.patch | 12 + vtk-limits.patch | 60 ++++ vtk-proj6_compat.patch | 264 --------------- vtk.spec | 669 ++++++++++++++++---------------------- vtk_freetype-2.10.4.patch | 44 +-- 10 files changed, 582 insertions(+), 885 deletions(-) delete mode 100644 5883.patch create mode 100644 vtk-AllValues.patch delete mode 100644 vtk-gcc10.patch create mode 100644 vtk-includes.patch create mode 100644 vtk-libharu.patch create mode 100644 vtk-limits.patch delete mode 100644 vtk-proj6_compat.patch diff --git a/.gitignore b/.gitignore index 56e40bd..79d4c4e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,7 @@ vtk-5.6.0.tar.gz /VTKData-8.1.1.tar.gz /VTK-8.2.0.tar.gz /VTKData-8.2.0.tar.gz +/VTK-9.0.0.tar.gz +/VTKData-9.0.0.tar.gz /VTK-9.0.1.tar.gz /VTKData-9.0.1.tar.gz diff --git a/5883.patch b/5883.patch deleted file mode 100644 index f749d3c..0000000 --- a/5883.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001 -From: David Gobbi -Date: Tue, 20 Aug 2019 17:02:24 -0600 -Subject: [PATCH] Compatibility for Python 3.8 - -The PyTypeObject struct was modified in Python 3.8, this change is -required to avoid compile errors. ---- - .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h | 6 ++++++ - Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 2 +- - Wrapping/PythonCore/PyVTKNamespace.cxx | 2 +- - Wrapping/PythonCore/PyVTKReference.cxx | 8 ++++---- - Wrapping/PythonCore/PyVTKTemplate.cxx | 2 +- - Wrapping/PythonCore/vtkPythonCompatibility.h | 8 +++++++- - Wrapping/Tools/vtkWrapPythonClass.c | 2 +- - Wrapping/Tools/vtkWrapPythonEnum.c | 2 +- - Wrapping/Tools/vtkWrapPythonType.c | 2 +- - 9 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -index b1c12c83de..14ccfbe928 100644 ---- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -+++ b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h -@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = { - #if PY_VERSION_HEX >= 0x03040000 - 0, // tp_finalize - #endif -+#if PY_VERSION_HEX >= 0x03080000 -+ 0, // tp_vectorcall -+#if PY_VERSION_HEX < 0x03090000 -+ 0, // tp_print -+#endif -+#endif - }; - - static PyObject* vtkWrite(PyObject* self, PyObject* args) -diff --git a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -index 2b0d443537..3840038498 100644 ---- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -+++ b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx -@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = { - sizeof(PyMethodDescrObject), // tp_basicsize - 0, // tp_itemsize - PyVTKMethodDescriptor_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx -index 71ee2a3516..5cf5bfbe6b 100644 ---- a/Wrapping/PythonCore/PyVTKNamespace.cxx -+++ b/Wrapping/PythonCore/PyVTKNamespace.cxx -@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = { - 0, // tp_basicsize - 0, // tp_itemsize - PyVTKNamespace_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/Wrapping/PythonCore/PyVTKReference.cxx b/Wrapping/PythonCore/PyVTKReference.cxx -index 943ac71080..b7104091c0 100644 ---- a/Wrapping/PythonCore/PyVTKReference.cxx -+++ b/Wrapping/PythonCore/PyVTKReference.cxx -@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = { - sizeof(PyVTKReference), // tp_basicsize - 0, // tp_itemsize - PyVTKReference_Delete, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx -index be200985b3..340fe7953b 100644 ---- a/Wrapping/PythonCore/PyVTKTemplate.cxx -+++ b/Wrapping/PythonCore/PyVTKTemplate.cxx -@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = { - 0, // tp_basicsize - 0, // tp_itemsize - nullptr, // tp_dealloc -- nullptr, // tp_print -+ 0, // tp_vectorcall_offset - nullptr, // tp_getattr - nullptr, // tp_setattr - nullptr, // tp_compare -diff --git a/Wrapping/PythonCore/vtkPythonCompatibility.h b/Wrapping/PythonCore/vtkPythonCompatibility.h -index 4a767844a6..be208faeef 100644 ---- a/Wrapping/PythonCore/vtkPythonCompatibility.h -+++ b/Wrapping/PythonCore/vtkPythonCompatibility.h -@@ -64,7 +64,13 @@ - #endif - - // PyTypeObject compatibility --#if PY_VERSION_HEX >= 0x03040000 -+#if PY_VERSION_HEX >= 0x03090000 -+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ -+ 0, 0, 0, 0, -+#elif PY_VERSION_HEX >= 0x03080000 -+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ -+ 0, 0, 0, 0, 0, -+#elif PY_VERSION_HEX >= 0x03040000 - #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ - 0, 0, 0, - #else -diff --git a/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c -index b1e45f8e80..4d558ea081 100644 ---- a/Wrapping/Tools/vtkWrapPythonClass.c -+++ b/Wrapping/Tools/vtkWrapPythonClass.c -@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType( - " sizeof(PyVTKObject), // tp_basicsize\n" - " 0, // tp_itemsize\n" - " PyVTKObject_Delete, // tp_dealloc\n" -- " nullptr, // tp_print\n" -+ " 0, // tp_vectorcall_offset\n" - " nullptr, // tp_getattr\n" - " nullptr, // tp_setattr\n" - " nullptr, // tp_compare\n" -diff --git a/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c -index b933702242..1249362854 100644 ---- a/Wrapping/Tools/vtkWrapPythonEnum.c -+++ b/Wrapping/Tools/vtkWrapPythonEnum.c -@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType( - " sizeof(PyIntObject), // tp_basicsize\n" - " 0, // tp_itemsize\n" - " nullptr, // tp_dealloc\n" -- " nullptr, // tp_print\n" -+ " 0, // tp_vectorcall_offset\n" - " nullptr, // tp_getattr\n" - " nullptr, // tp_setattr\n" - " nullptr, // tp_compare\n" -diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c -index 744cb1b9d3..0a1375e541 100644 ---- a/Wrapping/Tools/vtkWrapPythonType.c -+++ b/Wrapping/Tools/vtkWrapPythonType.c -@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType( - " sizeof(PyVTKSpecialObject), // tp_basicsize\n" - " 0, // tp_itemsize\n" - " Py%s_Delete, // tp_dealloc\n" -- " nullptr, // tp_print\n" -+ " 0, // tp_vectorcall_offset\n" - " nullptr, // tp_getattr\n" - " nullptr, // tp_setattr\n" - " nullptr, // tp_compare\n" --- -2.21.0 - diff --git a/vtk-AllValues.patch b/vtk-AllValues.patch new file mode 100644 index 0000000..d032d92 --- /dev/null +++ b/vtk-AllValues.patch @@ -0,0 +1,137 @@ +Index: VTK-9.0.1/Common/Core/vtkDataArray.cxx +=================================================================== +--- VTK-9.0.1.orig/Common/Core/vtkDataArray.cxx ++++ VTK-9.0.1/Common/Core/vtkDataArray.cxx +@@ -1627,7 +1627,7 @@ struct ScalarRangeDispatchWrapper + void operator()(ArrayT* array) + { + this->Success = vtkDataArrayPrivate::DoComputeScalarRange( +- array, this->Range, vtkDataArrayPrivate::AllValues()); ++ array, this->Range, vtkDataArrayPrivate::vtkAllValues()); + } + }; + +@@ -1646,7 +1646,7 @@ struct VectorRangeDispatchWrapper + void operator()(ArrayT* array) + { + this->Success = vtkDataArrayPrivate::DoComputeVectorRange( +- array, this->Range, vtkDataArrayPrivate::AllValues()); ++ array, this->Range, vtkDataArrayPrivate::vtkAllValues()); + } + }; + +Index: VTK-9.0.1/Common/Core/vtkDataArray.h +=================================================================== +--- VTK-9.0.1.orig/Common/Core/vtkDataArray.h ++++ VTK-9.0.1/Common/Core/vtkDataArray.h +@@ -599,7 +599,7 @@ vtkArrayDownCast_FastCastMacro(vtkDataAr + // vtkGenericDataArray.h as well. + namespace vtkDataArrayPrivate + { +-struct AllValues ++struct vtkAllValues + { + }; + struct FiniteValues +Index: VTK-9.0.1/Common/Core/vtkGenericDataArray.txx +=================================================================== +--- VTK-9.0.1.orig/Common/Core/vtkGenericDataArray.txx ++++ VTK-9.0.1/Common/Core/vtkGenericDataArray.txx +@@ -1192,7 +1192,7 @@ bool vtkGenericDataArray; + return ComputeScalarValueRangeImpl( +- static_cast(this), ranges, vtkDataArrayPrivate::AllValues{}, Supported{}); ++ static_cast(this), ranges, vtkDataArrayPrivate::vtkAllValues{}, Supported{}); + } + + //----------------------------------------------------------------------------- +@@ -1202,7 +1202,7 @@ bool vtkGenericDataArray; + return ComputeVectorValueRangeImpl( +- static_cast(this), range, vtkDataArrayPrivate::AllValues{}, Supported{}); ++ static_cast(this), range, vtkDataArrayPrivate::vtkAllValues{}, Supported{}); + } + + //----------------------------------------------------------------------------- +Index: VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx +=================================================================== +--- VTK-9.0.1.orig/Common/Core/vtkDataArrayPrivate.txx ++++ VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx +@@ -301,7 +301,7 @@ template + struct ComputeScalarRange + { + template +- bool operator()(ArrayT* array, RangeValueType* ranges, AllValues) ++ bool operator()(ArrayT* array, RangeValueType* ranges, vtkAllValues) + { + AllValuesMinAndMax minmax(array); + vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax); +@@ -435,7 +435,7 @@ public: + }; + + template +-bool GenericComputeScalarRange(ArrayT* array, RangeValueType* ranges, AllValues) ++bool GenericComputeScalarRange(ArrayT* array, RangeValueType* ranges, vtkAllValues) + { + AllValuesGenericMinAndMax minmax(array); + vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax); +@@ -518,7 +518,7 @@ bool DoComputeScalarRange(ArrayT* array, + //---------------------------------------------------------------------------- + // generic implementation that operates on ValueType. + template +-bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], AllValues) ++bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], vtkAllValues) + { + range[0] = vtkTypeTraits::Max(); + range[1] = vtkTypeTraits::Min(); +Index: VTK-9.0.1/Common/Core/vtkGenericDataArray.h +=================================================================== +--- VTK-9.0.1.orig/Common/Core/vtkGenericDataArray.h ++++ VTK-9.0.1/Common/Core/vtkGenericDataArray.h +@@ -414,7 +414,7 @@ namespace vtkDataArrayPrivate + template + bool DoComputeScalarRange(A*, R*, T); + template +-bool DoComputeVectorRange(A*, R[2], AllValues); ++bool DoComputeVectorRange(A*, R[2], vtkAllValues); + template + bool DoComputeVectorRange(A*, R[2], FiniteValues); + } // namespace vtkDataArrayPrivate +@@ -466,11 +466,11 @@ class vtkScaledSOADataArrayTemplate; + + #define VTK_INSTANTIATE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType) \ + template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ +- ArrayType*, ValueType*, vtkDataArrayPrivate::AllValues); \ ++ ArrayType*, ValueType*, vtkDataArrayPrivate::vtkAllValues); \ + template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ + ArrayType*, ValueType*, vtkDataArrayPrivate::FiniteValues); \ + template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ +- ArrayType*, ValueType[2], vtkDataArrayPrivate::AllValues); \ ++ ArrayType*, ValueType[2], vtkDataArrayPrivate::vtkAllValues); \ + template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ + ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues); + +@@ -516,18 +516,18 @@ namespace vtkDataArrayPrivate + template + bool DoComputeScalarRange(A*, R*, T); + template +-bool DoComputeVectorRange(A*, R[2], AllValues); ++bool DoComputeVectorRange(A*, R[2], vtkAllValues); + template + bool DoComputeVectorRange(A*, R[2], FiniteValues); + } // namespace vtkDataArrayPrivate + + #define VTK_DECLARE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType) \ + extern template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ +- ArrayType*, ValueType*, vtkDataArrayPrivate::AllValues); \ ++ ArrayType*, ValueType*, vtkDataArrayPrivate::vtkAllValues); \ + extern template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ + ArrayType*, ValueType*, vtkDataArrayPrivate::FiniteValues); \ + extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ +- ArrayType*, ValueType[2], vtkDataArrayPrivate::AllValues); \ ++ ArrayType*, ValueType[2], vtkDataArrayPrivate::vtkAllValues); \ + extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ + ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues); + diff --git a/vtk-gcc10.patch b/vtk-gcc10.patch deleted file mode 100644 index 27b15cd..0000000 --- a/vtk-gcc10.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c ---- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 2019-01-30 10:15:13.000000000 -0700 -+++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c 2020-05-08 21:38:46.401363001 -0600 -@@ -614,5 +614,5 @@ int ex_create_par_int(const char *path, - * Prevent warning in some versions of ranlib(1) because the object - * file has no symbols. - */ --const char exodus_unused_symbol_dummy_1; -+const char exodus_unused_symbol_dummy_ex_create_par; - #endif -diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c ---- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 2019-01-30 10:15:13.000000000 -0700 -+++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c 2020-05-08 21:38:46.402363007 -0600 -@@ -474,5 +474,5 @@ int ex_open_par_int(const char *path, in - * Prevent warning in some versions of ranlib(1) because the object - * file has no symbols. - */ --const char exodus_unused_symbol_dummy_1; -+const char exodus_unused_symbol_dummy_ex_open_par; - #endif -diff -up VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake ---- VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 2019-01-30 10:15:13.000000000 -0700 -+++ VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake 2020-05-26 21:07:24.625840251 -0600 -@@ -174,7 +174,7 @@ macro(_vtk_test_compiler_hidden_visibili - execute_process(COMMAND ${CMAKE_C_COMPILER} --version - OUTPUT_VARIABLE _gcc_version_info - ERROR_VARIABLE _gcc_version_info) -- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" -+ string(REGEX MATCH "[1-9][0-9]*\\.[0-9]+\\.[0-9]+" - _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the - # patch level, handle this here: diff --git a/vtk-includes.patch b/vtk-includes.patch new file mode 100644 index 0000000..f906200 --- /dev/null +++ b/vtk-includes.patch @@ -0,0 +1,71 @@ +diff -up VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx.includes VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx +--- VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx.includes 2020-06-26 07:24:40.000000000 -0600 ++++ VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx 2021-01-27 06:51:11.776958150 -0700 +@@ -61,10 +61,23 @@ typedef ptrdiff_t GLsizeiptr; + + #include + ++#include ++#include ++#if VTK_HAVE_XCURSOR ++#include ++#endif + #include + #include +-#include + ++/* ++ * Work-around to get forward declarations of C typedef of anonymous ++ * structs working. We do not want to include XUtil.h in the header as ++ * it populates the global namespace. ++ */ ++struct vtkXVisualInfo : public XVisualInfo ++{ ++}; ++ + #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 + #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 + typedef GLXContext (*glXCreateContextAttribsARBProc)( +@@ -224,7 +237,7 @@ int XEventTypeEquals(Display*, XEvent* e + return event->type == EventType; + } + +-XVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualInfo() ++vtkXVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualInfo() + { + XVisualInfo* v = nullptr; + +@@ -258,7 +271,7 @@ XVisualInfo* vtkXOpenGLRenderWindow::Get + vtkErrorMacro(<< "Could not find a decent visual\n"); + } + } +- return (v); ++ return reinterpret_cast(v); + } + + vtkXOpenGLRenderWindow::vtkXOpenGLRenderWindow() +diff -up VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h.includes VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h +--- VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h.includes 2020-06-26 07:24:40.000000000 -0600 ++++ VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h 2021-01-27 06:49:09.420323338 -0700 +@@ -28,11 +28,11 @@ + #include "vtkOpenGLRenderWindow.h" + #include "vtkRenderingOpenGL2Module.h" // For export macro + #include // Needed for X types used in the public interface +-#include // Needed for X types used in the public interface + #include // for ivar + + class vtkIdList; + class vtkXOpenGLRenderWindowInternal; ++struct vtkXVisualInfo; + + class VTKRENDERINGOPENGL2_EXPORT vtkXOpenGLRenderWindow : public vtkOpenGLRenderWindow + { +@@ -112,7 +112,7 @@ public: + */ + virtual Colormap GetDesiredColormap(); + virtual Visual* GetDesiredVisual(); +- virtual XVisualInfo* GetDesiredVisualInfo(); ++ virtual vtkXVisualInfo* GetDesiredVisualInfo(); + virtual int GetDesiredDepth(); + //@} + diff --git a/vtk-libharu.patch b/vtk-libharu.patch new file mode 100644 index 0000000..2d03ab6 --- /dev/null +++ b/vtk-libharu.patch @@ -0,0 +1,12 @@ +diff -up VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt.libharu VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt +--- VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt.libharu 2020-05-01 13:29:00.000000000 -0600 ++++ VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt 2020-05-12 16:47:18.298133406 -0600 +@@ -8,7 +8,7 @@ vtk_module_third_party( + # Unreleased. Requires these PRs: + # https://github.com/libharu/libharu/pull/157 + # https://github.com/libharu/libharu/pull/187 +- VERSION 2.4.0 ++ VERSION 2.3.0 + TARGETS LibHaru::LibHaru + STANDARD_INCLUDE_DIRS) + diff --git a/vtk-limits.patch b/vtk-limits.patch new file mode 100644 index 0000000..e581628 --- /dev/null +++ b/vtk-limits.patch @@ -0,0 +1,60 @@ +diff --git a/Common/Core/vtkGenericDataArrayLookupHelper.h b/Common/Core/vtkGenericDataArrayLookupHelper.h +index ab9d57248f..202aaa27f4 100644 +--- a/Common/Core/vtkGenericDataArrayLookupHelper.h ++++ b/Common/Core/vtkGenericDataArrayLookupHelper.h +@@ -25,6 +25,7 @@ + #include "vtkIdList.h" + #include + #include ++#include + #include + #include + +diff --git a/Common/DataModel/Testing/Cxx/UnitTestLine.cxx b/Common/DataModel/Testing/Cxx/UnitTestLine.cxx +index 7b45f41202..223f4db7ef 100644 +--- a/Common/DataModel/Testing/Cxx/UnitTestLine.cxx ++++ b/Common/DataModel/Testing/Cxx/UnitTestLine.cxx +@@ -14,6 +14,7 @@ + =========================================================================*/ + + #include ++#include + + #include "vtkLine.h" + #include "vtkMath.h" +diff --git a/Common/DataModel/vtkPiecewiseFunction.cxx b/Common/DataModel/vtkPiecewiseFunction.cxx +index 22eca0bc22..11086f1dc4 100644 +--- a/Common/DataModel/vtkPiecewiseFunction.cxx ++++ b/Common/DataModel/vtkPiecewiseFunction.cxx +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx +index a16bb27fc6..1052192c61 100644 +--- a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx ++++ b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx +@@ -27,6 +27,7 @@ + #include "vtkHyperTreeGridNonOrientedCursor.h" + + #include ++#include + + vtkStandardNewMacro(vtkHyperTreeGridThreshold); + +diff --git a/Rendering/Core/vtkColorTransferFunction.cxx b/Rendering/Core/vtkColorTransferFunction.cxx +index 55c046b4df..1be02919ab 100644 +--- a/Rendering/Core/vtkColorTransferFunction.cxx ++++ b/Rendering/Core/vtkColorTransferFunction.cxx +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/vtk-proj6_compat.patch b/vtk-proj6_compat.patch deleted file mode 100644 index 95e4a6d..0000000 --- a/vtk-proj6_compat.patch +++ /dev/null @@ -1,264 +0,0 @@ ---- a/CMake/FindLibPROJ.cmake -+++ b/CMake/FindLibPROJ.cmake -@@ -30,7 +30,7 @@ if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibP - ) - - find_path( LibPROJ_INCLUDE_DIR -- NAMES proj_api.h -+ NAMES proj_api.h proj.h - HINTS - ${_LibPROJ_DIR} - ${_LibPROJ_DIR}/include ---- a/Geovis/Core/vtkGeoProjection.cxx -+++ b/Geovis/Core/vtkGeoProjection.cxx -@@ -72,6 +72,9 @@ public: - } - - std::map< std::string, std::string > OptionalParameters; -+#if PROJ_VERSION_MAJOR >= 5 -+ PJ_PROJ_INFO ProjInfo; -+#endif - }; - - //----------------------------------------------------------------------------- -@@ -80,7 +83,7 @@ int vtkGeoProjection::GetNumberOfProject - if ( vtkGeoProjectionNumProj < 0 ) - { - vtkGeoProjectionNumProj = 0; -- for ( const PJ_LIST* pj = pj_get_list_ref(); pj && pj->id; ++ pj ) -+ for ( const PJ_LIST* pj = proj_list_operations(); pj && pj->id; ++ pj ) - ++ vtkGeoProjectionNumProj; - } - return vtkGeoProjectionNumProj; -@@ -91,7 +94,7 @@ const char* vtkGeoProjection::GetProject - if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() ) - return nullptr; - -- return pj_get_list_ref()[projection].id; -+ return proj_list_operations()[projection].id; - } - //----------------------------------------------------------------------------- - const char* vtkGeoProjection::GetProjectionDescription( int projection ) -@@ -99,7 +102,7 @@ const char* vtkGeoProjection::GetProject - if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() ) - return nullptr; - -- return pj_get_list_ref()[projection].descr[0]; -+ return proj_list_operations()[projection].descr[0]; - } - //----------------------------------------------------------------------------- - vtkGeoProjection::vtkGeoProjection() -@@ -144,7 +147,7 @@ void vtkGeoProjection::PrintSelf( ostrea - int vtkGeoProjection::GetIndex() - { - int i = 0; -- for ( const PJ_LIST* proj = pj_get_list_ref(); proj && proj->id; ++ proj, ++ i ) -+ for ( const PJ_LIST* proj = proj_list_operations(); proj && proj->id; ++ proj, ++ i ) - { - if ( ! strcmp( proj->id, this->Name ) ) - { -@@ -161,7 +164,11 @@ const char* vtkGeoProjection::GetDescrip - { - return nullptr; - } -+#if PROJ_VERSION_MAJOR >= 5 -+ return this->Internals->ProjInfo.description; -+#else - return this->Projection->descr; -+#endif - } - //----------------------------------------------------------------------------- - projPJ vtkGeoProjection::GetProjection() -@@ -232,6 +239,9 @@ int vtkGeoProjection::UpdateProjection() - this->ProjectionMTime = this->GetMTime(); - if ( this->Projection ) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ this->Internals->ProjInfo = proj_pj_info(this->Projection); -+#endif - return 0; - } - return 1; ---- a/Geovis/Core/vtkGeoTransform.cxx -+++ b/Geovis/Core/vtkGeoTransform.cxx -@@ -167,9 +167,17 @@ void vtkGeoTransform::InternalTransformP - double* coord = x; - for ( vtkIdType i = 0; i < numPts; ++ i ) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ xy.x = coord[0]; xy.y = coord[1]; -+#else - xy.u = coord[0]; xy.v = coord[1]; -+#endif - lp = pj_inv( xy, src ); -+#if PROJ_VERSION_MAJOR >= 5 -+ coord[0] = lp.lam; coord[1] = lp.phi; -+#else - coord[0] = lp.u; coord[1] = lp.v; -+#endif - coord += stride; - } - } -@@ -191,9 +199,17 @@ void vtkGeoTransform::InternalTransformP - double* coord = x; - for ( vtkIdType i = 0; i < numPts; ++ i ) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ lp.lam = coord[0]; lp.phi = coord[1]; -+#else - lp.u = coord[0]; lp.v = coord[1]; -+#endif - xy = pj_fwd( lp, dst ); -+#if PROJ_VERSION_MAJOR >= 5 -+ coord[0] = xy.x; coord[1] = xy.y; -+#else - coord[0] = xy.u; coord[1] = xy.v; -+#endif - coord += stride; - } - } ---- a/ThirdParty/libproj/vtk_libproj.h.in -+++ b/ThirdParty/libproj/vtk_libproj.h.in -@@ -15,10 +15,20 @@ - #ifndef vtk_libproj_h - #define vtk_libproj_h - -+#define VTK_LibPROJ_MAJOR_VERSION @LibPROJ_MAJOR_VERSION@ -+ - /* Use the libproj library configured for VTK. */ - #cmakedefine VTK_USE_SYSTEM_LIBPROJ - #ifdef VTK_USE_SYSTEM_LIBPROJ --# include -+# if VTK_LibPROJ_MAJOR_VERSION >= 5 -+# include -+# endif -+# if VTK_LibPROJ_MAJOR_VERSION < 6 -+# include -+# endif -+# if VTK_LibPROJ_MAJOR_VERSION >= 6 -+# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1 -+# endif - # include - # include - #else ---- VTK-8.2.0/CMake/FindLibPROJ.cmake 2019-09-11 22:13:29.493741215 -0600 -+++ vtk/CMake/FindLibPROJ.cmake 2019-09-11 19:56:57.465802610 -0600 -@@ -1,55 +1,67 @@ --# Find LibPROJ library and header file --# Sets --# LibPROJ_FOUND to 0 or 1 depending on the result --# LibPROJ_INCLUDE_DIR to directories required for using libproj4 --# LibPROJ_LIBRARIES to libproj4 and any dependent libraries --# If LibPROJ_REQUIRED is defined, then a fatal error message will be generated if libproj4 is not found -- --if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibPROJ_LIBRARIES OR NOT LibPROJ_FOUND ) -+find_path(LibPROJ_INCLUDE_DIR -+ NAMES proj_api.h proj.h -+ DOC "libproj include directories") -+mark_as_advanced(LibPROJ_INCLUDE_DIR) - -- if ( $ENV{LibPROJ_DIR} ) -- file( TO_CMAKE_PATH "$ENV{LibPROJ_DIR}" _LibPROJ_DIR ) -+find_library(LibPROJ_LIBRARY_RELEASE -+ NAMES proj -+ DOC "libproj release library") -+mark_as_advanced(LibPROJ_LIBRARY_RELEASE) -+ -+find_library(LibPROJ_LIBRARY_DEBUG -+ NAMES projd -+ DOC "libproj debug library") -+mark_as_advanced(LibPROJ_LIBRARY_DEBUG) -+ -+include(SelectLibraryConfigurations) -+select_library_configurations(LibPROJ) -+ -+if (LibPROJ_INCLUDE_DIR) -+ if (EXISTS "${LibPROJ_INCLUDE_DIR}/proj.h") -+ file(STRINGS "${LibPROJ_INCLUDE_DIR}/proj.h" _libproj_version_lines REGEX "#define[ \t]+PROJ_VERSION_(MAJOR|MINOR|PATCH)") -+ string(REGEX REPLACE ".*PROJ_VERSION_MAJOR *\([0-9]*\).*" "\\1" _libproj_version_major "${_libproj_version_lines}") -+ string(REGEX REPLACE ".*PROJ_VERSION_MINOR *\([0-9]*\).*" "\\1" _libproj_version_minor "${_libproj_version_lines}") -+ string(REGEX REPLACE ".*PROJ_VERSION_PATCH *\([0-9]*\).*" "\\1" _libproj_version_patch "${_libproj_version_lines}") -+ else () -+ file(STRINGS "${LibPROJ_INCLUDE_DIR}/proj_api.h" _libproj_version_lines REGEX "#define[ \t]+PJ_VERSION") -+ string(REGEX REPLACE ".*PJ_VERSION *\([0-9]*\).*" "\\1" _libproj_version "${_libproj_version_lines}") -+ math(EXPR _libproj_version_major "${_libproj_version} / 100") -+ math(EXPR _libproj_version_minor "(${_libproj_version} % 100) / 10") -+ math(EXPR _libproj_version_patch "${_libproj_version} % 10") - endif () -- -- set(LibPROJ_LIBRARY_SEARCH_PATHS -- ${_LibPROJ_DIR} -- ${_LibPROJ_DIR}/lib64 -- ${_LibPROJ_DIR}/lib -- ) -- -- find_library( LibPROJ_LIBRARY_RELEASE -- NAMES proj -- HINTS -- ${LibPROJ_LIBRARY_SEARCH_PATHS} -- ) -- -- find_library( LibPROJ_LIBRARY_DEBUG -- NAMES projd -- PATHS -- ${LibPROJ_LIBRARY_SEARCH_PATHS} -- ) -- -- find_path( LibPROJ_INCLUDE_DIR -- NAMES proj_api.h proj.h -- HINTS -- ${_LibPROJ_DIR} -- ${_LibPROJ_DIR}/include -- ) -- -- include(SelectLibraryConfigurations) -- select_library_configurations(LibPROJ) -- -- include(FindPackageHandleStandardArgs) -- find_package_handle_standard_args(LibPROJ -- REQUIRED_VARS LibPROJ_LIBRARY LibPROJ_INCLUDE_DIR) -- -- if(LibPROJ_FOUND) -- set(LibPROJ_INCLUDE_DIRS ${LibPROJ_INCLUDE_DIR}) -- -- if(NOT LibPROJ_LIBRARIES) -- set(LibPROJ_LIBRARIES ${LibPROJ_LIBRARY}) -- endif() -- endif() -+ set(LibPROJ_VERSION "${_libproj_version_major}.${_libproj_version_minor}.${_libproj_version_patch}") -+ set(LibPROJ_MAJOR_VERSION "${_libproj_version_major}") -+ unset(_libproj_version_major) -+ unset(_libproj_version_minor) -+ unset(_libproj_version_patch) -+ unset(_libproj_version) -+ unset(_libproj_version_lines) - endif () - --mark_as_advanced(LibPROJ_INCLUDE_DIR) -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(LibPROJ -+ REQUIRED_VARS LibPROJ_LIBRARY LibPROJ_INCLUDE_DIR -+ VERSION_VAR LibPROJ_VERSION) -+ -+if (LibPROJ_FOUND) -+ set(LibPROJ_INCLUDE_DIRS "${LibPROJ_INCLUDE_DIR}") -+ set(LibPROJ_LIBRARIES "${LibPROJ_LIBRARY}") -+ -+ if (NOT TARGET LibPROJ::LibPROJ) -+ add_library(LibPROJ::LibPROJ UNKNOWN IMPORTED) -+ set_target_properties(LibPROJ::LibPROJ PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${LibPROJ_INCLUDE_DIR}") -+ if (LibPROJ_LIBRARY_RELEASE) -+ set_property(TARGET LibPROJ::LibPROJ APPEND PROPERTY -+ IMPORTED_CONFIGURATIONS RELEASE) -+ set_target_properties(LibPROJ::LibPROJ PROPERTIES -+ IMPORTED_LOCATION_RELEASE "${LibPROJ_LIBRARY_RELEASE}") -+ endif () -+ if (LibPROJ_LIBRARY_DEBUG) -+ set_property(TARGET LibPROJ::LibPROJ APPEND PROPERTY -+ IMPORTED_CONFIGURATIONS DEBUG) -+ set_target_properties(LibPROJ::LibPROJ PROPERTIES -+ IMPORTED_LOCATION_DEBUG "${LibPROJ_LIBRARY_DEBUG}") -+ endif () -+ endif () -+endif () diff --git a/vtk.spec b/vtk.spec index e137a55..f59cf2d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -5,11 +5,11 @@ # '_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits@@LLVM_11' %global _lto_cflags %{nil} -# Disable OSMesa builds for now - see Bug 744434 -%bcond_without OSMesa +# OSMesa and X support are mutually exclusive. +# TODO - buid separate OSMesa version if desired +%bcond_with OSMesa %bcond_without java %bcond_without mpich -%bcond_without qt5 %bcond_without openmpi # s390x on EL8 does not have xorg-x11-drv-dummy %if 0%{?rhel} @@ -34,86 +34,90 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 8.2.0 -Release: 26%{?dist} +Version: 9.0.1 +Release: 1%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant License: BSD -Source0: http://www.vtk.org/files/release/8.2/VTK-%{version}.tar.gz -Source1: http://www.vtk.org/files/release/8.2/VTKData-%{version}.tar.gz +Source0: https://www.vtk.org/files/release/9.0/VTK-%{version}.tar.gz +Source1: https://www.vtk.org/files/release/9.0/VTKData-%{version}.tar.gz Source2: xorg.conf -Source3: FindPEGTL.cmake -# Python 3.8 support -Patch0: https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch -# Proj 6 support -Patch1: vtk-proj6_compat.patch -# GCC 10 support based on: -# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6420 -Patch2: vtk-gcc10.patch -# Qt 5.15 support -# https://gitlab.kitware.com/vtk/vtk/-/issues/18005 -Patch3: vtk-qt5.15.patch +# Patch required libharu version (Fedora 33+ contains the needed VTK patches) +Patch0: vtk-libharu.patch +Patch1: vtk-limits.patch +#Patch2: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7430.patch +Patch2: vtk-includes.patch +# Duplicate define conflict with Xutil, see: +# https://gitlab.kitware.com/vtk/vtk/-/issues/18048 +Patch3: vtk-AllValues.patch # Temporary patch for building against freetype-2.10.4, which removed FT_CALLBACK_DEF, # but was later re-added in https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=b0667d2d36fb134d48030b2a560eaaa37810d6ba Patch4: vtk_freetype-2.10.4.patch -URL: http://vtk.org/ +URL: https://vtk.org/ -BuildRequires: cmake -BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: gcc-c++ %{?with_java:BuildRequires: java-devel} -BuildRequires: libX11-devel, libXt-devel, libXext-devel -BuildRequires: libICE-devel, libGL-devel -%{?with_OSMesa:BuildRequires: mesa-libOSMesa-devel} -BuildRequires: tk-devel, tcl-devel -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel -%if 0%{with gl2ps} -BuildRequires: gl2ps-devel -%endif -BuildRequires: libtiff-devel, zlib-devel -BuildRequires: libxml2-devel -%if %{with qt5} -BuildRequires: cmake(Qt5) -BuildRequires: cmake(Qt5UiPlugin) -BuildRequires: cmake(Qt5X11Extras) -BuildRequires: qt5-qtwebkit-devel -BuildRequires: python%{python3_pkgversion}-qt5 -%else -BuildRequires: PyQt4-devel -BuildRequires: qt4-devel -BuildRequires: qtwebkit-devel -%endif -BuildRequires: chrpath -BuildRequires: doxygen, graphviz -BuildRequires: gnuplot -BuildRequires: boost-devel -BuildRequires: double-conversion-devel -BuildRequires: eigen3-devel -BuildRequires: glew-devel -BuildRequires: hdf5-devel -BuildRequires: jsoncpp-devel -BuildRequires: libtheora-devel -BuildRequires: mariadb-connector-c-devel -BuildRequires: netcdf-cxx-devel -BuildRequires: libpq-devel -BuildRequires: PEGTL-devel -BuildRequires: proj-devel -BuildRequires: pugixml-devel -BuildRequires: R-devel -BuildRequires: sqlite-devel -BuildRequires: wget %if %{with flexiblas} -BuildRequires: flexiblas-devel +BuildRequires: flexiblas-devel %else -BuildRequires: blas-devel -BuildRequires: lapack-devel +BuildRequires: blas-devel +BuildRequires: lapack-devel %endif -# Requires patched libharu https://github.com/libharu/libharu/pull/157 -#BuildRequires: libharu-devel -BuildRequires: lz4-devel -BuildRequires: motif-devel +BuildRequires: boost-devel +BuildRequires: double-conversion-devel +BuildRequires: eigen3-devel +BuildRequires: expat-devel +BuildRequires: freetype-devel +BuildRequires: gdal-devel +%if %{with gl2ps} +BuildRequires: gl2ps-devel +%endif +BuildRequires: glew-devel +BuildRequires: hdf5-devel +BuildRequires: jsoncpp-devel +BuildRequires: libarchive-devel +BuildRequires: libGL-devel +# Requires special patched version of libharu +BuildRequires: libharu-devel >= 2.3.0-9 +BuildRequires: libICE-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libpq-devel +BuildRequires: libtheora-devel +BuildRequires: libtiff-devel +BuildRequires: libxml2-devel +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXt-devel +BuildRequires: lz4-devel +BuildRequires: mariadb-connector-c-devel +%{?with_OSMesa:BuildRequires: mesa-libOSMesa-devel} +BuildRequires: motif-devel +BuildRequires: netcdf-cxx-devel +BuildRequires: openslide-devel +BuildRequires: PEGTL-devel +BuildRequires: proj-devel +BuildRequires: pugixml-devel +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-qt5 +BuildRequires: cmake(Qt5) +BuildRequires: cmake(Qt5UiPlugin) +BuildRequires: cmake(Qt5X11Extras) +BuildRequires: qt5-qtwebkit-devel +BuildRequires: R-devel +BuildRequires: sqlite-devel +BuildRequires: tcl-devel +BuildRequires: tk-devel +BuildRequires: utf8cpp-devel +BuildRequires: zlib-devel +BuildRequires: chrpath +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: gnuplot +BuildRequires: wget %if %{with mpich} BuildRequires: mpich-devel BuildRequires: python%{?python3_pkgversion}-mpi4py-mpich @@ -126,11 +130,71 @@ BuildRequires: netcdf-openmpi-devel %endif # For %check %if %{with xdummy} -BuildRequires: xorg-x11-drv-dummy +BuildRequires: xorg-x11-drv-dummy +BuildRequires: mesa-dri-drivers %endif %{!?with_java:Conflicts: vtk-java} Requires: hdf5 = %{_hdf5_version} +# Almost every BR needs to be required by the -devel packages +%global vtk_devel_requires \ +Requires: cmake \ +%if %{with flexiblas} \ +Requires: flexiblas-devel%{?_isa} \ +%else \ +Requires: blas-devel%{?_isa} \ +Requires: lapack-devel%{?_isa} \ +%endif \ +Requires: blas-devel%{?_isa} \ +Requires: boost-devel%{?_isa} \ +Requires: double-conversion-devel%{?_isa} \ +# eigen3 is noarch \ +Requires: eigen3-devel \ +Requires: expat-devel%{?_isa} \ +Requires: freetype-devel%{?_isa} \ +Requires: gdal-devel%{?_isa} \ +%if %{with gl2ps} \ +Requires: gl2ps-devel%{?_isa} \ +%endif \ +Requires: glew-devel%{?_isa} \ +%if %{with java} \ +Requires: java-devel \ +%endif \ +Requires: jsoncpp-devel%{?_isa} \ +Requires: lapack-devel%{?_isa} \ +Requires: libarchive-devel%{?_isa} \ +Requires: libGL-devel%{?_isa} \ +Requires: libharu-devel%{?_isa} >= 2.3.0-9 \ +Requires: libjpeg-devel%{?_isa} \ +Requires: libogg-devel%{?_isa} \ +Requires: libpng-devel%{?_isa} \ +Requires: libpq-devel%{?_isa} \ +Requires: libtheora-devel%{?_isa} \ +Requires: libtiff-devel%{?_isa} \ +Requires: libxml2-devel%{?_isa} \ +Requires: libX11-devel%{?_isa} \ +Requires: libXext-devel%{?_isa} \ +Requires: libXt-devel%{?_isa} \ +Requires: lz4-devel%{?_isa} \ +Requires: mariadb-connector-c-devel%{?_isa} \ +%if %{with OSMesa} \ +Requires: mesa-libOSMesa-devel%{?_isa} \ +%endif \ +Requires: netcdf-cxx-devel%{?_isa} \ +Requires: openslide-devel%{?_isa} \ +Requires: PEGTL-devel%{?_isa} \ +Requires: proj-devel%{?_isa} \ +Requires: pugixml-devel%{?_isa} \ +# bz #1183210 + #1183530 \ +Requires: python%{python3_pkgversion}-devel \ +Requires: sqlite-devel%{?_isa} \ +Requires: cmake(Qt5) \ +Requires: cmake(Qt5UiPlugin) \ +Requires: cmake(Qt5X11Extras) \ +Requires: qt5-qtwebkit-devel%{?_isa} \ +Requires: utf8cpp-devel \ +Requires: zlib-devel%{?_isa} \ + # Bundled KWSys # https://fedorahosted.org/fpc/ticket/555 # Components used are specified in Utilities/KWSys/CMakeLists.txt @@ -155,10 +219,7 @@ Provides: bundled(ftgl) = 1.32 %if !%{with gl2ps} Provides: bundled(gl2ps) = 1.4.0 %endif -Provides: bundled(libharu) Provides: bundled(metaio) -Provides: bundled(pugixml) = 1.8 -Provides: bundled(utf8cpp) Provides: bundled(verdict) = 1.2.0 Provides: bundled(vpic) Provides: bundled(xdmf2) = 2.1 @@ -184,76 +245,32 @@ Install the %{name}-openmpi package to get a version compiled with openmpi. %package devel Summary: VTK header files for building C++ code -Requires: vtk%{?_isa} = %{version}-%{release} -Requires: python%{python3_pkgversion}-vtk%{?_isa} = %{version}-%{release} -Requires: python%{python3_pkgversion}-vtk-qt%{?_isa} = %{version}-%{release} -%{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} -Requires: cmake -%if %{with flexiblas} -Requires: flexiblas-devel%{?_isa} -%else -Requires: blas-devel%{?_isa} -Requires: lapack-devel%{?_isa} -%endif -Requires: double-conversion-devel%{?_isa} -# eigen3 is noarch -Requires: eigen3-devel -Requires: expat-devel%{?_isa} -Requires: freetype-devel%{?_isa} -%if %{with gl2ps} -Requires: gl2ps-devel%{?_isa} -%endif -Requires: glew-devel%{?_isa} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release} Requires: hdf5-devel%{?_isa} -Requires: libjpeg-devel%{?_isa} -Requires: lz4-devel%{?_isa} -Requires: libpng-devel%{?_isa} -Requires: libogg-devel%{?_isa} -Requires: libSM-devel%{?_isa} -Requires: libtheora-devel%{?_isa} -Requires: libtiff-devel%{?_isa} -Requires: libxml2-devel%{?_isa} -Requires: libpq-devel%{?_isa} -Requires: PEGTL-devel%{?_isa} -Requires: proj-devel%{?_isa} -Requires: pugixml-devel%{?_isa} -Requires: sqlite-devel%{?_isa} -Requires: libX11-devel%{?_isa} -Requires: libXext-devel%{?_isa} -Requires: libXt-devel%{?_isa} -Requires: mariadb-devel%{?_isa} -Requires: netcdf-cxx-devel%{?_isa} -%if %{with qt5} -Requires: cmake(Qt5) -Requires: cmake(Qt5UiPlugin) -Requires: cmake(Qt5X11Extras) -Requires: qt5-qtwebkit-devel%{?_isa} -%else -Requires: qt4-devel%{?_isa} -Requires: qtwebkit-devel%{?_isa} -%endif -Requires: jsoncpp-devel%{?_isa} -# bz #1183210 + #1183530 -Requires: python%{python3_pkgversion}-devel +Requires: netcdf-mpich-devel%{?_isa} +%{vtk_devel_requires} -%description devel +%description devel This provides the VTK header files required to compile C++ programs that use VTK to do 3D visualization. -%package -n python%{python3_pkgversion}-vtk +%package -n python%{python3_pkgversion}-%{name} Summary: Python 3 bindings for VTK Requires: vtk%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python%{python3_pkgversion}-vtk} Provides: %{py3_dist vtk} = %{version} Provides: python%{python3_version}dist(vtk) = %{version} +Obsoletes: python3-vtk-qt < 8.2.0-15 +Provides: python%{python3_pkgversion}-vtk-qt = %{version}-%{release} -%description -n python%{python3_pkgversion}-vtk +%description -n python%{python3_pkgversion}-%{name} Python 3 bindings for VTK. %if %{with java} %package java Summary: Java bindings for VTK -Requires: vtk%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description java Java bindings for VTK. @@ -261,19 +278,11 @@ Java bindings for VTK. %package qt Summary: Qt bindings for VTK -Requires: vtk%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description qt Qt bindings for VTK. -%package -n python%{python3_pkgversion}-vtk-qt -Summary: Qt Python 3 bindings for VTK -Requires: vtk%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python%{python3_pkgversion}-vtk-qt} - -%description -n python%{python3_pkgversion}-vtk-qt -Qt Python 3 bindings for VTK. - %if %{with mpich} %package mpich Summary: The Visualization Toolkit - mpich version @@ -292,64 +301,31 @@ NOTE: The version in this package has been compiled with mpich support. %package mpich-devel Summary: VTK header files for building C++ code with mpich -Requires: vtk-mpich%{?_isa} = %{version}-%{release} -#Requires: python2-vtk%{?_isa} = %{version}-%{release} -#Requires: python2-vtk-qt%{?_isa} = %{version}-%{release} -%{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} -Requires: cmake +Requires: %{name}-mpich%{?_isa} = %{version}-%{release} +Requires: python%{python3_pkgversion}-%{name}-mpich%{?_isa} = %{version}-%{release} Requires: mpich-devel -%if %{with flexiblas} -Requires: flexiblas-devel%{?_isa} -%else -Requires: blas-devel%{?_isa} -Requires: lapack-devel%{?_isa} -%endif -%if 0%{with gl2ps} -Requires: gl2ps-devel%{?_isa} -%endif -Requires: expat-devel%{?_isa} -Requires: freetype-devel%{?_isa} Requires: hdf5-mpich-devel%{?_isa} -Requires: libjpeg-devel%{?_isa} -Requires: libpng-devel%{?_isa} -Requires: libogg-devel%{?_isa} -Requires: libtheora-devel%{?_isa} -Requires: libtiff-devel%{?_isa} -Requires: libxml2-devel%{?_isa} -Requires: libpq-devel%{?_isa} -Requires: mariadb-devel%{?_isa} -Requires: netcdf-cxx-devel%{?_isa} -Requires: netcdf-mpich-devel%{?_isa} -%if %{with qt5} -Requires: cmake(Qt5) -Requires: cmake(Qt5UiPlugin) -Requires: cmake(Qt5X11Extras) -Requires: qt5-qtwebkit-devel%{?_isa} -%else -Requires: qt4-devel%{?_isa} -Requires: qtwebkit-devel%{?_isa} -%endif -Requires: jsoncpp-devel%{?_isa} -# bz #1183210 + #1183530 -Requires: python%{python3_pkgversion}-devel +%{vtk_devel_requires} -%description mpich-devel +%description mpich-devel This provides the VTK header files required to compile C++ programs that use VTK to do 3D visualization. NOTE: The version in this package has been compiled with mpich support. -%package -n python%{python3_pkgversion}-vtk-mpich +%package -n python%{python3_pkgversion}-%{name}-mpich Summary: Python 3 bindings for VTK with mpich -Requires: vtk-mpich%{?_isa} = %{version}-%{release} +Requires: %{name}-mpich%{?_isa} = %{version}-%{release} +Obsoletes: python3-vtk-mpich-qt < 8.2.0-15 +Provides: python%{python3_pkgversion}-vtk-mpich-qt = %{version}-%{release} -%description -n python%{python3_pkgversion}-vtk-mpich +%description -n python%{python3_pkgversion}-%{name}-mpich python 3 bindings for VTK with mpich. %if %{with java} %package mpich-java Summary: Java bindings for VTK with mpich -Requires: vtk-mpich%{?_isa} = %{version}-%{release} +Requires: %{name}-mpich%{?_isa} = %{version}-%{release} %description mpich-java Java bindings for VTK with mpich. @@ -357,17 +333,10 @@ Java bindings for VTK with mpich. %package mpich-qt Summary: Qt bindings for VTK with mpich -Requires: vtk-mpich%{?_isa} = %{version}-%{release} +Requires: %{name}-mpich%{?_isa} = %{version}-%{release} %description mpich-qt Qt bindings for VTK with mpich. - -%package -n python%{python3_pkgversion}-vtk-mpich-qt -Summary: Qt Python 3 bindings for VTK with mpich -Requires: vtk-mpich%{?_isa} = %{version}-%{release} - -%description -n python%{python3_pkgversion}-vtk-mpich-qt -Qt Python 3 bindings for VTK with mpich. %endif %if %{with openmpi} @@ -388,64 +357,32 @@ NOTE: The version in this package has been compiled with openmpi support. %package openmpi-devel Summary: VTK header files for building C++ code with openmpi -Requires: vtk-openmpi%{?_isa} = %{version}-%{release} -#Requires: python2-vtk%{?_isa} = %{version}-%{release} -#Requires: python2-vtk-qt%{?_isa} = %{version}-%{release} -%{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}} -Requires: cmake +Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} +Requires: python%{python3_pkgversion}-%{name}-openmpi%{?_isa} = %{version}-%{release} Requires: openmpi-devel -%if %{with flexiblas} -Requires: flexiblas-devel%{?_isa} -%else -Requires: blas-devel%{?_isa} -Requires: lapack-devel%{?_isa} -%endif -%if 0%{with gl2ps} -Requires: gl2ps-devel%{?_isa} -%endif -Requires: expat-devel%{?_isa} -Requires: freetype-devel%{?_isa} Requires: hdf5-openmpi-devel%{?_isa} -Requires: libjpeg-devel%{?_isa} -Requires: libpng-devel%{?_isa} -Requires: libogg-devel%{?_isa} -Requires: libtheora-devel%{?_isa} -Requires: libtiff-devel%{?_isa} -Requires: libxml2-devel%{?_isa} -Requires: libpq-devel%{?_isa} -Requires: mariadb-devel%{?_isa} -Requires: netcdf-cxx-devel%{?_isa} Requires: netcdf-openmpi-devel%{?_isa} -%if %{with qt5} -Requires: cmake(Qt5) -Requires: cmake(Qt5UiPlugin) -Requires: cmake(Qt5X11Extras) -Requires: qt5-qtwebkit-devel%{?_isa} -%else -Requires: qt4-devel%{?_isa} -Requires: qtwebkit-devel%{?_isa} -%endif -Requires: jsoncpp-devel%{?_isa} -# bz #1183210 + #1183530 -Requires: python%{python3_pkgversion}-devel +%{vtk_devel_requires} -%description openmpi-devel +%description openmpi-devel This provides the VTK header files required to compile C++ programs that use VTK to do 3D visualization. NOTE: The version in this package has been compiled with openmpi support. -%package -n python%{python3_pkgversion}-vtk-openmpi +%package -n python%{python3_pkgversion}-%{name}-openmpi Summary: Python 3 bindings for VTK with openmpi -Requires: vtk-openmpi%{?_isa} = %{version}-%{release} +Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} +Obsoletes: python3-vtk-openmpi-qt < 8.2.0-15 +Provides: python%{python3_pkgversion}-vtk-openmpi-qt = %{version}-%{release} -%description -n python%{python3_pkgversion}-vtk-openmpi +%description -n python%{python3_pkgversion}-%{name}-openmpi Python 3 bindings for VTK with openmpi. %if %{with java} %package openmpi-java Summary: Java bindings for VTK with openmpi -Requires: vtk-openmpi%{?_isa} = %{version}-%{release} +Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} %endif %description openmpi-java @@ -453,17 +390,10 @@ Java bindings for VTK with openmpi. %package openmpi-qt Summary: Qt bindings for VTK with openmpi -Requires: vtk-openmpi%{?_isa} = %{version}-%{release} +Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} %description openmpi-qt Qt bindings for VTK with openmpi. - -%package -n python%{python3_pkgversion}-vtk-openmpi-qt -Summary: Qt Python 3 bindings for VTK with openmpi -Requires: vtk-openmpi%{?_isa} = %{version}-%{release} - -%description -n python%{python3_pkgversion}-vtk-openmpi-qt -Qt Python 3 bindings for VTK with openmpi. %endif %package data @@ -476,14 +406,14 @@ VTK data files for tests and examples. %package testing Summary: Testing programs for VTK -Requires: vtk%{?_isa} = %{version}-%{release}, vtk-data = %{version} +Requires: %{name}%{?_isa} = %{version}-%{release}, %{name}-data = %{version} %description testing Testing programs for VTK %package examples Summary: Examples for VTK -Requires: vtk%{?_isa} = %{version}-%{release}, vtk-data = %{version} +Requires: %{name}%{?_isa} = %{version}-%{release}, %{name}-data = %{version} %description examples This package contains many well-commented examples showing how to use @@ -493,28 +423,23 @@ programming languages. %prep %setup -q -b 1 -n VTK-%{version} -%patch0 -p1 -b .py38 -%patch1 -p1 -b .proj6 -%patch2 -p1 -b .gcc10 -%patch3 -p1 -b .qt5.15 +%patch0 -p1 -b .libharu +%patch1 -p1 -b .limits +%patch2 -p1 -b .includes +%patch3 -p1 -b .AllValues %patch4 -p1 -b .freetype # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged -# TODO - pugixml - https://gitlab.kitware.com/vtk/vtk/issues/17538 -# TODO - utf8cpp(source) - http://www.vtk.org/Bug/view.php?id=15730 # TODO - verdict - not yet packaged # TODO - VPIC - not yet packaged # TODO - xdmf2 - not yet packaged # TODO - xdmf3 - not yet packaged -for x in vtk{doubleconversion,eigen,expat,freetype,%{?_with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,kissfft,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,sqlite,theora,tiff,zfp,zlib} +for x in vtk{doubleconversion,eigen,expat,freetype,%{?with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,kissfft,libharu,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,pugixml,sqlite,theora,tiff,utf8,zfp,zlib} do rm -r ThirdParty/*/${x} done -# Needed to find PEGTL -cp %SOURCE3 CMake/FindPEGTL.cmake - # Remove unused KWSys items find Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm @@ -525,6 +450,7 @@ cp -a Examples vtk-examples rm -r vtk-examples/Examples/GUI/Win32 find vtk-examples -type f | xargs chmod -R a-x + %build export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" @@ -538,19 +464,30 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %endif %global vtk_cmake_options \\\ + -DCMAKE_INSTALL_DOCDIR=share/doc/%{name} \\\ + -DCMAKE_INSTALL_JARDIR=share/java \\\ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ + -DCMAKE_INSTALL_JNILIBDIR:PATH=%{_lib}/%{name} \\\ + -DCMAKE_INSTALL_LICENSEDIR:PATH=share/licenses/%{name} \\\ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \\\ - -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib} \\\ - -DVTK_INSTALL_DATA_DIR=share/vtk \\\ - -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \\\ - -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \\\ - -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \\\ + -DVTK_INSTALL_DATA_DIR=share/%{name} \\\ + -DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \\\ + -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{name} \\\ + -DVTK_VERSIONED_INSTALL:BOOL=OFF \\\ + -DVTK_GROUP_ENABLE_Imaging:STRING=YES \\\ + -DVTK_GROUP_ENABLE_Qt:STRING=YES \\\ + -DVTK_GROUP_ENABLE_Rendering:STRING=YES \\\ + -DVTK_GROUP_ENABLE_StandAlone:STRING=YES \\\ + -DVTK_GROUP_ENABLE_Views:STRING=YES \\\ + -DVTK_GROUP_ENABLE_Web:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_CommonArchive:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_GeovisGDAL:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_InfovisBoost:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_IOMySQL:STRING=YES \\\ -DVTK_PYTHON_VERSION=3 \\\ -%if %{with qt5} \ - -DVTK_INSTALL_QT_DIR:PATH=%{_lib}/qt5/plugins/designer \\\ -%else \ - -DVTK_INSTALL_QT_DIR:PATH=%{_lib}/qt4/plugins/designer \\\ -%endif \ - -DTK_INTERNAL_PATH:PATH=/usr/include/tk-private/generic \\\ %if %{with OSMesa} \ -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\ %endif \ @@ -563,62 +500,38 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DVTK_WRAP_JAVA:BOOL=OFF \\\ %endif \ -DVTK_WRAP_PYTHON:BOOL=ON \\\ - -DVTK_Group_Imaging:BOOL=ON \\\ - -DVTK_Group_Qt:BOOL=ON \\\ - -DVTK_Group_Rendering:BOOL=ON \\\ - -DVTK_Group_StandAlone:BOOL=ON \\\ - -DVTK_Group_Tk:BOOL=ON \\\ - -DVTK_Group_Views:BOOL=ON \\\ - -DModule_vtkIOExportOpenGL2:BOOL=ON \\\ - -DModule_vtkIOMySQL:BOOL=ON \\\ - -DModule_vtkIOPostgreSQL:BOOL=ON \\\ - -DModule_vtkRenderingParallel:BOOL=ON \\\ - -DModule_vtkTestingCore:BOOL=ON \\\ - -DModule_vtkTestingRendering:BOOL=ON \\\ -%if %{with qt5} \ - -DVTK_QT_VERSION:STRING="5" \\\ -%endif \ -DVTK_USE_OGGTHEORA_ENCODER=ON \\\ - -DVTK_USE_SYSTEM_LIBRARIES=ON \\\ - %{?vtk_use_system_gl2ps} \\\ - -DVTK_USE_SYSTEM_HDF5:BOOL=ON \\\ - -DVTK_USE_SYSTEM_LIBHARU=OFF \\\ - -DVTK_USE_SYSTEM_NETCDF:BOOL=ON -# Commented old flags in case we'd like to reactive some of them -# -DVTK_USE_DISPLAY:BOOL=OFF \ # This prevents building of graphics tests + -DVTK_USE_EXTERNAL=ON \\\ +%if !%{with gl2ps} \ + -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF \\\ +%endif \ + -DVTK_USE_TK=ON +# https://gitlab.kitware.com/cmake/cmake/issues/17223 +#-DVTK_MODULE_ENABLE_VTK_IOPostgreSQL:STRING=YES \\\ %global _vpath_builddir build %cmake \ %{vtk_cmake_options} \ %{?with_flexiblas:-DBLAS_LIBRARIES=-lflexiblas} \ - -DBUILD_DOCUMENTATION:BOOL=ON \ - -DBUILD_EXAMPLES:BOOL=ON \ - -DBUILD_TESTING:BOOL=ON + -DVTK_BUILD_DOCUMENTATION:BOOL=ON \ + -DVTK_BUILD_EXAMPLES:BOOL=ON \ + -DVTK_BUILD_TESTING:BOOL=ON %cmake_build -%cmake_build --target DoxygenDoc vtkMyDoxygenDoc +%cmake_build --target DoxygenDoc %if %{with mpich} %global _vpath_builddir build-mpich %_mpich_load -export CC=mpicc -export CXX=mpic++ +%define __cc mpicc +%define __cxx mpic++ %cmake \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ - -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib \ - -DVTK_INSTALL_LIBRARY_DIR:PATH=lib \ + -DCMAKE_INSTALL_LIBDIR:PATH=lib \ + -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ -DVTK_INSTALL_PACKAGE_DIR:PATH=lib/cmake \ -%if %{with qt5} - -DVTK_INSTALL_QT_DIR:PATH=lib/qt5/plugins/designer \ -%else - -DVTK_INSTALL_QT_DIR:PATH=lib/qt4/plugins/designer \ -%endif - -DVTK_Group_MPI:BOOL=ON \ - -DModule_vtkRenderingParallel:BOOL=ON \ - -DVTK_USE_PARALLEL:BOOL=ON \ - -DVTK_USE_SYSTEM_DIY2:BOOL=OFF \ - -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON + -DVTK_USE_MPI:BOOL=ON %cmake_build %_mpich_unload %endif @@ -626,25 +539,16 @@ export CXX=mpic++ %if %{with openmpi} %global _vpath_builddir build-openmpi %_openmpi_load -export CC=mpicc -export CXX=mpic++ +%define __cc mpicc +%define __cxx mpic++ %cmake \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ - -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib \ - -DVTK_INSTALL_LIBRARY_DIR:PATH=lib \ + -DCMAKE_INSTALL_LIBDIR:PATH=lib \ + -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ -DVTK_INSTALL_PACKAGE_DIR:PATH=lib/cmake \ -%if %{with qt5} - -DVTK_INSTALL_QT_DIR:PATH=lib/qt5/plugins/designer \ -%else - -DVTK_INSTALL_QT_DIR:PATH=lib/qt4/plugins/designer \ -%endif - -DVTK_Group_MPI:BOOL=ON \ - -DModule_vtkRenderingParallel:BOOL=ON \ - -DVTK_USE_PARALLEL:BOOL=ON \ - -DVTK_USE_SYSTEM_DIY2:BOOL=OFF \ - -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON + -DVTK_USE_MPI:BOOL=ON %cmake_build %_openmpi_unload %endif @@ -659,59 +563,31 @@ find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or \ %cmake_install pushd build -# Gather list of non-python/tcl libraries +# Gather list of non-java/python/qt libraries ls %{buildroot}%{_libdir}/*.so.* \ - | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > libs.list - -# List of executable examples -cat > examples.list << EOF -HierarchicalBoxPipeline -MultiBlock -Arrays -Cube -RGrid -SGrid -Medical1 -Medical2 -Medical3 -finance -AmbientSpheres -Cylinder -DiffuseSpheres -SpecularSpheres -Cone -Cone2 -Cone3 -Cone4 -Cone5 -Cone6 -EOF + | grep -Ev '(Java|Qt|Python)' | sed -e's,^%{buildroot},,' > libs.list # List of executable test binaries find bin \( -name \*Tests -o -name Test\* -o -name VTKBenchMark \) \ -printf '%f\n' > testing.list # Install examples too -for filelist in examples.list testing.list; do +for filelist in testing.list; do for file in `cat $filelist`; do install -p bin/$file %{buildroot}%{_bindir} done done # Fix up filelist paths -for filelist in examples.list testing.list; do +for filelist in testing.list; do perl -pi -e's,^,%{_bindir}/,' $filelist done # Remove any remnants of rpaths on files we install # Seems to be some kind of java path -for file in `cat examples.list testing.list`; do +for file in `cat testing.list`; do chrpath -d %{buildroot}$file done -chrpath -d %{buildroot}%{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so - -# Main package contains utils and core libs -cat libs.list popd %if %{with mpich} @@ -719,9 +595,12 @@ popd %global _vpath_builddir build-mpich %cmake_install -# Gather list of non-python/tcl libraries +# Gather list of non-java/pythonl/qt libraries ls %{buildroot}%{_libdir}/mpich/lib/*.so.* \ - | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > build-mpich/libs.list + | grep -Ev '(Java|Python|Qt)' | sed -e's,^%{buildroot},,' > build-mpich/libs.list + +# Move licenses since we cannot install them outside of CMAKE_INSTALL_PREFIX (MPI_HOME) +mv %{buildroot}%{_libdir}/mpich/share/licenses/vtk %{buildroot}%{_defaultlicensedir}/%{name}-mpich %_mpich_unload %endif @@ -730,9 +609,12 @@ ls %{buildroot}%{_libdir}/mpich/lib/*.so.* \ %global _vpath_builddir build-openmpi %cmake_install -# Gather list of non-python/tcl libraries +# Gather list of non-java/python//qt libraries ls %{buildroot}%{_libdir}/openmpi/lib/*.so.* \ - | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' > build-openmpi/libs.list + | grep -Ev '(Java|Python|Qt)' | sed -e's,^%{buildroot},,' > build-openmpi/libs.list + +# Move licenses since we cannot install them outside of CMAKE_INSTALL_PREFIX (MPI_HOME) +mv %{buildroot}%{_libdir}/openmpi/share/licenses/vtk %{buildroot}%{_defaultlicensedir}/%{name}-openmpi %_openmpi_unload %endif @@ -746,12 +628,13 @@ find Utilities/Upgrading -type f -print0 | xargs -0 chmod -x # Setup Wrapping docs tree mkdir -p _docs -cp -pr --parents Wrapping/*/README* _docs/ +cp -pr --parents Wrapping/*/README* _docs/ #Install data mkdir -p %{buildroot}%{_datadir}/vtkdata cp -alL build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ + %check cp %SOURCE2 . %if %{with xdummy} @@ -773,22 +656,23 @@ cat xorg.log %files -f build/libs.list -%license Copyright.txt +%license %{_defaultlicensedir}/%{name}/ %doc README.md _docs/Wrapping %files devel %doc Utilities/Upgrading +%{_bindir}/vtkProbeOpenGLVersion %{_bindir}/vtkWrapHierarchy -%{_includedir}/vtk +%{_includedir}/%{name} %{_libdir}/*.so -%{_libdir}/libvtkWrappingTools.a -%{_libdir}/cmake/vtk/ -%{_docdir}/vtk-8.2/ +%{_libdir}/cmake/%{name}/ +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/hierarchy/ +%{_docdir}/%{name}-9.0/ %files -n python%{python3_pkgversion}-vtk %{python3_sitearch}/* -%{_libdir}/*Python%{python3_version_nodots}D.so.* -%exclude %{_libdir}/*QtPython%{python3_version_nodots}D.so.* +%{_libdir}/*Python*.so.* %{_bindir}/vtkpython %{_bindir}/vtkWrapPython %{_bindir}/vtkWrapPythonInit @@ -796,36 +680,34 @@ cat xorg.log %if %{with java} %files java %{_libdir}/*Java.so.* -%{_libdir}/vtk.jar +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/*Java.so +%{_javadir}/vtk.jar %{_bindir}/vtkParseJava %{_bindir}/vtkWrapJava %endif %files qt %{_libdir}/lib*Qt*.so.* -%exclude %{_libdir}/*Python%{python3_version_nodots}D.so.* -%{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so - -%files -n python%{python3_pkgversion}-vtk-qt -%{_libdir}/*QtPython%{python3_version_nodots}D.so.* +%exclude %{_libdir}/*Python*.so.* %if %{with mpich} %files mpich -f build-mpich/libs.list -%license Copyright.txt +%license %{_defaultlicensedir}/%{name}-mpich/ %doc README.md _docs/Wrapping %files mpich-devel +%{_libdir}/mpich/bin/vtkProbeOpenGLVersion %{_libdir}/mpich/bin/vtkWrapHierarchy %{_libdir}/mpich/include/ %{_libdir}/mpich/lib/*.so -%{_libdir}/mpich/lib/libvtkWrappingTools.a %{_libdir}/mpich/lib/cmake/ -%{_libdir}/mpich/share/doc/vtk-8.2/ +%dir %{_libdir}/mpich/lib/%{name} +%{_libdir}/mpich/lib/%{name}/hierarchy/ %files -n python%{python3_pkgversion}-vtk-mpich %{_libdir}/mpich/lib/python%{python3_version}/ -%{_libdir}/mpich/lib/*Python%{python3_version_nodots}D.so.* -%exclude %{_libdir}/mpich/lib/*QtPython%{python3_version_nodots}D.so.* +%{_libdir}/mpich/lib/*Python*.so.* %{_libdir}/mpich/bin/pvtkpython %{_libdir}/mpich/bin/vtkpython %{_libdir}/mpich/bin/vtkWrapPython @@ -834,38 +716,35 @@ cat xorg.log %if %{with java} %files mpich-java %{_libdir}/mpich/lib/*Java.so.* -%{_libdir}/mpich/lib/vtk.jar +%dir %{_libdir}/mpich/lib/%{name} +%{_libdir}/mpich/lib/%{name}/*Java.so +%{_libdir}/mpich/share/java/vtk.jar %{_libdir}/mpich/bin/vtkParseJava %{_libdir}/mpich/bin/vtkWrapJava %endif %files mpich-qt %{_libdir}/mpich/lib/lib*Qt*.so.* -%exclude %{_libdir}/mpich/lib/*Python%{python3_version_nodots}D.so.* -%{_libdir}/mpich/lib/qt?/ - -%files -n python%{python3_pkgversion}-vtk-mpich-qt -%{_libdir}/mpich/lib/*QtPython%{python3_version_nodots}D.so.* +%exclude %{_libdir}/mpich/lib/*Python*.so.* %endif %if %{with openmpi} %files openmpi -f build-openmpi/libs.list -%license Copyright.txt +%license %{_defaultlicensedir}/%{name}-openmpi/ %doc README.md _docs/Wrapping %files openmpi-devel +%{_libdir}/openmpi/bin/vtkProbeOpenGLVersion %{_libdir}/openmpi/bin/vtkWrapHierarchy %{_libdir}/openmpi/include/ %{_libdir}/openmpi/lib/*.so -%{_libdir}/openmpi/lib/libvtkWrappingTools.a %{_libdir}/openmpi/lib/cmake/ -%{_libdir}/openmpi/share/doc/vtk-8.2/ - +%dir %{_libdir}/openmpi/lib/%{name} +%{_libdir}/openmpi/lib/%{name}/hierarchy/ %files -n python%{python3_pkgversion}-vtk-openmpi %{_libdir}/openmpi/lib/python%{python3_version}/ -%{_libdir}/openmpi/lib/*Python%{python3_version_nodots}D.so.* -%exclude %{_libdir}/openmpi/lib/*QtPython%{python3_version_nodots}D.so.* +%{_libdir}/openmpi/lib/*Python*.so.* %{_libdir}/openmpi/bin/pvtkpython %{_libdir}/openmpi/bin/vtkpython %{_libdir}/openmpi/bin/vtkWrapPython @@ -874,18 +753,16 @@ cat xorg.log %if %{with java} %files openmpi-java %{_libdir}/openmpi/lib/*Java.so.* -%{_libdir}/openmpi/lib/vtk.jar +%dir %{_libdir}/openmpi/lib/%{name} +%{_libdir}/openmpi/lib/%{name}/*Java.so +%{_libdir}/openmpi/share/java/vtk.jar %{_libdir}/openmpi/bin/vtkParseJava %{_libdir}/openmpi/bin/vtkWrapJava %endif %files openmpi-qt %{_libdir}/openmpi/lib/lib*Qt*.so.* -%exclude %{_libdir}/openmpi/lib/*Python27D.so.* -%{_libdir}/openmpi/lib/qt?/ - -%files -n python%{python3_pkgversion}-vtk-openmpi-qt -%{_libdir}/openmpi/lib/*QtPython%{python3_version_nodots}D.so.* +%exclude %{_libdir}/openmpi/lib/*Python*.so.* %endif %files data @@ -893,11 +770,21 @@ cat xorg.log %files testing -f build/testing.list -%files examples -f build/examples.list +%files examples %doc vtk-examples/Examples %changelog +* Sat Jan 30 2021 Orion Poplawski - 9.0.1-1 +- Update to 9.0.1 +- Disable OSMesa - conflicts with X support +- Build against Fedora gl2ps, libharu, utf8cpp +- Drop python3-vtk-qt packages +- No longer ship compiled examples +- Install jar file into /usr/share/java +- Fix JNI install location +- Drop Qt4 build option + * Wed Jan 27 2021 Fedora Release Engineering - 8.2.0-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -1430,11 +1317,11 @@ cat xorg.log * Sun Jan 11 2004 Intrinsic Spin - Built against a reasonably good (according to dashboard) CVS version so-as to get GL2PS support. -- Rearranged. Cleaned up. Added some comments. +- Rearranged. Cleaned up. Added some comments. * Sat Jan 10 2004 Intrinsic Spin - Blatently stole this spec file for my own nefarious purposes. -- Removed Java (for now). Merged the Python and Tcl stuff into +- Removed Java (for now). Merged the Python and Tcl stuff into the main rpm. * Fri Dec 05 2003 Fabrice Bellet diff --git a/vtk_freetype-2.10.4.patch b/vtk_freetype-2.10.4.patch index d8469a5..4ae8269 100644 --- a/vtk_freetype-2.10.4.patch +++ b/vtk_freetype-2.10.4.patch @@ -1,23 +1,6 @@ -diff -rupN VTK-8.2.0/Rendering/FreeType/vtkFreeTypeTools.cxx VTK-8.2.0-new/Rendering/FreeType/vtkFreeTypeTools.cxx ---- VTK-8.2.0/Rendering/FreeType/vtkFreeTypeTools.cxx 2019-01-30 18:15:13.000000000 +0100 -+++ VTK-8.2.0-new/Rendering/FreeType/vtkFreeTypeTools.cxx 2020-11-06 00:21:07.259999338 +0100 -@@ -387,6 +387,13 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMap - } - - //---------------------------------------------------------------------------- -+#ifndef FT_CALLBACK_DEF -+#ifdef __cplusplus -+#define FT_CALLBACK_DEF( x ) extern "C" x -+#else -+#define FT_CALLBACK_DEF( x ) static x -+#endif -+#endif /* FT_CALLBACK_DEF */ - FT_CALLBACK_DEF(FT_Error) - vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, - FT_Library lib, -diff -rupN VTK-8.2.0/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx VTK-8.2.0-new/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx ---- VTK-8.2.0/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx 2019-01-30 18:15:13.000000000 +0100 -+++ VTK-8.2.0-new/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx 2020-11-06 00:21:25.588991839 +0100 +diff -up VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx.freetype VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +--- VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx.freetype 2021-01-23 17:24:14.600721579 -0700 ++++ VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx 2021-01-23 17:25:05.457127603 -0700 @@ -29,6 +29,13 @@ vtkStandardNewMacro(vtkFontConfigFreeTyp namespace { @@ -30,5 +13,22 @@ diff -rupN VTK-8.2.0/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +#endif +#endif /* FT_CALLBACK_DEF */ FT_CALLBACK_DEF(FT_Error) - vtkFontConfigFreeTypeToolsFaceRequester(FTC_FaceID face_id, - FT_Library lib, + vtkFontConfigFreeTypeToolsFaceRequester( + FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) +diff -up VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx.freetype VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx +--- VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx.freetype 2021-01-23 17:24:14.600721579 -0700 ++++ VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx 2021-01-23 17:25:49.546479602 -0700 +@@ -378,6 +378,13 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMap + } + + //---------------------------------------------------------------------------- ++#ifndef FT_CALLBACK_DEF ++#ifdef __cplusplus ++#define FT_CALLBACK_DEF( x ) extern "C" x ++#else ++#define FT_CALLBACK_DEF( x ) static x ++#endif ++#endif /* FT_CALLBACK_DEF */ + FT_CALLBACK_DEF(FT_Error) + vtkFreeTypeToolsFaceRequester( + FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) From ea410dd8ec167b39d903d8ff824e0ee3eca52026 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 8 Feb 2021 10:31:45 +0100 Subject: [PATCH 051/158] rebuild for libpq ABI fix Related: rhbz#1908268 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index f59cf2d..d1d5216 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.1 -Release: 1%{?dist} +Release: 2%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -775,6 +775,9 @@ cat xorg.log %changelog +* Mon Feb 08 2021 Pavel Raiskup - 9.0.1-2 +- rebuild for libpq ABI fix rhbz#1908268 + * Sat Jan 30 2021 Orion Poplawski - 9.0.1-1 - Update to 9.0.1 - Disable OSMesa - conflicts with X support From f60f3c41600a24c71dee4a042796beb98c19bd8a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 14 Feb 2021 20:23:55 -0700 Subject: [PATCH 052/158] Bump python3-vtk-qt obsoletes --- vtk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index d1d5216..d305c32 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.1 -Release: 2%{?dist} +Release: 3%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -261,7 +261,7 @@ Requires: vtk%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python%{python3_pkgversion}-vtk} Provides: %{py3_dist vtk} = %{version} Provides: python%{python3_version}dist(vtk) = %{version} -Obsoletes: python3-vtk-qt < 8.2.0-15 +Obsoletes: python3-vtk-qt < 8.2.0-27 Provides: python%{python3_pkgversion}-vtk-qt = %{version}-%{release} %description -n python%{python3_pkgversion}-%{name} @@ -775,6 +775,9 @@ cat xorg.log %changelog +* Mon Feb 15 2021 Orion Poplawski - 9.0.1-3 +- Bump python3-vtk-qt obsoletes + * Mon Feb 08 2021 Pavel Raiskup - 9.0.1-2 - rebuild for libpq ABI fix rhbz#1908268 From 3304f8febe2fb7de3588bddf03460f3e75b3325a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 7 Mar 2021 11:16:02 +0100 Subject: [PATCH 053/158] Rebuild (proj) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d305c32..5b43645 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.1 -Release: 3%{?dist} +Release: 4%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -775,6 +775,9 @@ cat xorg.log %changelog +* Sun Mar 07 2021 Sandro Mani - 9.0.1-4 +- Rebuild (proj) + * Mon Feb 15 2021 Orion Poplawski - 9.0.1-3 - Bump python3-vtk-qt obsoletes From b901524dddf159204a499e907d477079fa4af67e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 13 Mar 2021 11:38:37 -0700 Subject: [PATCH 054/158] Add upstream patch for proj 5 support --- vtk-proj5.patch | 131 ++++++++++++++++++++++++++++++++++++++++++++++++ vtk.spec | 6 +++ 2 files changed, 137 insertions(+) create mode 100644 vtk-proj5.patch diff --git a/vtk-proj5.patch b/vtk-proj5.patch new file mode 100644 index 0000000..d64121d --- /dev/null +++ b/vtk-proj5.patch @@ -0,0 +1,131 @@ +diff -up VTK-9.0.1/Geovis/Core/vtkGeoProjection.cxx.proj5 VTK-9.0.1/Geovis/Core/vtkGeoProjection.cxx +--- VTK-9.0.1/Geovis/Core/vtkGeoProjection.cxx.proj5 2020-06-26 07:24:40.000000000 -0600 ++++ VTK-9.0.1/Geovis/Core/vtkGeoProjection.cxx 2021-03-13 11:36:29.049321435 -0700 +@@ -121,7 +121,11 @@ vtkGeoProjection::~vtkGeoProjection() + this->SetPROJ4String(nullptr); + if (this->Projection) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ proj_destroy(this->Projection); ++#else + pj_free(this->Projection); ++#endif + } + delete this->Internals; + this->Internals = nullptr; +@@ -185,13 +189,21 @@ int vtkGeoProjection::UpdateProjection() + + if (this->Projection) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ proj_destroy(this->Projection); ++#else + pj_free(this->Projection); ++#endif + this->Projection = nullptr; + } + + if (this->PROJ4String && strlen(this->PROJ4String)) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ this->Projection = proj_create(PJ_DEFAULT_CTX, this->PROJ4String); ++#else + this->Projection = pj_init_plus(this->PROJ4String); ++#endif + } + else + { +@@ -230,8 +242,11 @@ int vtkGeoProjection::UpdateProjection() + stringHolder[i] = param.str(); + pjArgs[3 + i] = stringHolder[i].c_str(); + } +- ++#if PROJ_VERSION_MAJOR >= 5 ++ this->Projection = proj_create_argv(PJ_DEFAULT_CTX, argSize, const_cast(pjArgs)); ++#else + this->Projection = pj_init(argSize, const_cast(pjArgs)); ++#endif + delete[] pjArgs; + } + this->ProjectionMTime = this->GetMTime(); +diff -up VTK-9.0.1/Geovis/Core/vtkGeoTransform.cxx.proj5 VTK-9.0.1/Geovis/Core/vtkGeoTransform.cxx +--- VTK-9.0.1/Geovis/Core/vtkGeoTransform.cxx.proj5 2020-06-26 07:24:40.000000000 -0600 ++++ VTK-9.0.1/Geovis/Core/vtkGeoTransform.cxx 2021-03-13 11:35:13.646115813 -0700 +@@ -163,8 +163,12 @@ void vtkGeoTransform::InternalTransformP + projPJ src = this->SourceProjection ? this->SourceProjection->GetProjection() : nullptr; + projPJ dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : nullptr; + int delta = stride - 2; ++#if PROJ_VERSION_MAJOR >= 5 ++ PJ_COORD c, c_out; ++#else + projLP lp; + projXY xy; ++#endif + if (src) + { + // Convert from src system to lat/long using inverse of src transform +@@ -172,17 +176,15 @@ void vtkGeoTransform::InternalTransformP + for (vtkIdType i = 0; i < numPts; ++i) + { + #if PROJ_VERSION_MAJOR >= 5 +- xy.x = coord[0]; +- xy.y = coord[1]; ++ c.xy.x = coord[0]; ++ c.xy.y = coord[1]; ++ c_out = proj_trans(src, PJ_INV, c); ++ coord[0] = c_out.lp.lam; ++ coord[1] = c_out.lp.phi; + #else + xy.u = coord[0]; + xy.v = coord[1]; +-#endif + lp = pj_inv(xy, src); +-#if PROJ_VERSION_MAJOR >= 5 +- coord[0] = lp.lam; +- coord[1] = lp.phi; +-#else + coord[0] = lp.u; + coord[1] = lp.v; + #endif +@@ -208,17 +210,15 @@ void vtkGeoTransform::InternalTransformP + for (vtkIdType i = 0; i < numPts; ++i) + { + #if PROJ_VERSION_MAJOR >= 5 +- lp.lam = coord[0]; +- lp.phi = coord[1]; ++ c.lp.lam = coord[0]; ++ c.lp.phi = coord[1]; ++ c_out = proj_trans(src, PJ_FWD, c); ++ coord[0] = c_out.xy.x; ++ coord[1] = c_out.xy.y; + #else + lp.u = coord[0]; + lp.v = coord[1]; +-#endif + xy = pj_fwd(lp, dst); +-#if PROJ_VERSION_MAJOR >= 5 +- coord[0] = xy.x; +- coord[1] = xy.y; +-#else + coord[0] = xy.u; + coord[1] = xy.v; + #endif +diff -up VTK-9.0.1/ThirdParty/libproj/vtk_libproj.h.in.proj5 VTK-9.0.1/ThirdParty/libproj/vtk_libproj.h.in +--- VTK-9.0.1/ThirdParty/libproj/vtk_libproj.h.in.proj5 2020-06-26 07:24:40.000000000 -0600 ++++ VTK-9.0.1/ThirdParty/libproj/vtk_libproj.h.in 2021-03-13 11:35:13.646115813 -0700 +@@ -28,14 +28,9 @@ + #if VTK_MODULE_USE_EXTERNAL_vtklibproj + # if VTK_LibPROJ_MAJOR_VERSION >= 5 + # include +-# endif +-# if VTK_LibPROJ_MAJOR_VERSION < 6 ++# else + # include + # endif +-# if VTK_LibPROJ_MAJOR_VERSION >= 6 +-# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1 +-# endif +-# include + # include + #else + # include diff --git a/vtk.spec b/vtk.spec index 5b43645..c6f4d65 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,6 +54,8 @@ Patch3: vtk-AllValues.patch # Temporary patch for building against freetype-2.10.4, which removed FT_CALLBACK_DEF, # but was later re-added in https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=b0667d2d36fb134d48030b2a560eaaa37810d6ba Patch4: vtk_freetype-2.10.4.patch +# Proj 5 support - backport https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7731 +Patch5: vtk-proj5.patch URL: https://vtk.org/ @@ -428,6 +430,7 @@ programming languages. %patch2 -p1 -b .includes %patch3 -p1 -b .AllValues %patch4 -p1 -b .freetype +%patch5 -p1 -b .proj5 # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged @@ -775,6 +778,9 @@ cat xorg.log %changelog +* Sat Mar 13 2021 Orion Poplawski - 9.0.1-4 +- Add upstream patch for proj 5 support + * Sun Mar 07 2021 Sandro Mani - 9.0.1-4 - Rebuild (proj) From 8059b23730ae28e7e661296da32b0da84f5b1f8d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 1 Apr 2021 21:08:01 -0600 Subject: [PATCH 055/158] Make vtk-devel package require vtk-java --- vtk.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index c6f4d65..e15854e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.1 -Release: 4%{?dist} +Release: 5%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -248,6 +248,9 @@ Install the %{name}-openmpi package to get a version compiled with openmpi. %package devel Summary: VTK header files for building C++ code Requires: %{name}%{?_isa} = %{version}-%{release} +%if %{with java} +Requires: %{name}-java%{?_isa} = %{version}-%{release} +%endif Requires: python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release} Requires: hdf5-devel%{?_isa} Requires: netcdf-mpich-devel%{?_isa} @@ -778,6 +781,9 @@ cat xorg.log %changelog +* Fri Apr 02 2021 Orion Poplawski - 9.0.1-5 +- Make vtk-devel package require vtk-java + * Sat Mar 13 2021 Orion Poplawski - 9.0.1-4 - Add upstream patch for proj 5 support From cf797b0cc17d0bb2fad1464495fee412435a0340 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 7 May 2021 12:16:54 +0200 Subject: [PATCH 056/158] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index e15854e..e6aa2f7 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.1 -Release: 5%{?dist} +Release: 6%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -781,6 +781,9 @@ cat xorg.log %changelog +* Fri May 07 2021 Sandro Mani - 9.0.1-6 +- Rebuild (gdal) + * Fri Apr 02 2021 Orion Poplawski - 9.0.1-5 - Make vtk-devel package require vtk-java From 685cac8f0d372ea42cb612f763fe005543207ecd Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 20 May 2021 11:23:13 -0500 Subject: [PATCH 057/158] Rebuild for gdal 3.3.0. --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index e6aa2f7..8bc3fc3 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.1 -Release: 6%{?dist} +Release: 7%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -781,6 +781,9 @@ cat xorg.log %changelog +* Thu May 20 2021 Richard Shaw - 9.0.1-7 +- Rebuild for gdal 3.3.0. + * Fri May 07 2021 Sandro Mani - 9.0.1-6 - Rebuild (gdal) From 712b2482827705c27eb630f7abfde800f0d0096e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 21 May 2021 20:29:37 +0200 Subject: [PATCH 058/158] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 8bc3fc3..f32aeac 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.1 -Release: 7%{?dist} +Release: 8%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -781,6 +781,9 @@ cat xorg.log %changelog +* Fri May 21 2021 Sandro Mani - 9.0.1-8 +- Rebuild (gdal) + * Thu May 20 2021 Richard Shaw - 9.0.1-7 - Rebuild for gdal 3.3.0. From c9c6637f0322886f859b13d37afe217a56a7989f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:19:42 +0200 Subject: [PATCH 059/158] Rebuilt for Python 3.10 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index f32aeac..02150ae 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.1 -Release: 8%{?dist} +Release: 9%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -781,6 +781,9 @@ cat xorg.log %changelog +* Fri Jun 04 2021 Python Maint - 9.0.1-9 +- Rebuilt for Python 3.10 + * Fri May 21 2021 Sandro Mani - 9.0.1-8 - Rebuild (gdal) From 9adc5a5676ea05aa6a6418f4aee8cc19faa100cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 7 Jun 2021 11:38:53 +0200 Subject: [PATCH 060/158] Temporarily disable the RPATH check to unblock the Python 3.10 rebuild --- vtk.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/vtk.spec b/vtk.spec index 02150ae..506e76f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -5,6 +5,17 @@ # '_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits@@LLVM_11' %global _lto_cflags %{nil} +# https://fedoraproject.org/wiki/Changes/Broken_RPATH_will_fail_rpmbuild +# https://bugzilla.redhat.com/show_bug.cgi?id=1902729 +# ERROR 0008: file '/usr/lib64/mpich/lib/vtk/libvtkFiltersParallelGeometryJava.so' +# ERROR 0008: file '/usr/lib64/mpich/lib/vtk/libvtkFiltersParallelGeometryJava.so' +# ERROR 0008: file '/usr/lib64/mpich/lib/vtk/libvtkParallelMPIJava.so' +# ERROR 0008: file '/usr/lib64/mpich/lib/vtk/libvtkParallelMPIJava.so' +# contains the $ORIGIN runpath specifier at the wrong position in [/usr/lib64/mpich/lib:$ORIGIN:$ORIGIN/../] +# TODO fix or investigate +%global __brp_check_rpaths %{nil} + + # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired %bcond_with OSMesa From c5f398af4c47bb32d03f05a5bf58008a90fbdc25 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 30 Jun 2021 22:30:49 -0600 Subject: [PATCH 061/158] Update to 9.0.2 --- .gitignore | 2 ++ sources | 4 ++-- vtk.spec | 11 +++++------ vtk_freetype-2.10.4.patch | 34 ---------------------------------- 4 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 vtk_freetype-2.10.4.patch diff --git a/.gitignore b/.gitignore index 79d4c4e..3b2a162 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ vtk-5.6.0.tar.gz /VTKData-9.0.0.tar.gz /VTK-9.0.1.tar.gz /VTKData-9.0.1.tar.gz +/VTK-9.0.2.tar.gz +/VTKData-9.0.2.tar.gz diff --git a/sources b/sources index 4ae1996..3b8a9e6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.0.1.tar.gz) = eb2508e2409ad302cc5db65282a9c1ff4477ac8a93e0fee898ad8f0974d72decc7d5d444dc825a3c2f7952ebf59853616097ebe0d134649cab0d49a9619065bf -SHA512 (VTKData-9.0.1.tar.gz) = d2ebe6abaef0a7003d834ce65ea2b9f967e35b6c392bf6e46cea161f0ea5c1f03d0b7da5cbe3f2bbf8253bcc124c50a907c6edffe6108d0fab6d28b316b48658 +SHA512 (VTK-9.0.2.tar.gz) = 65c6bce3023b45f2d145023ae6bf224257a6d89cdf7bbd4acda3d6a25cb6b8c947f0e9a44129bd1882d6d8a8d46fd4caef0463bfb94afc9f4edcca8566bc2393 +SHA512 (VTKData-9.0.2.tar.gz) = 3f4f9e5d241b69b514a72bad9e5b956a5d60e1335edb3feb66666b58e2813039c1ed9ed90e521a377bfaef03453eda6bbadc265df42e9f1f4057d2cb5018f138 diff --git a/vtk.spec b/vtk.spec index 506e76f..42655dc 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,8 +45,8 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.0.1 -Release: 9%{?dist} +Version: 9.0.2 +Release: 1%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -62,9 +62,6 @@ Patch2: vtk-includes.patch # Duplicate define conflict with Xutil, see: # https://gitlab.kitware.com/vtk/vtk/-/issues/18048 Patch3: vtk-AllValues.patch -# Temporary patch for building against freetype-2.10.4, which removed FT_CALLBACK_DEF, -# but was later re-added in https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=b0667d2d36fb134d48030b2a560eaaa37810d6ba -Patch4: vtk_freetype-2.10.4.patch # Proj 5 support - backport https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7731 Patch5: vtk-proj5.patch @@ -443,7 +440,6 @@ programming languages. %patch1 -p1 -b .limits %patch2 -p1 -b .includes %patch3 -p1 -b .AllValues -%patch4 -p1 -b .freetype %patch5 -p1 -b .proj5 # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged @@ -792,6 +788,9 @@ cat xorg.log %changelog +* Thu Jul 01 2021 Orion Poplawski - 9.0.2-1 +- Update to 9.0.2 + * Fri Jun 04 2021 Python Maint - 9.0.1-9 - Rebuilt for Python 3.10 diff --git a/vtk_freetype-2.10.4.patch b/vtk_freetype-2.10.4.patch deleted file mode 100644 index 4ae8269..0000000 --- a/vtk_freetype-2.10.4.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx.freetype VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx ---- VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx.freetype 2021-01-23 17:24:14.600721579 -0700 -+++ VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx 2021-01-23 17:25:05.457127603 -0700 -@@ -29,6 +29,13 @@ vtkStandardNewMacro(vtkFontConfigFreeTyp - namespace - { - // The FreeType face requester callback: -+#ifndef FT_CALLBACK_DEF -+#ifdef __cplusplus -+#define FT_CALLBACK_DEF( x ) extern "C" x -+#else -+#define FT_CALLBACK_DEF( x ) static x -+#endif -+#endif /* FT_CALLBACK_DEF */ - FT_CALLBACK_DEF(FT_Error) - vtkFontConfigFreeTypeToolsFaceRequester( - FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) -diff -up VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx.freetype VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx ---- VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx.freetype 2021-01-23 17:24:14.600721579 -0700 -+++ VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx 2021-01-23 17:25:49.546479602 -0700 -@@ -378,6 +378,13 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMap - } - - //---------------------------------------------------------------------------- -+#ifndef FT_CALLBACK_DEF -+#ifdef __cplusplus -+#define FT_CALLBACK_DEF( x ) extern "C" x -+#else -+#define FT_CALLBACK_DEF( x ) static x -+#endif -+#endif /* FT_CALLBACK_DEF */ - FT_CALLBACK_DEF(FT_Error) - vtkFreeTypeToolsFaceRequester( - FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) From 74cdae9fac6650ac06623724bdf4bc02dc6fcc04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 13 Jul 2021 20:42:29 +0200 Subject: [PATCH 062/158] Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 --- vtk.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vtk.spec b/vtk.spec index 42655dc..a5c5265 100644 --- a/vtk.spec +++ b/vtk.spec @@ -46,7 +46,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.2 -Release: 1%{?dist} +Release: 2%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -518,14 +518,14 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %if !%{with gl2ps} \ -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF \\\ %endif \ - -DVTK_USE_TK=ON + -DVTK_USE_TK=ON \\\ + %{?with_flexiblas:-DBLA_VENDOR=FlexiBLAS} # https://gitlab.kitware.com/cmake/cmake/issues/17223 #-DVTK_MODULE_ENABLE_VTK_IOPostgreSQL:STRING=YES \\\ %global _vpath_builddir build %cmake \ %{vtk_cmake_options} \ - %{?with_flexiblas:-DBLAS_LIBRARIES=-lflexiblas} \ -DVTK_BUILD_DOCUMENTATION:BOOL=ON \ -DVTK_BUILD_EXAMPLES:BOOL=ON \ -DVTK_BUILD_TESTING:BOOL=ON @@ -788,6 +788,9 @@ cat xorg.log %changelog +* Tue Jul 13 2021 Björn Esser - 9.0.2-2 +- Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 + * Thu Jul 01 2021 Orion Poplawski - 9.0.2-1 - Update to 9.0.2 From 549726fd24dd1fe1a4919c9ded90efd8196d740c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:41:49 +0000 Subject: [PATCH 063/158] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index a5c5265..018ab09 100644 --- a/vtk.spec +++ b/vtk.spec @@ -46,7 +46,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.2 -Release: 2%{?dist} +Release: 3%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -788,6 +788,9 @@ cat xorg.log %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 9.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jul 13 2021 Björn Esser - 9.0.2-2 - Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 From 933b3454cee76e2682ba4139b4fd3d879a7001ed Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 7 Aug 2021 04:10:37 +0100 Subject: [PATCH 064/158] Rebuilt for Boost 1.76 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 018ab09..e2e20ba 100644 --- a/vtk.spec +++ b/vtk.spec @@ -46,7 +46,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.2 -Release: 3%{?dist} +Release: 4%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -788,6 +788,9 @@ cat xorg.log %changelog +* Sat Aug 07 2021 Jonathan Wakely - 9.0.2-4 +- Rebuilt for Boost 1.76 + * Fri Jul 23 2021 Fedora Release Engineering - 9.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From feba82afc30fc2c5301f78259184e789d975cbb1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Aug 2021 19:07:26 -0600 Subject: [PATCH 065/158] More rpath cleanup --- vtk.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index e2e20ba..a667385 100644 --- a/vtk.spec +++ b/vtk.spec @@ -46,7 +46,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.2 -Release: 4%{?dist} +Release: 5%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -599,8 +599,18 @@ done # Remove any remnants of rpaths on files we install # Seems to be some kind of java path for file in `cat testing.list`; do - chrpath -d %{buildroot}$file + chrpath -l -d %{buildroot}$file done +%if %{with mpich} +chrpath -l -d %{buildroot}%{_libdir}/mpich/bin/pvtkpython +chrpath -l -d %{buildroot}%{_libdir}/mpich/lib/python%{python3_version}/site-packages/vtkmodules/vtk*.so +chrpath -l -d %{buildroot}%{_libdir}/mpich/lib/vtk/libvtk{FiltersParallelGeometryJava,IOExodusJava,ParallelMPIJava}.so +%endif +%if %{with openmpi} +chrpath -l -d %{buildroot}%{_libdir}/openmpi/bin/pvtkpython +chrpath -l -d %{buildroot}%{_libdir}/openmpi/lib/python%{python3_version}/site-packages/vtkmodules/vtk*.so +chrpath -l -d %{buildroot}%{_libdir}/openmpi/lib/vtk/libvtk{FiltersParallelGeometryJava,IOExodusJava,ParallelMPIJava}.so +%endif popd %if %{with mpich} @@ -788,6 +798,9 @@ cat xorg.log %changelog +* Tue Aug 10 2021 Orion Poplawski - 9.0.2-5 +- More rpath cleanup + * Sat Aug 07 2021 Jonathan Wakely - 9.0.2-4 - Rebuilt for Boost 1.76 From 13c5adcd4179729b3abeed113f4f0ae2a2db9ea1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Aug 2021 20:16:17 -0600 Subject: [PATCH 066/158] Rebuild for hdf5 1.10.7/netcdf 4.8.0 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index a667385..3e00e84 100644 --- a/vtk.spec +++ b/vtk.spec @@ -46,7 +46,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.2 -Release: 5%{?dist} +Release: 6%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -798,6 +798,9 @@ cat xorg.log %changelog +* Tue Aug 10 2021 Orion Poplawski - 9.0.2-6 +- Rebuild for hdf5 1.10.7/netcdf 4.8.0 + * Tue Aug 10 2021 Orion Poplawski - 9.0.2-5 - More rpath cleanup From cdc92f1a01329afe108623f0b377f435885ebef6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 11 Aug 2021 22:00:21 -0600 Subject: [PATCH 067/158] Drop extra rpath fixes for now - missing files --- vtk.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/vtk.spec b/vtk.spec index 3e00e84..e9dba3e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -601,16 +601,17 @@ done for file in `cat testing.list`; do chrpath -l -d %{buildroot}$file done -%if %{with mpich} -chrpath -l -d %{buildroot}%{_libdir}/mpich/bin/pvtkpython -chrpath -l -d %{buildroot}%{_libdir}/mpich/lib/python%{python3_version}/site-packages/vtkmodules/vtk*.so -chrpath -l -d %{buildroot}%{_libdir}/mpich/lib/vtk/libvtk{FiltersParallelGeometryJava,IOExodusJava,ParallelMPIJava}.so -%endif -%if %{with openmpi} -chrpath -l -d %{buildroot}%{_libdir}/openmpi/bin/pvtkpython -chrpath -l -d %{buildroot}%{_libdir}/openmpi/lib/python%{python3_version}/site-packages/vtkmodules/vtk*.so -chrpath -l -d %{buildroot}%{_libdir}/openmpi/lib/vtk/libvtk{FiltersParallelGeometryJava,IOExodusJava,ParallelMPIJava}.so -%endif +# TODO - get proper list of files +#if %{with mpich} +#hrpath -l -d %{buildroot}%{_libdir}/mpich/bin/pvtkpython +#hrpath -l -d %{buildroot}%{_libdir}/mpich/lib/python%{python3_version}/site-packages/vtkmodules/vtk*.so +#hrpath -l -d %{buildroot}%{_libdir}/mpich/lib/vtk/libvtk{FiltersParallelGeometryJava,IOExodusJava,ParallelMPIJava}.so +#endif +#if %{with openmpi} +#hrpath -l -d %{buildroot}%{_libdir}/openmpi/bin/pvtkpython +#hrpath -l -d %{buildroot}%{_libdir}/openmpi/lib/python%{python3_version}/site-packages/vtkmodules/vtk*.so +#hrpath -l -d %{buildroot}%{_libdir}/openmpi/lib/vtk/libvtk{FiltersParallelGeometryJava,IOExodusJava,ParallelMPIJava}.so +#endif popd %if %{with mpich} From baa123e14b38523ed0099104722060db22ce7043 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 12 Aug 2021 08:13:21 -0600 Subject: [PATCH 068/158] Limit to 3 cpus on arm to try to prevent memory issues --- vtk.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vtk.spec b/vtk.spec index e9dba3e..c69449f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -474,6 +474,10 @@ export JAVA_HOME=/usr/lib/jvm/java # getting "java.lang.OutOfMemoryError: Java heap space" during the build export JAVA_TOOL_OPTIONS=-Xmx2048m %endif +%ifarch %{arm} +# Likely running out of memory during build +%global _smp_ncpus_max 3 +%endif %endif %global vtk_cmake_options \\\ From 9b4d485b83cee6b6564663f68905af3a0a967564 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 15 Sep 2021 08:19:29 -0600 Subject: [PATCH 069/158] Update to 9.0.3 Add upstream patch to fix Mayavi crash (bz#1966135) --- .gitignore | 2 ++ sources | 4 ++-- vtk-openslidereader.patch | 19 +++++++++++++++++++ vtk.spec | 12 ++++++++++-- 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 vtk-openslidereader.patch diff --git a/.gitignore b/.gitignore index 3b2a162..5c809d0 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ vtk-5.6.0.tar.gz /VTKData-9.0.1.tar.gz /VTK-9.0.2.tar.gz /VTKData-9.0.2.tar.gz +/VTK-9.0.3.tar.gz +/VTKData-9.0.3.tar.gz diff --git a/sources b/sources index 3b8a9e6..3b855ee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.0.2.tar.gz) = 65c6bce3023b45f2d145023ae6bf224257a6d89cdf7bbd4acda3d6a25cb6b8c947f0e9a44129bd1882d6d8a8d46fd4caef0463bfb94afc9f4edcca8566bc2393 -SHA512 (VTKData-9.0.2.tar.gz) = 3f4f9e5d241b69b514a72bad9e5b956a5d60e1335edb3feb66666b58e2813039c1ed9ed90e521a377bfaef03453eda6bbadc265df42e9f1f4057d2cb5018f138 +SHA512 (VTK-9.0.3.tar.gz) = 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2 +SHA512 (VTKData-9.0.3.tar.gz) = 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6 diff --git a/vtk-openslidereader.patch b/vtk-openslidereader.patch new file mode 100644 index 0000000..dd6f9cb --- /dev/null +++ b/vtk-openslidereader.patch @@ -0,0 +1,19 @@ +commit 27e159a06042fd144dd9d30183cb38b1eba943d7 +Author: Aleksei Nikiforov +Date: Fri Jun 25 11:36:29 2021 +0300 + + Fix crash in vtkOpenSlideReader destructor due to uninitialized pointer use + +diff --git a/Domains/Microscopy/vtkOpenSlideReader.h b/Domains/Microscopy/vtkOpenSlideReader.h +index 0e6daf8667..18a767886f 100644 +--- a/Domains/Microscopy/vtkOpenSlideReader.h ++++ b/Domains/Microscopy/vtkOpenSlideReader.h +@@ -73,7 +73,7 @@ protected: + void ExecuteDataWithInformation(vtkDataObject* out, vtkInformation* outInfo) override; + + private: +- openslide_t* openslide_handle; ++ openslide_t* openslide_handle = nullptr; + + vtkOpenSlideReader(const vtkOpenSlideReader&) = delete; + void operator=(const vtkOpenSlideReader&) = delete; diff --git a/vtk.spec b/vtk.spec index c69449f..c92dc52 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,8 +45,8 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.0.2 -Release: 6%{?dist} +Version: 9.0.3 +Release: 1%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -62,6 +62,9 @@ Patch2: vtk-includes.patch # Duplicate define conflict with Xutil, see: # https://gitlab.kitware.com/vtk/vtk/-/issues/18048 Patch3: vtk-AllValues.patch +# Upstream fix for openslidereader initialization that causes Mayavi to crash +# https://bugzilla.redhat.com/show_bug.cgi?id=1966135 +Patch4: vtk-openslidereader.patch # Proj 5 support - backport https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7731 Patch5: vtk-proj5.patch @@ -440,6 +443,7 @@ programming languages. %patch1 -p1 -b .limits %patch2 -p1 -b .includes %patch3 -p1 -b .AllValues +%patch4 -p1 -b .openslidereader %patch5 -p1 -b .proj5 # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged @@ -803,6 +807,10 @@ cat xorg.log %changelog +* Wed Sep 15 2021 Orion Poplawski - 9.0.3-1 +- Update to 9.0.3 +- Add upstream patch to fix Mayavi crash (bz#1966135) + * Tue Aug 10 2021 Orion Poplawski - 9.0.2-6 - Rebuild for hdf5 1.10.7/netcdf 4.8.0 From f5102d0f010a51440564c665753b8f4f6f428e16 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Sep 2021 19:33:29 -0600 Subject: [PATCH 070/158] Cleanup rpath handling (bz#1902729) --- vtk.spec | 52 ++++++++++++++++------------------------------------ 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/vtk.spec b/vtk.spec index c92dc52..826f872 100644 --- a/vtk.spec +++ b/vtk.spec @@ -5,17 +5,6 @@ # '_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits@@LLVM_11' %global _lto_cflags %{nil} -# https://fedoraproject.org/wiki/Changes/Broken_RPATH_will_fail_rpmbuild -# https://bugzilla.redhat.com/show_bug.cgi?id=1902729 -# ERROR 0008: file '/usr/lib64/mpich/lib/vtk/libvtkFiltersParallelGeometryJava.so' -# ERROR 0008: file '/usr/lib64/mpich/lib/vtk/libvtkFiltersParallelGeometryJava.so' -# ERROR 0008: file '/usr/lib64/mpich/lib/vtk/libvtkParallelMPIJava.so' -# ERROR 0008: file '/usr/lib64/mpich/lib/vtk/libvtkParallelMPIJava.so' -# contains the $ORIGIN runpath specifier at the wrong position in [/usr/lib64/mpich/lib:$ORIGIN:$ORIGIN/../] -# TODO fix or investigate -%global __brp_check_rpaths %{nil} - - # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired %bcond_with OSMesa @@ -46,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.3 -Release: 1%{?dist} +Release: 2%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -592,34 +581,15 @@ ls %{buildroot}%{_libdir}/*.so.* \ find bin \( -name \*Tests -o -name Test\* -o -name VTKBenchMark \) \ -printf '%f\n' > testing.list -# Install examples too -for filelist in testing.list; do - for file in `cat $filelist`; do - install -p bin/$file %{buildroot}%{_bindir} - done +# Install examples too, need to remove buildtime runpath manually +for file in `cat testing.list`; do + install -p bin/$file %{buildroot}%{_bindir} + chrpath -l -d %{buildroot}%{_bindir}/$file done # Fix up filelist paths -for filelist in testing.list; do - perl -pi -e's,^,%{_bindir}/,' $filelist -done +perl -pi -e's,^,%{_bindir}/,' testing.list -# Remove any remnants of rpaths on files we install -# Seems to be some kind of java path -for file in `cat testing.list`; do - chrpath -l -d %{buildroot}$file -done -# TODO - get proper list of files -#if %{with mpich} -#hrpath -l -d %{buildroot}%{_libdir}/mpich/bin/pvtkpython -#hrpath -l -d %{buildroot}%{_libdir}/mpich/lib/python%{python3_version}/site-packages/vtkmodules/vtk*.so -#hrpath -l -d %{buildroot}%{_libdir}/mpich/lib/vtk/libvtk{FiltersParallelGeometryJava,IOExodusJava,ParallelMPIJava}.so -#endif -#if %{with openmpi} -#hrpath -l -d %{buildroot}%{_libdir}/openmpi/bin/pvtkpython -#hrpath -l -d %{buildroot}%{_libdir}/openmpi/lib/python%{python3_version}/site-packages/vtkmodules/vtk*.so -#hrpath -l -d %{buildroot}%{_libdir}/openmpi/lib/vtk/libvtk{FiltersParallelGeometryJava,IOExodusJava,ParallelMPIJava}.so -#endif popd %if %{with mpich} @@ -666,6 +636,13 @@ cp -pr --parents Wrapping/*/README* _docs/ mkdir -p %{buildroot}%{_datadir}/vtkdata cp -alL build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ +# https://bugzilla.redhat.com/show_bug.cgi?id=1902729 +# contains the $ORIGIN runpath specifier at the wrong position in [/usr/lib64/mpich/lib:$ORIGIN:$ORIGIN/../] +# 0x0008 ... the special '$ORIGIN' RPATHs are appearing after other +# RPATHs; this is just a minor issue but usually unwanted +# The paths are equivalent and "this is just a minor issue", so we are allowing it below +export QA_RPATHS=8 + %check cp %SOURCE2 . @@ -807,6 +784,9 @@ cat xorg.log %changelog +* Sun Sep 26 2021 Orion Poplawski - 9.0.3-2 +- Cleanup rpath handling (bz#1902729) + * Wed Sep 15 2021 Orion Poplawski - 9.0.3-1 - Update to 9.0.3 - Add upstream patch to fix Mayavi crash (bz#1966135) From 91dba92acf030d29bfa6a2a692a4c1a64608c945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Nov 2021 20:29:31 +0100 Subject: [PATCH 071/158] Rebuild (jsoncpp) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 826f872..d972e2c 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.3 -Release: 2%{?dist} +Release: 3%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -784,6 +784,9 @@ cat xorg.log %changelog +* Wed Nov 03 2021 Björn Esser - 9.0.3-3 +- Rebuild (jsoncpp) + * Sun Sep 26 2021 Orion Poplawski - 9.0.3-2 - Cleanup rpath handling (bz#1902729) From 80ba414461382f4f4da2a22a60d56377a6b26879 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 11 Nov 2021 12:11:28 +0100 Subject: [PATCH 072/158] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d972e2c..b1eba83 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.0.3 -Release: 3%{?dist} +Release: 4%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -784,6 +784,9 @@ cat xorg.log %changelog +* Thu Nov 11 2021 Sandro Mani - 9.0.3-4 +- Rebuild (gdal) + * Wed Nov 03 2021 Björn Esser - 9.0.3-3 - Rebuild (jsoncpp) From 1c260d929fa9a98193d67e73537b49d4a80d3e73 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 3 Nov 2021 06:49:00 -0600 Subject: [PATCH 073/158] Update to 9.1.0 --- .gitignore | 2 + sources | 4 +- vtk-AllValues.patch | 81 +++++++++++------------ vtk-includes.patch | 71 --------------------- vtk-limits.patch | 60 ----------------- vtk-openslidereader.patch | 19 ------ vtk-proj5.patch | 131 -------------------------------------- vtk.spec | 76 ++++++++++++---------- 8 files changed, 86 insertions(+), 358 deletions(-) delete mode 100644 vtk-includes.patch delete mode 100644 vtk-limits.patch delete mode 100644 vtk-openslidereader.patch delete mode 100644 vtk-proj5.patch diff --git a/.gitignore b/.gitignore index 5c809d0..c9fc96e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ vtk-5.6.0.tar.gz /VTKData-9.0.2.tar.gz /VTK-9.0.3.tar.gz /VTKData-9.0.3.tar.gz +/VTK-9.1.0.tar.gz +/VTKData-9.1.0.tar.gz diff --git a/sources b/sources index 3b855ee..07ce256 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.0.3.tar.gz) = 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2 -SHA512 (VTKData-9.0.3.tar.gz) = 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6 +SHA512 (VTK-9.1.0.tar.gz) = b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a +SHA512 (VTKData-9.1.0.tar.gz) = 134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a diff --git a/vtk-AllValues.patch b/vtk-AllValues.patch index d032d92..7f6de66 100644 --- a/vtk-AllValues.patch +++ b/vtk-AllValues.patch @@ -1,8 +1,7 @@ -Index: VTK-9.0.1/Common/Core/vtkDataArray.cxx -=================================================================== ---- VTK-9.0.1.orig/Common/Core/vtkDataArray.cxx -+++ VTK-9.0.1/Common/Core/vtkDataArray.cxx -@@ -1627,7 +1627,7 @@ struct ScalarRangeDispatchWrapper +diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx +--- VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx.AllValues 2021-10-01 12:23:49.000000000 -0600 ++++ VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx 2021-10-04 19:27:42.557502417 -0600 +@@ -1674,7 +1674,7 @@ struct ScalarRangeDispatchWrapper void operator()(ArrayT* array) { this->Success = vtkDataArrayPrivate::DoComputeScalarRange( @@ -11,7 +10,7 @@ Index: VTK-9.0.1/Common/Core/vtkDataArray.cxx } }; -@@ -1646,7 +1646,7 @@ struct VectorRangeDispatchWrapper +@@ -1693,7 +1693,7 @@ struct VectorRangeDispatchWrapper void operator()(ArrayT* array) { this->Success = vtkDataArrayPrivate::DoComputeVectorRange( @@ -20,10 +19,9 @@ Index: VTK-9.0.1/Common/Core/vtkDataArray.cxx } }; -Index: VTK-9.0.1/Common/Core/vtkDataArray.h -=================================================================== ---- VTK-9.0.1.orig/Common/Core/vtkDataArray.h -+++ VTK-9.0.1/Common/Core/vtkDataArray.h +diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArray.h.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArray.h +--- VTK-9.1.0.rc1/Common/Core/vtkDataArray.h.AllValues 2021-10-01 12:23:49.000000000 -0600 ++++ VTK-9.1.0.rc1/Common/Core/vtkDataArray.h 2021-10-04 19:27:42.557502417 -0600 @@ -599,7 +599,7 @@ vtkArrayDownCast_FastCastMacro(vtkDataAr // vtkGenericDataArray.h as well. namespace vtkDataArrayPrivate @@ -33,33 +31,10 @@ Index: VTK-9.0.1/Common/Core/vtkDataArray.h { }; struct FiniteValues -Index: VTK-9.0.1/Common/Core/vtkGenericDataArray.txx -=================================================================== ---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArray.txx -+++ VTK-9.0.1/Common/Core/vtkGenericDataArray.txx -@@ -1192,7 +1192,7 @@ bool vtkGenericDataArray; - return ComputeScalarValueRangeImpl( -- static_cast(this), ranges, vtkDataArrayPrivate::AllValues{}, Supported{}); -+ static_cast(this), ranges, vtkDataArrayPrivate::vtkAllValues{}, Supported{}); - } - - //----------------------------------------------------------------------------- -@@ -1202,7 +1202,7 @@ bool vtkGenericDataArray; - return ComputeVectorValueRangeImpl( -- static_cast(this), range, vtkDataArrayPrivate::AllValues{}, Supported{}); -+ static_cast(this), range, vtkDataArrayPrivate::vtkAllValues{}, Supported{}); - } - - //----------------------------------------------------------------------------- -Index: VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx -=================================================================== ---- VTK-9.0.1.orig/Common/Core/vtkDataArrayPrivate.txx -+++ VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx -@@ -301,7 +301,7 @@ template +diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx +--- VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx.AllValues 2021-10-01 12:23:49.000000000 -0600 ++++ VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx 2021-10-04 19:27:42.559502435 -0600 +@@ -310,7 +310,7 @@ template struct ComputeScalarRange { template @@ -68,7 +43,7 @@ Index: VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx { AllValuesMinAndMax minmax(array); vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax); -@@ -435,7 +435,7 @@ public: +@@ -447,7 +447,7 @@ public: }; template @@ -77,7 +52,7 @@ Index: VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx { AllValuesGenericMinAndMax minmax(array); vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax); -@@ -518,7 +518,7 @@ bool DoComputeScalarRange(ArrayT* array, +@@ -530,7 +530,7 @@ bool DoComputeScalarRange(ArrayT* array, //---------------------------------------------------------------------------- // generic implementation that operates on ValueType. template @@ -86,10 +61,9 @@ Index: VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx { range[0] = vtkTypeTraits::Max(); range[1] = vtkTypeTraits::Min(); -Index: VTK-9.0.1/Common/Core/vtkGenericDataArray.h -=================================================================== ---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArray.h -+++ VTK-9.0.1/Common/Core/vtkGenericDataArray.h +diff -up VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h.AllValues VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h +--- VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h.AllValues 2021-10-01 12:23:49.000000000 -0600 ++++ VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h 2021-10-04 19:27:42.559502435 -0600 @@ -414,7 +414,7 @@ namespace vtkDataArrayPrivate template bool DoComputeScalarRange(A*, R*, T); @@ -135,3 +109,24 @@ Index: VTK-9.0.1/Common/Core/vtkGenericDataArray.h extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues); +diff -up VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx.AllValues VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx +--- VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx.AllValues 2021-10-01 12:23:49.000000000 -0600 ++++ VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx 2021-10-04 19:27:42.558502426 -0600 +@@ -1190,7 +1190,7 @@ bool vtkGenericDataArray; + return ComputeScalarValueRangeImpl( +- static_cast(this), ranges, vtkDataArrayPrivate::AllValues{}, Supported{}); ++ static_cast(this), ranges, vtkDataArrayPrivate::vtkAllValues{}, Supported{}); + } + + //----------------------------------------------------------------------------- +@@ -1200,7 +1200,7 @@ bool vtkGenericDataArray; + return ComputeVectorValueRangeImpl( +- static_cast(this), range, vtkDataArrayPrivate::AllValues{}, Supported{}); ++ static_cast(this), range, vtkDataArrayPrivate::vtkAllValues{}, Supported{}); + } + + //----------------------------------------------------------------------------- diff --git a/vtk-includes.patch b/vtk-includes.patch deleted file mode 100644 index f906200..0000000 --- a/vtk-includes.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -up VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx.includes VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx ---- VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx.includes 2020-06-26 07:24:40.000000000 -0600 -+++ VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx 2021-01-27 06:51:11.776958150 -0700 -@@ -61,10 +61,23 @@ typedef ptrdiff_t GLsizeiptr; - - #include - -+#include -+#include -+#if VTK_HAVE_XCURSOR -+#include -+#endif - #include - #include --#include - -+/* -+ * Work-around to get forward declarations of C typedef of anonymous -+ * structs working. We do not want to include XUtil.h in the header as -+ * it populates the global namespace. -+ */ -+struct vtkXVisualInfo : public XVisualInfo -+{ -+}; -+ - #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 - #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 - typedef GLXContext (*glXCreateContextAttribsARBProc)( -@@ -224,7 +237,7 @@ int XEventTypeEquals(Display*, XEvent* e - return event->type == EventType; - } - --XVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualInfo() -+vtkXVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualInfo() - { - XVisualInfo* v = nullptr; - -@@ -258,7 +271,7 @@ XVisualInfo* vtkXOpenGLRenderWindow::Get - vtkErrorMacro(<< "Could not find a decent visual\n"); - } - } -- return (v); -+ return reinterpret_cast(v); - } - - vtkXOpenGLRenderWindow::vtkXOpenGLRenderWindow() -diff -up VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h.includes VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h ---- VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h.includes 2020-06-26 07:24:40.000000000 -0600 -+++ VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h 2021-01-27 06:49:09.420323338 -0700 -@@ -28,11 +28,11 @@ - #include "vtkOpenGLRenderWindow.h" - #include "vtkRenderingOpenGL2Module.h" // For export macro - #include // Needed for X types used in the public interface --#include // Needed for X types used in the public interface - #include // for ivar - - class vtkIdList; - class vtkXOpenGLRenderWindowInternal; -+struct vtkXVisualInfo; - - class VTKRENDERINGOPENGL2_EXPORT vtkXOpenGLRenderWindow : public vtkOpenGLRenderWindow - { -@@ -112,7 +112,7 @@ public: - */ - virtual Colormap GetDesiredColormap(); - virtual Visual* GetDesiredVisual(); -- virtual XVisualInfo* GetDesiredVisualInfo(); -+ virtual vtkXVisualInfo* GetDesiredVisualInfo(); - virtual int GetDesiredDepth(); - //@} - diff --git a/vtk-limits.patch b/vtk-limits.patch deleted file mode 100644 index e581628..0000000 --- a/vtk-limits.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/Common/Core/vtkGenericDataArrayLookupHelper.h b/Common/Core/vtkGenericDataArrayLookupHelper.h -index ab9d57248f..202aaa27f4 100644 ---- a/Common/Core/vtkGenericDataArrayLookupHelper.h -+++ b/Common/Core/vtkGenericDataArrayLookupHelper.h -@@ -25,6 +25,7 @@ - #include "vtkIdList.h" - #include - #include -+#include - #include - #include - -diff --git a/Common/DataModel/Testing/Cxx/UnitTestLine.cxx b/Common/DataModel/Testing/Cxx/UnitTestLine.cxx -index 7b45f41202..223f4db7ef 100644 ---- a/Common/DataModel/Testing/Cxx/UnitTestLine.cxx -+++ b/Common/DataModel/Testing/Cxx/UnitTestLine.cxx -@@ -14,6 +14,7 @@ - =========================================================================*/ - - #include -+#include - - #include "vtkLine.h" - #include "vtkMath.h" -diff --git a/Common/DataModel/vtkPiecewiseFunction.cxx b/Common/DataModel/vtkPiecewiseFunction.cxx -index 22eca0bc22..11086f1dc4 100644 ---- a/Common/DataModel/vtkPiecewiseFunction.cxx -+++ b/Common/DataModel/vtkPiecewiseFunction.cxx -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx -index a16bb27fc6..1052192c61 100644 ---- a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx -+++ b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx -@@ -27,6 +27,7 @@ - #include "vtkHyperTreeGridNonOrientedCursor.h" - - #include -+#include - - vtkStandardNewMacro(vtkHyperTreeGridThreshold); - -diff --git a/Rendering/Core/vtkColorTransferFunction.cxx b/Rendering/Core/vtkColorTransferFunction.cxx -index 55c046b4df..1be02919ab 100644 ---- a/Rendering/Core/vtkColorTransferFunction.cxx -+++ b/Rendering/Core/vtkColorTransferFunction.cxx -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/vtk-openslidereader.patch b/vtk-openslidereader.patch deleted file mode 100644 index dd6f9cb..0000000 --- a/vtk-openslidereader.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 27e159a06042fd144dd9d30183cb38b1eba943d7 -Author: Aleksei Nikiforov -Date: Fri Jun 25 11:36:29 2021 +0300 - - Fix crash in vtkOpenSlideReader destructor due to uninitialized pointer use - -diff --git a/Domains/Microscopy/vtkOpenSlideReader.h b/Domains/Microscopy/vtkOpenSlideReader.h -index 0e6daf8667..18a767886f 100644 ---- a/Domains/Microscopy/vtkOpenSlideReader.h -+++ b/Domains/Microscopy/vtkOpenSlideReader.h -@@ -73,7 +73,7 @@ protected: - void ExecuteDataWithInformation(vtkDataObject* out, vtkInformation* outInfo) override; - - private: -- openslide_t* openslide_handle; -+ openslide_t* openslide_handle = nullptr; - - vtkOpenSlideReader(const vtkOpenSlideReader&) = delete; - void operator=(const vtkOpenSlideReader&) = delete; diff --git a/vtk-proj5.patch b/vtk-proj5.patch deleted file mode 100644 index d64121d..0000000 --- a/vtk-proj5.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -up VTK-9.0.1/Geovis/Core/vtkGeoProjection.cxx.proj5 VTK-9.0.1/Geovis/Core/vtkGeoProjection.cxx ---- VTK-9.0.1/Geovis/Core/vtkGeoProjection.cxx.proj5 2020-06-26 07:24:40.000000000 -0600 -+++ VTK-9.0.1/Geovis/Core/vtkGeoProjection.cxx 2021-03-13 11:36:29.049321435 -0700 -@@ -121,7 +121,11 @@ vtkGeoProjection::~vtkGeoProjection() - this->SetPROJ4String(nullptr); - if (this->Projection) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ proj_destroy(this->Projection); -+#else - pj_free(this->Projection); -+#endif - } - delete this->Internals; - this->Internals = nullptr; -@@ -185,13 +189,21 @@ int vtkGeoProjection::UpdateProjection() - - if (this->Projection) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ proj_destroy(this->Projection); -+#else - pj_free(this->Projection); -+#endif - this->Projection = nullptr; - } - - if (this->PROJ4String && strlen(this->PROJ4String)) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ this->Projection = proj_create(PJ_DEFAULT_CTX, this->PROJ4String); -+#else - this->Projection = pj_init_plus(this->PROJ4String); -+#endif - } - else - { -@@ -230,8 +242,11 @@ int vtkGeoProjection::UpdateProjection() - stringHolder[i] = param.str(); - pjArgs[3 + i] = stringHolder[i].c_str(); - } -- -+#if PROJ_VERSION_MAJOR >= 5 -+ this->Projection = proj_create_argv(PJ_DEFAULT_CTX, argSize, const_cast(pjArgs)); -+#else - this->Projection = pj_init(argSize, const_cast(pjArgs)); -+#endif - delete[] pjArgs; - } - this->ProjectionMTime = this->GetMTime(); -diff -up VTK-9.0.1/Geovis/Core/vtkGeoTransform.cxx.proj5 VTK-9.0.1/Geovis/Core/vtkGeoTransform.cxx ---- VTK-9.0.1/Geovis/Core/vtkGeoTransform.cxx.proj5 2020-06-26 07:24:40.000000000 -0600 -+++ VTK-9.0.1/Geovis/Core/vtkGeoTransform.cxx 2021-03-13 11:35:13.646115813 -0700 -@@ -163,8 +163,12 @@ void vtkGeoTransform::InternalTransformP - projPJ src = this->SourceProjection ? this->SourceProjection->GetProjection() : nullptr; - projPJ dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : nullptr; - int delta = stride - 2; -+#if PROJ_VERSION_MAJOR >= 5 -+ PJ_COORD c, c_out; -+#else - projLP lp; - projXY xy; -+#endif - if (src) - { - // Convert from src system to lat/long using inverse of src transform -@@ -172,17 +176,15 @@ void vtkGeoTransform::InternalTransformP - for (vtkIdType i = 0; i < numPts; ++i) - { - #if PROJ_VERSION_MAJOR >= 5 -- xy.x = coord[0]; -- xy.y = coord[1]; -+ c.xy.x = coord[0]; -+ c.xy.y = coord[1]; -+ c_out = proj_trans(src, PJ_INV, c); -+ coord[0] = c_out.lp.lam; -+ coord[1] = c_out.lp.phi; - #else - xy.u = coord[0]; - xy.v = coord[1]; --#endif - lp = pj_inv(xy, src); --#if PROJ_VERSION_MAJOR >= 5 -- coord[0] = lp.lam; -- coord[1] = lp.phi; --#else - coord[0] = lp.u; - coord[1] = lp.v; - #endif -@@ -208,17 +210,15 @@ void vtkGeoTransform::InternalTransformP - for (vtkIdType i = 0; i < numPts; ++i) - { - #if PROJ_VERSION_MAJOR >= 5 -- lp.lam = coord[0]; -- lp.phi = coord[1]; -+ c.lp.lam = coord[0]; -+ c.lp.phi = coord[1]; -+ c_out = proj_trans(src, PJ_FWD, c); -+ coord[0] = c_out.xy.x; -+ coord[1] = c_out.xy.y; - #else - lp.u = coord[0]; - lp.v = coord[1]; --#endif - xy = pj_fwd(lp, dst); --#if PROJ_VERSION_MAJOR >= 5 -- coord[0] = xy.x; -- coord[1] = xy.y; --#else - coord[0] = xy.u; - coord[1] = xy.v; - #endif -diff -up VTK-9.0.1/ThirdParty/libproj/vtk_libproj.h.in.proj5 VTK-9.0.1/ThirdParty/libproj/vtk_libproj.h.in ---- VTK-9.0.1/ThirdParty/libproj/vtk_libproj.h.in.proj5 2020-06-26 07:24:40.000000000 -0600 -+++ VTK-9.0.1/ThirdParty/libproj/vtk_libproj.h.in 2021-03-13 11:35:13.646115813 -0700 -@@ -28,14 +28,9 @@ - #if VTK_MODULE_USE_EXTERNAL_vtklibproj - # if VTK_LibPROJ_MAJOR_VERSION >= 5 - # include --# endif --# if VTK_LibPROJ_MAJOR_VERSION < 6 -+# else - # include - # endif --# if VTK_LibPROJ_MAJOR_VERSION >= 6 --# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1 --# endif --# include - # include - #else - # include diff --git a/vtk.spec b/vtk.spec index b1eba83..f63b14a 100644 --- a/vtk.spec +++ b/vtk.spec @@ -28,34 +28,26 @@ # VTK currently is carrying local modifications to gl2ps %bcond_with gl2ps -%if !%{with gl2ps} -%global vtk_use_system_gl2ps -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF -%endif + +# VTK currently requires unreleased fmt 8.1.0 +%bcond_with fmt Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.0.3 -Release: 4%{?dist} +Version: 9.1.0 +Release: 1%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant License: BSD -Source0: https://www.vtk.org/files/release/9.0/VTK-%{version}.tar.gz -Source1: https://www.vtk.org/files/release/9.0/VTKData-%{version}.tar.gz +Source0: https://www.vtk.org/files/release/9.1/VTK-%{version}.tar.gz +Source1: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz Source2: xorg.conf # Patch required libharu version (Fedora 33+ contains the needed VTK patches) Patch0: vtk-libharu.patch -Patch1: vtk-limits.patch -#Patch2: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7430.patch -Patch2: vtk-includes.patch # Duplicate define conflict with Xutil, see: # https://gitlab.kitware.com/vtk/vtk/-/issues/18048 Patch3: vtk-AllValues.patch -# Upstream fix for openslidereader initialization that causes Mayavi to crash -# https://bugzilla.redhat.com/show_bug.cgi?id=1966135 -Patch4: vtk-openslidereader.patch -# Proj 5 support - backport https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7731 -Patch5: vtk-proj5.patch URL: https://vtk.org/ @@ -69,9 +61,14 @@ BuildRequires: blas-devel BuildRequires: lapack-devel %endif BuildRequires: boost-devel +BuildRequires: cgnslib-devel +BuildRequires: cli11-devel BuildRequires: double-conversion-devel BuildRequires: eigen3-devel BuildRequires: expat-devel +%if %{with fmt} +BuildRequires: fmt-devel >= 8.1.0 +%endif BuildRequires: freetype-devel BuildRequires: gdal-devel %if %{with gl2ps} @@ -149,10 +146,16 @@ Requires: lapack-devel%{?_isa} \ %endif \ Requires: blas-devel%{?_isa} \ Requires: boost-devel%{?_isa} \ +Requires: cgnslib-devel%{?_isa} \ +# cli11 is noarch and header-only \ +Requires: cli11-static \ Requires: double-conversion-devel%{?_isa} \ -# eigen3 is noarch \ -Requires: eigen3-devel \ +# eigen3 is noarch and header-only \ +Requires: eigen3-static \ Requires: expat-devel%{?_isa} \ +%if %{with fmt} \ +Requires: fmt-devel%{?_isa} \ +%endif \ Requires: freetype-devel%{?_isa} \ Requires: gdal-devel%{?_isa} \ %if %{with gl2ps} \ @@ -211,16 +214,23 @@ Provides: bundled(kwsys-glob) Provides: bundled(kwsys-md5) Provides: bundled(kwsys-process) Provides: bundled(kwsys-regularexpression) +Provides: bundled(kwsys-status) Provides: bundled(kwsys-system) Provides: bundled(kwsys-systeminformation) Provides: bundled(kwsys-systemtools) # Other bundled libraries Provides: bundled(diy2) Provides: bundled(exodusII) = 2.0.0 +Provides: bundled(exprtk) = 2.71 +%if !%{with fmt} +Provides: bundled(fmt) = 8.1.0 +%endif Provides: bundled(ftgl) = 1.32 %if !%{with gl2ps} Provides: bundled(gl2ps) = 1.4.0 %endif +Provides: bundled(ioss) = 20210512 +Provides: bundled(kissfft) Provides: bundled(metaio) Provides: bundled(verdict) = 1.2.0 Provides: bundled(vpic) @@ -429,11 +439,7 @@ programming languages. %prep %setup -q -b 1 -n VTK-%{version} %patch0 -p1 -b .libharu -%patch1 -p1 -b .limits -%patch2 -p1 -b .includes %patch3 -p1 -b .AllValues -%patch4 -p1 -b .openslidereader -%patch5 -p1 -b .proj5 # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged @@ -441,19 +447,17 @@ programming languages. # TODO - VPIC - not yet packaged # TODO - xdmf2 - not yet packaged # TODO - xdmf3 - not yet packaged -for x in vtk{doubleconversion,eigen,expat,freetype,%{?with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,kissfft,libharu,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,pugixml,sqlite,theora,tiff,utf8,zfp,zlib} +for x in vtk{cli11,doubleconversion,eigen,expat,%{?with_fmt:fmt,}freetype,%{?with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,libharu,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,pugixml,sqlite,theora,tiff,utf8,zfp,zlib} do rm -r ThirdParty/*/${x} done # Remove unused KWSys items -find Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm +find Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|Status|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm # Save an unbuilt copy of the Example's sources for %doc mkdir vtk-examples cp -a Examples vtk-examples -# Don't ship Win32 examples -rm -r vtk-examples/Examples/GUI/Win32 find vtk-examples -type f | xargs chmod -R a-x @@ -479,10 +483,8 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ -DCMAKE_INSTALL_JNILIBDIR:PATH=%{_lib}/%{name} \\\ -DCMAKE_INSTALL_LICENSEDIR:PATH=share/licenses/%{name} \\\ + -DCMAKE_INSTALL_QMLDIR:PATH=%{_lib}/qt5/qml \\\ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \\\ - -DVTK_INSTALL_DATA_DIR=share/%{name} \\\ - -DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \\\ - -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{name} \\\ -DVTK_VERSIONED_INSTALL:BOOL=OFF \\\ -DVTK_GROUP_ENABLE_Imaging:STRING=YES \\\ -DVTK_GROUP_ENABLE_Qt:STRING=YES \\\ @@ -510,11 +512,15 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DVTK_WRAP_JAVA:BOOL=OFF \\\ %endif \ -DVTK_WRAP_PYTHON:BOOL=ON \\\ - -DVTK_USE_OGGTHEORA_ENCODER=ON \\\ -DVTK_USE_EXTERNAL=ON \\\ +%if !%{with fmt} \ + -DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \\\ +%endif \ %if !%{with gl2ps} \ -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF \\\ %endif \ + -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \\\ + -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \\\ -DVTK_USE_TK=ON \\\ %{?with_flexiblas:-DBLA_VENDOR=FlexiBLAS} # https://gitlab.kitware.com/cmake/cmake/issues/17223 @@ -540,7 +546,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ -DCMAKE_INSTALL_LIBDIR:PATH=lib \ -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ - -DVTK_INSTALL_PACKAGE_DIR:PATH=lib/cmake \ + -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ -DVTK_USE_MPI:BOOL=ON %cmake_build %_mpich_unload @@ -557,7 +563,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ -DCMAKE_INSTALL_LIBDIR:PATH=lib \ -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ - -DVTK_INSTALL_PACKAGE_DIR:PATH=lib/cmake \ + -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ -DVTK_USE_MPI:BOOL=ON %cmake_build %_openmpi_unload @@ -677,7 +683,7 @@ cat xorg.log %{_libdir}/cmake/%{name}/ %dir %{_libdir}/%{name} %{_libdir}/%{name}/hierarchy/ -%{_docdir}/%{name}-9.0/ +%{_docdir}/%{name}/ %files -n python%{python3_pkgversion}-vtk %{python3_sitearch}/* @@ -699,6 +705,7 @@ cat xorg.log %files qt %{_libdir}/lib*Qt*.so.* %exclude %{_libdir}/*Python*.so.* +%{_libdir}/qt5/qml/* %if %{with mpich} %files mpich -f build-mpich/libs.list @@ -735,6 +742,7 @@ cat xorg.log %files mpich-qt %{_libdir}/mpich/lib/lib*Qt*.so.* %exclude %{_libdir}/mpich/lib/*Python*.so.* +%{_libdir}/mpich/lib/qt5/ %endif %if %{with openmpi} @@ -772,6 +780,7 @@ cat xorg.log %files openmpi-qt %{_libdir}/openmpi/lib/lib*Qt*.so.* %exclude %{_libdir}/openmpi/lib/*Python*.so.* +%{_libdir}/openmpi/lib/qt5/ %endif %files data @@ -784,6 +793,9 @@ cat xorg.log %changelog +* Sun Nov 21 2021 Orion Poplawski - 9.1.0-1 +- Update to 9.1.0 + * Thu Nov 11 2021 Sandro Mani - 9.0.3-4 - Rebuild (gdal) From a231eabbe186e19bff77ac7dcb7cf00586df19be Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 22 Nov 2021 18:01:46 -0700 Subject: [PATCH 074/158] Try reducing parallel build ncpus on x86_64 due to possible build issue --- vtk.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vtk.spec b/vtk.spec index f63b14a..05e7801 100644 --- a/vtk.spec +++ b/vtk.spec @@ -475,6 +475,10 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m # Likely running out of memory during build %global _smp_ncpus_max 3 %endif +%ifarch x86_64 +# Parallel build issue https://gitlab.kitware.com/vtk/vtk/-/issues/18394 +%global _smp_ncpus_max 3 +%endif %endif %global vtk_cmake_options \\\ From f832c7e9c7ca3e360f837cb67b31606df3a833fb Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 23 Nov 2021 07:41:29 -0700 Subject: [PATCH 075/158] Reduce cpus further --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 05e7801..84e14de 100644 --- a/vtk.spec +++ b/vtk.spec @@ -477,7 +477,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %endif %ifarch x86_64 # Parallel build issue https://gitlab.kitware.com/vtk/vtk/-/issues/18394 -%global _smp_ncpus_max 3 +%global _smp_ncpus_max 2 %endif %endif From ccb3e637fdcc4dc01d6c70d9a08e3d51e4cdc2fa Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 23 Nov 2021 22:02:48 -0700 Subject: [PATCH 076/158] Use ninja on x86_64 to workaround build failure --- vtk.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/vtk.spec b/vtk.spec index 84e14de..3c38ba2 100644 --- a/vtk.spec +++ b/vtk.spec @@ -52,6 +52,15 @@ Patch3: vtk-AllValues.patch URL: https://vtk.org/ BuildRequires: cmake +# Fails with make on x86_64 for some reason, but otherwise make appears to be faster +# and ninja seems to fail on ppc64le +# https://gitlab.kitware.com/vtk/vtk/-/issues/18394 +%ifarch x86_64 +BuildRequires: ninja-build +%global cmake_gen -GNinja +%else +%global cmake_gen %{nil} +%endif BuildRequires: gcc-c++ %{?with_java:BuildRequires: java-devel} %if %{with flexiblas} @@ -475,10 +484,6 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m # Likely running out of memory during build %global _smp_ncpus_max 3 %endif -%ifarch x86_64 -# Parallel build issue https://gitlab.kitware.com/vtk/vtk/-/issues/18394 -%global _smp_ncpus_max 2 -%endif %endif %global vtk_cmake_options \\\ @@ -531,7 +536,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m #-DVTK_MODULE_ENABLE_VTK_IOPostgreSQL:STRING=YES \\\ %global _vpath_builddir build -%cmake \ +%cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DVTK_BUILD_DOCUMENTATION:BOOL=ON \ -DVTK_BUILD_EXAMPLES:BOOL=ON \ @@ -544,7 +549,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %_mpich_load %define __cc mpicc %define __cxx mpic++ -%cmake \ +%cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ @@ -561,7 +566,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %_openmpi_load %define __cc mpicc %define __cxx mpic++ -%cmake \ +%cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ From 23a9ec45695f6d4c0bdcb95d7887bfcb1cbbb7f0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 6 Jan 2022 21:47:25 -0700 Subject: [PATCH 077/158] Make java-devel only be brought in by vtk-java-devel --- vtk.spec | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/vtk.spec b/vtk.spec index 3c38ba2..3d8e8e0 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 1%{?dist} +Release: 2%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -171,9 +171,6 @@ Requires: gdal-devel%{?_isa} \ Requires: gl2ps-devel%{?_isa} \ %endif \ Requires: glew-devel%{?_isa} \ -%if %{with java} \ -Requires: java-devel \ -%endif \ Requires: jsoncpp-devel%{?_isa} \ Requires: lapack-devel%{?_isa} \ Requires: libarchive-devel%{?_isa} \ @@ -298,6 +295,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description java Java bindings for VTK. + +%package java-devel +Summary: Java development for VTK +Requires: %{name}-java%{?_isa} = %{version}-%{release} +Requires: java-devel + +%description java-devel +Java development for VTK. %endif %package qt @@ -353,6 +358,14 @@ Requires: %{name}-mpich%{?_isa} = %{version}-%{release} %description mpich-java Java bindings for VTK with mpich. + +%package mpich-java-devel +Summary: Java development for VTK with mpich +Requires: %{name}-mpich-java%{?_isa} = %{version}-%{release} +Requires: java-devel + +%description mpich-java-devel +Java development for VTK with mpich. %endif %package mpich-qt @@ -407,11 +420,19 @@ Python 3 bindings for VTK with openmpi. %package openmpi-java Summary: Java bindings for VTK with openmpi Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} -%endif %description openmpi-java Java bindings for VTK with openmpi. +%package openmpi-java-devel +Summary: Java development for VTK with openmpi +Requires: %{name}-openmpi-java%{?_isa} = %{version}-%{release} +Requires: java-devel + +%description openmpi-java-devel +Java development for VTK with openmpi. +%endif + %package openmpi-qt Summary: Qt bindings for VTK with openmpi Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} @@ -802,6 +823,9 @@ cat xorg.log %changelog +* Fri Jan 07 2022 Orion Poplawski - 9.1.0-2 +- Make java-devel only be brought in by vtk-java-devel + * Sun Nov 21 2021 Orion Poplawski - 9.1.0-1 - Update to 9.1.0 From 0af3c77a74cd0c68b59df9a2ab924703e716667b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 19 Jan 2022 19:46:24 -0700 Subject: [PATCH 078/158] Use %global to define __cc/__cxx --- vtk.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/vtk.spec b/vtk.spec index 3d8e8e0..cd5b61b 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 2%{?dist} +Release: 3%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -568,8 +568,8 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %if %{with mpich} %global _vpath_builddir build-mpich %_mpich_load -%define __cc mpicc -%define __cxx mpic++ +%global __cc mpicc +%global __cxx mpic++ %cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ @@ -585,8 +585,8 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %if %{with openmpi} %global _vpath_builddir build-openmpi %_openmpi_load -%define __cc mpicc -%define __cxx mpic++ +%global __cc mpicc +%global __cxx mpic++ %cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ @@ -823,6 +823,9 @@ cat xorg.log %changelog +* Thu Jan 20 2022 Orion Poplawski - 9.1.0-3 +- Use %%global to define __cc/__cxx + * Fri Jan 07 2022 Orion Poplawski - 9.1.0-2 - Make java-devel only be brought in by vtk-java-devel From 37d635a72517fdf54fb0368f061eecd0cbbb45bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:12:24 +0000 Subject: [PATCH 079/158] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index cd5b61b..866e175 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 3%{?dist} +Release: 4%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -823,6 +823,9 @@ cat xorg.log %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 9.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jan 20 2022 Orion Poplawski - 9.1.0-3 - Use %%global to define __cc/__cxx From ffa6c39e9eba37be055041609cf8cc9b3327a638 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 29 Jan 2022 14:45:10 -0700 Subject: [PATCH 080/158] Use export CC/CXX to set MPI compiler --- vtk.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vtk.spec b/vtk.spec index 866e175..6f8eda6 100644 --- a/vtk.spec +++ b/vtk.spec @@ -568,8 +568,8 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %if %{with mpich} %global _vpath_builddir build-mpich %_mpich_load -%global __cc mpicc -%global __cxx mpic++ +export CC=mpicc +export CXX=mpic++ %cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ @@ -585,8 +585,8 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %if %{with openmpi} %global _vpath_builddir build-openmpi %_openmpi_load -%global __cc mpicc -%global __cxx mpic++ +export CC=mpicc +export CXX=mpic++ %cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ @@ -823,6 +823,9 @@ cat xorg.log %changelog +* Sat Jan 29 2022 Orion Poplawski - 9.1.0-4 +- Use export CC/CXX to set MPI compiler + * Sat Jan 22 2022 Fedora Release Engineering - 9.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 10827ac247282197bb2da797b260629ea1ef88bc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 31 Jan 2022 19:30:43 -0700 Subject: [PATCH 081/158] Drop ninja build; Allow RPATH style 10 --- vtk.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/vtk.spec b/vtk.spec index 6f8eda6..b56bef8 100644 --- a/vtk.spec +++ b/vtk.spec @@ -52,15 +52,9 @@ Patch3: vtk-AllValues.patch URL: https://vtk.org/ BuildRequires: cmake -# Fails with make on x86_64 for some reason, but otherwise make appears to be faster -# and ninja seems to fail on ppc64le -# https://gitlab.kitware.com/vtk/vtk/-/issues/18394 -%ifarch x86_64 -BuildRequires: ninja-build -%global cmake_gen -GNinja -%else +# Allow for testing with different cmake generators. +# make still seems to be faster than ninja, but has failed at times. %global cmake_gen %{nil} -%endif BuildRequires: gcc-c++ %{?with_java:BuildRequires: java-devel} %if %{with flexiblas} @@ -677,7 +671,10 @@ cp -alL build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ # 0x0008 ... the special '$ORIGIN' RPATHs are appearing after other # RPATHs; this is just a minor issue but usually unwanted # The paths are equivalent and "this is just a minor issue", so we are allowing it below -export QA_RPATHS=8 +# 0x0010 ... the RPATH is empty; there is no reason for such RPATHs +# and they cause unneeded work while loading libraries +# This is appearing on mpi libraries, no idea why. +export QA_RPATHS=18 %check From 1a9236c17f06625800b1835f789f97bfbe84d264 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:36:33 +0100 Subject: [PATCH 082/158] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index b56bef8..d6efd0d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 4%{?dist} +Release: 5%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -820,6 +820,9 @@ cat xorg.log %changelog +* Sat Feb 05 2022 Jiri Vanek - 9.1.0-5 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 29 2022 Orion Poplawski - 9.1.0-4 - Use export CC/CXX to set MPI compiler From f6aaa20332d5308b311a9496321b923f472e8d07 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 9 Feb 2022 20:45:10 -0700 Subject: [PATCH 083/158] Rebuild for glew 2.2 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d6efd0d..b300739 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 5%{?dist} +Release: 6%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -820,6 +820,9 @@ cat xorg.log %changelog +* Thu Feb 10 2022 Orion Poplawski - 9.1.0-6 +- Rebuild for glew 2.2 + * Sat Feb 05 2022 Jiri Vanek - 9.1.0-5 - Rebuilt for java-17-openjdk as system jdk From c5fc8a040a69c729fd264d458b7bfd0986d377c3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 10 Feb 2022 19:10:58 -0700 Subject: [PATCH 084/158] Still running out of memory on armv7hl, drop to 2 cpus --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index b300739..f4b2506 100644 --- a/vtk.spec +++ b/vtk.spec @@ -497,7 +497,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %endif %ifarch %{arm} # Likely running out of memory during build -%global _smp_ncpus_max 3 +%global _smp_ncpus_max 2 %endif %endif From 9a02d753f344d583d3fef1b4d316ccd9df1665fd Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 10 Mar 2022 13:50:30 +0100 Subject: [PATCH 085/158] Rebuild for proj-9.0.0 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index f4b2506..c8f78c7 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 6%{?dist} +Release: 7%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -820,6 +820,9 @@ cat xorg.log %changelog +* Thu Mar 03 2022 Sandro Mani - 9.1.0-7 +- Rebuild for proj-9.0.0 + * Thu Feb 10 2022 Orion Poplawski - 9.1.0-6 - Rebuild for glew 2.2 From 4bc95f02cec47f689b35fd9c2140cd68d78ec543 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 22 Mar 2022 10:30:55 +0100 Subject: [PATCH 086/158] Rebuild for cgnslib-4.3.0 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index c8f78c7..1eb56d0 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 7%{?dist} +Release: 8%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -820,6 +820,9 @@ cat xorg.log %changelog +* Tue Mar 22 2022 Sandro Mani - 9.1.0-8 +- Rebuild for cgnslib-4.3.0 + * Thu Mar 03 2022 Sandro Mani - 9.1.0-7 - Rebuild for proj-9.0.0 From 999c16f7fdd4e5bde2b6c460648517bea3721895 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:42:36 +0200 Subject: [PATCH 087/158] Rebuilt for Boost 1.78 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 1eb56d0..376169f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 8%{?dist} +Release: 9%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -820,6 +820,9 @@ cat xorg.log %changelog +* Wed May 04 2022 Thomas Rodgers - 9.1.0-9 +- Rebuilt for Boost 1.78 + * Tue Mar 22 2022 Sandro Mani - 9.1.0-8 - Rebuild for cgnslib-4.3.0 From abc039f1d1dd537451f4d585e9a073b22df43eae Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 May 2022 00:21:39 +0200 Subject: [PATCH 088/158] Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 376169f..859ae5d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 9%{?dist} +Release: 10%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -820,6 +820,9 @@ cat xorg.log %changelog +* Fri May 20 2022 Sandro Mani - 9.1.0-10 +- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 + * Wed May 04 2022 Thomas Rodgers - 9.1.0-9 - Rebuilt for Boost 1.78 From e8a1a6d17aa9d73887e5994229d38cbf4d1aa0af Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 22:20:12 +0200 Subject: [PATCH 089/158] Rebuilt for Python 3.11 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 859ae5d..989b161 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 10%{?dist} +Release: 11%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -820,6 +820,9 @@ cat xorg.log %changelog +* Mon Jun 13 2022 Python Maint - 9.1.0-11 +- Rebuilt for Python 3.11 + * Fri May 20 2022 Sandro Mani - 9.1.0-10 - Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 From 344d7f95d41107a55163e159200091f9581b4e70 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 24 Jun 2022 17:54:26 -0600 Subject: [PATCH 090/158] Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611) --- vtk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 989b161..2bc56b1 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 11%{?dist} +Release: 12%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -523,6 +523,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DVTK_MODULE_ENABLE_VTK_InfovisBoost:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_IOMySQL:STRING=YES \\\ + -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \\\ -DVTK_PYTHON_VERSION=3 \\\ %if %{with OSMesa} \ -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\ @@ -820,6 +821,9 @@ cat xorg.log %changelog +* Fri Jun 24 2022 Orion Poplawski - 9.1.0-12 +- Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611) + * Mon Jun 13 2022 Python Maint - 9.1.0-11 - Rebuilt for Python 3.11 From 794f8053f0fae2002518aafa88ad7a04361e47b0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 24 Jun 2022 21:18:51 -0600 Subject: [PATCH 091/158] Link libvtkkissfft.so.1 against libm (bz#2100573) --- vtk-kissfft-libm.patch | 11 +++++++++++ vtk.spec | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 vtk-kissfft-libm.patch diff --git a/vtk-kissfft-libm.patch b/vtk-kissfft-libm.patch new file mode 100644 index 0000000..e598bf2 --- /dev/null +++ b/vtk-kissfft-libm.patch @@ -0,0 +1,11 @@ +diff -ru VTK-9.1.0/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt VTK-9.2.0.rc1/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt +--- VTK-9.1.0/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt 2021-11-04 13:48:20.000000000 -0600 ++++ VTK-9.2.0.rc1/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt 2022-06-20 10:08:06.000000000 -0600 +@@ -40,3 +40,7 @@ + target_include_directories(kissfft + PRIVATE + "$") ++ ++if (UNIX) ++ vtk_module_link(VTK::kissfft PRIVATE m) ++endif () diff --git a/vtk.spec b/vtk.spec index 2bc56b1..3cfadf2 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,6 +45,8 @@ Source1: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz Source2: xorg.conf # Patch required libharu version (Fedora 33+ contains the needed VTK patches) Patch0: vtk-libharu.patch +# Upstream patch to link kissfft with libm +Patch1: vtk-kissfft-libm.patch # Duplicate define conflict with Xutil, see: # https://gitlab.kitware.com/vtk/vtk/-/issues/18048 Patch3: vtk-AllValues.patch @@ -463,6 +465,7 @@ programming languages. %prep %setup -q -b 1 -n VTK-%{version} %patch0 -p1 -b .libharu +%patch1 -p1 -b .kissfft-libm %patch3 -p1 -b .AllValues # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged @@ -823,6 +826,7 @@ cat xorg.log %changelog * Fri Jun 24 2022 Orion Poplawski - 9.1.0-12 - Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611) +- Link libvtkkissfft.so.1 against libm (bz#2100573) * Mon Jun 13 2022 Python Maint - 9.1.0-11 - Rebuilt for Python 3.11 From 770c1d7af079673e8016d7457272ba2db5e0bed8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 28 Jun 2022 07:07:10 -0600 Subject: [PATCH 092/158] Add patch to support netcdf 4.9.0 --- vtk-netcdf.patch | 13 +++++++++++++ vtk.spec | 13 ++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 vtk-netcdf.patch diff --git a/vtk-netcdf.patch b/vtk-netcdf.patch new file mode 100644 index 0000000..fbe18be --- /dev/null +++ b/vtk-netcdf.patch @@ -0,0 +1,13 @@ +diff -up VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.netcdf VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c +--- VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.netcdf 2021-11-04 13:48:20.000000000 -0600 ++++ VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2022-06-28 07:04:11.574398570 -0600 +@@ -1770,7 +1770,9 @@ void ex__compress_variable(int exoid, in + */ + + /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ ++#if !defined(NC_SZIP_NN) + const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ ++#endif + /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ + const int SZIP_PIXELS_PER_BLOCK = + file->compression_level == 0 ? 32 : file->compression_level; diff --git a/vtk.spec b/vtk.spec index 3cfadf2..c406116 100644 --- a/vtk.spec +++ b/vtk.spec @@ -35,7 +35,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 12%{?dist} +Release: 13%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -47,6 +47,9 @@ Source2: xorg.conf Patch0: vtk-libharu.patch # Upstream patch to link kissfft with libm Patch1: vtk-kissfft-libm.patch +# Upstream patch to support netcdf 4.9.0 +# https://gitlab.kitware.com/vtk/vtk/-/issues/18576 +Patch2: vtk-netcdf.patch # Duplicate define conflict with Xutil, see: # https://gitlab.kitware.com/vtk/vtk/-/issues/18048 Patch3: vtk-AllValues.patch @@ -463,10 +466,7 @@ programming languages. %prep -%setup -q -b 1 -n VTK-%{version} -%patch0 -p1 -b .libharu -%patch1 -p1 -b .kissfft-libm -%patch3 -p1 -b .AllValues +%autosetup -p1 -b 1 -n VTK-%{version} # Remove included thirdparty sources just to be sure # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged @@ -824,6 +824,9 @@ cat xorg.log %changelog +* Tue Jun 28 2022 Orion Poplawski - 9.1.0-13 +- Add patch to support netcdf 4.9.0 + * Fri Jun 24 2022 Orion Poplawski - 9.1.0-12 - Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611) - Link libvtkkissfft.so.1 against libm (bz#2100573) From 4b99a68082a71d4da81bd732b5ae23b59435c9c7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 9 Jul 2022 22:27:44 -0600 Subject: [PATCH 093/158] Drop java for i686 (bz#2104109) --- vtk.spec | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/vtk.spec b/vtk.spec index c406116..7f5fe25 100644 --- a/vtk.spec +++ b/vtk.spec @@ -8,7 +8,12 @@ # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired %bcond_with OSMesa +# No more Java on i686 +%ifarch %{java_arches} %bcond_without java +%else +%bcond_with java +%endif %bcond_without mpich %bcond_without openmpi # s390x on EL8 does not have xorg-x11-drv-dummy @@ -35,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 13%{?dist} +Release: 14%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -61,7 +66,12 @@ BuildRequires: cmake # make still seems to be faster than ninja, but has failed at times. %global cmake_gen %{nil} BuildRequires: gcc-c++ -%{?with_java:BuildRequires: java-devel} +%if %{with java} +BuildRequires: java-devel +%else +Obsoletes: %{name}-java < %{version}-%{release} +Obsoletes: %{name}-java-devel < %{version}-%{release} +%endif %if %{with flexiblas} BuildRequires: flexiblas-devel %else @@ -140,7 +150,6 @@ BuildRequires: netcdf-openmpi-devel BuildRequires: xorg-x11-drv-dummy BuildRequires: mesa-dri-drivers %endif -%{!?with_java:Conflicts: vtk-java} Requires: hdf5 = %{_hdf5_version} # Almost every BR needs to be required by the -devel packages @@ -317,6 +326,10 @@ Summary: The Visualization Toolkit - mpich version Obsoletes: %{name}-mpich-tcl < 8.2.0-1 Obsoletes: %{name}-mpich-qt-tcl < 8.2.0-1 +%if %{without java} +Obsoletes: %{name}-mpich-java < %{version}-%{release} +Obsoletes: %{name}-mpich-java-devel < %{version}-%{release} +%endif %description mpich VTK is an open-source software system for image processing, 3D @@ -381,6 +394,10 @@ Summary: The Visualization Toolkit - openmpi version Obsoletes: %{name}-openmpi-tcl < 8.2.0-1 Obsoletes: %{name}-openmpi-qt-tcl < 8.2.0-1 +%if %{without java} +Obsoletes: %{name}-mpich-java < %{version}-%{release} +Obsoletes: %{name}-mpich-java-devel < %{version}-%{release} +%endif %description openmpi VTK is an open-source software system for image processing, 3D @@ -824,6 +841,9 @@ cat xorg.log %changelog +* Sun Jul 10 2022 Orion Poplawski - 9.1.0-14 +- Drop java for i686 (bz#2104109) + * Tue Jun 28 2022 Orion Poplawski - 9.1.0-13 - Add patch to support netcdf 4.9.0 From 671695c1b77e781d69ec10cfc053820378ff633d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 10 Jul 2022 13:58:37 -0600 Subject: [PATCH 094/158] Move WrapJava into -devel --- vtk.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vtk.spec b/vtk.spec index 7f5fe25..0d87a16 100644 --- a/vtk.spec +++ b/vtk.spec @@ -724,8 +724,10 @@ cat xorg.log %files devel %doc Utilities/Upgrading +%{_bindir}/vtkParseJava %{_bindir}/vtkProbeOpenGLVersion %{_bindir}/vtkWrapHierarchy +%{_bindir}/vtkWrapJava %{_includedir}/%{name} %{_libdir}/*.so %{_libdir}/cmake/%{name}/ @@ -746,8 +748,6 @@ cat xorg.log %dir %{_libdir}/%{name} %{_libdir}/%{name}/*Java.so %{_javadir}/vtk.jar -%{_bindir}/vtkParseJava -%{_bindir}/vtkWrapJava %endif %files qt @@ -761,8 +761,10 @@ cat xorg.log %doc README.md _docs/Wrapping %files mpich-devel +%{_libdir}/mpich/bin/vtkParseJava %{_libdir}/mpich/bin/vtkProbeOpenGLVersion %{_libdir}/mpich/bin/vtkWrapHierarchy +%{_libdir}/mpich/bin/vtkWrapJava %{_libdir}/mpich/include/ %{_libdir}/mpich/lib/*.so %{_libdir}/mpich/lib/cmake/ @@ -783,8 +785,6 @@ cat xorg.log %dir %{_libdir}/mpich/lib/%{name} %{_libdir}/mpich/lib/%{name}/*Java.so %{_libdir}/mpich/share/java/vtk.jar -%{_libdir}/mpich/bin/vtkParseJava -%{_libdir}/mpich/bin/vtkWrapJava %endif %files mpich-qt @@ -799,8 +799,10 @@ cat xorg.log %doc README.md _docs/Wrapping %files openmpi-devel +%{_libdir}/openmpi/bin/vtkParseJava %{_libdir}/openmpi/bin/vtkProbeOpenGLVersion %{_libdir}/openmpi/bin/vtkWrapHierarchy +%{_libdir}/openmpi/bin/vtkWrapJava %{_libdir}/openmpi/include/ %{_libdir}/openmpi/lib/*.so %{_libdir}/openmpi/lib/cmake/ @@ -821,8 +823,6 @@ cat xorg.log %dir %{_libdir}/openmpi/lib/%{name} %{_libdir}/openmpi/lib/%{name}/*Java.so %{_libdir}/openmpi/share/java/vtk.jar -%{_libdir}/openmpi/bin/vtkParseJava -%{_libdir}/openmpi/bin/vtkWrapJava %endif %files openmpi-qt From 3802c758b6de82edbd012716359d54ba2a1d0c67 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 17 Jul 2022 14:48:09 -0600 Subject: [PATCH 095/158] Make noarch data sub-package the same on all arches --- vtk.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 0d87a16..a3fd19a 100644 --- a/vtk.spec +++ b/vtk.spec @@ -683,9 +683,11 @@ find Utilities/Upgrading -type f -print0 | xargs -0 chmod -x mkdir -p _docs cp -pr --parents Wrapping/*/README* _docs/ -#Install data +# Install data mkdir -p %{buildroot}%{_datadir}/vtkdata cp -alL build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ +# Make noarch data sub-package the same on all arches +rm -rf %{buildroot}%{_datadir}/vtkdata/Wrapping/Java/Testing # https://bugzilla.redhat.com/show_bug.cgi?id=1902729 # contains the $ORIGIN runpath specifier at the wrong position in [/usr/lib64/mpich/lib:$ORIGIN:$ORIGIN/../] From 723cd6eab3d4894b7fac5c16dd895f0f6be69860 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:08:24 +0000 Subject: [PATCH 096/158] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index a3fd19a..a12e42f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 14%{?dist} +Release: 15%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -843,6 +843,9 @@ cat xorg.log %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 9.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jul 10 2022 Orion Poplawski - 9.1.0-14 - Drop java for i686 (bz#2104109) From 8fe77bbd067937b10ed126173ea32b5d811090ce Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 28 Jul 2022 10:07:22 +0900 Subject: [PATCH 097/158] Make -data subpackage arch-dependent for now due to java removal (bz#2104109) --- vtk.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index a12e42f..ac6ebaf 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 15%{?dist} +Release: 16%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -459,7 +459,9 @@ Qt bindings for VTK with openmpi. %package data Summary: VTK data files for tests/examples -BuildArch: noarch +# FIXME due to java removal on i686, data file list differs on i686 +# FIXME make this arch-dependent for now +#BuildArch: noarch Obsoletes: vtkdata < 6.1.0-3 %description data @@ -843,6 +845,10 @@ cat xorg.log %changelog +* Thu Jul 28 2022 Mamoru TASAKA - 9.1.0-16 +- Make -data subpackage arch-dependent for now due to + java removal (bz#2104109) + * Sat Jul 23 2022 Fedora Release Engineering - 9.1.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e2b1543e2205eb62f5cfd3e75a0257313c4898db Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 27 Jul 2022 21:03:02 -0600 Subject: [PATCH 098/158] Remove all of vtkdata/Wrapping to keep vtk-data noarch --- vtk.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/vtk.spec b/vtk.spec index ac6ebaf..3dab677 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 16%{?dist} +Release: 17%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -459,9 +459,7 @@ Qt bindings for VTK with openmpi. %package data Summary: VTK data files for tests/examples -# FIXME due to java removal on i686, data file list differs on i686 -# FIXME make this arch-dependent for now -#BuildArch: noarch +BuildArch: noarch Obsoletes: vtkdata < 6.1.0-3 %description data @@ -689,7 +687,8 @@ cp -pr --parents Wrapping/*/README* _docs/ mkdir -p %{buildroot}%{_datadir}/vtkdata cp -alL build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ # Make noarch data sub-package the same on all arches -rm -rf %{buildroot}%{_datadir}/vtkdata/Wrapping/Java/Testing +# At the moment this only contains Java/Testing/Data/Baseline +rm -rf %{buildroot}%{_datadir}/vtkdata/Wrapping # https://bugzilla.redhat.com/show_bug.cgi?id=1902729 # contains the $ORIGIN runpath specifier at the wrong position in [/usr/lib64/mpich/lib:$ORIGIN:$ORIGIN/../] @@ -845,6 +844,9 @@ cat xorg.log %changelog +* Thu Jul 28 2022 Orion Poplawski - 9.1.0-17 +- Remove all of vtkdata/Wrapping to keep vtk-data noarch + * Thu Jul 28 2022 Mamoru TASAKA - 9.1.0-16 - Make -data subpackage arch-dependent for now due to java removal (bz#2104109) From a6301b86a6ee0098b203cbb3bd08ed777476d7de Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 12 Nov 2022 11:34:51 +0100 Subject: [PATCH 099/158] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 3dab677..49174f8 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 17%{?dist} +Release: 18%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -844,6 +844,9 @@ cat xorg.log %changelog +* Sat Nov 12 2022 Sandro Mani - 9.1.0-18 +- Rebuild (gdal) + * Thu Jul 28 2022 Orion Poplawski - 9.1.0-17 - Remove all of vtkdata/Wrapping to keep vtk-data noarch From 5cef47821ac1ac368fc8903bdd5e3565019b833e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 24 Jun 2022 07:50:00 -0600 Subject: [PATCH 100/158] Update to 9.2.5 Use SPDX License tag --- .gitignore | 2 + 9616.patch | 79 ++++++++++++++++++++++++ sources | 4 +- vtk-AllValues.patch | 132 ----------------------------------------- vtk-kissfft-libm.patch | 11 ---- vtk-libharu.patch | 15 ++--- vtk-netcdf.patch | 13 ---- vtk-qt5.15.patch | 22 ------- vtk.spec | 43 +++++++------- 9 files changed, 112 insertions(+), 209 deletions(-) create mode 100644 9616.patch delete mode 100644 vtk-AllValues.patch delete mode 100644 vtk-kissfft-libm.patch delete mode 100644 vtk-netcdf.patch delete mode 100644 vtk-qt5.15.patch diff --git a/.gitignore b/.gitignore index c9fc96e..43fc717 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ vtk-5.6.0.tar.gz /VTKData-9.0.3.tar.gz /VTK-9.1.0.tar.gz /VTKData-9.1.0.tar.gz +/VTK-9.2.5.tar.gz +/VTKData-9.2.5.tar.gz diff --git a/9616.patch b/9616.patch new file mode 100644 index 0000000..4dfd591 --- /dev/null +++ b/9616.patch @@ -0,0 +1,79 @@ +From a2ca9a079ecc8926f6ddf7a72803340a4944e7cf Mon Sep 17 00:00:00 2001 +From: Eric Larson +Date: Tue, 11 Oct 2022 12:12:38 -0400 +Subject: [PATCH] BUG: Fix bug with vtkPlotBar.GetLookupTable() + +Also remove old nullptr assignments as they are unnecessary +when using vtkSmartPointer. +--- + .../Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx | 2 ++ + Charts/Core/vtkPlotBar.cxx | 10 +++++++--- + .../release/dev/fix-vtkPlotBar-GetLookupTable.md | 4 ++++ + 3 files changed, 13 insertions(+), 3 deletions(-) + create mode 100644 Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md + +diff --git a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx +index 2d0ed46b128..919319a6b4d 100644 +--- a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx ++++ b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx +@@ -88,6 +88,8 @@ int TestPlotBarRangeHandlesItem(int, char*[]) + + // Add bar plot and handles + vtkPlotBar* barPlot = vtkPlotBar::SafeDownCast(chart->AddPlot(vtkChart::BAR)); ++ // smoke test for https://gitlab.kitware.com/vtk/vtk/-/issues/18682#note_1258974 ++ barPlot->GetLookupTable(); + barPlot->SetInputData(table, "Months", "Books"); + chart->SetBarWidthFraction(1.0); + +diff --git a/Charts/Core/vtkPlotBar.cxx b/Charts/Core/vtkPlotBar.cxx +index a68a26c0ecd..220e8199d02 100644 +--- a/Charts/Core/vtkPlotBar.cxx ++++ b/Charts/Core/vtkPlotBar.cxx +@@ -535,12 +535,11 @@ vtkStandardNewMacro(vtkPlotBar); + vtkPlotBar::vtkPlotBar() + { + this->Private = new vtkPlotBarPrivate(this); ++ // Points is not a vtkSmartPointer, so set it explicitly to nullptr + this->Points = nullptr; +- this->AutoLabels = nullptr; + this->Width = 1.0; + this->Pen->SetWidth(1.0); + this->Offset = 1.0; +- this->ColorSeries = nullptr; + this->Orientation = vtkPlotBar::VERTICAL; + this->ScalarVisibility = false; + this->EnableOpacityMapping = true; +@@ -612,6 +611,10 @@ void vtkPlotBar::GetBounds(double bounds[4], bool unscaled) + + // Get the x and y arrays (index 0 and 1 respectively) + vtkTable* table = this->Data->GetInput(); ++ if (!table) ++ { ++ return; ++ } + vtkDataArray* x = + this->UseIndexForXSeries ? nullptr : this->Data->GetInputArrayToProcess(0, table); + vtkDataArray* y = this->Data->GetInputArrayToProcess(1, table); +@@ -945,7 +948,8 @@ void vtkPlotBar::CreateDefaultLookupTable() + // rainbow - blue to red + lut->SetHueRange(0.6667, 0.0); + lut->Build(); +- double bounds[4]; ++ // set reasonable defaults in case no data has been set ++ double bounds[4] = { 0.0, 1.0, 0.0, 1.0 }; + this->GetBounds(bounds); + lut->SetRange(bounds[0], bounds[1]); + this->LookupTable = lut; +diff --git a/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md +new file mode 100644 +index 00000000000..ba6a96753ac +--- /dev/null ++++ b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md +@@ -0,0 +1,4 @@ ++## Fixes for vtkPlotBar.GetLookupTable ++ ++Fixes a bug where calling vtkPlotBar.GetLookupTable caused a segmentation ++fault in the case where no data had been plotted yet. +-- +GitLab + diff --git a/sources b/sources index 07ce256..bb8f778 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.1.0.tar.gz) = b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a -SHA512 (VTKData-9.1.0.tar.gz) = 134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a +SHA512 (VTK-9.2.5.tar.gz) = b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf +SHA512 (VTKData-9.2.5.tar.gz) = c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3 diff --git a/vtk-AllValues.patch b/vtk-AllValues.patch deleted file mode 100644 index 7f6de66..0000000 --- a/vtk-AllValues.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx ---- VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx.AllValues 2021-10-01 12:23:49.000000000 -0600 -+++ VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx 2021-10-04 19:27:42.557502417 -0600 -@@ -1674,7 +1674,7 @@ struct ScalarRangeDispatchWrapper - void operator()(ArrayT* array) - { - this->Success = vtkDataArrayPrivate::DoComputeScalarRange( -- array, this->Range, vtkDataArrayPrivate::AllValues()); -+ array, this->Range, vtkDataArrayPrivate::vtkAllValues()); - } - }; - -@@ -1693,7 +1693,7 @@ struct VectorRangeDispatchWrapper - void operator()(ArrayT* array) - { - this->Success = vtkDataArrayPrivate::DoComputeVectorRange( -- array, this->Range, vtkDataArrayPrivate::AllValues()); -+ array, this->Range, vtkDataArrayPrivate::vtkAllValues()); - } - }; - -diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArray.h.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArray.h ---- VTK-9.1.0.rc1/Common/Core/vtkDataArray.h.AllValues 2021-10-01 12:23:49.000000000 -0600 -+++ VTK-9.1.0.rc1/Common/Core/vtkDataArray.h 2021-10-04 19:27:42.557502417 -0600 -@@ -599,7 +599,7 @@ vtkArrayDownCast_FastCastMacro(vtkDataAr - // vtkGenericDataArray.h as well. - namespace vtkDataArrayPrivate - { --struct AllValues -+struct vtkAllValues - { - }; - struct FiniteValues -diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx ---- VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx.AllValues 2021-10-01 12:23:49.000000000 -0600 -+++ VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx 2021-10-04 19:27:42.559502435 -0600 -@@ -310,7 +310,7 @@ template - struct ComputeScalarRange - { - template -- bool operator()(ArrayT* array, RangeValueType* ranges, AllValues) -+ bool operator()(ArrayT* array, RangeValueType* ranges, vtkAllValues) - { - AllValuesMinAndMax minmax(array); - vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax); -@@ -447,7 +447,7 @@ public: - }; - - template --bool GenericComputeScalarRange(ArrayT* array, RangeValueType* ranges, AllValues) -+bool GenericComputeScalarRange(ArrayT* array, RangeValueType* ranges, vtkAllValues) - { - AllValuesGenericMinAndMax minmax(array); - vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax); -@@ -530,7 +530,7 @@ bool DoComputeScalarRange(ArrayT* array, - //---------------------------------------------------------------------------- - // generic implementation that operates on ValueType. - template --bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], AllValues) -+bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], vtkAllValues) - { - range[0] = vtkTypeTraits::Max(); - range[1] = vtkTypeTraits::Min(); -diff -up VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h.AllValues VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h ---- VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h.AllValues 2021-10-01 12:23:49.000000000 -0600 -+++ VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h 2021-10-04 19:27:42.559502435 -0600 -@@ -414,7 +414,7 @@ namespace vtkDataArrayPrivate - template - bool DoComputeScalarRange(A*, R*, T); - template --bool DoComputeVectorRange(A*, R[2], AllValues); -+bool DoComputeVectorRange(A*, R[2], vtkAllValues); - template - bool DoComputeVectorRange(A*, R[2], FiniteValues); - } // namespace vtkDataArrayPrivate -@@ -466,11 +466,11 @@ class vtkScaledSOADataArrayTemplate; - - #define VTK_INSTANTIATE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType) \ - template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ -- ArrayType*, ValueType*, vtkDataArrayPrivate::AllValues); \ -+ ArrayType*, ValueType*, vtkDataArrayPrivate::vtkAllValues); \ - template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ - ArrayType*, ValueType*, vtkDataArrayPrivate::FiniteValues); \ - template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ -- ArrayType*, ValueType[2], vtkDataArrayPrivate::AllValues); \ -+ ArrayType*, ValueType[2], vtkDataArrayPrivate::vtkAllValues); \ - template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ - ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues); - -@@ -516,18 +516,18 @@ namespace vtkDataArrayPrivate - template - bool DoComputeScalarRange(A*, R*, T); - template --bool DoComputeVectorRange(A*, R[2], AllValues); -+bool DoComputeVectorRange(A*, R[2], vtkAllValues); - template - bool DoComputeVectorRange(A*, R[2], FiniteValues); - } // namespace vtkDataArrayPrivate - - #define VTK_DECLARE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType) \ - extern template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ -- ArrayType*, ValueType*, vtkDataArrayPrivate::AllValues); \ -+ ArrayType*, ValueType*, vtkDataArrayPrivate::vtkAllValues); \ - extern template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ - ArrayType*, ValueType*, vtkDataArrayPrivate::FiniteValues); \ - extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ -- ArrayType*, ValueType[2], vtkDataArrayPrivate::AllValues); \ -+ ArrayType*, ValueType[2], vtkDataArrayPrivate::vtkAllValues); \ - extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ - ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues); - -diff -up VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx.AllValues VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx ---- VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx.AllValues 2021-10-01 12:23:49.000000000 -0600 -+++ VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx 2021-10-04 19:27:42.558502426 -0600 -@@ -1190,7 +1190,7 @@ bool vtkGenericDataArray; - return ComputeScalarValueRangeImpl( -- static_cast(this), ranges, vtkDataArrayPrivate::AllValues{}, Supported{}); -+ static_cast(this), ranges, vtkDataArrayPrivate::vtkAllValues{}, Supported{}); - } - - //----------------------------------------------------------------------------- -@@ -1200,7 +1200,7 @@ bool vtkGenericDataArray; - return ComputeVectorValueRangeImpl( -- static_cast(this), range, vtkDataArrayPrivate::AllValues{}, Supported{}); -+ static_cast(this), range, vtkDataArrayPrivate::vtkAllValues{}, Supported{}); - } - - //----------------------------------------------------------------------------- diff --git a/vtk-kissfft-libm.patch b/vtk-kissfft-libm.patch deleted file mode 100644 index e598bf2..0000000 --- a/vtk-kissfft-libm.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru VTK-9.1.0/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt VTK-9.2.0.rc1/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt ---- VTK-9.1.0/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt 2021-11-04 13:48:20.000000000 -0600 -+++ VTK-9.2.0.rc1/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt 2022-06-20 10:08:06.000000000 -0600 -@@ -40,3 +40,7 @@ - target_include_directories(kissfft - PRIVATE - "$") -+ -+if (UNIX) -+ vtk_module_link(VTK::kissfft PRIVATE m) -+endif () diff --git a/vtk-libharu.patch b/vtk-libharu.patch index 2d03ab6..7100aa3 100644 --- a/vtk-libharu.patch +++ b/vtk-libharu.patch @@ -1,10 +1,11 @@ -diff -up VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt.libharu VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt ---- VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt.libharu 2020-05-01 13:29:00.000000000 -0600 -+++ VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt 2020-05-12 16:47:18.298133406 -0600 -@@ -8,7 +8,7 @@ vtk_module_third_party( - # Unreleased. Requires these PRs: - # https://github.com/libharu/libharu/pull/157 - # https://github.com/libharu/libharu/pull/187 +diff --git a/ThirdParty/libharu/CMakeLists.txt b/ThirdParty/libharu/CMakeLists.txt +index b18b7a1..3793f4b 100644 +--- a/ThirdParty/libharu/CMakeLists.txt ++++ b/ThirdParty/libharu/CMakeLists.txt +@@ -5,7 +5,7 @@ vtk_module_third_party( + STANDARD_INCLUDE_DIRS + EXTERNAL + PACKAGE LibHaru - VERSION 2.4.0 + VERSION 2.3.0 TARGETS LibHaru::LibHaru diff --git a/vtk-netcdf.patch b/vtk-netcdf.patch deleted file mode 100644 index fbe18be..0000000 --- a/vtk-netcdf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.netcdf VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c ---- VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.netcdf 2021-11-04 13:48:20.000000000 -0600 -+++ VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2022-06-28 07:04:11.574398570 -0600 -@@ -1770,7 +1770,9 @@ void ex__compress_variable(int exoid, in - */ - - /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ -+#if !defined(NC_SZIP_NN) - const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ -+#endif - /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ - const int SZIP_PIXELS_PER_BLOCK = - file->compression_level == 0 ? 32 : file->compression_level; diff --git a/vtk-qt5.15.patch b/vtk-qt5.15.patch deleted file mode 100644 index cff62f8..0000000 --- a/vtk-qt5.15.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx ---- VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 2019-01-30 10:15:13.000000000 -0700 -+++ VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx 2020-09-17 21:44:08.125697274 -0600 -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -up VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx.qt5.15 VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx ---- VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx.qt5.15 2020-09-17 21:44:08.125697274 -0600 -+++ VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx 2020-09-17 21:45:46.126513263 -0600 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/vtk.spec b/vtk.spec index 49174f8..4180136 100644 --- a/vtk.spec +++ b/vtk.spec @@ -39,25 +39,16 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.1.0 -Release: 18%{?dist} -# This is a variant BSD license, a cross between BSD and ZLIB. -# For all intents, it has the same rights and restrictions as BSD. -# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant -License: BSD -Source0: https://www.vtk.org/files/release/9.1/VTK-%{version}.tar.gz -Source1: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz +Version: 9.2.5 +Release: 1%{?dist} +License: BSD-3-Clause +Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz +Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz Source2: xorg.conf # Patch required libharu version (Fedora 33+ contains the needed VTK patches) Patch0: vtk-libharu.patch -# Upstream patch to link kissfft with libm -Patch1: vtk-kissfft-libm.patch -# Upstream patch to support netcdf 4.9.0 -# https://gitlab.kitware.com/vtk/vtk/-/issues/18576 -Patch2: vtk-netcdf.patch -# Duplicate define conflict with Xutil, see: -# https://gitlab.kitware.com/vtk/vtk/-/issues/18048 -Patch3: vtk-AllValues.patch +# Fix issue with Mayavi +Patch1: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9616.patch URL: https://vtk.org/ @@ -94,11 +85,11 @@ BuildRequires: gl2ps-devel %endif BuildRequires: glew-devel BuildRequires: hdf5-devel +BuildRequires: json-devel BuildRequires: jsoncpp-devel BuildRequires: libarchive-devel BuildRequires: libGL-devel -# Requires special patched version of libharu -BuildRequires: libharu-devel >= 2.3.0-9 +BuildRequires: libharu-devel >= 2.4.0 BuildRequires: libICE-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -107,6 +98,7 @@ BuildRequires: libtheora-devel BuildRequires: libtiff-devel BuildRequires: libxml2-devel BuildRequires: libX11-devel +BuildRequires: libXcursor-devel BuildRequires: libXext-devel BuildRequires: libXt-devel BuildRequires: lz4-devel @@ -179,6 +171,7 @@ Requires: gdal-devel%{?_isa} \ Requires: gl2ps-devel%{?_isa} \ %endif \ Requires: glew-devel%{?_isa} \ +Requires: json-devel%{?_isa} \ Requires: jsoncpp-devel%{?_isa} \ Requires: lapack-devel%{?_isa} \ Requires: libarchive-devel%{?_isa} \ @@ -192,6 +185,7 @@ Requires: libtheora-devel%{?_isa} \ Requires: libtiff-devel%{?_isa} \ Requires: libxml2-devel%{?_isa} \ Requires: libX11-devel%{?_isa} \ +Requires: libXcursor-devel%{?_isa} \ Requires: libXext-devel%{?_isa} \ Requires: libXt-devel%{?_isa} \ Requires: lz4-devel%{?_isa} \ @@ -246,7 +240,7 @@ Provides: bundled(gl2ps) = 1.4.0 Provides: bundled(ioss) = 20210512 Provides: bundled(kissfft) Provides: bundled(metaio) -Provides: bundled(verdict) = 1.2.0 +Provides: bundled(verdict) = 1.4.0 Provides: bundled(vpic) Provides: bundled(xdmf2) = 2.1 Provides: bundled(xdmf3) @@ -566,6 +560,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %endif \ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \\\ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \\\ + -DVTK_MODULE_USE_EXTERNAL_VTK_verdict:BOOL=OFF \\\ -DVTK_USE_TK=ON \\\ %{?with_flexiblas:-DBLA_VENDOR=FlexiBLAS} # https://gitlab.kitware.com/cmake/cmake/issues/17223 @@ -577,7 +572,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DVTK_BUILD_DOCUMENTATION:BOOL=ON \ -DVTK_BUILD_EXAMPLES:BOOL=ON \ -DVTK_BUILD_TESTING:BOOL=ON -%cmake_build +%cmake_build -- --output-sync %cmake_build --target DoxygenDoc %if %{with mpich} @@ -593,7 +588,7 @@ export CXX=mpic++ -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ -DVTK_USE_MPI:BOOL=ON -%cmake_build +%cmake_build -- --output-sync %_mpich_unload %endif @@ -610,7 +605,7 @@ export CXX=mpic++ -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ -DVTK_USE_MPI:BOOL=ON -%cmake_build +%cmake_build -- --output-sync %_openmpi_unload %endif @@ -844,6 +839,10 @@ cat xorg.log %changelog +* Mon Jan 09 2023 Orion Poplawski - 9.2.5-1 +- Update to 9.2.5 +- Use SPDX License tag + * Sat Nov 12 2022 Sandro Mani - 9.1.0-18 - Rebuild (gdal) From 085f74c1ef78eefd356da6a4c715e052eea5851b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 17 Jan 2023 17:13:50 -0700 Subject: [PATCH 101/158] Add patch to fix build with gcc 13 --- vtk-include.patch | 11 +++++++++++ vtk.spec | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 vtk-include.patch diff --git a/vtk-include.patch b/vtk-include.patch new file mode 100644 index 0000000..85d6e2f --- /dev/null +++ b/vtk-include.patch @@ -0,0 +1,11 @@ +diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h +--- VTK-9.2.5/IO/Image/vtkSEPReader.h.include 2023-01-05 08:51:35.000000000 -0700 ++++ VTK-9.2.5/IO/Image/vtkSEPReader.h 2023-01-17 07:43:41.988095734 -0700 +@@ -26,6 +26,7 @@ + #include "vtkNew.h" // for ivars + + #include // for std::array ++#include // for std::uint8_t + #include // for std::string + + namespace details diff --git a/vtk.spec b/vtk.spec index 4180136..8d86dac 100644 --- a/vtk.spec +++ b/vtk.spec @@ -49,6 +49,9 @@ Source2: xorg.conf Patch0: vtk-libharu.patch # Fix issue with Mayavi Patch1: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9616.patch +# Add missing includes for gcc 13 +# https://gitlab.kitware.com/vtk/vtk/-/issues/18782 +Patch2: vtk-include.patch URL: https://vtk.org/ From 36a6ede0c93d512feac87dd0a86cfd0e89779867 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:32:02 +0000 Subject: [PATCH 102/158] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 8d86dac..f2b3b78 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 9.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 09 2023 Orion Poplawski - 9.2.5-1 - Update to 9.2.5 - Use SPDX License tag From b01bce2be6ea02d8eae04d8104bb0b1a97e0c358 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 18 Feb 2023 20:29:46 -0700 Subject: [PATCH 103/158] Update to 9.2.6 --- vtk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index f2b3b78..fd9b633 100644 --- a/vtk.spec +++ b/vtk.spec @@ -39,8 +39,8 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.2.5 -Release: 2%{?dist} +Version: 9.2.6 +Release: 1%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Sun Feb 19 2023 Orion Poplawski - 9.2.6-1 +- Update to 9.2.6 + * Sat Jan 21 2023 Fedora Release Engineering - 9.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b3badea619a6b92a47c7e67e03401ec086bdb724 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 18 Feb 2023 20:45:59 -0700 Subject: [PATCH 104/158] Upload sources --- .gitignore | 2 ++ sources | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 43fc717..104cc2e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ vtk-5.6.0.tar.gz /VTKData-9.1.0.tar.gz /VTK-9.2.5.tar.gz /VTKData-9.2.5.tar.gz +/VTK-9.2.6.tar.gz +/VTKData-9.2.6.tar.gz diff --git a/sources b/sources index bb8f778..03bdad8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.2.5.tar.gz) = b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf -SHA512 (VTKData-9.2.5.tar.gz) = c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3 +SHA512 (VTK-9.2.6.tar.gz) = f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc +SHA512 (VTKData-9.2.6.tar.gz) = 5c5f2b365777733180a63daff224da7055e1c2911eb5e4efda26e38b9ac01cb8e886cf7e71c45ac83347642caf1786e72bb469c22954ffbbb6e2c317fc6b4080 From dac5ec46ae0b9c554c61ac19d41dd2a1bf123cb3 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 22:19:40 +0000 Subject: [PATCH 105/158] Rebuilt for Boost 1.81 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index fd9b633..7c89758 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Mon Feb 20 2023 Jonathan Wakely - 9.2.6-2 +- Rebuilt for Boost 1.81 + * Sun Feb 19 2023 Orion Poplawski - 9.2.6-1 - Update to 9.2.6 From 831187c07e8ec5f78336f3f61f7ea1d102d85d0d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 11 May 2023 10:21:33 +0200 Subject: [PATCH 106/158] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 7c89758..eece31d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Thu May 11 2023 Sandro Mani - 9.2.6-3 +- Rebuild (gdal) + * Mon Feb 20 2023 Jonathan Wakely - 9.2.6-2 - Rebuilt for Boost 1.81 From de6786f4b221b5c654dfb24a456d3393117a6d92 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 17:30:53 +0200 Subject: [PATCH 107/158] Rebuilt for Python 3.12 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index eece31d..fca9143 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Fri Jun 16 2023 Python Maint - 9.2.6-4 +- Rebuilt for Python 3.12 + * Thu May 11 2023 Sandro Mani - 9.2.6-3 - Rebuild (gdal) From d7c5c6ec013434db7874c3d5f464a1b1d0a648fe Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 6 Jul 2023 15:43:54 +0200 Subject: [PATCH 108/158] Rebuild (cgnslib) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index fca9143..d253ae6 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Thu Jul 06 2023 Sandro Mani - 9.2.6-5 +- Rebuild (cgnslib) + * Fri Jun 16 2023 Python Maint - 9.2.6-4 - Rebuilt for Python 3.12 From 9b75c31167b945a63764a6048759400911a2e6bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:54:17 +0000 Subject: [PATCH 109/158] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d253ae6..99380b0 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 9.2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 06 2023 Sandro Mani - 9.2.6-5 - Rebuild (cgnslib) From b3db91756ac2d62d813923ce15f6aef3196f1ddd Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 6 Sep 2023 10:02:21 -0400 Subject: [PATCH 110/158] Fix flatpak build We neither need nor are building mpich and openmpi subpackages. --- vtk.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vtk.spec b/vtk.spec index 99380b0..0fbb0d8 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,8 +14,13 @@ %else %bcond_with java %endif +%if 0%{?flatpak} +%bcond_with mpich +%bcond_with openmpi +%else %bcond_without mpich %bcond_without openmpi +%endif # s390x on EL8 does not have xorg-x11-drv-dummy %if 0%{?rhel} %ifarch s390x From 5f9a1f7ae79797dc0650d77756b0ef008c749d11 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 10 Sep 2023 15:53:22 -0600 Subject: [PATCH 111/158] Fix -devel deps on netcdf-*-devel --- vtk.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index 0fbb0d8..7f0f7ae 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,7 +45,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -279,7 +279,7 @@ Requires: %{name}-java%{?_isa} = %{version}-%{release} %endif Requires: python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release} Requires: hdf5-devel%{?_isa} -Requires: netcdf-mpich-devel%{?_isa} +Requires: netcdf-cxx-devel%{?_isa} %{vtk_devel_requires} %description devel @@ -348,6 +348,7 @@ Requires: %{name}-mpich%{?_isa} = %{version}-%{release} Requires: python%{python3_pkgversion}-%{name}-mpich%{?_isa} = %{version}-%{release} Requires: mpich-devel Requires: hdf5-mpich-devel%{?_isa} +Requires: netcdf-mpich-devel%{?_isa} %{vtk_devel_requires} %description mpich-devel @@ -847,6 +848,9 @@ cat xorg.log %changelog +* Sun Sep 10 2023 Orion Poplawski - 9.2.6-7 +- Fix -devel deps on netcdf-*-devel + * Sat Jul 22 2023 Fedora Release Engineering - 9.2.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e98440838139d26affdee4f18a5642fa4a22f629 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 17 Sep 2023 08:19:43 -0600 Subject: [PATCH 112/158] Use loops for mpi builds/intalls --- vtk.spec | 145 ++++++++++++++++++++++++------------------------------- 1 file changed, 62 insertions(+), 83 deletions(-) diff --git a/vtk.spec b/vtk.spec index 7f0f7ae..fb8f73c 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,7 +45,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -322,7 +322,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description qt Qt bindings for VTK. +%global mpi_list %{nil} + %if %{with mpich} +%global mpi_list %mpi_list mpich %package mpich Summary: The Visualization Toolkit - mpich version @@ -392,6 +395,7 @@ Qt bindings for VTK with mpich. %endif %if %{with openmpi} +%global mpi_list %mpi_list openmpi %package openmpi Summary: The Visualization Toolkit - openmpi version @@ -508,22 +512,6 @@ cp -a Examples vtk-examples find vtk-examples -type f | xargs chmod -R a-x -%build -export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" -export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" -export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H -%if %{with java} -export JAVA_HOME=/usr/lib/jvm/java -%ifarch %{arm} s390x -# getting "java.lang.OutOfMemoryError: Java heap space" during the build -export JAVA_TOOL_OPTIONS=-Xmx2048m -%endif -%ifarch %{arm} -# Likely running out of memory during build -%global _smp_ncpus_max 2 -%endif -%endif - %global vtk_cmake_options \\\ -DCMAKE_INSTALL_DOCDIR=share/doc/%{name} \\\ -DCMAKE_INSTALL_JARDIR=share/java \\\ @@ -575,7 +563,25 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m # https://gitlab.kitware.com/cmake/cmake/issues/17223 #-DVTK_MODULE_ENABLE_VTK_IOPostgreSQL:STRING=YES \\\ -%global _vpath_builddir build +# $mpi will be evaluated in the loops below +%global _vpath_builddir %{_vendor}-%{_target_os}-build-${mpi:-serial} + +%build +export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" +export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" +export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H +%if %{with java} +export JAVA_HOME=/usr/lib/jvm/java +%ifarch %{arm} s390x +# getting "java.lang.OutOfMemoryError: Java heap space" during the build +export JAVA_TOOL_OPTIONS=-Xmx2048m +%endif +%ifarch %{arm} +# Likely running out of memory during build +%global _smp_ncpus_max 2 +%endif +%endif + %cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DVTK_BUILD_DOCUMENTATION:BOOL=ON \ @@ -584,39 +590,24 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %cmake_build -- --output-sync %cmake_build --target DoxygenDoc -%if %{with mpich} -%global _vpath_builddir build-mpich -%_mpich_load -export CC=mpicc -export CXX=mpic++ -%cmake %{cmake_gen} \ - %{vtk_cmake_options} \ - -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ - -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ - -DCMAKE_INSTALL_LIBDIR:PATH=lib \ - -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ - -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ - -DVTK_USE_MPI:BOOL=ON -%cmake_build -- --output-sync -%_mpich_unload -%endif -%if %{with openmpi} -%global _vpath_builddir build-openmpi -%_openmpi_load export CC=mpicc export CXX=mpic++ -%cmake %{cmake_gen} \ - %{vtk_cmake_options} \ - -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ - -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ - -DCMAKE_INSTALL_LIBDIR:PATH=lib \ - -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ - -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ - -DVTK_USE_MPI:BOOL=ON -%cmake_build -- --output-sync -%_openmpi_unload -%endif +for mpi in %{mpi_list} +do + module load mpi/$mpi-%{_arch} + #CMAKE_INSTALL_LIBDIR -> ARCHIVE_DESTINATION must not be an absolute path + %cmake %{cmake_gen} \ + %{vtk_cmake_options} \ + -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ + -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ + -DCMAKE_INSTALL_LIBDIR:PATH=lib \ + -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ + -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ + -DVTK_USE_MPI:BOOL=ON + %cmake_build -- --output-sync + module purge +done # Remove executable bits from sources (some of which are generated) find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or \ @@ -624,10 +615,9 @@ find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or \ %install -%global _vpath_builddir build %cmake_install -pushd build +pushd %{_vpath_builddir} # Gather list of non-java/python/qt libraries ls %{buildroot}%{_libdir}/*.so.* \ | grep -Ev '(Java|Qt|Python)' | sed -e's,^%{buildroot},,' > libs.list @@ -645,35 +635,25 @@ done # Fix up filelist paths perl -pi -e's,^,%{_bindir}/,' testing.list +# Install data +mkdir -p %{buildroot}%{_datadir}/vtkdata +cp -alL ExternalData/* %{buildroot}%{_datadir}/vtkdata/ + popd -%if %{with mpich} -%_mpich_load -%global _vpath_builddir build-mpich -%cmake_install +for mpi in %{mpi_list} +do + module load mpi/$mpi-%{_arch} + %cmake_install -# Gather list of non-java/pythonl/qt libraries -ls %{buildroot}%{_libdir}/mpich/lib/*.so.* \ - | grep -Ev '(Java|Python|Qt)' | sed -e's,^%{buildroot},,' > build-mpich/libs.list + # Gather list of non-java/pythonl/qt libraries + ls %{buildroot}%{_libdir}/${mpi}/lib/*.so.* \ + | grep -Ev '(Java|Python|Qt)' | sed -e's,^%{buildroot},,' > %{_vpath_builddir}/libs.list -# Move licenses since we cannot install them outside of CMAKE_INSTALL_PREFIX (MPI_HOME) -mv %{buildroot}%{_libdir}/mpich/share/licenses/vtk %{buildroot}%{_defaultlicensedir}/%{name}-mpich -%_mpich_unload -%endif - -%if %{with openmpi} -%_openmpi_load -%global _vpath_builddir build-openmpi -%cmake_install - -# Gather list of non-java/python//qt libraries -ls %{buildroot}%{_libdir}/openmpi/lib/*.so.* \ - | grep -Ev '(Java|Python|Qt)' | sed -e's,^%{buildroot},,' > build-openmpi/libs.list - -# Move licenses since we cannot install them outside of CMAKE_INSTALL_PREFIX (MPI_HOME) -mv %{buildroot}%{_libdir}/openmpi/share/licenses/vtk %{buildroot}%{_defaultlicensedir}/%{name}-openmpi -%_openmpi_unload -%endif + # Move licenses since we cannot install them outside of CMAKE_INSTALL_PREFIX (MPI_HOME) + mv %{buildroot}%{_libdir}/${mpi}/share/licenses/vtk %{buildroot}%{_defaultlicensedir}/%{name}-${mpi} + module purge +done # Remove exec bit from non-scripts and %%doc for file in `find %{buildroot} -type f -perm 0755 \ @@ -687,9 +667,6 @@ find Utilities/Upgrading -type f -print0 | xargs -0 chmod -x mkdir -p _docs cp -pr --parents Wrapping/*/README* _docs/ -# Install data -mkdir -p %{buildroot}%{_datadir}/vtkdata -cp -alL build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ # Make noarch data sub-package the same on all arches # At the moment this only contains Java/Testing/Data/Baseline rm -rf %{buildroot}%{_datadir}/vtkdata/Wrapping @@ -716,7 +693,6 @@ fi $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 & export DISPLAY=:99 %endif -%global _vpath_builddir build export FLEXIBLAS=netlib %ctest --verbose || : %if %{with xdummy} @@ -725,7 +701,7 @@ cat xorg.log %endif -%files -f build/libs.list +%files -f %{_vendor}-%{_target_os}-build-serial/libs.list %license %{_defaultlicensedir}/%{name}/ %doc README.md _docs/Wrapping @@ -763,7 +739,7 @@ cat xorg.log %{_libdir}/qt5/qml/* %if %{with mpich} -%files mpich -f build-mpich/libs.list +%files mpich -f %{_vendor}-%{_target_os}-build-mpich/libs.list %license %{_defaultlicensedir}/%{name}-mpich/ %doc README.md _docs/Wrapping @@ -801,7 +777,7 @@ cat xorg.log %endif %if %{with openmpi} -%files openmpi -f build-openmpi/libs.list +%files openmpi -f %{_vendor}-%{_target_os}-build-openmpi/libs.list %license %{_defaultlicensedir}/%{name}-openmpi/ %doc README.md _docs/Wrapping @@ -841,13 +817,16 @@ cat xorg.log %files data %{_datadir}/vtkdata -%files testing -f build/testing.list +%files testing -f %{_vendor}-%{_target_os}-build-serial/testing.list %files examples %doc vtk-examples/Examples %changelog +* Sun Sep 17 2023 Orion Poplawski - 9.2.6-8 +- Use loops for mpi builds/intalls + * Sun Sep 10 2023 Orion Poplawski - 9.2.6-7 - Fix -devel deps on netcdf-*-devel From 3b88f3fa847bf8fb62b92a1ee4883ca1d6d54599 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 11 Oct 2023 16:21:06 -0600 Subject: [PATCH 113/158] Rebuild for openslide 4.0.0 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index fb8f73c..fec52df 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,7 +45,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -824,6 +824,9 @@ cat xorg.log %changelog +* Wed Oct 11 2023 Orion Poplawski - 9.2.6-9 +- Rebuild for openslide 4.0.0 + * Sun Sep 17 2023 Orion Poplawski - 9.2.6-8 - Use loops for mpi builds/intalls From 6ac8d12b235b988e6dc576275227d8460f78eb69 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 1 Nov 2023 19:44:44 -0600 Subject: [PATCH 114/158] Move API docs to separate doc sub-package (bz#2247327) --- vtk.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index fec52df..6893d62 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,7 +45,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -472,6 +472,13 @@ Obsoletes: vtkdata < 6.1.0-3 %description data VTK data files for tests and examples. +%package doc +Summary: API documentation for VTK +BuildArch: noarch + +%description doc +Generated API documentation for VTK + %package testing Summary: Testing programs for VTK Requires: %{name}%{?_isa} = %{version}-%{release}, %{name}-data = %{version} @@ -716,7 +723,6 @@ cat xorg.log %{_libdir}/cmake/%{name}/ %dir %{_libdir}/%{name} %{_libdir}/%{name}/hierarchy/ -%{_docdir}/%{name}/ %files -n python%{python3_pkgversion}-vtk %{python3_sitearch}/* @@ -817,6 +823,9 @@ cat xorg.log %files data %{_datadir}/vtkdata +%files doc +%{_docdir}/%{name}/ + %files testing -f %{_vendor}-%{_target_os}-build-serial/testing.list %files examples @@ -824,6 +833,9 @@ cat xorg.log %changelog +* Thu Nov 02 2023 Philip Matura - 9.2.6-10 +- Move API docs to separate doc sub-package (bz#2247327) + * Wed Oct 11 2023 Orion Poplawski - 9.2.6-9 - Rebuild for openslide 4.0.0 From 54bf13eec1a65103c407ccb97938350f2f5126cb Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 1 Nov 2023 19:48:44 -0600 Subject: [PATCH 115/158] No openmpi on i668 with openmpi 5 in Fedora 40+ --- vtk.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vtk.spec b/vtk.spec index 6893d62..1b1a70d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -19,8 +19,17 @@ %bcond_with openmpi %else %bcond_without mpich +# No openmpi on i668 with openmpi 5 in Fedora 40+ +%if 0%{?fedora} >= 40 +%ifarch %{ix86} +%bcond_with openmpi +%else %bcond_without openmpi %endif +%else +%bcond_without openmpi +%endif +%endif # s390x on EL8 does not have xorg-x11-drv-dummy %if 0%{?rhel} %ifarch s390x From 669f31d92649c2adbd7695111003c9a5ff3cb352 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 15 Nov 2023 15:03:19 +0100 Subject: [PATCH 116/158] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 1b1a70d..ceef52c 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Wed Nov 15 2023 Sandro Mani - 9.2.6-11 +- Rebuild (gdal) + * Thu Nov 02 2023 Philip Matura - 9.2.6-10 - Move API docs to separate doc sub-package (bz#2247327) From 72c3dccfc9680817ec4b78f612093dae03c1cba5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 17 Jan 2024 22:45:52 +0000 Subject: [PATCH 117/158] Rebuilt for Boost 1.83 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index ceef52c..f270330 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 11%{?dist} +Release: 12%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Wed Jan 17 2024 Jonathan Wakely - 9.2.6-12 +- Rebuilt for Boost 1.83 + * Wed Nov 15 2023 Sandro Mani - 9.2.6-11 - Rebuild (gdal) From 1a12f28665b2f24537b98fcf4b3fb3a176fa7fba Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 24 Jan 2024 21:43:42 -0700 Subject: [PATCH 118/158] Drop mpi4py-mpich BR on i686 (bz#2259594) --- vtk.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vtk.spec b/vtk.spec index f270330..cebaf62 100644 --- a/vtk.spec +++ b/vtk.spec @@ -146,7 +146,9 @@ BuildRequires: gnuplot BuildRequires: wget %if %{with mpich} BuildRequires: mpich-devel +%ifnarch %{ix86} BuildRequires: python%{?python3_pkgversion}-mpi4py-mpich +%endif BuildRequires: netcdf-mpich-devel %endif %if %{with openmpi} @@ -842,6 +844,9 @@ cat xorg.log %changelog +* Wed Jan 24 2024 Orion Poplawski - 9.2.6-12 +- Drop mpi4py-mpich BR on i686 (bz#2259594) + * Wed Jan 17 2024 Jonathan Wakely - 9.2.6-12 - Rebuilt for Boost 1.83 From 37872b22acd365439a9a3bef050d788ac7ad48b3 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 11 Dec 2023 09:56:47 +0200 Subject: [PATCH 119/158] Reduce memory and ncpu usage The builds jobs keep restarting. We are most likely hitting OOM. Signed-off-by: David Abdurachmanov --- vtk.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vtk.spec b/vtk.spec index cebaf62..ec6b1b8 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 12%{?dist} +Release: 13%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -590,11 +590,11 @@ export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H %if %{with java} export JAVA_HOME=/usr/lib/jvm/java -%ifarch %{arm} s390x +%ifarch %{arm} s390x riscv64 # getting "java.lang.OutOfMemoryError: Java heap space" during the build export JAVA_TOOL_OPTIONS=-Xmx2048m %endif -%ifarch %{arm} +%ifarch %{arm} riscv64 # Likely running out of memory during build %global _smp_ncpus_max 2 %endif @@ -844,6 +844,9 @@ cat xorg.log %changelog +* Sat Feb 24 2024 David Abdurachmanov - 9.2.6-13 +- Reduce memory and ncpu usage + * Wed Jan 24 2024 Orion Poplawski - 9.2.6-12 - Drop mpi4py-mpich BR on i686 (bz#2259594) From 1a9901bfad9773c52e4f5e5761beeb59f2702b56 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 27 Feb 2024 17:13:16 -0700 Subject: [PATCH 120/158] Better changelog entry --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index ec6b1b8..688d2fe 100644 --- a/vtk.spec +++ b/vtk.spec @@ -845,7 +845,7 @@ cat xorg.log %changelog * Sat Feb 24 2024 David Abdurachmanov - 9.2.6-13 -- Reduce memory and ncpu usage +- Reduce memory and ncpu usage during riscv64 builds * Wed Jan 24 2024 Orion Poplawski - 9.2.6-12 - Drop mpi4py-mpich BR on i686 (bz#2259594) From 3300be518ba7bb4dd6531fd059b99ae1685ea8ec Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 9 Apr 2024 21:06:59 -0600 Subject: [PATCH 121/158] Set Java source/target version to 8 (FTBFS bz#2272954) --- vtk.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 688d2fe..a504a97 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 13%{?dist} +Release: 14%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -559,6 +559,8 @@ find vtk-examples -type f | xargs chmod -R a-x %endif \ %if %{with java} \ -DVTK_WRAP_JAVA:BOOL=ON \\\ + -DVTK_JAVA_SOURCE_VERSION=8 \\\ + -DVTK_JAVA_TARGET_VERSION=8 \\\ -DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\ -DJAVA_INCLUDE_PATH2:PATH=$JAVA_HOME/include/linux \\\ -DJAVA_AWT_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\ @@ -844,6 +846,9 @@ cat xorg.log %changelog +* Wed Apr 10 2024 Orion Poplawski - 9.2.6-14 +- Set Java source/target version to 8 (FTBFS bz#2272954) + * Sat Feb 24 2024 David Abdurachmanov - 9.2.6-13 - Reduce memory and ncpu usage during riscv64 builds From 6e5de7889d75014601dc2c82b2993e6349cbd129 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 13 May 2024 16:35:04 +0200 Subject: [PATCH 122/158] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index a504a97..9bdc581 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 14%{?dist} +Release: 15%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -846,6 +846,9 @@ cat xorg.log %changelog +* Mon May 13 2024 Sandro Mani - 9.2.6-15 +- Rebuild (gdal) + * Wed Apr 10 2024 Orion Poplawski - 9.2.6-14 - Set Java source/target version to 8 (FTBFS bz#2272954) From e1b8d18b96f7b7cc02cfbe73af9234cc6424902e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 20 May 2024 18:07:09 -0400 Subject: [PATCH 123/158] Fix flatpak build OpenJDK is built into /app for flatpaks which need it, so provide some additional hints so that it is found during the build. --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 9bdc581..a9ea1fd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -564,6 +564,9 @@ find vtk-examples -type f | xargs chmod -R a-x -DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\ -DJAVA_INCLUDE_PATH2:PATH=$JAVA_HOME/include/linux \\\ -DJAVA_AWT_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\ + -DJAVA_AWT_LIBRARY:PATH=$JAVA_HOME/lib/libjawt.so \\\ + -DJAVA_JNI_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\ + -DJAVA_JVM_LIBRARY:PATH=$JAVA_HOME/lib/libjava.so \\\ %else \ -DVTK_WRAP_JAVA:BOOL=OFF \\\ %endif \ @@ -591,7 +594,7 @@ export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H %if %{with java} -export JAVA_HOME=/usr/lib/jvm/java +export JAVA_HOME=%{_prefix}/lib/jvm/java %ifarch %{arm} s390x riscv64 # getting "java.lang.OutOfMemoryError: Java heap space" during the build export JAVA_TOOL_OPTIONS=-Xmx2048m From c12f2e51d4b9dd81995d6295b59f370d780b83b5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 01:40:26 +0200 Subject: [PATCH 124/158] Rebuilt for Python 3.13 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index a9ea1fd..6ed13b7 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -849,6 +849,9 @@ cat xorg.log %changelog +* Sat Jun 08 2024 Python Maint - 9.2.6-16 +- Rebuilt for Python 3.13 + * Mon May 13 2024 Sandro Mani - 9.2.6-15 - Rebuild (gdal) From b8259cc0a46f15974c2581b8c98a8a5ea47845e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:02:53 +0000 Subject: [PATCH 125/158] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 6ed13b7..dd03878 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 16%{?dist} +Release: 17%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -849,6 +849,9 @@ cat xorg.log %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 9.2.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 08 2024 Python Maint - 9.2.6-16 - Rebuilt for Python 3.13 From 75f31f569796fdf1f23793e97795a3ef54512f81 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 8 Oct 2024 08:00:53 -0600 Subject: [PATCH 126/158] Add upstream patch to fix segmentation fault on import with Python 3.13 (rhbz#2310520) --- vtk-python3.13.patch | 90 ++++++++++++++++++++++++++++++++++++++++++++ vtk.spec | 10 ++++- 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 vtk-python3.13.patch diff --git a/vtk-python3.13.patch b/vtk-python3.13.patch new file mode 100644 index 0000000..0bea05f --- /dev/null +++ b/vtk-python3.13.patch @@ -0,0 +1,90 @@ +diff --git a/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx b/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx +index 0471594..bc92c85 100644 +--- a/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx ++++ b/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx +@@ -114,7 +114,9 @@ wchar_t* vtk_Py_UTF8ToWide(const char* arg) + + return result; + } ++#endif + ++#if PY_VERSION_HEX < 0x03080000 + std::string vtk_Py_WideToUTF8(const wchar_t* arg) + { + std::string result; +@@ -859,15 +861,20 @@ void vtkPythonInterpreter::SetupVTKPythonPaths() + if (vtklib.empty()) + { + VTKPY_DEBUG_MESSAGE( +- "`GetVTKVersion` library couldn't be found. Will use `Py_GetProgramName` next."); ++ "`GetVTKVersion` library couldn't be found. Will use `sys.executable` next."); + } + + if (vtklib.empty()) + { +-#if PY_VERSION_HEX >= 0x03000000 +- vtklib = vtk_Py_WideToUTF8(Py_GetProgramName()); ++#if PY_VERSION_HEX >= 0x03080000 ++ vtkPythonScopeGilEnsurer gilEnsurer; ++ PyObject* executable_path = PySys_GetObject("executable"); ++ if (executable_path != Py_None) ++ { ++ vtklib = PyUnicode_AsUTF8AndSize(executable_path, nullptr); ++ } + #else +- vtklib = Py_GetProgramName(); ++ vtklib = vtk_Py_WideToUTF8(Py_GetProgramName()); + #endif + } + +diff --git a/Wrapping/Python/vtkmodules/test/Testing.py b/Wrapping/Python/vtkmodules/test/Testing.py +index 59186bb..d0643c1 100644 +--- a/Wrapping/Python/vtkmodules/test/Testing.py ++++ b/Wrapping/Python/vtkmodules/test/Testing.py +@@ -513,8 +513,10 @@ def test(cases): + """ + # Make the test suites from the arguments. + suites = [] +- for case in cases: +- suites.append(unittest.makeSuite(case[0], case[1])) ++ loader = unittest.TestLoader() ++ # the "name" is ignored (it was always just 'test') ++ for test,name in cases: ++ suites.append(loader.loadTestsFromTestCase(test)) + test_suite = unittest.TestSuite(suites) + + # Now run the tests. +diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx +index 927eef1..7460eb7 100644 +--- a/Wrapping/PythonCore/PyVTKNamespace.cxx ++++ b/Wrapping/PythonCore/PyVTKNamespace.cxx +@@ -113,8 +113,10 @@ PyObject* PyVTKNamespace_New(const char* name) + { + // make sure python has readied the type object + PyType_Ready(&PyVTKNamespace_Type); +- // call the allocator provided by python for this type +- self = PyVTKNamespace_Type.tp_alloc(&PyVTKNamespace_Type, 0); ++ // call the superclass new function ++ PyObject* empty = PyTuple_New(0); ++ self = PyVTKNamespace_Type.tp_base->tp_new(&PyVTKNamespace_Type, empty, nullptr); ++ Py_DECREF(empty); + // call the superclass init function + PyObject* args = PyTuple_New(1); + PyTuple_SET_ITEM(args, 0, PyString_FromString(name)); +diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx +index e0ff31e..c89900f 100644 +--- a/Wrapping/PythonCore/PyVTKTemplate.cxx ++++ b/Wrapping/PythonCore/PyVTKTemplate.cxx +@@ -788,8 +788,10 @@ PyObject* PyVTKTemplate_New(const char* name, const char* docstring) + { + // make sure python has readied the type object + PyType_Ready(&PyVTKTemplate_Type); +- // call the allocator provided by python for this type +- PyObject* self = PyVTKTemplate_Type.tp_alloc(&PyVTKTemplate_Type, 0); ++ // call the superclass new function ++ PyObject* empty = PyTuple_New(0); ++ PyObject* self = PyVTKTemplate_Type.tp_base->tp_new(&PyVTKTemplate_Type, empty, nullptr); ++ Py_DECREF(empty); + // call the superclass init function + PyObject* args = PyTuple_New(2); + PyTuple_SET_ITEM(args, 0, PyString_FromString(name)); diff --git a/vtk.spec b/vtk.spec index dd03878..d3ce529 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 17%{?dist} +Release: 18%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -66,6 +66,10 @@ Patch1: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9616.patch # Add missing includes for gcc 13 # https://gitlab.kitware.com/vtk/vtk/-/issues/18782 Patch2: vtk-include.patch +# Fix segfault with Python 3.13 +# https://bugzilla.redhat.com/show_bug.cgi?id=2310520 +# Backport of https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11486 +Patch3: vtk-python3.13.patch URL: https://vtk.org/ @@ -849,6 +853,10 @@ cat xorg.log %changelog +* Tue Oct 08 2024 Orion Poplawski - 9.2.6-18 +- Add upstream patch to fix segmentation fault on import with Python 3.13 + (rhbz#2310520) + * Sat Jul 20 2024 Fedora Release Engineering - 9.2.6-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3a47e405769aaef3c9d8c582480630fdfd6b1711 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 25 Oct 2024 17:33:12 -0600 Subject: [PATCH 127/158] Rebuild for hdf5 1.14.5 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d3ce529..d0f6cff 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 18%{?dist} +Release: 19%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -853,6 +853,9 @@ cat xorg.log %changelog +* Fri Oct 25 2024 Orion Poplawski - 9.2.6-19 +- Rebuild for hdf5 1.14.5 + * Tue Oct 08 2024 Orion Poplawski - 9.2.6-18 - Add upstream patch to fix segmentation fault on import with Python 3.13 (rhbz#2310520) From 8fa78a9f1c60ab5e6afaf68465bdafd3fb54d8cf Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 31 Oct 2024 15:18:59 -0600 Subject: [PATCH 128/158] Add missing dep to mpi-devel packages --- vtk.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d0f6cff..131ab38 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 19%{?dist} +Release: 20%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -363,6 +363,9 @@ NOTE: The version in this package has been compiled with mpich support. %package mpich-devel Summary: VTK header files for building C++ code with mpich Requires: %{name}-mpich%{?_isa} = %{version}-%{release} +%if %{with java} +Requires: %{name}-mpich-java%{?_isa} = %{version}-%{release} +%endif Requires: python%{python3_pkgversion}-%{name}-mpich%{?_isa} = %{version}-%{release} Requires: mpich-devel Requires: hdf5-mpich-devel%{?_isa} @@ -433,6 +436,9 @@ NOTE: The version in this package has been compiled with openmpi support. %package openmpi-devel Summary: VTK header files for building C++ code with openmpi Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} +%if %{with java} +Requires: %{name}-openmpi-java%{?_isa} = %{version}-%{release} +%endif Requires: python%{python3_pkgversion}-%{name}-openmpi%{?_isa} = %{version}-%{release} Requires: openmpi-devel Requires: hdf5-openmpi-devel%{?_isa} @@ -853,6 +859,9 @@ cat xorg.log %changelog +* Thu Oct 31 2024 Christoph Junghans - 9.2.6-20 +- Add missing dep to mpi-devel packages + * Fri Oct 25 2024 Orion Poplawski - 9.2.6-19 - Rebuild for hdf5 1.14.5 From cc5fea73f2c51ac0766084d1664a16732bc7b8cf Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 8 Nov 2024 16:10:09 +0100 Subject: [PATCH 129/158] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 131ab38..38939b5 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 20%{?dist} +Release: 21%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -859,6 +859,9 @@ cat xorg.log %changelog +* Fri Nov 08 2024 Sandro Mani - 9.2.6-21 +- Rebuild (gdal) + * Thu Oct 31 2024 Christoph Junghans - 9.2.6-20 - Add missing dep to mpi-devel packages From 1d4c060849b5d681cc94d115595ec9b520f395c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:39:46 +0000 Subject: [PATCH 130/158] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 38939b5..63cc64a 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 21%{?dist} +Release: 22%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -859,6 +859,9 @@ cat xorg.log %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 9.2.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 08 2024 Sandro Mani - 9.2.6-21 - Rebuild (gdal) From 0dd36f7b889d8094789b6eea20047d364322a145 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 24 Jan 2025 11:04:59 +0100 Subject: [PATCH 131/158] Rebuild (cgnslib) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 63cc64a..6e0c5f2 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 22%{?dist} +Release: 23%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -859,6 +859,9 @@ cat xorg.log %changelog +* Fri Jan 24 2025 Sandro Mani - 9.2.6-23 +- Rebuild (cgnslib) + * Sun Jan 19 2025 Fedora Release Engineering - 9.2.6-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From eeaedd55ea0e5ff0942452fa328c494447a167cf Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 26 Jan 2025 00:05:45 +0100 Subject: [PATCH 132/158] Add patch to fix FTBFS --- vtk-build.patch | 12 ++++++++++++ vtk.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 vtk-build.patch diff --git a/vtk-build.patch b/vtk-build.patch new file mode 100644 index 0000000..e1ab822 --- /dev/null +++ b/vtk-build.patch @@ -0,0 +1,12 @@ +diff -rupN VTK-9.2.6/Utilities/octree/octree/octree_node.txx VTK-9.2.6-new/Utilities/octree/octree/octree_node.txx +--- VTK-9.2.6/Utilities/octree/octree/octree_node.txx 2023-02-15 05:03:53.000000000 +0100 ++++ VTK-9.2.6-new/Utilities/octree/octree/octree_node.txx 2025-01-24 14:12:16.855255487 +0100 +@@ -207,7 +207,7 @@ const octree_node& octree_no + { + throw std::domain_error("Attempt to access children of an octree leaf node."); + } +- return this->_M_chilren[child]; ++ return this->m_children[child]; + } + + /**\brief Return a reference to a child node. diff --git a/vtk.spec b/vtk.spec index 6e0c5f2..56fc110 100644 --- a/vtk.spec +++ b/vtk.spec @@ -70,6 +70,8 @@ Patch2: vtk-include.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2310520 # Backport of https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11486 Patch3: vtk-python3.13.patch +# Fix build +Patch4: vtk-build.patch URL: https://vtk.org/ From 0d8651907257674b45b851d481aa4b407cefdbfb Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 27 Jan 2025 09:15:29 +0100 Subject: [PATCH 133/158] Rebuild (cgnslib) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 56fc110..4813c0e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 23%{?dist} +Release: 24%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -861,6 +861,9 @@ cat xorg.log %changelog +* Mon Jan 27 2025 Sandro Mani - 9.2.6-24 +- Rebuild (cgnslib) + * Fri Jan 24 2025 Sandro Mani - 9.2.6-23 - Rebuild (cgnslib) From 8323ad52393daacb1d1f91c8573e8ee69e302640 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 28 Jan 2025 08:39:40 +0100 Subject: [PATCH 134/158] Rebuild for cgnslib built with scoped enums --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 4813c0e..40a1491 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 24%{?dist} +Release: 25%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -861,6 +861,9 @@ cat xorg.log %changelog +* Tue Jan 28 2025 Sandro Mani - 9.2.6-25 +- Rebuild for cgnslib built with scoped enums + * Mon Jan 27 2025 Sandro Mani - 9.2.6-24 - Rebuild (cgnslib) From b0f15f1891138b3022ee033bf458b3ea1db5492b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 13 Feb 2025 06:35:30 -0700 Subject: [PATCH 135/158] Rebuild with hdf5 1.14.6 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 40a1491..f6b63db 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 25%{?dist} +Release: 26%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -861,6 +861,9 @@ cat xorg.log %changelog +* Thu Feb 13 2025 Orion Poplawski - 9.2.6-26 +- Rebuild with hdf5 1.14.6 + * Tue Jan 28 2025 Sandro Mani - 9.2.6-25 - Rebuild for cgnslib built with scoped enums From e327ae003ec45b57b053161938953e217ab2e478 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 17 Feb 2025 15:33:41 -0700 Subject: [PATCH 136/158] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 757 +++++++++++++++++++++++++++++++++++++++++++++++++++++ vtk.spec | 760 +----------------------------------------------------- 2 files changed, 759 insertions(+), 758 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..cd948dd --- /dev/null +++ b/changelog @@ -0,0 +1,757 @@ +* Thu Feb 13 2025 Orion Poplawski - 9.2.6-26 +- Rebuild with hdf5 1.14.6 + +* Tue Jan 28 2025 Sandro Mani - 9.2.6-25 +- Rebuild for cgnslib built with scoped enums + +* Mon Jan 27 2025 Sandro Mani - 9.2.6-24 +- Rebuild (cgnslib) + +* Fri Jan 24 2025 Sandro Mani - 9.2.6-23 +- Rebuild (cgnslib) + +* Sun Jan 19 2025 Fedora Release Engineering - 9.2.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Nov 08 2024 Sandro Mani - 9.2.6-21 +- Rebuild (gdal) + +* Thu Oct 31 2024 Christoph Junghans - 9.2.6-20 +- Add missing dep to mpi-devel packages + +* Fri Oct 25 2024 Orion Poplawski - 9.2.6-19 +- Rebuild for hdf5 1.14.5 + +* Tue Oct 08 2024 Orion Poplawski - 9.2.6-18 +- Add upstream patch to fix segmentation fault on import with Python 3.13 + (rhbz#2310520) + +* Sat Jul 20 2024 Fedora Release Engineering - 9.2.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jun 08 2024 Python Maint - 9.2.6-16 +- Rebuilt for Python 3.13 + +* Mon May 13 2024 Sandro Mani - 9.2.6-15 +- Rebuild (gdal) + +* Wed Apr 10 2024 Orion Poplawski - 9.2.6-14 +- Set Java source/target version to 8 (FTBFS bz#2272954) + +* Sat Feb 24 2024 David Abdurachmanov - 9.2.6-13 +- Reduce memory and ncpu usage during riscv64 builds + +* Wed Jan 24 2024 Orion Poplawski - 9.2.6-12 +- Drop mpi4py-mpich BR on i686 (bz#2259594) + +* Wed Jan 17 2024 Jonathan Wakely - 9.2.6-12 +- Rebuilt for Boost 1.83 + +* Wed Nov 15 2023 Sandro Mani - 9.2.6-11 +- Rebuild (gdal) + +* Thu Nov 02 2023 Philip Matura - 9.2.6-10 +- Move API docs to separate doc sub-package (bz#2247327) + +* Wed Oct 11 2023 Orion Poplawski - 9.2.6-9 +- Rebuild for openslide 4.0.0 + +* Sun Sep 17 2023 Orion Poplawski - 9.2.6-8 +- Use loops for mpi builds/intalls + +* Sun Sep 10 2023 Orion Poplawski - 9.2.6-7 +- Fix -devel deps on netcdf-*-devel + +* Sat Jul 22 2023 Fedora Release Engineering - 9.2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 06 2023 Sandro Mani - 9.2.6-5 +- Rebuild (cgnslib) + +* Fri Jun 16 2023 Python Maint - 9.2.6-4 +- Rebuilt for Python 3.12 + +* Thu May 11 2023 Sandro Mani - 9.2.6-3 +- Rebuild (gdal) + +* Mon Feb 20 2023 Jonathan Wakely - 9.2.6-2 +- Rebuilt for Boost 1.81 + +* Sun Feb 19 2023 Orion Poplawski - 9.2.6-1 +- Update to 9.2.6 + +* Sat Jan 21 2023 Fedora Release Engineering - 9.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 09 2023 Orion Poplawski - 9.2.5-1 +- Update to 9.2.5 +- Use SPDX License tag + +* Sat Nov 12 2022 Sandro Mani - 9.1.0-18 +- Rebuild (gdal) + +* Thu Jul 28 2022 Orion Poplawski - 9.1.0-17 +- Remove all of vtkdata/Wrapping to keep vtk-data noarch + +* Thu Jul 28 2022 Mamoru TASAKA - 9.1.0-16 +- Make -data subpackage arch-dependent for now due to + java removal (bz#2104109) + +* Sat Jul 23 2022 Fedora Release Engineering - 9.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Jul 10 2022 Orion Poplawski - 9.1.0-14 +- Drop java for i686 (bz#2104109) + +* Tue Jun 28 2022 Orion Poplawski - 9.1.0-13 +- Add patch to support netcdf 4.9.0 + +* Fri Jun 24 2022 Orion Poplawski - 9.1.0-12 +- Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611) +- Link libvtkkissfft.so.1 against libm (bz#2100573) + +* Mon Jun 13 2022 Python Maint - 9.1.0-11 +- Rebuilt for Python 3.11 + +* Fri May 20 2022 Sandro Mani - 9.1.0-10 +- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 + +* Wed May 04 2022 Thomas Rodgers - 9.1.0-9 +- Rebuilt for Boost 1.78 + +* Tue Mar 22 2022 Sandro Mani - 9.1.0-8 +- Rebuild for cgnslib-4.3.0 + +* Thu Mar 03 2022 Sandro Mani - 9.1.0-7 +- Rebuild for proj-9.0.0 + +* Thu Feb 10 2022 Orion Poplawski - 9.1.0-6 +- Rebuild for glew 2.2 + +* Sat Feb 05 2022 Jiri Vanek - 9.1.0-5 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 29 2022 Orion Poplawski - 9.1.0-4 +- Use export CC/CXX to set MPI compiler + +* Sat Jan 22 2022 Fedora Release Engineering - 9.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 20 2022 Orion Poplawski - 9.1.0-3 +- Use %%global to define __cc/__cxx + +* Fri Jan 07 2022 Orion Poplawski - 9.1.0-2 +- Make java-devel only be brought in by vtk-java-devel + +* Sun Nov 21 2021 Orion Poplawski - 9.1.0-1 +- Update to 9.1.0 + +* Thu Nov 11 2021 Sandro Mani - 9.0.3-4 +- Rebuild (gdal) + +* Wed Nov 03 2021 Björn Esser - 9.0.3-3 +- Rebuild (jsoncpp) + +* Sun Sep 26 2021 Orion Poplawski - 9.0.3-2 +- Cleanup rpath handling (bz#1902729) + +* Wed Sep 15 2021 Orion Poplawski - 9.0.3-1 +- Update to 9.0.3 +- Add upstream patch to fix Mayavi crash (bz#1966135) + +* Tue Aug 10 2021 Orion Poplawski - 9.0.2-6 +- Rebuild for hdf5 1.10.7/netcdf 4.8.0 + +* Tue Aug 10 2021 Orion Poplawski - 9.0.2-5 +- More rpath cleanup + +* Sat Aug 07 2021 Jonathan Wakely - 9.0.2-4 +- Rebuilt for Boost 1.76 + +* Fri Jul 23 2021 Fedora Release Engineering - 9.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 13 2021 Björn Esser - 9.0.2-2 +- Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 + +* Thu Jul 01 2021 Orion Poplawski - 9.0.2-1 +- Update to 9.0.2 + +* Fri Jun 04 2021 Python Maint - 9.0.1-9 +- Rebuilt for Python 3.10 + +* Fri May 21 2021 Sandro Mani - 9.0.1-8 +- Rebuild (gdal) + +* Thu May 20 2021 Richard Shaw - 9.0.1-7 +- Rebuild for gdal 3.3.0. + +* Fri May 07 2021 Sandro Mani - 9.0.1-6 +- Rebuild (gdal) + +* Fri Apr 02 2021 Orion Poplawski - 9.0.1-5 +- Make vtk-devel package require vtk-java + +* Sat Mar 13 2021 Orion Poplawski - 9.0.1-4 +- Add upstream patch for proj 5 support + +* Sun Mar 07 2021 Sandro Mani - 9.0.1-4 +- Rebuild (proj) + +* Mon Feb 15 2021 Orion Poplawski - 9.0.1-3 +- Bump python3-vtk-qt obsoletes + +* Mon Feb 08 2021 Pavel Raiskup - 9.0.1-2 +- rebuild for libpq ABI fix rhbz#1908268 + +* Sat Jan 30 2021 Orion Poplawski - 9.0.1-1 +- Update to 9.0.1 +- Disable OSMesa - conflicts with X support +- Build against Fedora gl2ps, libharu, utf8cpp +- Drop python3-vtk-qt packages +- No longer ship compiled examples +- Install jar file into /usr/share/java +- Fix JNI install location +- Drop Qt4 build option + +* Wed Jan 27 2021 Fedora Release Engineering - 8.2.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 5 20:45:48 CET 2020 Sandro Mani - 8.2.0-25 +- Rebuild (proj) + +* Thu Sep 17 2020 Orion Poplawski - 8.2.0-24 +- Add patch to fix build with Qt 5.15 + +* Thu Aug 27 2020 Iñaki Úcar - 8.2.0-23 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + +* Sun Aug 9 2020 Orion Poplawski - 8.2.0-22 +- Fix ExternalData in vtk-data (bz#1783622) + +* Tue Aug 4 2020 Orion Poplawski - 8.2.0-21 +- Use new cmake macros + +* Wed Jul 29 2020 Fedora Release Engineering - 8.2.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 24 2020 Jeff Law - 8.2.0-19 +- Use __cmake_in_source_build + +* Sat Jul 11 2020 Jiri Vanek - 8.2.0-18 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 25 2020 Orion Poplawski - 8.2.0-17 +- Rebuild for hdf5 1.10.6 + +* Sat Jun 20 2020 Orion Poplawski - 8.2.0-16 +- Drop _python_bytecompile_extra, python2 conditionals + +* Sat May 30 2020 Björn Esser - 8.2.0-15 +- Rebuild (jsoncpp) + +* Wed May 27 2020 Orion Poplawski - 8.2.0-14 +- Add patch to fix building with GCC 10 (bz#1800240) + +* Tue May 26 2020 Miro Hrončok - 8.2.0-14 +- Rebuilt for Python 3.9 + +* Fri Jan 31 2020 Fedora Release Engineering - 8.2.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Nov 14 2019 Björn Esser - 8.2.0-12 +- Rebuild (jsoncpp) + +* Sat Nov 9 2019 Orion Poplawski - 8.2.0-11 +- Drop BR on sip-devel (python2) + +* Sun Sep 22 2019 Orion Poplawski - 8.2.0-10 +- Rebuild for double-conversion 3.1.5 + +* Mon Sep 09 2019 Orion Poplawski - 8.2.0-9 +- Rebuild for proj 6.2.0 +- Add patch and flags for proj 6 support + +* Tue Aug 20 2019 Orion Poplawski - 8.2.0-8 +- Add upstream patch to support Python 3.8 + +* Mon Aug 19 2019 Miro Hrončok - 8.2.0-7 +- Rebuilt for Python 3.8 + +* Wed Jul 31 2019 Orion Poplawski - 8.2.0-6 +- BR motif-devel instead of /usr/include/Xm (bugz#1731728) + +* Sat Jul 27 2019 Fedora Release Engineering - 8.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jul 03 2019 Björn Esser - 8.2.0-4 +- Rebuild (jsoncpp) + +* Thu Apr 18 2019 Orion Poplawski - 8.2.0-3 +- Provide starndard python 3.Y dist name (bugz#1700307) + +* Tue Apr 16 2019 Orion Poplawski - 8.2.0-2 +- Provide standard python 3 dist name (bugz#1700307) + +* Sat Mar 16 2019 Orion Poplawski - 8.2.0-1 +- Update to 8.2.0 +- TCL wrapping has been dropped upstream +- Build with system glew + +* Fri Feb 15 2019 Orion Poplawski - 8.1.1-3 +- Rebuild for openmpi 3.1.3 + +* Sun Feb 03 2019 Fedora Release Engineering - 8.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Oct 26 2018 Orion Poplawski - 8.1.1-1 +- Update to 8.1.1 (bug #1460059) +- Use Qt 5 (bug #1319504) +- Use Python 3 for Fedora 30+ (bug #1549034) + +* Thu Sep 06 2018 Pavel Raiskup - 7.1.1-13 +- rebuild against libpq (rhbz#1618698, rhbz#1623764) + +* Sat Jul 14 2018 Fedora Release Engineering - 7.1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Mar 07 2018 Adam Williamson - 7.1.1-11 +- Rebuild to fix GCC 8 mis-compilation + See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") + +* Fri Feb 09 2018 Fedora Release Engineering - 7.1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Dec 26 2017 Björn Esser - 7.1.1-9 +- Rebuilt for jsoncpp.so.20 + +* Mon Dec 18 2017 Orion Poplawski - 7.1.1-8 +- Enable mysql and postgresql support +- Use mariadb BR for F28+ (Bug #1494054) + +* Fri Sep 01 2017 Björn Esser - 7.1.1-7 +- Rebuilt for jsoncpp-1.8.3 + +* Sat Aug 12 2017 Zbigniew Jędrzejewski-Szmek - 7.1.1-6 +- Python 2 binary packages renamed to python2-vtk and python2-vtk-qt + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Aug 03 2017 Fedora Release Engineering - 7.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 7.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Fedora Release Engineering - 7.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Tue May 9 2017 Orion Poplawski - 7.1.1-2 +- Enable tests on s390x + +* Mon May 8 2017 Orion Poplawski - 7.1.1-1 +- Update to 7.1.1 + +* Sat Feb 11 2017 Fedora Release Engineering - 7.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 3 2017 Dan Horák - 7.1.0-5 +- s390x needs increased Java heap size + +* Thu Dec 29 2016 Orion Poplawski - 7.1.0-4 +- Drop setting java heap size + +* Thu Dec 8 2016 Dan Horák - 7.1.0-3 +- Enable openmpi on s390(x) +- Add missing conditions for mpich/openmpi subpackages + +* Thu Dec 8 2016 Orion Poplawski - 7.1.0-2 +- Fix MPI library install location + +* Mon Dec 5 2016 Orion Poplawski - 7.1.0-1 +- Update to 7.1.0 +- Enable OSMesa +- Build MPI versions +- Use bundled glew + +* Wed Nov 2 2016 Orion Poplawski - 6.3.0-12 +- Rebuild for R openblas changes + +* Mon Oct 03 2016 Björn Esser - 6.3.0-11 +- Rebuilt for libjsoncpp.so.11 + +* Thu Jul 28 2016 Than Ngo - 6.3.0-10 +- %%check: make non-fatal as temporary workaround for build on s390x + +* Tue Jul 19 2016 Fedora Release Engineering - 6.3.0-9 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Jun 29 2016 Orion Poplawski - 6.3.0-8 +- Rebuild for hdf5 1.8.17 + +* Fri Mar 25 2016 Björn Esser - 6.3.0-7 +- Rebuilt for libjsoncpp.so.1 + +* Mon Feb 8 2016 Orion Poplawski - 6.3.0-6 +- Add patch for gcc 6 support + +* Fri Feb 05 2016 Fedora Release Engineering - 6.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 22 2016 Orion Poplawski - 6.3.0-4 +- Rebuild for netcdf 4.4.0 + +* Sat Jan 16 2016 Jonathan Wakely - 6.3.0-3 +- Rebuilt for Boost 1.60 + +* Wed Oct 21 2015 Orion Poplawski - 6.3.0-2 +- Note bundled libraries + +* Tue Sep 15 2015 Orion Poplawski - 6.3.0-1 +- Update to 6.3.0 + +* Thu Aug 27 2015 Jonathan Wakely - 6.2.0-10 +- Rebuilt for Boost 1.59 + +* Fri Aug 21 2015 Orion Poplawski - 6.2.0-9 +- Note bundled kwsys, remove unused kwsys files + +* Wed Jul 29 2015 Fedora Release Engineering - 6.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + +* Wed Jul 22 2015 David Tardon - 6.2.0-7 +- rebuild for Boost 1.58 + +* Tue Jul 7 2015 Orion Poplawski - 6.2.0-6 +- Drop glext patch, no longer needed + +* Fri Jun 19 2015 Fedora Release Engineering - 6.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 23 2015 Orion Poplawski - 6.2.0-4 +- Add requires netcdf-cxx-devel to vtk-devel (bug #1224512) + +* Sun May 17 2015 Orion Poplawski - 6.2.0-3 +- Rebuild for hdf5 1.8.15 + +* Sat May 02 2015 Kalev Lember - 6.2.0-2 +- Rebuilt for GCC 5 C++11 ABI change + +* Wed Mar 18 2015 Orion Poplawski - 6.2.0-1 +- Update to 6.2.0 +- Remove type, system, install, and netcdf patches applied upstream +- Integrate and replace vtkdata +- Build and run tests again +- Generate testing.list based on executable name + +* Thu Mar 05 2015 Orion Poplawski - 6.1.0-26 +- Add needed vtk-*-devel requires to vtk-devel (bug #1199310) + +* Wed Mar 04 2015 Orion Poplawski - 6.1.0-25 +- Rebuild for jsoncpp + +* Wed Feb 04 2015 Petr Machata - 6.1.0-24 +- Bump for rebuild. + +* Tue Feb 3 2015 Orion Poplawski - 6.1.0-23 +- Add patch to fix tcl library loading + +* Mon Jan 26 2015 Petr Machata - 6.1.0-22 +- Rebuild for boost 1.57.0 + +* Mon Jan 19 2015 François Cami - 6.1.0-21 +- Switch to non-explicit arch requires for now (bugs #1183210 #1183530) + +* Sat Jan 17 2015 François Cami - 6.1.0-20 +- Add jsoncpp-devel and python2-devel to vtk-devel Requires (bug #1183210) + +* Thu Jan 08 2015 Orion Poplawski - 6.1.0-19 +- Rebuild for hdf5 1.8.14 +- Add patch to fix compilation error + +* Thu Nov 20 2014 Dan Horák - 6.1.0-18 +- Don't override Java memory settings on s390 (related to bug #1115920) + +* Wed Nov 19 2014 Orion Poplawski - 6.1.0-17 +- Add patch to fix compilation with mesa 10.4 (bug #1138466) + +* Fri Oct 31 2014 Orion Poplawski - 6.1.0-16 +- No longer need cmake28 on RHEL6 + +* Thu Sep 4 2014 Orion Poplawski - 6.1.0-15 +- Increase java heap space for builds (bug #1115920) + +* Mon Aug 18 2014 Fedora Release Engineering - 6.1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jun 10 2014 Orion Poplawski - 6.1.0-13 +- Rebuild for hdf 1.8.13 + +* Sun Jun 08 2014 Fedora Release Engineering - 6.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jun 5 2014 Orion Poplawski - 6.1.0-11 +- Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) + +* Tue May 27 2014 Orion Poplawski - 6.1.0-10 +- Rebuild for Tcl 8.6 + +* Fri May 23 2014 Petr Machata - 6.1.0-9 +- Rebuild for boost 1.55.0 + +* Wed May 21 2014 Jaroslav Škarvada - 6.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 + +* Tue May 6 2014 Tom Callaway - 6.1.0-7 +- rebuild against R 3.1.0 (without bundled blas/lapack) + +* Wed Mar 26 2014 Orion Poplawski - 6.1.0-5 +- Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) + +* Tue Jan 28 2014 Orion Poplawski - 6.1.0-4 +- Really fix requires freetype-devel + +* Mon Jan 27 2014 Orion Poplawski - 6.1.0-3 +- Fix requires freetype-devel + +* Sun Jan 26 2014 Orion Poplawski - 6.1.0-2 +- Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924) + +* Thu Jan 23 2014 Orion Poplawski - 6.1.0-1 +- Update to 6.1.0 +- Rebase patches, drop vtkpython patch +- Disable BUILD_TESTING for now until we can provide test data + +* Fri Dec 27 2013 Orion Poplawski - 6.0.0-10 +- Add patch to use system netcdf + +* Sun Dec 22 2013 Kevin Fenzi 6.0.0-9 +- Add BuildRequires on blas-devel and lapack-devel + +* Sun Dec 22 2013 François Cami - 6.0.0-8 +* Rebuild for rawhide. + +* Sun Aug 04 2013 Fedora Release Engineering - 6.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 30 2013 Petr Machata - 6.0.0-6 +- Rebuild for boost 1.54.0 + +* Mon Jul 29 2013 Orion Poplawski - 6.0.0-5 +- Enable VTK_WRAP_PYTHON_SIP + +* Fri Jul 26 2013 Orion Poplawski - 6.0.0-4 +- Add patch to install vtkpython + +* Wed Jul 17 2013 Petr Pisar - 6.0.0-3 +- Perl 5.18 rebuild + +* Mon Jul 15 2013 Orion Poplawski - 6.0.0-2 +- Install vtkMakeInstantiator files for gdcm build + +* Fri Jul 12 2013 Orion Poplawski - 6.0.0-1 +- Add BR on R-devel + +* Thu Jun 27 2013 Orion Poplawski - 6.0.0-1 +- Update to 6.0.0 + +* Thu May 16 2013 Orion Poplawski - 5.10.1-5 +- Rebuild for hdf5 1.8.11 + +* Fri Feb 15 2013 Fedora Release Engineering - 5.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Jan 21 2013 Adam Tkac - 5.10.1-3 +- rebuild due to "jpeg8-ABI" feature drop + +* Mon Dec 03 2012 Orion Poplawski - 5.10.1-2 +- Rebuild for hdf5 1.8.10 +- Change doc handling + +* Thu Nov 1 2012 Orion Poplawski - 5.10.1-1 +- Update to 5.10.1 + +* Sun Jul 22 2012 Fedora Release Engineering - 5.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 24 2012 Orion Poplawski - 5.10.0-2 +- Add patch to add soname to libvtkNetCDF_cxx + +* Tue May 15 2012 Orion Poplawski - 5.10.0-1 +- Update to 5.10.0 + +* Tue May 15 2012 Jonathan G. Underwood - 5.8.0-6 +- Add cmake28 usage when building for EL6 +- Disable -java build on PPC64 as it fails to build + +* Tue Feb 28 2012 Fedora Release Engineering - 5.8.0-5 +- Rebuilt for c++ ABI breakage + +* Sun Jan 8 2012 Orion Poplawski - 5.8.0-4 +- Rebuild with gcc 4.7 + +* Fri Nov 18 2011 Orion Poplawski - 5.8.0-3 +- Rebuild for hdf5 1.8.8, add explicit requires + +* Tue Nov 1 2011 Orion Poplawski - 5.8.0-2 +- Keep libraries in %%{_libdir}/vtk, use ld.so.conf.d + +* Fri Oct 7 2011 Orion Poplawski - 5.8.0-1 +- Update to 5.8.0 +- Drop version from directory names +- Use VTK_PYTHON_SETUP_ARGS instead of patch to set python install dir +- Drop several patches fixed upstream +- Remove rpaths from all hand installed binaries (Bug 744437) +- Don't link against OSMesa (Bug 744434) + +* Thu Jun 23 2011 Orion Poplawski - 5.6.1-10 +- Add BR qtwebkit-devel, fixes FTBS bug 715770 + +* Thu May 19 2011 Orion Poplawski - 5.6.1-9 +- Update soversion patch to add soversion to libvtkNetCDF.so + +* Mon Mar 28 2011 Orion Poplawski - 5.6.1-8 +- Rebuild for new mysql + +* Thu Mar 17 2011 Orion Poplawski - 5.6.1-7 +- Add needed requires to vtk-devel + +* Wed Mar 16 2011 Orion Poplawski - 5.6.1-6 +- Turn on boost, mysql, postgres, ogg theora, and text analysis support, + bug 688275. + +* Wed Mar 16 2011 Marek Kasik - 5.6.1-5 +- Add backslashes to VTK_INSTALL_LIB_DIR and +- VTK_INSTALL_INCLUDE_DIR (#687895) + +* Tue Mar 15 2011 Orion Poplawski - 5.6.1-4 +- Set VTK_INSTALL_LIB_DIR, fix bug 687895 + +* Fri Feb 18 2011 Orion Poplawski - 5.6.1-3 +- Add patch to support gcc 4.6 +- Add patch to make using system libraries easier +- Update pythondestdir patch to use --prefix and --root +- Use system gl2ps and libxml2 +- Use standard cmake build macro, out of tree builds +- Add patch from upstream to add sonames to libCosmo and libVPIC (bug #622840) + +* Mon Feb 07 2011 Fedora Release Engineering - 5.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Dec 7 2010 Orion Poplawski - 5.6.1-1 +- Update to 5.6.1 +- Enable qt4 support, drop qt3 support + +* Wed Oct 20 2010 Adam Jackson 5.6.0-37 +- Rebuild for new libOSMesa soname + +* Sat Jul 31 2010 David Malcolm - 5.6.0-36 +- add python 2.7 compat patch + +* Thu Jul 22 2010 David Malcolm - 5.6.0-35 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon Jul 5 2010 Axel Thimm - 5.6.0-34 +- Update to 5.6.0. + +* Sat Jun 6 2009 Axel Thimm - 5.4.2-30 +- Update to 5.4.2. + +* Thu Mar 12 2009 Orion Poplawski - 5.2.1-29 +- Update to 5.2.1 + +* Fri Mar 06 2009 Jesse Keating - 5.2.0-28 +- Remove chmod on examples .so files, none are built. This needs + more attention. + +* Sun Oct 5 2008 Axel Thimm - 5.2.0-26 +- Update to 5.2.0. + +* Wed Oct 1 2008 Orion Poplawski - 5.0.2-25 +- Fix patch fuzz + +* Mon Aug 25 2008 Axel Thimm - 5.0.4-24 +- Change java build dependencies from java-devel to gcj. + +* Sun Aug 24 2008 Axel Thimm - 5.0.4-23 +- %%check || : does not work anymore. +- enable java by default. + +* Wed May 21 2008 Tom "spot" Callaway - 5.0.4-22 +- fix license tag + +* Sat Apr 12 2008 Axel Thimm - 5.0.4-21 +- Fixes for gcc 4.3 by Orion Poplawski. + +* Sat Apr 5 2008 Axel Thimm - 5.0.4-20 +- Change BR to qt-devel to qt3-devel. + +* Sat Feb 23 2008 Axel Thimm - 5.0.4-19 +- Update to 5.0.4. + +* Mon May 28 2007 Axel Thimm - 5.0.3-18 +- Move headers to %%{_includedir}/vtk. +- Remove executable bit from sources. + +* Mon Apr 16 2007 Axel Thimm - 5.0.3-17 +- Make java build conditional. +- Add ldconfig %%post/%%postun for java/qt subpackages. + +* Sun Apr 15 2007 Axel Thimm - 5.0.3-16 +- Remove %%ghosting pyc/pyo. + +* Wed Apr 04 2007 Paulo Roma - 5.0.3-15 +- Update to 5.0.4. +- Added support for qt4 plugin. + +* Wed Feb 7 2007 Orion Poplawski - 5.0.2-14 +- Enable Java, Qt, GL2PS, OSMESA + +* Mon Sep 11 2006 Axel Thimm - 5.0.2-13 +- Update to 5.0.2. + +* Sun Aug 6 2006 Axel Thimm - 5.0.1-12 +- cmake needs to be >= 2.0.4. + +* Fri Aug 4 2006 Axel Thimm - 5.0.1-11 +- Fix some python issues including pyo management. + +* Sun Jul 23 2006 Axel Thimm - 5.0.1-10 +- Embed feedback from bug 199405 comment 5. +- Fix some Group entries. +- Remove redundant dependencies. +- Use system libs. +- Comment specfile more. +- Change buildroot handling with CMAKE_INSTALL_PREFIX. +- Enable qt designer plugin. + +* Wed Jul 19 2006 Axel Thimm - 5.0.1-7 +- Fix some permissions for rpmlint and debuginfo. + +* Sun Jul 16 2006 Axel Thimm - 5.0.1-7 +- Remove rpath and some further rpmlint warnings. + +* Thu Jul 13 2006 Axel Thimm - 5.0.1-6 +- Update to 5.0.1. + +* Wed May 31 2006 Axel Thimm +- Update to 5.0. + +* Mon Apr 05 2004 Intrinsic Spin 2.mr +- built on a machine with a stock libGL.so + +* Sun Apr 04 2004 Intrinsic Spin +- little cleanups +- Built for FC1 + +* Sun Jan 11 2004 Intrinsic Spin +- Built against a reasonably good (according to dashboard) CVS version so-as + to get GL2PS support. +- Rearranged. Cleaned up. Added some comments. + +* Sat Jan 10 2004 Intrinsic Spin +- Blatently stole this spec file for my own nefarious purposes. +- Removed Java (for now). Merged the Python and Tcl stuff into + the main rpm. + +* Fri Dec 05 2003 Fabrice Bellet +- (See Fabrice's RPMs for any more comments --Spin) diff --git a/vtk.spec b/vtk.spec index f6b63db..8e0638e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 26%{?dist} +Release: %autorelease License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -861,760 +861,4 @@ cat xorg.log %changelog -* Thu Feb 13 2025 Orion Poplawski - 9.2.6-26 -- Rebuild with hdf5 1.14.6 - -* Tue Jan 28 2025 Sandro Mani - 9.2.6-25 -- Rebuild for cgnslib built with scoped enums - -* Mon Jan 27 2025 Sandro Mani - 9.2.6-24 -- Rebuild (cgnslib) - -* Fri Jan 24 2025 Sandro Mani - 9.2.6-23 -- Rebuild (cgnslib) - -* Sun Jan 19 2025 Fedora Release Engineering - 9.2.6-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Nov 08 2024 Sandro Mani - 9.2.6-21 -- Rebuild (gdal) - -* Thu Oct 31 2024 Christoph Junghans - 9.2.6-20 -- Add missing dep to mpi-devel packages - -* Fri Oct 25 2024 Orion Poplawski - 9.2.6-19 -- Rebuild for hdf5 1.14.5 - -* Tue Oct 08 2024 Orion Poplawski - 9.2.6-18 -- Add upstream patch to fix segmentation fault on import with Python 3.13 - (rhbz#2310520) - -* Sat Jul 20 2024 Fedora Release Engineering - 9.2.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jun 08 2024 Python Maint - 9.2.6-16 -- Rebuilt for Python 3.13 - -* Mon May 13 2024 Sandro Mani - 9.2.6-15 -- Rebuild (gdal) - -* Wed Apr 10 2024 Orion Poplawski - 9.2.6-14 -- Set Java source/target version to 8 (FTBFS bz#2272954) - -* Sat Feb 24 2024 David Abdurachmanov - 9.2.6-13 -- Reduce memory and ncpu usage during riscv64 builds - -* Wed Jan 24 2024 Orion Poplawski - 9.2.6-12 -- Drop mpi4py-mpich BR on i686 (bz#2259594) - -* Wed Jan 17 2024 Jonathan Wakely - 9.2.6-12 -- Rebuilt for Boost 1.83 - -* Wed Nov 15 2023 Sandro Mani - 9.2.6-11 -- Rebuild (gdal) - -* Thu Nov 02 2023 Philip Matura - 9.2.6-10 -- Move API docs to separate doc sub-package (bz#2247327) - -* Wed Oct 11 2023 Orion Poplawski - 9.2.6-9 -- Rebuild for openslide 4.0.0 - -* Sun Sep 17 2023 Orion Poplawski - 9.2.6-8 -- Use loops for mpi builds/intalls - -* Sun Sep 10 2023 Orion Poplawski - 9.2.6-7 -- Fix -devel deps on netcdf-*-devel - -* Sat Jul 22 2023 Fedora Release Engineering - 9.2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jul 06 2023 Sandro Mani - 9.2.6-5 -- Rebuild (cgnslib) - -* Fri Jun 16 2023 Python Maint - 9.2.6-4 -- Rebuilt for Python 3.12 - -* Thu May 11 2023 Sandro Mani - 9.2.6-3 -- Rebuild (gdal) - -* Mon Feb 20 2023 Jonathan Wakely - 9.2.6-2 -- Rebuilt for Boost 1.81 - -* Sun Feb 19 2023 Orion Poplawski - 9.2.6-1 -- Update to 9.2.6 - -* Sat Jan 21 2023 Fedora Release Engineering - 9.2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 09 2023 Orion Poplawski - 9.2.5-1 -- Update to 9.2.5 -- Use SPDX License tag - -* Sat Nov 12 2022 Sandro Mani - 9.1.0-18 -- Rebuild (gdal) - -* Thu Jul 28 2022 Orion Poplawski - 9.1.0-17 -- Remove all of vtkdata/Wrapping to keep vtk-data noarch - -* Thu Jul 28 2022 Mamoru TASAKA - 9.1.0-16 -- Make -data subpackage arch-dependent for now due to - java removal (bz#2104109) - -* Sat Jul 23 2022 Fedora Release Engineering - 9.1.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Jul 10 2022 Orion Poplawski - 9.1.0-14 -- Drop java for i686 (bz#2104109) - -* Tue Jun 28 2022 Orion Poplawski - 9.1.0-13 -- Add patch to support netcdf 4.9.0 - -* Fri Jun 24 2022 Orion Poplawski - 9.1.0-12 -- Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611) -- Link libvtkkissfft.so.1 against libm (bz#2100573) - -* Mon Jun 13 2022 Python Maint - 9.1.0-11 -- Rebuilt for Python 3.11 - -* Fri May 20 2022 Sandro Mani - 9.1.0-10 -- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 - -* Wed May 04 2022 Thomas Rodgers - 9.1.0-9 -- Rebuilt for Boost 1.78 - -* Tue Mar 22 2022 Sandro Mani - 9.1.0-8 -- Rebuild for cgnslib-4.3.0 - -* Thu Mar 03 2022 Sandro Mani - 9.1.0-7 -- Rebuild for proj-9.0.0 - -* Thu Feb 10 2022 Orion Poplawski - 9.1.0-6 -- Rebuild for glew 2.2 - -* Sat Feb 05 2022 Jiri Vanek - 9.1.0-5 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 29 2022 Orion Poplawski - 9.1.0-4 -- Use export CC/CXX to set MPI compiler - -* Sat Jan 22 2022 Fedora Release Engineering - 9.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jan 20 2022 Orion Poplawski - 9.1.0-3 -- Use %%global to define __cc/__cxx - -* Fri Jan 07 2022 Orion Poplawski - 9.1.0-2 -- Make java-devel only be brought in by vtk-java-devel - -* Sun Nov 21 2021 Orion Poplawski - 9.1.0-1 -- Update to 9.1.0 - -* Thu Nov 11 2021 Sandro Mani - 9.0.3-4 -- Rebuild (gdal) - -* Wed Nov 03 2021 Björn Esser - 9.0.3-3 -- Rebuild (jsoncpp) - -* Sun Sep 26 2021 Orion Poplawski - 9.0.3-2 -- Cleanup rpath handling (bz#1902729) - -* Wed Sep 15 2021 Orion Poplawski - 9.0.3-1 -- Update to 9.0.3 -- Add upstream patch to fix Mayavi crash (bz#1966135) - -* Tue Aug 10 2021 Orion Poplawski - 9.0.2-6 -- Rebuild for hdf5 1.10.7/netcdf 4.8.0 - -* Tue Aug 10 2021 Orion Poplawski - 9.0.2-5 -- More rpath cleanup - -* Sat Aug 07 2021 Jonathan Wakely - 9.0.2-4 -- Rebuilt for Boost 1.76 - -* Fri Jul 23 2021 Fedora Release Engineering - 9.0.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 13 2021 Björn Esser - 9.0.2-2 -- Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 - -* Thu Jul 01 2021 Orion Poplawski - 9.0.2-1 -- Update to 9.0.2 - -* Fri Jun 04 2021 Python Maint - 9.0.1-9 -- Rebuilt for Python 3.10 - -* Fri May 21 2021 Sandro Mani - 9.0.1-8 -- Rebuild (gdal) - -* Thu May 20 2021 Richard Shaw - 9.0.1-7 -- Rebuild for gdal 3.3.0. - -* Fri May 07 2021 Sandro Mani - 9.0.1-6 -- Rebuild (gdal) - -* Fri Apr 02 2021 Orion Poplawski - 9.0.1-5 -- Make vtk-devel package require vtk-java - -* Sat Mar 13 2021 Orion Poplawski - 9.0.1-4 -- Add upstream patch for proj 5 support - -* Sun Mar 07 2021 Sandro Mani - 9.0.1-4 -- Rebuild (proj) - -* Mon Feb 15 2021 Orion Poplawski - 9.0.1-3 -- Bump python3-vtk-qt obsoletes - -* Mon Feb 08 2021 Pavel Raiskup - 9.0.1-2 -- rebuild for libpq ABI fix rhbz#1908268 - -* Sat Jan 30 2021 Orion Poplawski - 9.0.1-1 -- Update to 9.0.1 -- Disable OSMesa - conflicts with X support -- Build against Fedora gl2ps, libharu, utf8cpp -- Drop python3-vtk-qt packages -- No longer ship compiled examples -- Install jar file into /usr/share/java -- Fix JNI install location -- Drop Qt4 build option - -* Wed Jan 27 2021 Fedora Release Engineering - 8.2.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 5 20:45:48 CET 2020 Sandro Mani - 8.2.0-25 -- Rebuild (proj) - -* Thu Sep 17 2020 Orion Poplawski - 8.2.0-24 -- Add patch to fix build with Qt 5.15 - -* Thu Aug 27 2020 Iñaki Úcar - 8.2.0-23 -- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager - -* Sun Aug 9 2020 Orion Poplawski - 8.2.0-22 -- Fix ExternalData in vtk-data (bz#1783622) - -* Tue Aug 4 2020 Orion Poplawski - 8.2.0-21 -- Use new cmake macros - -* Wed Jul 29 2020 Fedora Release Engineering - 8.2.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 24 2020 Jeff Law - 8.2.0-19 -- Use __cmake_in_source_build - -* Sat Jul 11 2020 Jiri Vanek - 8.2.0-18 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu Jun 25 2020 Orion Poplawski - 8.2.0-17 -- Rebuild for hdf5 1.10.6 - -* Sat Jun 20 2020 Orion Poplawski - 8.2.0-16 -- Drop _python_bytecompile_extra, python2 conditionals - -* Sat May 30 2020 Björn Esser - 8.2.0-15 -- Rebuild (jsoncpp) - -* Wed May 27 2020 Orion Poplawski - 8.2.0-14 -- Add patch to fix building with GCC 10 (bz#1800240) - -* Tue May 26 2020 Miro Hrončok - 8.2.0-14 -- Rebuilt for Python 3.9 - -* Fri Jan 31 2020 Fedora Release Engineering - 8.2.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Nov 14 2019 Björn Esser - 8.2.0-12 -- Rebuild (jsoncpp) - -* Sat Nov 9 2019 Orion Poplawski - 8.2.0-11 -- Drop BR on sip-devel (python2) - -* Sun Sep 22 2019 Orion Poplawski - 8.2.0-10 -- Rebuild for double-conversion 3.1.5 - -* Mon Sep 09 2019 Orion Poplawski - 8.2.0-9 -- Rebuild for proj 6.2.0 -- Add patch and flags for proj 6 support - -* Tue Aug 20 2019 Orion Poplawski - 8.2.0-8 -- Add upstream patch to support Python 3.8 - -* Mon Aug 19 2019 Miro Hrončok - 8.2.0-7 -- Rebuilt for Python 3.8 - -* Wed Jul 31 2019 Orion Poplawski - 8.2.0-6 -- BR motif-devel instead of /usr/include/Xm (bugz#1731728) - -* Sat Jul 27 2019 Fedora Release Engineering - 8.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jul 03 2019 Björn Esser - 8.2.0-4 -- Rebuild (jsoncpp) - -* Thu Apr 18 2019 Orion Poplawski - 8.2.0-3 -- Provide starndard python 3.Y dist name (bugz#1700307) - -* Tue Apr 16 2019 Orion Poplawski - 8.2.0-2 -- Provide standard python 3 dist name (bugz#1700307) - -* Sat Mar 16 2019 Orion Poplawski - 8.2.0-1 -- Update to 8.2.0 -- TCL wrapping has been dropped upstream -- Build with system glew - -* Fri Feb 15 2019 Orion Poplawski - 8.1.1-3 -- Rebuild for openmpi 3.1.3 - -* Sun Feb 03 2019 Fedora Release Engineering - 8.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Oct 26 2018 Orion Poplawski - 8.1.1-1 -- Update to 8.1.1 (bug #1460059) -- Use Qt 5 (bug #1319504) -- Use Python 3 for Fedora 30+ (bug #1549034) - -* Thu Sep 06 2018 Pavel Raiskup - 7.1.1-13 -- rebuild against libpq (rhbz#1618698, rhbz#1623764) - -* Sat Jul 14 2018 Fedora Release Engineering - 7.1.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Mar 07 2018 Adam Williamson - 7.1.1-11 -- Rebuild to fix GCC 8 mis-compilation - See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") - -* Fri Feb 09 2018 Fedora Release Engineering - 7.1.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Dec 26 2017 Björn Esser - 7.1.1-9 -- Rebuilt for jsoncpp.so.20 - -* Mon Dec 18 2017 Orion Poplawski - 7.1.1-8 -- Enable mysql and postgresql support -- Use mariadb BR for F28+ (Bug #1494054) - -* Fri Sep 01 2017 Björn Esser - 7.1.1-7 -- Rebuilt for jsoncpp-1.8.3 - -* Sat Aug 12 2017 Zbigniew Jędrzejewski-Szmek - 7.1.1-6 -- Python 2 binary packages renamed to python2-vtk and python2-vtk-qt - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Aug 03 2017 Fedora Release Engineering - 7.1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 7.1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering - 7.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Tue May 9 2017 Orion Poplawski - 7.1.1-2 -- Enable tests on s390x - -* Mon May 8 2017 Orion Poplawski - 7.1.1-1 -- Update to 7.1.1 - -* Sat Feb 11 2017 Fedora Release Engineering - 7.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 3 2017 Dan Horák - 7.1.0-5 -- s390x needs increased Java heap size - -* Thu Dec 29 2016 Orion Poplawski - 7.1.0-4 -- Drop setting java heap size - -* Thu Dec 8 2016 Dan Horák - 7.1.0-3 -- Enable openmpi on s390(x) -- Add missing conditions for mpich/openmpi subpackages - -* Thu Dec 8 2016 Orion Poplawski - 7.1.0-2 -- Fix MPI library install location - -* Mon Dec 5 2016 Orion Poplawski - 7.1.0-1 -- Update to 7.1.0 -- Enable OSMesa -- Build MPI versions -- Use bundled glew - -* Wed Nov 2 2016 Orion Poplawski - 6.3.0-12 -- Rebuild for R openblas changes - -* Mon Oct 03 2016 Björn Esser - 6.3.0-11 -- Rebuilt for libjsoncpp.so.11 - -* Thu Jul 28 2016 Than Ngo - 6.3.0-10 -- %%check: make non-fatal as temporary workaround for build on s390x - -* Tue Jul 19 2016 Fedora Release Engineering - 6.3.0-9 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed Jun 29 2016 Orion Poplawski - 6.3.0-8 -- Rebuild for hdf5 1.8.17 - -* Fri Mar 25 2016 Björn Esser - 6.3.0-7 -- Rebuilt for libjsoncpp.so.1 - -* Mon Feb 8 2016 Orion Poplawski - 6.3.0-6 -- Add patch for gcc 6 support - -* Fri Feb 05 2016 Fedora Release Engineering - 6.3.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 22 2016 Orion Poplawski - 6.3.0-4 -- Rebuild for netcdf 4.4.0 - -* Sat Jan 16 2016 Jonathan Wakely - 6.3.0-3 -- Rebuilt for Boost 1.60 - -* Wed Oct 21 2015 Orion Poplawski - 6.3.0-2 -- Note bundled libraries - -* Tue Sep 15 2015 Orion Poplawski - 6.3.0-1 -- Update to 6.3.0 - -* Thu Aug 27 2015 Jonathan Wakely - 6.2.0-10 -- Rebuilt for Boost 1.59 - -* Fri Aug 21 2015 Orion Poplawski - 6.2.0-9 -- Note bundled kwsys, remove unused kwsys files - -* Wed Jul 29 2015 Fedora Release Engineering - 6.2.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 6.2.0-7 -- rebuild for Boost 1.58 - -* Tue Jul 7 2015 Orion Poplawski - 6.2.0-6 -- Drop glext patch, no longer needed - -* Fri Jun 19 2015 Fedora Release Engineering - 6.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 23 2015 Orion Poplawski - 6.2.0-4 -- Add requires netcdf-cxx-devel to vtk-devel (bug #1224512) - -* Sun May 17 2015 Orion Poplawski - 6.2.0-3 -- Rebuild for hdf5 1.8.15 - -* Sat May 02 2015 Kalev Lember - 6.2.0-2 -- Rebuilt for GCC 5 C++11 ABI change - -* Wed Mar 18 2015 Orion Poplawski - 6.2.0-1 -- Update to 6.2.0 -- Remove type, system, install, and netcdf patches applied upstream -- Integrate and replace vtkdata -- Build and run tests again -- Generate testing.list based on executable name - -* Thu Mar 05 2015 Orion Poplawski - 6.1.0-26 -- Add needed vtk-*-devel requires to vtk-devel (bug #1199310) - -* Wed Mar 04 2015 Orion Poplawski - 6.1.0-25 -- Rebuild for jsoncpp - -* Wed Feb 04 2015 Petr Machata - 6.1.0-24 -- Bump for rebuild. - -* Tue Feb 3 2015 Orion Poplawski - 6.1.0-23 -- Add patch to fix tcl library loading - -* Mon Jan 26 2015 Petr Machata - 6.1.0-22 -- Rebuild for boost 1.57.0 - -* Mon Jan 19 2015 François Cami - 6.1.0-21 -- Switch to non-explicit arch requires for now (bugs #1183210 #1183530) - -* Sat Jan 17 2015 François Cami - 6.1.0-20 -- Add jsoncpp-devel and python2-devel to vtk-devel Requires (bug #1183210) - -* Thu Jan 08 2015 Orion Poplawski - 6.1.0-19 -- Rebuild for hdf5 1.8.14 -- Add patch to fix compilation error - -* Thu Nov 20 2014 Dan Horák - 6.1.0-18 -- Don't override Java memory settings on s390 (related to bug #1115920) - -* Wed Nov 19 2014 Orion Poplawski - 6.1.0-17 -- Add patch to fix compilation with mesa 10.4 (bug #1138466) - -* Fri Oct 31 2014 Orion Poplawski - 6.1.0-16 -- No longer need cmake28 on RHEL6 - -* Thu Sep 4 2014 Orion Poplawski - 6.1.0-15 -- Increase java heap space for builds (bug #1115920) - -* Mon Aug 18 2014 Fedora Release Engineering - 6.1.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jun 10 2014 Orion Poplawski - 6.1.0-13 -- Rebuild for hdf 1.8.13 - -* Sun Jun 08 2014 Fedora Release Engineering - 6.1.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jun 5 2014 Orion Poplawski - 6.1.0-11 -- Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) - -* Tue May 27 2014 Orion Poplawski - 6.1.0-10 -- Rebuild for Tcl 8.6 - -* Fri May 23 2014 Petr Machata - 6.1.0-9 -- Rebuild for boost 1.55.0 - -* Wed May 21 2014 Jaroslav Škarvada - 6.1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 - -* Tue May 6 2014 Tom Callaway - 6.1.0-7 -- rebuild against R 3.1.0 (without bundled blas/lapack) - -* Wed Mar 26 2014 Orion Poplawski - 6.1.0-5 -- Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) - -* Tue Jan 28 2014 Orion Poplawski - 6.1.0-4 -- Really fix requires freetype-devel - -* Mon Jan 27 2014 Orion Poplawski - 6.1.0-3 -- Fix requires freetype-devel - -* Sun Jan 26 2014 Orion Poplawski - 6.1.0-2 -- Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924) - -* Thu Jan 23 2014 Orion Poplawski - 6.1.0-1 -- Update to 6.1.0 -- Rebase patches, drop vtkpython patch -- Disable BUILD_TESTING for now until we can provide test data - -* Fri Dec 27 2013 Orion Poplawski - 6.0.0-10 -- Add patch to use system netcdf - -* Sun Dec 22 2013 Kevin Fenzi 6.0.0-9 -- Add BuildRequires on blas-devel and lapack-devel - -* Sun Dec 22 2013 François Cami - 6.0.0-8 -* Rebuild for rawhide. - -* Sun Aug 04 2013 Fedora Release Engineering - 6.0.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 6.0.0-6 -- Rebuild for boost 1.54.0 - -* Mon Jul 29 2013 Orion Poplawski - 6.0.0-5 -- Enable VTK_WRAP_PYTHON_SIP - -* Fri Jul 26 2013 Orion Poplawski - 6.0.0-4 -- Add patch to install vtkpython - -* Wed Jul 17 2013 Petr Pisar - 6.0.0-3 -- Perl 5.18 rebuild - -* Mon Jul 15 2013 Orion Poplawski - 6.0.0-2 -- Install vtkMakeInstantiator files for gdcm build - -* Fri Jul 12 2013 Orion Poplawski - 6.0.0-1 -- Add BR on R-devel - -* Thu Jun 27 2013 Orion Poplawski - 6.0.0-1 -- Update to 6.0.0 - -* Thu May 16 2013 Orion Poplawski - 5.10.1-5 -- Rebuild for hdf5 1.8.11 - -* Fri Feb 15 2013 Fedora Release Engineering - 5.10.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 5.10.1-3 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Dec 03 2012 Orion Poplawski - 5.10.1-2 -- Rebuild for hdf5 1.8.10 -- Change doc handling - -* Thu Nov 1 2012 Orion Poplawski - 5.10.1-1 -- Update to 5.10.1 - -* Sun Jul 22 2012 Fedora Release Engineering - 5.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu May 24 2012 Orion Poplawski - 5.10.0-2 -- Add patch to add soname to libvtkNetCDF_cxx - -* Tue May 15 2012 Orion Poplawski - 5.10.0-1 -- Update to 5.10.0 - -* Tue May 15 2012 Jonathan G. Underwood - 5.8.0-6 -- Add cmake28 usage when building for EL6 -- Disable -java build on PPC64 as it fails to build - -* Tue Feb 28 2012 Fedora Release Engineering - 5.8.0-5 -- Rebuilt for c++ ABI breakage - -* Sun Jan 8 2012 Orion Poplawski - 5.8.0-4 -- Rebuild with gcc 4.7 - -* Fri Nov 18 2011 Orion Poplawski - 5.8.0-3 -- Rebuild for hdf5 1.8.8, add explicit requires - -* Tue Nov 1 2011 Orion Poplawski - 5.8.0-2 -- Keep libraries in %%{_libdir}/vtk, use ld.so.conf.d - -* Fri Oct 7 2011 Orion Poplawski - 5.8.0-1 -- Update to 5.8.0 -- Drop version from directory names -- Use VTK_PYTHON_SETUP_ARGS instead of patch to set python install dir -- Drop several patches fixed upstream -- Remove rpaths from all hand installed binaries (Bug 744437) -- Don't link against OSMesa (Bug 744434) - -* Thu Jun 23 2011 Orion Poplawski - 5.6.1-10 -- Add BR qtwebkit-devel, fixes FTBS bug 715770 - -* Thu May 19 2011 Orion Poplawski - 5.6.1-9 -- Update soversion patch to add soversion to libvtkNetCDF.so - -* Mon Mar 28 2011 Orion Poplawski - 5.6.1-8 -- Rebuild for new mysql - -* Thu Mar 17 2011 Orion Poplawski - 5.6.1-7 -- Add needed requires to vtk-devel - -* Wed Mar 16 2011 Orion Poplawski - 5.6.1-6 -- Turn on boost, mysql, postgres, ogg theora, and text analysis support, - bug 688275. - -* Wed Mar 16 2011 Marek Kasik - 5.6.1-5 -- Add backslashes to VTK_INSTALL_LIB_DIR and -- VTK_INSTALL_INCLUDE_DIR (#687895) - -* Tue Mar 15 2011 Orion Poplawski - 5.6.1-4 -- Set VTK_INSTALL_LIB_DIR, fix bug 687895 - -* Fri Feb 18 2011 Orion Poplawski - 5.6.1-3 -- Add patch to support gcc 4.6 -- Add patch to make using system libraries easier -- Update pythondestdir patch to use --prefix and --root -- Use system gl2ps and libxml2 -- Use standard cmake build macro, out of tree builds -- Add patch from upstream to add sonames to libCosmo and libVPIC (bug #622840) - -* Mon Feb 07 2011 Fedora Release Engineering - 5.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Dec 7 2010 Orion Poplawski - 5.6.1-1 -- Update to 5.6.1 -- Enable qt4 support, drop qt3 support - -* Wed Oct 20 2010 Adam Jackson 5.6.0-37 -- Rebuild for new libOSMesa soname - -* Sat Jul 31 2010 David Malcolm - 5.6.0-36 -- add python 2.7 compat patch - -* Thu Jul 22 2010 David Malcolm - 5.6.0-35 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Mon Jul 5 2010 Axel Thimm - 5.6.0-34 -- Update to 5.6.0. - -* Sat Jun 6 2009 Axel Thimm - 5.4.2-30 -- Update to 5.4.2. - -* Thu Mar 12 2009 Orion Poplawski - 5.2.1-29 -- Update to 5.2.1 - -* Fri Mar 06 2009 Jesse Keating - 5.2.0-28 -- Remove chmod on examples .so files, none are built. This needs - more attention. - -* Sun Oct 5 2008 Axel Thimm - 5.2.0-26 -- Update to 5.2.0. - -* Wed Oct 1 2008 Orion Poplawski - 5.0.2-25 -- Fix patch fuzz - -* Mon Aug 25 2008 Axel Thimm - 5.0.4-24 -- Change java build dependencies from java-devel to gcj. - -* Sun Aug 24 2008 Axel Thimm - 5.0.4-23 -- %%check || : does not work anymore. -- enable java by default. - -* Wed May 21 2008 Tom "spot" Callaway - 5.0.4-22 -- fix license tag - -* Sat Apr 12 2008 Axel Thimm - 5.0.4-21 -- Fixes for gcc 4.3 by Orion Poplawski. - -* Sat Apr 5 2008 Axel Thimm - 5.0.4-20 -- Change BR to qt-devel to qt3-devel. - -* Sat Feb 23 2008 Axel Thimm - 5.0.4-19 -- Update to 5.0.4. - -* Mon May 28 2007 Axel Thimm - 5.0.3-18 -- Move headers to %%{_includedir}/vtk. -- Remove executable bit from sources. - -* Mon Apr 16 2007 Axel Thimm - 5.0.3-17 -- Make java build conditional. -- Add ldconfig %%post/%%postun for java/qt subpackages. - -* Sun Apr 15 2007 Axel Thimm - 5.0.3-16 -- Remove %%ghosting pyc/pyo. - -* Wed Apr 04 2007 Paulo Roma - 5.0.3-15 -- Update to 5.0.4. -- Added support for qt4 plugin. - -* Wed Feb 7 2007 Orion Poplawski - 5.0.2-14 -- Enable Java, Qt, GL2PS, OSMESA - -* Mon Sep 11 2006 Axel Thimm - 5.0.2-13 -- Update to 5.0.2. - -* Sun Aug 6 2006 Axel Thimm - 5.0.1-12 -- cmake needs to be >= 2.0.4. - -* Fri Aug 4 2006 Axel Thimm - 5.0.1-11 -- Fix some python issues including pyo management. - -* Sun Jul 23 2006 Axel Thimm - 5.0.1-10 -- Embed feedback from bug 199405 comment 5. -- Fix some Group entries. -- Remove redundant dependencies. -- Use system libs. -- Comment specfile more. -- Change buildroot handling with CMAKE_INSTALL_PREFIX. -- Enable qt designer plugin. - -* Wed Jul 19 2006 Axel Thimm - 5.0.1-7 -- Fix some permissions for rpmlint and debuginfo. - -* Sun Jul 16 2006 Axel Thimm - 5.0.1-7 -- Remove rpath and some further rpmlint warnings. - -* Thu Jul 13 2006 Axel Thimm - 5.0.1-6 -- Update to 5.0.1. - -* Wed May 31 2006 Axel Thimm -- Update to 5.0. - -* Mon Apr 05 2004 Intrinsic Spin 2.mr -- built on a machine with a stock libGL.so - -* Sun Apr 04 2004 Intrinsic Spin -- little cleanups -- Built for FC1 - -* Sun Jan 11 2004 Intrinsic Spin -- Built against a reasonably good (according to dashboard) CVS version so-as - to get GL2PS support. -- Rearranged. Cleaned up. Added some comments. - -* Sat Jan 10 2004 Intrinsic Spin -- Blatently stole this spec file for my own nefarious purposes. -- Removed Java (for now). Merged the Python and Tcl stuff into - the main rpm. - -* Fri Dec 05 2003 Fabrice Bellet -- (See Fabrice's RPMs for any more comments --Spin) +%autochangelog From 7e5784cef9564a2521042fb9e612fb642729d0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 10:50:21 +0100 Subject: [PATCH 137/158] Rebuild (jsoncpp) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser From 391628582755e24003fc7ba84f17b77499500008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 16:04:33 +0100 Subject: [PATCH 138/158] Explicitly set CMAKE_POLICY_VERSION_MINIMUM=3.5 --- vtk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vtk.spec b/vtk.spec index 8e0638e..0be0fe7 100644 --- a/vtk.spec +++ b/vtk.spec @@ -543,6 +543,7 @@ find vtk-examples -type f | xargs chmod -R a-x %global vtk_cmake_options \\\ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \\\ -DCMAKE_INSTALL_DOCDIR=share/doc/%{name} \\\ -DCMAKE_INSTALL_JARDIR=share/java \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ From 00e3473c3deb552f10a0f660852897760004bf9f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 1 Mar 2025 09:54:51 -0700 Subject: [PATCH 139/158] Remove obsolete FindHDF5.cmake --- vtk.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vtk.spec b/vtk.spec index 0be0fe7..bf1457f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -707,6 +707,15 @@ cp -pr --parents Wrapping/*/README* _docs/ # At the moment this only contains Java/Testing/Data/Baseline rm -rf %{buildroot}%{_datadir}/vtkdata/Wrapping +# The fixed FindHDF5.cmake is patch of CMake now +rm -v %{buildroot}/%{_libdir}/cmake/%{name}/patches/99/FindHDF5.cmake +%if %{with mpich} +rm -v %{buildroot}/%{_libdir}/mpich/lib/cmake/%{name}/patches/99/FindHDF5.cmake +%endif +%if %{with openmpi} +rm -v %{buildroot}/%{_libdir}/openmpi/lib/cmake/%{name}/patches/99/FindHDF5.cmake +%endif + # https://bugzilla.redhat.com/show_bug.cgi?id=1902729 # contains the $ORIGIN runpath specifier at the wrong position in [/usr/lib64/mpich/lib:$ORIGIN:$ORIGIN/../] # 0x0008 ... the special '$ORIGIN' RPATHs are appearing after other From aadcf0d04bc73e89fd0fed74d1c19d519912849a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 15:52:56 +0200 Subject: [PATCH 140/158] Rebuilt for Python 3.14 From 4f9df1a1b243b9f44fdf1151e8e1d21c1431a378 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:14:52 +0000 Subject: [PATCH 141/158] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 95952d15da2430ef3cbd903720c6661d129774b1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 29 Jul 2025 23:24:57 +0200 Subject: [PATCH 142/158] Rebuild (gdal) From c2cd10a5d159fc1f5fa8c62a81d6c56f9175759f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 9 Aug 2025 17:10:25 -0600 Subject: [PATCH 143/158] Rebuild for libharu 2.4.5 From 62512374c5e9c636b0da132d8c43a308d4c9bdbf Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:22:32 +0200 Subject: [PATCH 144/158] Rebuilt for Python 3.14.0rc2 bytecode From 58a50cc16354e9abc905f82fd254e6229b0d4115 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 10 Sep 2023 15:49:50 -0600 Subject: [PATCH 145/158] Update to 9.5.0 Use %conf Enable more modules with added dependencies Builds with Qt6 Drop mpich on i686 as well Re-enable PDAL Add BR alembic-devel Drop BR motif-devel Add patch for Tk 9 support Add bootstrap conditional to build without opencascade if needed Drop CMAKE_INSTALL_QMLDIR --- .gitignore | 10 + 9616.patch | 79 ----- sources | 4 +- vtk-build.patch | 12 - vtk-chobo-cstdint.patch | 22 ++ vtk-include.patch | 11 - vtk-ppc64-no-always-inline.patch | 13 + vtk-python3.13.patch | 90 ------ vtk-tk9.patch | 489 +++++++++++++++++++++++++++++++ vtk.spec | 200 ++++++++++--- 10 files changed, 690 insertions(+), 240 deletions(-) delete mode 100644 9616.patch delete mode 100644 vtk-build.patch create mode 100644 vtk-chobo-cstdint.patch delete mode 100644 vtk-include.patch create mode 100644 vtk-ppc64-no-always-inline.patch delete mode 100644 vtk-python3.13.patch create mode 100644 vtk-tk9.patch diff --git a/.gitignore b/.gitignore index 104cc2e..2843b96 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,13 @@ vtk-5.6.0.tar.gz /VTKData-9.2.5.tar.gz /VTK-9.2.6.tar.gz /VTKData-9.2.6.tar.gz +/VTK-9.3.0.tar.gz +/VTKData-9.3.0.tar.gz +/VTK-9.3.1.tar.gz +/VTKData-9.3.1.tar.gz +/VTK-9.4.1.tar.gz +/VTKData-9.4.1.tar.gz +/VTK-9.4.2.tar.gz +/VTKData-9.4.2.tar.gz +/VTK-9.5.0.tar.gz +/VTKData-9.5.0.tar.gz diff --git a/9616.patch b/9616.patch deleted file mode 100644 index 4dfd591..0000000 --- a/9616.patch +++ /dev/null @@ -1,79 +0,0 @@ -From a2ca9a079ecc8926f6ddf7a72803340a4944e7cf Mon Sep 17 00:00:00 2001 -From: Eric Larson -Date: Tue, 11 Oct 2022 12:12:38 -0400 -Subject: [PATCH] BUG: Fix bug with vtkPlotBar.GetLookupTable() - -Also remove old nullptr assignments as they are unnecessary -when using vtkSmartPointer. ---- - .../Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx | 2 ++ - Charts/Core/vtkPlotBar.cxx | 10 +++++++--- - .../release/dev/fix-vtkPlotBar-GetLookupTable.md | 4 ++++ - 3 files changed, 13 insertions(+), 3 deletions(-) - create mode 100644 Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md - -diff --git a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx -index 2d0ed46b128..919319a6b4d 100644 ---- a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx -+++ b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx -@@ -88,6 +88,8 @@ int TestPlotBarRangeHandlesItem(int, char*[]) - - // Add bar plot and handles - vtkPlotBar* barPlot = vtkPlotBar::SafeDownCast(chart->AddPlot(vtkChart::BAR)); -+ // smoke test for https://gitlab.kitware.com/vtk/vtk/-/issues/18682#note_1258974 -+ barPlot->GetLookupTable(); - barPlot->SetInputData(table, "Months", "Books"); - chart->SetBarWidthFraction(1.0); - -diff --git a/Charts/Core/vtkPlotBar.cxx b/Charts/Core/vtkPlotBar.cxx -index a68a26c0ecd..220e8199d02 100644 ---- a/Charts/Core/vtkPlotBar.cxx -+++ b/Charts/Core/vtkPlotBar.cxx -@@ -535,12 +535,11 @@ vtkStandardNewMacro(vtkPlotBar); - vtkPlotBar::vtkPlotBar() - { - this->Private = new vtkPlotBarPrivate(this); -+ // Points is not a vtkSmartPointer, so set it explicitly to nullptr - this->Points = nullptr; -- this->AutoLabels = nullptr; - this->Width = 1.0; - this->Pen->SetWidth(1.0); - this->Offset = 1.0; -- this->ColorSeries = nullptr; - this->Orientation = vtkPlotBar::VERTICAL; - this->ScalarVisibility = false; - this->EnableOpacityMapping = true; -@@ -612,6 +611,10 @@ void vtkPlotBar::GetBounds(double bounds[4], bool unscaled) - - // Get the x and y arrays (index 0 and 1 respectively) - vtkTable* table = this->Data->GetInput(); -+ if (!table) -+ { -+ return; -+ } - vtkDataArray* x = - this->UseIndexForXSeries ? nullptr : this->Data->GetInputArrayToProcess(0, table); - vtkDataArray* y = this->Data->GetInputArrayToProcess(1, table); -@@ -945,7 +948,8 @@ void vtkPlotBar::CreateDefaultLookupTable() - // rainbow - blue to red - lut->SetHueRange(0.6667, 0.0); - lut->Build(); -- double bounds[4]; -+ // set reasonable defaults in case no data has been set -+ double bounds[4] = { 0.0, 1.0, 0.0, 1.0 }; - this->GetBounds(bounds); - lut->SetRange(bounds[0], bounds[1]); - this->LookupTable = lut; -diff --git a/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md -new file mode 100644 -index 00000000000..ba6a96753ac ---- /dev/null -+++ b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md -@@ -0,0 +1,4 @@ -+## Fixes for vtkPlotBar.GetLookupTable -+ -+Fixes a bug where calling vtkPlotBar.GetLookupTable caused a segmentation -+fault in the case where no data had been plotted yet. --- -GitLab - diff --git a/sources b/sources index 03bdad8..942f059 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.2.6.tar.gz) = f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc -SHA512 (VTKData-9.2.6.tar.gz) = 5c5f2b365777733180a63daff224da7055e1c2911eb5e4efda26e38b9ac01cb8e886cf7e71c45ac83347642caf1786e72bb469c22954ffbbb6e2c317fc6b4080 +SHA512 (VTK-9.5.0.tar.gz) = bdb110a15d99311c88d3576c4ec40ce7d0d0625f8183665aa4250cd722aba54de2e3b2e8831d767582ee2ca6526eb8c23a09536c74b7dd2992c773dbe753f063 +SHA512 (VTKData-9.5.0.tar.gz) = a6d51f4d1da644d40a7afa858f98f70f51744a092b97fb67d1f2736b3532d92aa5eb917f23461d690137119e1791a8cb8c70630af9921ba405dd375c0a6577a2 diff --git a/vtk-build.patch b/vtk-build.patch deleted file mode 100644 index e1ab822..0000000 --- a/vtk-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN VTK-9.2.6/Utilities/octree/octree/octree_node.txx VTK-9.2.6-new/Utilities/octree/octree/octree_node.txx ---- VTK-9.2.6/Utilities/octree/octree/octree_node.txx 2023-02-15 05:03:53.000000000 +0100 -+++ VTK-9.2.6-new/Utilities/octree/octree/octree_node.txx 2025-01-24 14:12:16.855255487 +0100 -@@ -207,7 +207,7 @@ const octree_node& octree_no - { - throw std::domain_error("Attempt to access children of an octree leaf node."); - } -- return this->_M_chilren[child]; -+ return this->m_children[child]; - } - - /**\brief Return a reference to a child node. diff --git a/vtk-chobo-cstdint.patch b/vtk-chobo-cstdint.patch new file mode 100644 index 0000000..162259e --- /dev/null +++ b/vtk-chobo-cstdint.patch @@ -0,0 +1,22 @@ +diff -up VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp.cstdint VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp +--- VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp.cstdint 2024-06-28 10:00:10.000000000 -0600 ++++ VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp 2025-02-17 17:08:44.231541639 -0700 +@@ -138,6 +138,7 @@ + + #include + #include ++#include + #include + + #define CHOBO_SMALL_VECTOR_ERROR_HANDLING_NONE 0 +diff -up VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp.cstdint VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp +--- VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp.cstdint 2024-06-28 10:00:10.000000000 -0600 ++++ VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp 2025-02-17 17:08:27.992495226 -0700 +@@ -138,6 +138,7 @@ + + #include + #include ++#include + #include + + #define CHOBO_SMALL_VECTOR_ERROR_HANDLING_NONE 0 diff --git a/vtk-include.patch b/vtk-include.patch deleted file mode 100644 index 85d6e2f..0000000 --- a/vtk-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h ---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include 2023-01-05 08:51:35.000000000 -0700 -+++ VTK-9.2.5/IO/Image/vtkSEPReader.h 2023-01-17 07:43:41.988095734 -0700 -@@ -26,6 +26,7 @@ - #include "vtkNew.h" // for ivars - - #include // for std::array -+#include // for std::uint8_t - #include // for std::string - - namespace details diff --git a/vtk-ppc64-no-always-inline.patch b/vtk-ppc64-no-always-inline.patch new file mode 100644 index 0000000..9705931 --- /dev/null +++ b/vtk-ppc64-no-always-inline.patch @@ -0,0 +1,13 @@ +diff --git a/Common/Core/vtkDataArrayMeta.h b/Common/Core/vtkDataArrayMeta.h +index 602305d3ed..8c37a96891 100644 +--- a/Common/Core/vtkDataArrayMeta.h ++++ b/Common/Core/vtkDataArrayMeta.h +@@ -32,7 +32,7 @@ + #endif + + #if (defined(VTK_ALWAYS_OPTIMIZE_ARRAY_ITERATORS) || !defined(VTK_DEBUG_RANGE_ITERATORS)) && \ +- !defined(VTK_COMPILER_MSVC) ++ !defined(VTK_COMPILER_MSVC) && !defined(__PPC64__) + #define VTK_ITER_INLINE VTK_ALWAYS_INLINE + #define VTK_ITER_ASSUME VTK_ASSUME_NO_ASSERT + #define VTK_ITER_OPTIMIZE_START VTK_ALWAYS_OPTIMIZE_START diff --git a/vtk-python3.13.patch b/vtk-python3.13.patch deleted file mode 100644 index 0bea05f..0000000 --- a/vtk-python3.13.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx b/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx -index 0471594..bc92c85 100644 ---- a/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx -+++ b/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx -@@ -114,7 +114,9 @@ wchar_t* vtk_Py_UTF8ToWide(const char* arg) - - return result; - } -+#endif - -+#if PY_VERSION_HEX < 0x03080000 - std::string vtk_Py_WideToUTF8(const wchar_t* arg) - { - std::string result; -@@ -859,15 +861,20 @@ void vtkPythonInterpreter::SetupVTKPythonPaths() - if (vtklib.empty()) - { - VTKPY_DEBUG_MESSAGE( -- "`GetVTKVersion` library couldn't be found. Will use `Py_GetProgramName` next."); -+ "`GetVTKVersion` library couldn't be found. Will use `sys.executable` next."); - } - - if (vtklib.empty()) - { --#if PY_VERSION_HEX >= 0x03000000 -- vtklib = vtk_Py_WideToUTF8(Py_GetProgramName()); -+#if PY_VERSION_HEX >= 0x03080000 -+ vtkPythonScopeGilEnsurer gilEnsurer; -+ PyObject* executable_path = PySys_GetObject("executable"); -+ if (executable_path != Py_None) -+ { -+ vtklib = PyUnicode_AsUTF8AndSize(executable_path, nullptr); -+ } - #else -- vtklib = Py_GetProgramName(); -+ vtklib = vtk_Py_WideToUTF8(Py_GetProgramName()); - #endif - } - -diff --git a/Wrapping/Python/vtkmodules/test/Testing.py b/Wrapping/Python/vtkmodules/test/Testing.py -index 59186bb..d0643c1 100644 ---- a/Wrapping/Python/vtkmodules/test/Testing.py -+++ b/Wrapping/Python/vtkmodules/test/Testing.py -@@ -513,8 +513,10 @@ def test(cases): - """ - # Make the test suites from the arguments. - suites = [] -- for case in cases: -- suites.append(unittest.makeSuite(case[0], case[1])) -+ loader = unittest.TestLoader() -+ # the "name" is ignored (it was always just 'test') -+ for test,name in cases: -+ suites.append(loader.loadTestsFromTestCase(test)) - test_suite = unittest.TestSuite(suites) - - # Now run the tests. -diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx -index 927eef1..7460eb7 100644 ---- a/Wrapping/PythonCore/PyVTKNamespace.cxx -+++ b/Wrapping/PythonCore/PyVTKNamespace.cxx -@@ -113,8 +113,10 @@ PyObject* PyVTKNamespace_New(const char* name) - { - // make sure python has readied the type object - PyType_Ready(&PyVTKNamespace_Type); -- // call the allocator provided by python for this type -- self = PyVTKNamespace_Type.tp_alloc(&PyVTKNamespace_Type, 0); -+ // call the superclass new function -+ PyObject* empty = PyTuple_New(0); -+ self = PyVTKNamespace_Type.tp_base->tp_new(&PyVTKNamespace_Type, empty, nullptr); -+ Py_DECREF(empty); - // call the superclass init function - PyObject* args = PyTuple_New(1); - PyTuple_SET_ITEM(args, 0, PyString_FromString(name)); -diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx -index e0ff31e..c89900f 100644 ---- a/Wrapping/PythonCore/PyVTKTemplate.cxx -+++ b/Wrapping/PythonCore/PyVTKTemplate.cxx -@@ -788,8 +788,10 @@ PyObject* PyVTKTemplate_New(const char* name, const char* docstring) - { - // make sure python has readied the type object - PyType_Ready(&PyVTKTemplate_Type); -- // call the allocator provided by python for this type -- PyObject* self = PyVTKTemplate_Type.tp_alloc(&PyVTKTemplate_Type, 0); -+ // call the superclass new function -+ PyObject* empty = PyTuple_New(0); -+ PyObject* self = PyVTKTemplate_Type.tp_base->tp_new(&PyVTKTemplate_Type, empty, nullptr); -+ Py_DECREF(empty); - // call the superclass init function - PyObject* args = PyTuple_New(2); - PyTuple_SET_ITEM(args, 0, PyString_FromString(name)); diff --git a/vtk-tk9.patch b/vtk-tk9.patch new file mode 100644 index 0000000..895669f --- /dev/null +++ b/vtk-tk9.patch @@ -0,0 +1,489 @@ +commit b7c22497712be6751fbefe155533ae34d5e381f5 +Author: Spiros Tsalikis +Date: Thu May 22 12:30:19 2025 -0400 + + Tcl/Tk: Support version 9.0.0 + +diff --git a/Rendering/Tk/vtkTkImageViewerWidget.cxx b/Rendering/Tk/vtkTkImageViewerWidget.cxx +index 43c7a48a13..9d2c4210de 100644 +--- a/Rendering/Tk/vtkTkImageViewerWidget.cxx ++++ b/Rendering/Tk/vtkTkImageViewerWidget.cxx +@@ -23,6 +23,17 @@ + #include + #include + ++#if (TCL_MAJOR_VERSION >= 9) ++#define VTK_TCL_CONST const ++#elif ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)) ++#define VTK_TCL_CONST CONST84 ++#else ++#define VTK_TCL_CONST ++#endif ++#ifndef offsetof ++#define offsetof(type, field) ((size_t)((char*)&((type*)0)->field)) ++#endif ++ + #define VTK_ALL_EVENTS_MASK \ + KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | \ + LeaveWindowMask | PointerMotionMask | ExposureMask | VisibilityChangeMask | FocusChangeMask | \ +@@ -32,14 +43,14 @@ + // or with the command configure. The only new one is "-rw" which allows + // the uses to set their own ImageViewer window. + static Tk_ConfigSpec vtkTkImageViewerWidgetConfigSpecs[] = { +- { TK_CONFIG_PIXELS, (char*)"-height", (char*)"height", (char*)"Height", (char*)"400", +- Tk_Offset(struct vtkTkImageViewerWidget, Height), 0, nullptr }, ++ { TK_CONFIG_PIXELS, "-height", "height", "Height", "400", ++ offsetof(struct vtkTkImageViewerWidget, Height), 0, nullptr }, + +- { TK_CONFIG_PIXELS, (char*)"-width", (char*)"width", (char*)"Width", (char*)"400", +- Tk_Offset(struct vtkTkImageViewerWidget, Width), 0, nullptr }, ++ { TK_CONFIG_PIXELS, "-width", "width", "Width", "400", ++ offsetof(struct vtkTkImageViewerWidget, Width), 0, nullptr }, + +- { TK_CONFIG_STRING, (char*)"-iv", (char*)"iv", (char*)"IV", (char*)"", +- Tk_Offset(struct vtkTkImageViewerWidget, IV), 0, nullptr }, ++ { TK_CONFIG_STRING, "-iv", "iv", "IV", "", offsetof(struct vtkTkImageViewerWidget, IV), 0, ++ nullptr }, + + { TK_CONFIG_END, nullptr, nullptr, nullptr, nullptr, 0, 0, nullptr } + }; +@@ -56,17 +67,22 @@ extern int vtkImageViewerCommand(ClientData cd, Tcl_Interp* interp, int argc, ch + //------------------------------------------------------------------------------ + // It's possible to change with this function or in a script some + // options like width, height or the ImageViewer widget. +-int vtkTkImageViewerWidget_Configure( +- Tcl_Interp* interp, struct vtkTkImageViewerWidget* self, int argc, char* argv[], int flags) ++#if (TCL_MAJOR_VERSION >= 9) ++int vtkTkImageViewerWidget_Configure(Tcl_Interp* interp, struct vtkTkImageViewerWidget* self, ++ Tcl_Size objc, Tcl_Obj* const* objv, int flags) ++#else ++int vtkTkImageViewerWidget_Configure(Tcl_Interp* interp, struct vtkTkImageViewerWidget* self, ++ int argc, VTK_TCL_CONST char* argv[], int flags) ++#endif + { + // Let Tk handle generic configure options. +- if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkImageViewerWidgetConfigSpecs, argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv), ++#if (TCL_MAJOR_VERSION >= 9) ++ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkImageViewerWidgetConfigSpecs, objc, objv, ++ (void*)self, flags) == TCL_ERROR) + #else +- argv, +-#endif ++ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkImageViewerWidgetConfigSpecs, argc, argv, + (char*)self, flags) == TCL_ERROR) ++#endif + { + return (TCL_ERROR); + } +@@ -89,11 +105,8 @@ int vtkTkImageViewerWidget_Configure( + // to choose the appropriate method to invoke. + extern "C" + { +- int vtkTkImageViewerWidget_Widget(ClientData clientData, Tcl_Interp* interp, int argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char* argv[]) ++ int vtkTkImageViewerWidget_Widget( ++ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char* argv[]) + { + struct vtkTkImageViewerWidget* self = (struct vtkTkImageViewerWidget*)clientData; + int result = TCL_OK; +@@ -106,7 +119,11 @@ extern "C" + } + + // Make sure the widget is not deleted during this function ++#if (TCL_MAJOR_VERSION >= 9) ++ Tcl_Preserve((ClientData)self); ++#else + Tk_Preserve((ClientData)self); ++#endif + + // Handle render call to the widget + if (strncmp(argv[1], "render", std::max(1, strlen(argv[1]))) == 0 || +@@ -137,13 +154,27 @@ extern "C" + else + { + /* Execute a configuration change */ +- result = vtkTkImageViewerWidget_Configure(interp, self, argc - 2, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv + 2), ++#if (TCL_MAJOR_VERSION >= 9) ++ // Convert string arguments to Tcl_Obj for TCL 9.0 ++ Tcl_Obj** objv_config = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*)); ++ for (int i = 0; i < argc - 2; i++) ++ { ++ objv_config[i] = Tcl_NewStringObj(argv[i + 2], -1); ++ Tcl_IncrRefCount(objv_config[i]); ++ } ++ result = vtkTkImageViewerWidget_Configure( ++ interp, self, argc - 2, objv_config, TK_CONFIG_ARGV_ONLY); ++ ++ // Clean up the Tcl_Obj array ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_config[i]); ++ } ++ ckfree((char*)objv_config); + #else +- argv + 2, ++ result = ++ vtkTkImageViewerWidget_Configure(interp, self, argc - 2, argv + 2, TK_CONFIG_ARGV_ONLY); + #endif +- TK_CONFIG_ARGV_ONLY); + } + } + else if (!strcmp(argv[1], "GetImageViewer")) +@@ -165,7 +196,11 @@ extern "C" + } + + // Unlock the object so it can be deleted. ++#if (TCL_MAJOR_VERSION >= 9) ++ Tcl_Release((ClientData)self); ++#else + Tk_Release((ClientData)self); ++#endif + return result; + } + } +@@ -181,16 +216,10 @@ extern "C" + // * Configures this vtkTkImageViewerWidget for the given arguments + extern "C" + { +- int vtkTkImageViewerWidget_Cmd(ClientData clientData, Tcl_Interp* interp, int argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char** argv) ++ int vtkTkImageViewerWidget_Cmd( ++ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char** argv) + { +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char* name; ++ VTK_TCL_CONST char* name; + Tk_Window main = (Tk_Window)clientData; + Tk_Window tkwin; + struct vtkTkImageViewerWidget* self; +@@ -233,13 +262,37 @@ extern "C" + vtkTkImageViewerWidget_EventProc, (ClientData)self); + + // Configure vtkTkImageViewerWidget widget +- if (vtkTkImageViewerWidget_Configure(interp, self, argc - 2, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv + 2), ++#if (TCL_MAJOR_VERSION >= 9) ++ // Convert string arguments to Tcl_Obj for TCL 9.0 ++ Tcl_Obj** objv_init = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*)); ++ for (int i = 0; i < argc - 2; i++) ++ { ++ objv_init[i] = Tcl_NewStringObj(argv[i + 2], -1); ++ Tcl_IncrRefCount(objv_init[i]); ++ } ++ ++ if (vtkTkImageViewerWidget_Configure(interp, self, argc - 2, objv_init, 0) == TCL_ERROR) ++ { ++ // Clean up before error return ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_init[i]); ++ } ++ ckfree((char*)objv_init); ++ ++ Tk_DestroyWindow(tkwin); ++ Tcl_DeleteCommand(interp, (char*)"vtkTkImageViewerWidget"); ++ return TCL_ERROR; ++ } ++ ++ // Clean up the Tcl_Obj array ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_init[i]); ++ } ++ ckfree((char*)objv_init); + #else +- argv + 2, +-#endif +- 0) == TCL_ERROR) ++ if (vtkTkImageViewerWidget_Configure(interp, self, argc - 2, argv + 2, 0) == TCL_ERROR) + { + Tk_DestroyWindow(tkwin); + Tcl_DeleteCommand(interp, (char*)"vtkTkImageViewerWidget"); +@@ -247,6 +300,7 @@ extern "C" + // free(self); + return TCL_ERROR; + } ++#endif + + Tcl_AppendResult(interp, Tk_PathName(tkwin), nullptr); + return TCL_OK; +@@ -255,7 +309,11 @@ extern "C" + + extern "C" + { ++#if (TCL_MAJOR_VERSION >= 9) ++ void vtkTkImageViewerWidget_Destroy(void* memPtr) ++#else + void vtkTkImageViewerWidget_Destroy(char* memPtr) ++#endif + { + struct vtkTkImageViewerWidget* self = (struct vtkTkImageViewerWidget*)memPtr; + +diff --git a/Rendering/Tk/vtkTkRenderWidget.cxx b/Rendering/Tk/vtkTkRenderWidget.cxx +index 6ddaa5816a..84c940b484 100644 +--- a/Rendering/Tk/vtkTkRenderWidget.cxx ++++ b/Rendering/Tk/vtkTkRenderWidget.cxx +@@ -29,6 +29,17 @@ + #include + #include + ++#if (TCL_MAJOR_VERSION >= 9) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 6)) ++#define VTK_TCL_CONST const ++#elif ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)) ++#define VTK_TCL_CONST CONST84 ++#else ++#define VTK_TCL_CONST ++#endif ++#ifndef offsetof ++#define offsetof(type, field) ((size_t)((char*)&((type*)0)->field)) ++#endif ++ + // Silence warning like + // "dereferencing type-punned pointer will break strict-aliasing rules" + // it happens because this kind of expression: (long *)&ptr +@@ -45,14 +56,13 @@ + // or with the command configure. The only new one is "-rw" which allows + // the uses to set their own render window. + static Tk_ConfigSpec vtkTkRenderWidgetConfigSpecs[] = { +- { TK_CONFIG_PIXELS, (char*)"-height", (char*)"height", (char*)"Height", (char*)"400", +- Tk_Offset(struct vtkTkRenderWidget, Height), 0, nullptr }, ++ { TK_CONFIG_PIXELS, "-height", "height", "Height", "400", ++ offsetof(struct vtkTkRenderWidget, Height), 0, nullptr }, + +- { TK_CONFIG_PIXELS, (char*)"-width", (char*)"width", (char*)"Width", (char*)"400", +- Tk_Offset(struct vtkTkRenderWidget, Width), 0, nullptr }, ++ { TK_CONFIG_PIXELS, "-width", "width", "Width", "400", offsetof(struct vtkTkRenderWidget, Width), ++ 0, nullptr }, + +- { TK_CONFIG_STRING, (char*)"-rw", (char*)"rw", (char*)"RW", (char*)"", +- Tk_Offset(struct vtkTkRenderWidget, RW), 0, nullptr }, ++ { TK_CONFIG_STRING, "-rw", "rw", "RW", "", offsetof(struct vtkTkRenderWidget, RW), 0, nullptr }, + + { TK_CONFIG_END, nullptr, nullptr, nullptr, nullptr, 0, 0, nullptr } + }; +@@ -113,11 +123,8 @@ extern "C" + #define VTKIMAGEDATATOTKPHOTO_CORONAL 0 + #define VTKIMAGEDATATOTKPHOTO_SAGITTAL 1 + #define VTKIMAGEDATATOTKPHOTO_TRANSVERSE 2 +- int vtkImageDataToTkPhoto_Cmd(ClientData vtkNotUsed(clientData), Tcl_Interp* interp, int argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char** argv) ++ int vtkImageDataToTkPhoto_Cmd( ++ ClientData vtkNotUsed(clientData), Tcl_Interp* interp, int argc, VTK_TCL_CONST char** argv) + { + int status = 0; + vtkImageData* image; +@@ -330,8 +337,14 @@ extern "C" + block.offset[3] = 3; + break; + } ++#if (TCL_MAJOR_VERSION >= 9) ++ Tk_PhotoSetSize(interp, photo, block.width, block.height); ++ Tk_PhotoPutBlock( ++ interp, photo, &block, 0, 0, block.width, block.height, TK_PHOTO_COMPOSITE_SET); ++#else + Tk_PhotoSetSize(photo, block.width, block.height); + Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height); ++#endif + return TCL_OK; + } + } +@@ -339,17 +352,22 @@ extern "C" + //------------------------------------------------------------------------------ + // It's possible to change with this function or in a script some + // options like width, height or the render widget. +-int vtkTkRenderWidget_Configure( +- Tcl_Interp* interp, struct vtkTkRenderWidget* self, int argc, char* argv[], int flags) ++#if (TCL_MAJOR_VERSION >= 9) ++int vtkTkRenderWidget_Configure(Tcl_Interp* interp, struct vtkTkRenderWidget* self, Tcl_Size objc, ++ Tcl_Obj* const* objv, int flags) ++#else ++int vtkTkRenderWidget_Configure(Tcl_Interp* interp, struct vtkTkRenderWidget* self, int argc, ++ VTK_TCL_CONST char* argv[], int flags) ++#endif + { + // Let Tk handle generic configure options. +- if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkRenderWidgetConfigSpecs, argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv), ++#if (TCL_MAJOR_VERSION >= 9) ++ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkRenderWidgetConfigSpecs, objc, objv, (void*)self, ++ flags) == TCL_ERROR) + #else +- argv, ++ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkRenderWidgetConfigSpecs, argc, argv, (char*)self, ++ flags) == TCL_ERROR) + #endif +- (char*)self, flags) == TCL_ERROR) + { + return (TCL_ERROR); + } +@@ -372,11 +390,8 @@ int vtkTkRenderWidget_Configure( + // to choose the appropriate method to invoke. + extern "C" + { +- int vtkTkRenderWidget_Widget(ClientData clientData, Tcl_Interp* interp, int argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char* argv[]) ++ int vtkTkRenderWidget_Widget( ++ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char* argv[]) + { + struct vtkTkRenderWidget* self = (struct vtkTkRenderWidget*)clientData; + int result = TCL_OK; +@@ -389,7 +404,11 @@ extern "C" + } + + // Make sure the widget is not deleted during this function ++#if (TCL_MAJOR_VERSION >= 9) ++ Tcl_Preserve((ClientData)self); ++#else + Tk_Preserve((ClientData)self); ++#endif + + // Handle render call to the widget + if (strncmp(argv[1], "render", std::max(1, strlen(argv[1]))) == 0 || +@@ -420,13 +439,26 @@ extern "C" + else + { + /* Execute a configuration change */ +- result = vtkTkRenderWidget_Configure(interp, self, argc - 2, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv + 2), ++#if (TCL_MAJOR_VERSION >= 9) ++ // Convert string arguments to Tcl_Obj for TCL 9.0 ++ Tcl_Obj** objv_config = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*)); ++ for (int i = 0; i < argc - 2; i++) ++ { ++ objv_config[i] = Tcl_NewStringObj(argv[i + 2], -1); ++ Tcl_IncrRefCount(objv_config[i]); ++ } ++ result = ++ vtkTkRenderWidget_Configure(interp, self, argc - 2, objv_config, TK_CONFIG_ARGV_ONLY); ++ ++ // Clean up the Tcl_Obj array ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_config[i]); ++ } ++ ckfree((char*)objv_config); + #else +- argv + 2, ++ result = vtkTkRenderWidget_Configure(interp, self, argc - 2, argv + 2, TK_CONFIG_ARGV_ONLY); + #endif +- TK_CONFIG_ARGV_ONLY); + } + } + else if (!strcmp(argv[1], "GetRenderWindow")) +@@ -448,7 +480,11 @@ extern "C" + } + + // Unlock the object so it can be deleted. ++#if (TCL_MAJOR_VERSION >= 9) ++ Tcl_Release((ClientData)self); ++#else + Tk_Release((ClientData)self); ++#endif + return result; + } + } +@@ -464,16 +500,10 @@ extern "C" + // * Configures this vtkTkRenderWidget for the given arguments + extern "C" + { +- int vtkTkRenderWidget_Cmd(ClientData clientData, Tcl_Interp* interp, int argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char** argv) ++ int vtkTkRenderWidget_Cmd( ++ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char** argv) + { +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char* name; ++ VTK_TCL_CONST char* name; + Tk_Window main = (Tk_Window)clientData; + Tk_Window tkwin; + struct vtkTkRenderWidget* self; +@@ -515,13 +545,37 @@ extern "C" + tkwin, ExposureMask | StructureNotifyMask, vtkTkRenderWidget_EventProc, (ClientData)self); + + // Configure vtkTkRenderWidget widget +- if (vtkTkRenderWidget_Configure(interp, self, argc - 2, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv + 2), ++#if (TCL_MAJOR_VERSION >= 9) ++ // Convert string arguments to Tcl_Obj for TCL 9.0 ++ Tcl_Obj** objv_init = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*)); ++ for (int i = 0; i < argc - 2; i++) ++ { ++ objv_init[i] = Tcl_NewStringObj(argv[i + 2], -1); ++ Tcl_IncrRefCount(objv_init[i]); ++ } ++ ++ if (vtkTkRenderWidget_Configure(interp, self, argc - 2, objv_init, 0) == TCL_ERROR) ++ { ++ // Clean up before error return ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_init[i]); ++ } ++ ckfree((char*)objv_init); ++ ++ Tk_DestroyWindow(tkwin); ++ Tcl_DeleteCommand(interp, (char*)"vtkTkImageViewerWidget"); ++ return TCL_ERROR; ++ } ++ ++ // Clean up the Tcl_Obj array ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_init[i]); ++ } ++ ckfree((char*)objv_init); + #else +- argv + 2, +-#endif +- 0) == TCL_ERROR) ++ if (vtkTkRenderWidget_Configure(interp, self, argc - 2, argv + 2, 0) == TCL_ERROR) + { + Tk_DestroyWindow(tkwin); + Tcl_DeleteCommand(interp, "vtkTkRenderWidget"); +@@ -529,6 +583,7 @@ extern "C" + // free(self); + return TCL_ERROR; + } ++#endif + + Tcl_AppendResult(interp, Tk_PathName(tkwin), nullptr); + return TCL_OK; +@@ -555,7 +610,11 @@ extern "C" + + extern "C" + { ++#if (TCL_MAJOR_VERSION >= 9) ++ void vtkTkRenderWidget_Destroy(void* memPtr) ++#else + void vtkTkRenderWidget_Destroy(char* memPtr) ++#endif + { + struct vtkTkRenderWidget* self = (struct vtkTkRenderWidget*)memPtr; + diff --git a/vtk.spec b/vtk.spec index bf1457f..75cf6bd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -5,6 +5,9 @@ # '_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits@@LLVM_11' %global _lto_cflags %{nil} +# There is a circular dep with opencascade +%bcond bootstrap 0 + # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired %bcond_with OSMesa @@ -18,15 +21,18 @@ %bcond_with mpich %bcond_with openmpi %else -%bcond_without mpich # No openmpi on i668 with openmpi 5 in Fedora 40+ +# No mpi4py on i686 %if 0%{?fedora} >= 40 %ifarch %{ix86} +%bcond_with mpich %bcond_with openmpi %else +%bcond_without mpich %bcond_without openmpi %endif %else +%bcond_without mpich %bcond_without openmpi %endif %endif @@ -45,33 +51,35 @@ %bcond_without flexiblas %endif +# Try disabling LTO on ppc64le +%ifarch ppc64le +%global _lto_cflags %{nil} +%endif + # VTK currently is carrying local modifications to gl2ps %bcond_with gl2ps -# VTK currently requires unreleased fmt 8.1.0 -%bcond_with fmt +%bcond_without fmt + +#global rc rc2 Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.2.6 +Version: 9.5.0%{?rc:~%{rc}} Release: %autorelease License: BSD-3-Clause -Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz -Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz +%global srcver %{lua:local ver = rpm.expand('%version');ver = ver:gsub('~','.');print(ver)} +Source0: https://www.vtk.org/files/release/9.5/VTK-%{srcver}.tar.gz +Source1: https://www.vtk.org/files/release/9.5/VTKData-%{srcver}.tar.gz Source2: xorg.conf # Patch required libharu version (Fedora 33+ contains the needed VTK patches) -Patch0: vtk-libharu.patch -# Fix issue with Mayavi -Patch1: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9616.patch -# Add missing includes for gcc 13 -# https://gitlab.kitware.com/vtk/vtk/-/issues/18782 -Patch2: vtk-include.patch -# Fix segfault with Python 3.13 -# https://bugzilla.redhat.com/show_bug.cgi?id=2310520 -# Backport of https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11486 -Patch3: vtk-python3.13.patch -# Fix build -Patch4: vtk-build.patch +Patch: vtk-libharu.patch +# Tk 9.0 - based on b7c22497712be6751fbefe155533ae34d5e381f5 +Patch: vtk-tk9.patch +# always_inline fails on ppc64le +# https://gitlab.kitware.com/vtk/vtk/-/issues/19622 +# https://bugzilla.redhat.com/show_bug.cgi?id=2386242 +Patch: vtk-ppc64-no-always-inline.patch URL: https://vtk.org/ @@ -86,6 +94,7 @@ BuildRequires: java-devel Obsoletes: %{name}-java < %{version}-%{release} Obsoletes: %{name}-java-devel < %{version}-%{release} %endif +BuildRequires: alembic-devel %if %{with flexiblas} BuildRequires: flexiblas-devel %else @@ -98,15 +107,17 @@ BuildRequires: cli11-devel BuildRequires: double-conversion-devel BuildRequires: eigen3-devel BuildRequires: expat-devel +BuildRequires: fast_float-devel +BuildRequires: ffmpeg-free-devel %if %{with fmt} BuildRequires: fmt-devel >= 8.1.0 %endif +BuildRequires: freeglut-devel BuildRequires: freetype-devel BuildRequires: gdal-devel %if %{with gl2ps} BuildRequires: gl2ps-devel %endif -BuildRequires: glew-devel BuildRequires: hdf5-devel BuildRequires: json-devel BuildRequires: jsoncpp-devel @@ -115,10 +126,12 @@ BuildRequires: libGL-devel BuildRequires: libharu-devel >= 2.4.0 BuildRequires: libICE-devel BuildRequires: libjpeg-devel +BuildRequires: liblas-devel BuildRequires: libpng-devel BuildRequires: libpq-devel BuildRequires: libtheora-devel BuildRequires: libtiff-devel +BuildRequires: libxkbcommon-devel BuildRequires: libxml2-devel BuildRequires: libX11-devel BuildRequires: libXcursor-devel @@ -127,23 +140,29 @@ BuildRequires: libXt-devel BuildRequires: lz4-devel BuildRequires: mariadb-connector-c-devel %{?with_OSMesa:BuildRequires: mesa-libOSMesa-devel} -BuildRequires: motif-devel BuildRequires: netcdf-cxx-devel +%if %{without bootstrap} +BuildRequires: opencascade-devel +%endif BuildRequires: openslide-devel +# Currently does not provide OpenVDBConfig.cmake +#BuildRequires: openvdb-devel +BuildRequires: openvr-devel +BuildRequires: openxr-devel +BuildRequires: PDAL-devel BuildRequires: PEGTL-devel BuildRequires: proj-devel BuildRequires: pugixml-devel BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-qt5 -BuildRequires: cmake(Qt5) -BuildRequires: cmake(Qt5UiPlugin) -BuildRequires: cmake(Qt5X11Extras) -BuildRequires: qt5-qtwebkit-devel +BuildRequires: cmake(Qt6UiPlugin) +BuildRequires: cmake(Qt6Quick) BuildRequires: R-devel BuildRequires: sqlite-devel BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: unixODBC-devel BuildRequires: utf8cpp-devel +BuildRequires: zfp-devel BuildRequires: zlib-devel BuildRequires: chrpath BuildRequires: doxygen @@ -187,15 +206,18 @@ Requires: double-conversion-devel%{?_isa} \ # eigen3 is noarch and header-only \ Requires: eigen3-static \ Requires: expat-devel%{?_isa} \ +# fast_float is noarch and header-only \ +Requires: fast_float-devel \ +Requires: ffmpeg-free-devel%{?_isa} \ %if %{with fmt} \ Requires: fmt-devel%{?_isa} \ %endif \ +Requires: freeglut-devel%{?_isa} \ Requires: freetype-devel%{?_isa} \ Requires: gdal-devel%{?_isa} \ %if %{with gl2ps} \ Requires: gl2ps-devel%{?_isa} \ %endif \ -Requires: glew-devel%{?_isa} \ Requires: json-devel%{?_isa} \ Requires: jsoncpp-devel%{?_isa} \ Requires: lapack-devel%{?_isa} \ @@ -203,11 +225,13 @@ Requires: libarchive-devel%{?_isa} \ Requires: libGL-devel%{?_isa} \ Requires: libharu-devel%{?_isa} >= 2.3.0-9 \ Requires: libjpeg-devel%{?_isa} \ +Requires: liblas-devel%{?_isa} \ Requires: libogg-devel%{?_isa} \ Requires: libpng-devel%{?_isa} \ Requires: libpq-devel%{?_isa} \ Requires: libtheora-devel%{?_isa} \ Requires: libtiff-devel%{?_isa} \ +Requires: libxkbcommon-devel%{?_isa} \ Requires: libxml2-devel%{?_isa} \ Requires: libX11-devel%{?_isa} \ Requires: libXcursor-devel%{?_isa} \ @@ -219,18 +243,27 @@ Requires: mariadb-connector-c-devel%{?_isa} \ Requires: mesa-libOSMesa-devel%{?_isa} \ %endif \ Requires: netcdf-cxx-devel%{?_isa} \ +%if %{without bootstrap} \ +Requires: opencascade-devel%{?_isa} \ +%endif \ Requires: openslide-devel%{?_isa} \ +#Requires: openvdb-devel%{?_isa} \ +Requires: openvr-devel%{?_isa} \ +Requires: openxr-devel%{?_isa} \ +Requires: PDAL-devel%{?_isa} \ Requires: PEGTL-devel%{?_isa} \ Requires: proj-devel%{?_isa} \ Requires: pugixml-devel%{?_isa} \ # bz #1183210 + #1183530 \ Requires: python%{python3_pkgversion}-devel \ Requires: sqlite-devel%{?_isa} \ -Requires: cmake(Qt5) \ -Requires: cmake(Qt5UiPlugin) \ -Requires: cmake(Qt5X11Extras) \ -Requires: qt5-qtwebkit-devel%{?_isa} \ +Requires: cmake(Qt6) \ +Requires: cmake(Qt6Core5Compat) \ +Requires: cmake(Qt6Quick) \ +Requires: cmake(Qt6UiPlugin) \ +Requires: unixODBC-devel%{?_isa} \ Requires: utf8cpp-devel \ +Requires: zfp-devel%{?_isa} \ Requires: zlib-devel%{?_isa} \ # Bundled KWSys @@ -255,6 +288,7 @@ Provides: bundled(kwsys-systemtools) Provides: bundled(diy2) Provides: bundled(exodusII) = 2.0.0 Provides: bundled(exprtk) = 2.71 +Provides: bundled(fides) %if !%{with fmt} Provides: bundled(fmt) = 8.1.0 %endif @@ -262,10 +296,17 @@ Provides: bundled(ftgl) = 1.32 %if !%{with gl2ps} Provides: bundled(gl2ps) = 1.4.0 %endif -Provides: bundled(ioss) = 20210512 +Provides: bundled(h5part) = 1.6.6 +Provides: bundled(ioss) = 20221014 +Provides: bundled(itlib-small-vector) = 1.0.4 Provides: bundled(kissfft) +Provides: bundled(loguru) = 2.1 Provides: bundled(metaio) +Provides: bundled(scn) = 4.0.0 +# kitware library https://gitlab.kitware.com/utils/token +Provides: bundled(token) = 23.09 Provides: bundled(verdict) = 1.4.0 +Provides: bundled(viskores) = 1.0.0 Provides: bundled(vpic) Provides: bundled(xdmf2) = 2.1 Provides: bundled(xdmf3) @@ -520,18 +561,36 @@ programming languages. %prep -%autosetup -p1 -b 1 -n VTK-%{version} +%autosetup -p1 -b 1 -n VTK-%{srcver} # Remove included thirdparty sources just to be sure +# ls VTK-*/ThirdParty/*/vtk* -dl | grep ^d # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged +# TODO - exprtk - not yet packaged +# TODO - fides - not yet packaged +# TODO - h5part - not yet packaged +# TODO - ioss - not yet packaged +# TODO - kissfft - not yet packaged +# TODO - loguru - not yet packaged +# TODO - scn - not yet packaged # TODO - verdict - not yet packaged +# TODO - viskores - not yet packaged # TODO - VPIC - not yet packaged # TODO - xdmf2 - not yet packaged # TODO - xdmf3 - not yet packaged -for x in vtk{cli11,doubleconversion,eigen,expat,%{?with_fmt:fmt,}freetype,%{?with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,libharu,libproj,libxml2,lz4,lzma,mpi4py,netcdf,ogg,pegtl,png,pugixml,sqlite,theora,tiff,utf8,zfp,zlib} +for x in vtk{cgns,cli11,doubleconversion,eigen,expat,fast_float,%{?with_fmt:fmt,}freetype,%{?with_gl2ps:gl2ps,}hdf5,jpeg,jsoncpp,libharu,libproj,libxml2,lz4,lzma,mpi4py,netcdf,nlohmannjson,ogg,pegtl,png,pugixml,sqlite,theora,tiff,utf8,zlib} do rm -r ThirdParty/*/${x} done +%ifarch %{ix86} +rm -r ThirdParty/xdmf3 +%endif + +# Remove version requirements +sed -i -e '/VERSION *"/d' ThirdParty/fast_float/CMakeLists.txt + +# Remove version requirements +sed -i -e '/VERSION *"/d' ThirdParty/fast_float/CMakeLists.txt # Remove unused KWSys items find Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|Status|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm @@ -541,7 +600,11 @@ mkdir vtk-examples cp -a Examples vtk-examples find vtk-examples -type f | xargs chmod -R a-x - +# Requires OpenTURNS which is not packaged +# -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS:STRING=YES +# fides and ADIOS2 require ADIOS2 which is not packaged +# ZSpace is Windows only, but is getting enabled anyway +# Xdmf3 fails on i686 - https://gitlab.kitware.com/vtk/vtk/-/issues/19402 %global vtk_cmake_options \\\ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \\\ -DCMAKE_INSTALL_DOCDIR=share/doc/%{name} \\\ @@ -549,7 +612,6 @@ find vtk-examples -type f | xargs chmod -R a-x -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ -DCMAKE_INSTALL_JNILIBDIR:PATH=%{_lib}/%{name} \\\ -DCMAKE_INSTALL_LICENSEDIR:PATH=share/licenses/%{name} \\\ - -DCMAKE_INSTALL_QMLDIR:PATH=%{_lib}/qt5/qml \\\ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \\\ -DVTK_VERSIONED_INSTALL:BOOL=OFF \\\ -DVTK_GROUP_ENABLE_Imaging:STRING=YES \\\ @@ -558,15 +620,34 @@ find vtk-examples -type f | xargs chmod -R a-x -DVTK_GROUP_ENABLE_StandAlone:STRING=YES \\\ -DVTK_GROUP_ENABLE_Views:STRING=YES \\\ -DVTK_GROUP_ENABLE_Web:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_CommonArchive:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_GeovisGDAL:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_FiltersParallelStatistics:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_FiltersParallelVerdict:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_InfovisBoost:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms:STRING=YES \\\ +%if %{with bootstrap} \ + -DVTK_MODULE_ENABLE_VTK_IOOCCT:STRING=NO \\\ +%endif \ + -DVTK_MODULE_ENABLE_VTK_IOFDS:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_IOH5part:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_IOH5Rage:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_IOMySQL:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_IOOMF:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_IOParallelLSDyna:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_IOTRUCHAS:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_IOVPIC:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_IOXdmf2:STRING=YES \\\ +%ifarch %{ix86} \ + -DVTK_MODULE_ENABLE_VTK_IOXdmf3:STRING=NO \\\ +%endif \ + -DVTK_MODULE_ENABLE_VTK_RenderingAnari:STRING=NO \\\ + -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR:STRING=YES \\\ -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \\\ - -DVTK_PYTHON_VERSION=3 \\\ %if %{with OSMesa} \ -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\ %endif \ @@ -585,6 +666,12 @@ find vtk-examples -type f | xargs chmod -R a-x %endif \ -DVTK_WRAP_PYTHON:BOOL=ON \\\ -DVTK_USE_EXTERNAL=ON \\\ + -DVTK_BUILD_ALL_MODULES=ON \\\ + -DVTK_ENABLE_OSPRAY:BOOL=OFF \\\ + -DVTK_MODULE_ENABLE_VTK_fides:STRING=NO \\\ + -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS:STRING=NO \\\ + -DVTK_MODULE_ENABLE_VTK_IOADIOS2:STRING=NO \\\ + -DVTK_MODULE_ENABLE_VTK_IOOpenVDB:STRING=NO \\\ %if !%{with fmt} \ -DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \\\ %endif \ @@ -593,16 +680,18 @@ find vtk-examples -type f | xargs chmod -R a-x %endif \ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \\\ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \\\ + -DVTK_MODULE_USE_EXTERNAL_VTK_scn:BOOL=OFF \\\ + -DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF \\\ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict:BOOL=OFF \\\ + -DVTK_MODULE_USE_EXTERNAL_VTK_vtkviskores:BOOL=OFF \\\ -DVTK_USE_TK=ON \\\ %{?with_flexiblas:-DBLA_VENDOR=FlexiBLAS} -# https://gitlab.kitware.com/cmake/cmake/issues/17223 -#-DVTK_MODULE_ENABLE_VTK_IOPostgreSQL:STRING=YES \\\ # $mpi will be evaluated in the loops below %global _vpath_builddir %{_vendor}-%{_target_os}-build-${mpi:-serial} -%build + +%conf export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H @@ -618,29 +707,41 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %endif %endif + %cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DVTK_BUILD_DOCUMENTATION:BOOL=ON \ -DVTK_BUILD_EXAMPLES:BOOL=ON \ -DVTK_BUILD_TESTING:BOOL=ON -%cmake_build -- --output-sync -%cmake_build --target DoxygenDoc + #-DVTK_MODULE_ENABLE_VTK_FiltersParallelStatistics:STRING=YES \ + export CC=mpicc export CXX=mpic++ for mpi in %{mpi_list} do module load mpi/$mpi-%{_arch} - #CMAKE_INSTALL_LIBDIR -> ARCHIVE_DESTINATION must not be an absolute path + # CMAKE_INSTALL_LIBDIR -> ARCHIVE_DESTINATION must not be an absolute path + # VTK_MODULE_ENABLE_VTK_FiltersParallelStatistics need MPI modules at the moment %cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ -DCMAKE_INSTALL_LIBDIR:PATH=lib \ -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ - -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ + -DVTK_MODULE_ENABLE_VTK_IOPIO:STRING=YES \ -DVTK_USE_MPI:BOOL=ON + module purge +done + + +%build +%cmake_build -- --output-sync +%cmake_build --target DoxygenDoc +for mpi in %{mpi_list} +do + module load mpi/$mpi-%{_arch} %cmake_build -- --output-sync module purge done @@ -749,6 +850,8 @@ cat xorg.log %files -f %{_vendor}-%{_target_os}-build-serial/libs.list %license %{_defaultlicensedir}/%{name}/ %doc README.md _docs/Wrapping +%{_datadir}/vr_actions/ +%{_datadir}/xr_actions/ %files devel %doc Utilities/Upgrading @@ -756,6 +859,8 @@ cat xorg.log %{_bindir}/vtkProbeOpenGLVersion %{_bindir}/vtkWrapHierarchy %{_bindir}/vtkWrapJava +%{_bindir}/vtkWrapSerDes + %{_includedir}/%{name} %{_libdir}/*.so %{_libdir}/cmake/%{name}/ @@ -780,18 +885,20 @@ cat xorg.log %files qt %{_libdir}/lib*Qt*.so.* %exclude %{_libdir}/*Python*.so.* -%{_libdir}/qt5/qml/* %if %{with mpich} %files mpich -f %{_vendor}-%{_target_os}-build-mpich/libs.list %license %{_defaultlicensedir}/%{name}-mpich/ %doc README.md _docs/Wrapping +%{_libdir}/mpich/share/vr_actions/ +%{_libdir}/mpich/share/xr_actions/ %files mpich-devel %{_libdir}/mpich/bin/vtkParseJava %{_libdir}/mpich/bin/vtkProbeOpenGLVersion %{_libdir}/mpich/bin/vtkWrapHierarchy %{_libdir}/mpich/bin/vtkWrapJava +%{_libdir}/mpich/bin/vtkWrapSerDes %{_libdir}/mpich/include/ %{_libdir}/mpich/lib/*.so %{_libdir}/mpich/lib/cmake/ @@ -817,19 +924,21 @@ cat xorg.log %files mpich-qt %{_libdir}/mpich/lib/lib*Qt*.so.* %exclude %{_libdir}/mpich/lib/*Python*.so.* -%{_libdir}/mpich/lib/qt5/ %endif %if %{with openmpi} %files openmpi -f %{_vendor}-%{_target_os}-build-openmpi/libs.list %license %{_defaultlicensedir}/%{name}-openmpi/ %doc README.md _docs/Wrapping +%{_libdir}/openmpi/share/vr_actions/ +%{_libdir}/openmpi/share/xr_actions/ %files openmpi-devel %{_libdir}/openmpi/bin/vtkParseJava %{_libdir}/openmpi/bin/vtkProbeOpenGLVersion %{_libdir}/openmpi/bin/vtkWrapHierarchy %{_libdir}/openmpi/bin/vtkWrapJava +%{_libdir}/openmpi/bin/vtkWrapSerDes %{_libdir}/openmpi/include/ %{_libdir}/openmpi/lib/*.so %{_libdir}/openmpi/lib/cmake/ @@ -855,7 +964,6 @@ cat xorg.log %files openmpi-qt %{_libdir}/openmpi/lib/lib*Qt*.so.* %exclude %{_libdir}/openmpi/lib/*Python*.so.* -%{_libdir}/openmpi/lib/qt5/ %endif %files data From 1352cd40076afc27720028fbc0dad6ef11e5220f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 07:48:02 -0600 Subject: [PATCH 146/158] Bootstrap build for netcdf 4.9.3 soname bump --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 75cf6bd..36e00b4 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 0 +%bcond bootstrap 1 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From 065c5ad5e83050113ad2e5403d525efd286e522b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 21:41:37 -0600 Subject: [PATCH 147/158] Disable bootstrap --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 36e00b4..75cf6bd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 1 +%bcond bootstrap 0 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From b806dc837ab56b9e696cebda61ea5631bc898ce5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 23 Aug 2025 21:58:04 -0600 Subject: [PATCH 148/158] Skip tests on s390x - timeouts take too long --- vtk.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vtk.spec b/vtk.spec index 75cf6bd..2f2c216 100644 --- a/vtk.spec +++ b/vtk.spec @@ -828,6 +828,8 @@ rm -v %{buildroot}/%{_libdir}/openmpi/lib/cmake/%{name}/patches/99/FindHDF5.cmak export QA_RPATHS=18 +# Test take a very long time on s390x because many tests hit the default 25 minute timeout +%ifnarch s390x %check cp %SOURCE2 . %if %{with xdummy} @@ -845,6 +847,7 @@ export FLEXIBLAS=netlib kill %1 || : cat xorg.log %endif +%endif %files -f %{_vendor}-%{_target_os}-build-serial/libs.list From 6f18ecf3bf1034e5c08b6895064135822715c41c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 28 Aug 2025 22:07:11 -0600 Subject: [PATCH 149/158] Update to 9.5.1 --- .gitignore | 2 ++ sources | 4 ++-- vtk.spec | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2843b96..c0c6d78 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ vtk-5.6.0.tar.gz /VTKData-9.4.2.tar.gz /VTK-9.5.0.tar.gz /VTKData-9.5.0.tar.gz +/VTK-9.5.1.tar.gz +/VTKData-9.5.1.tar.gz diff --git a/sources b/sources index 942f059..f369061 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.5.0.tar.gz) = bdb110a15d99311c88d3576c4ec40ce7d0d0625f8183665aa4250cd722aba54de2e3b2e8831d767582ee2ca6526eb8c23a09536c74b7dd2992c773dbe753f063 -SHA512 (VTKData-9.5.0.tar.gz) = a6d51f4d1da644d40a7afa858f98f70f51744a092b97fb67d1f2736b3532d92aa5eb917f23461d690137119e1791a8cb8c70630af9921ba405dd375c0a6577a2 +SHA512 (VTK-9.5.1.tar.gz) = 18493d507b3bb543bffce5483229fd86e82413036d68d054b59cbbb952637cd2b575dfb21de755706671919ec41334b01c70bc66bc788772dae5facfb49d22a2 +SHA512 (VTKData-9.5.1.tar.gz) = 5244a6ce380e10d5ec872206a8cd928e66a1db30954cc415983c5456643a0c4fca463d4a3d2e8531c3673301576d711071fa68c0684124306afdf6776264d7dd diff --git a/vtk.spec b/vtk.spec index 2f2c216..0aa7cfb 100644 --- a/vtk.spec +++ b/vtk.spec @@ -23,7 +23,7 @@ %else # No openmpi on i668 with openmpi 5 in Fedora 40+ # No mpi4py on i686 -%if 0%{?fedora} >= 40 +%if 0%{?fedora} %ifarch %{ix86} %bcond_with mpich %bcond_with openmpi @@ -47,7 +47,7 @@ %bcond_without xdummy %endif -%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} >= 9 %bcond_without flexiblas %endif @@ -65,7 +65,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.5.0%{?rc:~%{rc}} +Version: 9.5.1%{?rc:~%{rc}} Release: %autorelease License: BSD-3-Clause %global srcver %{lua:local ver = rpm.expand('%version');ver = ver:gsub('~','.');print(ver)} From a08f5c88cdd5a16a58449d9bacdfb6523241bde3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:02:57 +0200 Subject: [PATCH 150/158] Rebuilt for Python 3.14.0rc3 bytecode From 2a3761907bceb35ff08bbc34a7a74be75846f6cc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 18 Sep 2025 08:15:11 -0600 Subject: [PATCH 151/158] Update to 9.5.2 --- .gitignore | 2 ++ sources | 4 ++-- vtk.spec | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c0c6d78..1e9afc3 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,5 @@ vtk-5.6.0.tar.gz /VTKData-9.5.0.tar.gz /VTK-9.5.1.tar.gz /VTKData-9.5.1.tar.gz +/VTK-9.5.2.tar.gz +/VTKData-9.5.2.tar.gz diff --git a/sources b/sources index f369061..be5d56c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.5.1.tar.gz) = 18493d507b3bb543bffce5483229fd86e82413036d68d054b59cbbb952637cd2b575dfb21de755706671919ec41334b01c70bc66bc788772dae5facfb49d22a2 -SHA512 (VTKData-9.5.1.tar.gz) = 5244a6ce380e10d5ec872206a8cd928e66a1db30954cc415983c5456643a0c4fca463d4a3d2e8531c3673301576d711071fa68c0684124306afdf6776264d7dd +SHA512 (VTK-9.5.2.tar.gz) = fc8157a89fa603a7f7fce356e2f638ae69e0ea629a507458bdbb173daf511c61e39a1f0d7201b196a5b3a7ffa7e3e821398b62521faadf85edb1119a1e8b8e8e +SHA512 (VTKData-9.5.2.tar.gz) = 1be895bed613ed0f0ace0ba5e138afacc3d61b57e437299b3aecf6beff702ad1a2d02036fd147853bbbcb6a1f9d20a51831c0263fdc5b8e62ece9a6f8f7d410e diff --git a/vtk.spec b/vtk.spec index 0aa7cfb..a7a763d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -65,7 +65,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.5.1%{?rc:~%{rc}} +Version: 9.5.2%{?rc:~%{rc}} Release: %autorelease License: BSD-3-Clause %global srcver %{lua:local ver = rpm.expand('%version');ver = ver:gsub('~','.');print(ver)} @@ -162,7 +162,6 @@ BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: unixODBC-devel BuildRequires: utf8cpp-devel -BuildRequires: zfp-devel BuildRequires: zlib-devel BuildRequires: chrpath BuildRequires: doxygen @@ -263,7 +262,6 @@ Requires: cmake(Qt6Quick) \ Requires: cmake(Qt6UiPlugin) \ Requires: unixODBC-devel%{?_isa} \ Requires: utf8cpp-devel \ -Requires: zfp-devel%{?_isa} \ Requires: zlib-devel%{?_isa} \ # Bundled KWSys From f3a0fa474fd88572a99c9d946addbc1236f3eaef Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 3 Sep 2025 08:28:00 -0600 Subject: [PATCH 152/158] Enable options for paraview --- vtk.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index a7a763d..17b813e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -728,7 +728,16 @@ do -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ -DCMAKE_INSTALL_LIBDIR:PATH=lib \ -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ - -DVTK_MODULE_ENABLE_VTK_IOPIO:STRING=YES \ + -DVTK_MODULE_ENABLE_VTK_ParallelMPI=WANT \ + -DVTK_MODULE_ENABLE_VTK_mpi=WANT \ + -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC=WANT \ + -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py=WANT \ + -DVTK_MODULE_ENABLE_VTK_FiltersParallelFlowPaths=WANT \ + -DVTK_MODULE_ENABLE_VTK_FiltersParallelGeometry=WANT \ + -DVTK_MODULE_ENABLE_VTK_FiltersParallelMPI=WANT \ + -DVTK_MODULE_ENABLE_VTK_IOMPIImage=WANT \ + -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF=WANT \ + -DVTK_MODULE_ENABLE_VTK_IOPIO=WANT \ -DVTK_USE_MPI:BOOL=ON module purge done From 28c34b1d95c1e36092f54bd83811518ebdbfd5a9 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 30 Sep 2025 22:12:09 +0200 Subject: [PATCH 153/158] rebuild for FFmpeg 8 Needs bootstrapping for circular vtk->opencascade->vtk dependency. --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 17b813e..93cf531 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 0 +%bcond bootstrap 1 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From a2d520c1c02cdaca1211524a2d08530ef8b1c5f6 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 6 Nov 2025 14:19:45 +0100 Subject: [PATCH 154/158] unbootstrap --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 93cf531..17b813e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 1 +%bcond bootstrap 0 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From 530dd529f34e8cffdf31e86619fd47c0b32c786d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 23 Nov 2025 17:13:43 +0100 Subject: [PATCH 155/158] Rebuild (gdal) From 9d536d0a1479a504b7706af70f5d4c2d3f602331 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 24 Nov 2025 09:03:19 +0100 Subject: [PATCH 156/158] Rebuild (gdal) - bootstrap --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 17b813e..93cf531 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 0 +%bcond bootstrap 1 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From 454cb762623484c428f528c6dc92488a7355499d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 25 Nov 2025 08:06:52 +0100 Subject: [PATCH 157/158] Rebuild (gdal) - full build --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 93cf531..17b813e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 1 +%bcond bootstrap 0 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From 643c0ef73cf383c3a76ddb3e26427427c5dc2240 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 13 Jan 2026 12:51:36 +0000 Subject: [PATCH 158/158] Rebuilt for Boost 1.90