Hello community, here is the log from the commit of package paraview for openSUSE:Leap:15.2 checked in at 2020-04-17 13:38:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/paraview (Old) and /work/SRC/openSUSE:Leap:15.2/.paraview.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "paraview" Fri Apr 17 13:38:26 2020 rev:18 rq:794594 version:5.8.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/paraview/paraview.changes 2020-01-15 15:39:04.763097017 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.paraview.new.2738/paraview.changes 2020-04-17 13:38:54.316281353 +0200 @@ -1,0 +2,134 @@ +Wed Apr 8 18:26:31 UTC 2020 - Christoph G <f...@grueninger.de> + +- add patch fix-3d48a287-support-new-api-cgio_read_data_type.patch + from upstream to fix build problem for Factory + +------------------------------------------------------------------- +Fri Feb 28 14:05:40 UTC 2020 - Atri Bhattacharya <badshah...@gmail.com> + +- Update minimum disk space required in _constraints: up to 16 GB + now required. + +------------------------------------------------------------------- +Tue Feb 18 18:49:49 UTC 2020 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 5.8.0: + * See https://blog.kitware.com/paraview-5-8-0-release-notes/. +- Rebase paraview-desktop-entry-fix.patch for updated location of + desktop file in source. +- Drop fix-QtGUI-missing-GLX_mesa-linking.patch: no longer + required as linking GLX_mesa to build QtGUI is now correctly + handled by build. +- Drop 0001-Allow-compilation-on-GLES-platforms.patch: patch no + longer applies (since vesin 5.7.0) and commenting out patch + leads to factory_auto declining the submission. +- Use ninja instead of make as recommended by upstream and to + speed up build; define __builder to ninja so that cmake build + macros use this instead of the default make. +- Pass PARAVIEW_BUILD_WITH_EXTERNAL to cmake to use system third + party libraries by default; pass VTK_MODULE_USE_EXTERNAL_<name> + to use specific bundled libraries conditionally (gl2ps, haru, + pugixml). +- Use %cmake_build instead of %make_jobs during building. +- Replace deprecated options passed to cmake by updated ones: + * PARAVIEW_BUILD_QT_GUI -> DPARAVIEW_USE_QT + * PARAVIEW_ENABLE_PYTHON -> PARAVIEW_USE_PYTHON. +- Update paraview-rpmlintrc to suppress warning about a non-exec + file that is installed to %{_bindir} and is really necessary + (see https://gitlab.kitware.com/paraview/paraview/issues/19706); + the previous entry no longer applies, so drop it. +- Add absolutely necessary dependencies for paraview-devel as + Requires. +- Install python modules to %{python3_sitearch}/paraview rather + than the default [%{python3_sitearch}] by setting + PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX when configuring cmake; + this avoids file conflicts between python3-paraview and + python3-vtk. +- Don't install paraview-config: it doesn't work without the + static libs being installed. + +------------------------------------------------------------------- +Sat Jan 31 22:30:41 UTC 2020 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 5.7.0: + See https://blog.kitware.com/paraview-5-7-0-release-notes/ +- Split out new subpackages: libparaview5_7 for all the shared + libs, paraview-plugins for bundled plugins, and python3-paraview + for python3 bindings. +- Move shared libraries to %{_libdir} and install them as part of + libparaview5_7. +- Update commands passed to cmake in keeping with upstream's + overhaul. +- Drop paraview-find-qhelpgenerator-qt5.patch: no longer needed. +- Drop paraview-fix-file-contains-date-time.patch: GCC supports + SOURCE_DATE_EPOCH and, as such, this fix is no longer needed. +- Switch to python3: Paraview is production ready with python3 + starting with version 5.7.0, and python2 support is slated to be + dropped from the next major upgrade. +- Rebase patches for updated version: + * fix-libharu-missing-m.patch. + * bundled_exodusii_add_missing_libpthread.patch. +- New patches to fix linking problems introduced with version + 5.7.0: + * fix-loguru-missing-links.patch: Add linking to libraries libm, + libdl, and libpthread when building loguru. + * fix-QtGUI-missing-GLX_mesa-linking.patch: Link to library + libGLX_mesa when building Qt GUI support. + * paraview-link-against-python.patch to fix linking against + the python library. +- Patch 0001-Allow-compilation-on-GLES-platforms.patch needs + rebase; commented out for now. +- Switch an env based hashbang with one directly calling the + required binary (python3 in this case). +- Switch as many BuildRequires as possible to pkgconfig based + ones. +- Update rpmlintrc file to remove no longer needed filters and + update the leftover filter (hidden file or dir) for directory + change. + +------------------------------------------------------------------- +Fri Jan 31 22:05:09 UTC 2020 - Atri Bhattacharya <badshah...@gmail.com> + +- Drop fix-libhdf5-missing-m.patch: No longer needed. + +------------------------------------------------------------------- +Thu Jan 30 14:47:12 UTC 2020 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Drop unused python-zope BuildRequires +- Replace Qt5WebKit BuildRequires with Qt5WebEngine +- Unbundle several dependencies, use system libraries: + * double-conversion + * CGNS + * Eigen3 + * GLEW + * HDF5 + * JsonCPP + * liblz4 + * netcdf + * protobuf + * PugiXML + * Ogg/Theora +- Add several patches from VTK package: + * bundled_exodusii_add_missing_libpthread.patch + * 0001-Add-libogg-to-IOMovie-target-link-libraries.patch + * 0001-Allow-compilation-on-GLES-platforms.patch + +------------------------------------------------------------------- +Fri Sep 20 06:14:35 UTC 2019 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 5.6.2: + * Fixes a trackpad interaction bug on macOS. + +------------------------------------------------------------------- +Fri Sep 20 05:46:33 UTC 2019 - Atri Bhattacharya <badshah...@gmail.com> + +- Pass -ffat-lto-objects for static libs. + +------------------------------------------------------------------- +Fri Aug 16 14:26:00 CEST 2019 - mark.ole...@esi-group.com + +- Update to version 5.6.1 + https://blog.kitware.com/paraview-5-6-1-release-notes/ +- using tar.xz instead of tar.gz file + +------------------------------------------------------------------- Old: ---- ParaView-v5.6.0.tar.gz ParaViewGettingStarted-5.6.0.pdf ParaViewGuide-5.6.0.pdf fix-libhdf5-missing-m.patch paraview-find-qhelpgenerator-qt5.patch paraview-fix-file-contains-date-time.patch New: ---- 0001-Add-libogg-to-IOMovie-target-link-libraries.patch ParaView-v5.8.0.tar.xz ParaViewGettingStarted-5.8.0.pdf ParaViewGuide-5.8.0.pdf bundled_exodusii_add_missing_libpthread.patch fix-3d48a287-support-new-api-cgio_read_data_type.patch fix-loguru-missing-links.patch paraview-link-against-python.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ paraview.spec ++++++ --- /var/tmp/diff_new_pack.2YfAjL/_old 2020-04-17 13:38:56.440282951 +0200 +++ /var/tmp/diff_new_pack.2YfAjL/_new 2020-04-17 13:38:56.444282953 +0200 @@ -1,7 +1,7 @@ # # spec file for package paraview # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,76 +16,114 @@ # -%define major_ver 5.6 +%define major_ver 5.8 +%define shlib libparaview5_8 + +%if 0%{?suse_version} <= 1500 +%bcond_with pugixml +%else +%bcond_without pugixml +%endif +# Need unrelased version > 1.4.0 with e.g. gl2psTextOptColorBL +%bcond_with gl2ps +# Need patched version with HPDF_SHADING +%bcond_with haru + +%define __builder ninja + Name: paraview -Version: 5.6.0 +Version: 5.8.0 Release: 0 Summary: Data analysis and visualization application License: BSD-3-Clause Group: Productivity/Scientific/Physics -Url: http://www.paraview.org -Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{version}.tar.gz +URL: https://www.paraview.org +Source0: https://www.paraview.org/files/v%{major_ver}/ParaView-v%{version}.tar.xz Source1: %{name}-rpmlintrc -Source2: http://www.paraview.org/files/v%{major_ver}/ParaViewGettingStarted-%{version}.pdf -Source3: http://www.paraview.org/files/v%{major_ver}/ParaViewGuide-%{version}.pdf +# CAUTION: GettingStarted may or may not be updated with each minor version +Source2: https://www.paraview.org/files/v%{major_ver}/ParaViewGettingStarted-%{major_ver}.0.pdf +Source3: https://www.paraview.org/files/v%{major_ver}/ParaViewGuide-%{version}.pdf # PATCH-FIX-UPSTREAM paraview-desktop-entry-fix.patch badshah...@gmail.com -- Fix desktop menu entry by inserting proper required categories Patch1: paraview-desktop-entry-fix.patch -# PATCH-FIX-UPSTREAM paraview-fix-file-contains-date-time.patch badshah...@gmail.com -- Remove reference to __DATE__ and __TIME__ from source -Patch2: paraview-fix-file-contains-date-time.patch +# PATCH-FIX-UPSTREAM fix-3d48a287-support-new-api-cgio_read_data_type.patch -- Add support for new API cgio_read_***data***_type +Patch2: fix-3d48a287-support-new-api-cgio_read_data_type.patch # PATCH-FIX-UPSTREAM paraview-do-not-install-missing-vtk-doxygen-dir.patch f...@grueninger.de -- Remove install of nonexistent doxygen/html dir Patch3: paraview-do-not-install-missing-vtk-doxygen-dir.patch -# PATCH-FIX-UPSTREAM paraview-find-qhelpgenerator-qt5.patch badshah...@gmail.com -- Help find qhelpgenerator-qt5 instead of qhelpgenerator when Qt5 is used -Patch4: paraview-find-qhelpgenerator-qt5.patch # PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking Patch8: fix-libharu-missing-m.patch -# PATCH-FIX-OPENSUSE fix-libhdf5-missing-m.patch -- missing libraries for linking -Patch9: fix-libhdf5-missing-m.patch +# PATCH-FIX-UPSTREAM paraview-link-against-python.patch badshah...@gmail.com -- Fix linking to python library +Patch9: paraview-link-against-python.patch +# PATCH-FIX-OPENSUSE bundled_exodusii_add_missing_libpthread.patch stefan.bru...@rwth-aachen.de -- Add missing libm for linking +Patch10: bundled_exodusii_add_missing_libpthread.patch +# PATCH-FIX-OPENSUSE -- Missing libogg symbols +Patch11: 0001-Add-libogg-to-IOMovie-target-link-libraries.patch +# PATCH-FIX-UPSTREAM fix-loguru-missing-links.patch badshah...@gmail.com -- Fix missing libs (libm, libpthread, libdl) when linking to build loguru +Patch13: fix-loguru-missing-links.patch BuildRequires: Mesa-devel -BuildRequires: boost-devel +BuildRequires: cgns-devel BuildRequires: cmake >= 3.3 BuildRequires: desktop-file-utils +BuildRequires: double-conversion-devel BuildRequires: doxygen +BuildRequires: exodusii-devel +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: gcc-fortran BuildRequires: gnuplot BuildRequires: graphviz -BuildRequires: libexpat-devel -BuildRequires: libjpeg-devel -BuildRequires: libpqxx-devel -BuildRequires: libtiff-devel -BuildRequires: openssl-devel -BuildRequires: python-Sphinx -BuildRequires: python-devel -BuildRequires: python-matplotlib -BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(xt) -%py_requires -BuildRequires: fdupes -BuildRequires: python-qt5-devel -BuildRequires: python-twisted -BuildRequires: python-zope.interface +BuildRequires: hdf5-devel +BuildRequires: libboost_graph-devel +BuildRequires: libboost_headers-devel +%if %{with gl2ps} +BuildRequires: gl2ps-devel +%endif +%if %{with haru} +BuildRequires: libharu-devel > 2.3.0 +%endif +BuildRequires: libnetcdf_c++-devel +BuildRequires: ninja +BuildRequires: python3-Sphinx +BuildRequires: python3-Twisted +BuildRequires: python3-devel +BuildRequires: python3-matplotlib +BuildRequires: python3-qt5-devel BuildRequires: readline-devel +BuildRequires: utfcpp-devel BuildRequires: wget -BuildRequires: zlib-devel BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Help) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5WebEngine) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(eigen3) >= 2.91.0 +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(glew) +BuildRequires: pkgconfig(jsoncpp) >= 0.7.0 +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(liblz4) >= 1.7.3 +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libpqxx) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(netcdf) +BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(protobuf) >= 2.6.0 +%if %{with pugixml} +BuildRequires: pkgconfig(pugixml) +%endif +BuildRequires: pkgconfig(theora) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(zlib) +Recommends: %{name}-plugins Requires: gnuplot Requires: graphviz -Requires: python -Requires: python-base -Requires: python-twisted -Requires: python-zope.interface Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -# FIXME: Remove when builds for 32-bit are fixed; they currently fail due to offt definition issues in ThirdParty/cgns/vtkcgns/src/adf/ADF_internals.c -ExcludeArch: %ix86 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -99,125 +137,128 @@ NOTE: The version in this package has NOT been compiled with MPI support. +%package -n %{shlib} +Summary: Shared libraries for Paraview +Group: Productivity/Scientific/Physics + +%description -n %{shlib} +This package provides the shared libraries for paraview. + %package devel Summary: Headers for building ParaView plugins or embedding Catalyst Group: Development/Libraries/Other -Requires: %{name} = %{version} +Requires: %{shlib} = %{version} +Requires: cmake >= 3.3 +Requires: glibc-devel +Requires: libboost_thread-devel %description devel This package contains headers and libraries required to build plugins for ParaView or to embed ParaView Catalyst in a simulation program. +%package -n python3-paraview +Summary: Python bindings for Paraview +Group: Productivity/Scientific/Physics +Requires: python3 +Requires: python3-Twisted +Requires: python3-matplotlib +Requires: python3-numpy +Requires: python3-qt5 + +%description -n python3-paraview +This package provides the python(3) bindings and modules for paraview. + +%package plugins +Summary: Plugins for paraview +Group: Productivity/Scientific/Physics +Requires: %{name} = %{version} + +%description plugins +This package provides the paraview plugins bundled with the upstream release. + %prep -%setup -q -n ParaView-v%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch8 -p1 -%patch9 -p1 +%autosetup -p1 -n ParaView-v%{version} + +# FIX env BASED HASHBANG +sed -Ei "1{s|#!/usr/bin/env python3|#!/usr/bin/python3|}" Clients/CommandLineExecutables/paraview-config %build -# Prepare for gcc 4.9.0: work around gcc 4.9.0 regression -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61294 -sed -i -e 's/-Wl,--fatal-warnings//' VTK/CMake/vtkCompilerExtraFlags.cmake - -export CC='gcc' -export CXX='g++' - -%cmake -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/%{name} \ - -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \ - -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name} \ - -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{name}-%{major_ver} \ - -DVTK_INSTALL_DATA_DIR=share/%{name} \ - -DVTK_INSTALL_DOC_DIR=share/doc/packages/%{name} \ - -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \ - -DCMAKE_C_COMPILER:FILEPATH=$CC \ +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects + +%cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} \ + -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \ + -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DPARAVIEW_USE_VTKM:BOOL=OFF \ - -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \ - -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=ON \ - -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ + -DPARAVIEW_USE_QT:BOOL=ON \ + -DPARAVIEW_USE_PYTHON:BOOL=ON \ + -DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=%{_lib}/python%{py3_ver}/site-packages/paraview \ + -DPARAVIEW_ENABLE_WEB:BOOL=ON \ -DVTK_WRAP_PYTHON:BOOL=ON \ - -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ -DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \ - -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ - -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ - -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ - -DVTK_USE_SYSTEM_PNG:BOOL=ON \ - -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ - -DVTK_USE_SYSTEM_LZMA:BOOL=ON \ - -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ - -DVTK_USE_SYSTEM_ZOPE:BOOL=ON \ - -DVTK_USE_SYSTEM_TWISTED:BOOL=ON \ - -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF \ - -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=OFF \ -DBUILD_TESTING:BOOL=OFF \ -DQtTesting_INSTALL_NO_DEVELOPMENT:BOOL=ON \ - -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON - -# FIXME: TURN ON WHEN UPDATED GL2PS > 1.3.9 IS RELEASED -# -DVTK_USE_SYSTEM_GL2PS:BOOL=ON \ - -# FIXME: CAUSES ERRORS WITH THE IN-APP PYTHON SHELL WHICH STILL LOOKS FOR PY MODULES IN THE DEFAULT DIR %%{_libdir}/%%{name}/site-packages -# -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH="%%{python_sitearch}/%%{name}" \ - -# FIXME: CAUSES PYTHON BYTECODE TIMESTAMP WARNINGS -# -G"Unix Makefiles" \ - -# https://gitlab.kitware.com/paraview/paraview/issues/17049 from -# -DCMAKE_SKIP_RPATH:BOOL=ON + -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF \ + -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \ + -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=%{?with_gl2ps:ON}%{!?with_gl2ps:OFF} \ + -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=%{?with_haru:ON}%{!?with_haru:OFF} \ + -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} -%make_jobs +%cmake_build %install find . \( -name \*.txt -o -name \*.xml -o -name '*.[ch]' -o -name '*.[ch][px][px]' \) -exec chmod -x "{}" + %cmake_install -# UNNECESSARY STATIC LIB -rm -fr %{buildroot}%{_libexecdir}/libFmmMesh.a +# UNNECESSARY STATIC LIBS +rm -fr %{buildroot}%{_libdir}/*.a +rm %{buildroot}%{_libdir}/%{name}-%{major_ver}/plugins/GeodesicMeasurement/libFmmMesh.a # INSTALL DOCUMENTATION USED BY THE HELP MENU IN MAIN APP install -Dm0644 %{S:2} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/GettingStarted.pdf install -Dm0644 %{S:3} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/Guide.pdf +# REMOVE paraview-config: DOESN'T WORK WITHOUT STATIC LIBS ANYWAY +rm %{buildroot}%{_bindir}/paraview-config + %fdupes %{buildroot}/ -%post -/sbin/ldconfig -%icon_theme_cache_post -%desktop_database_post - -%postun -/sbin/ldconfig -%icon_theme_cache_postun -%desktop_database_postun +%post -n %{shlib} -p /sbin/ldconfig -%files -%defattr(-,root,root) -%doc License_v1.2.txt +%postun -n %{shlib} -p /sbin/ldconfig +%files +%license %{_datadir}/licenses/ParaView/ +%{_bindir}/* %exclude %{_bindir}/smTest* %exclude %{_bindir}/vtk* -%exclude %{_includedir}/ -%exclude %{_libdir}/cmake/ - -%{_libdir}/%{name}/ -%{_bindir}/* -%{_docdir}/%{name}/ %{_datadir}/%{name}-%{major_ver}/ -%dir %{_datadir}/appdata -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/*.appdata.xml +%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_docdir}/paraview/ +%dir %{_libdir}/vtk/ +%dir %{_libdir}/vtk/hierarchy +%{_libdir}/vtk/hierarchy/ParaView/ + +%files -n %{shlib} +%{_libdir}/*.so.* + +%files plugins +%{_libdir}/%{name}-%{major_ver}/ %files devel -%defattr(-,root,root) +%{_libdir}/*.so +%{_libdir}/cmake/paraview-%{major_ver}/ %{_bindir}/smTest* %{_bindir}/vtk* %{_includedir}/%{name}* -%{_libdir}/cmake/%{name}-%{major_ver}/ + +%files -n python3-paraview +%{python3_sitearch}/%{name}/ %changelog ++++++ 0001-Add-libogg-to-IOMovie-target-link-libraries.patch ++++++ >From 9418a8a8c84c8185d61e5135b95a67c3d98ba23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Mon, 25 Feb 2019 00:27:07 +0100 Subject: [PATCH] Add libogg to IOMovie target link libraries --- IO/Movie/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) Index: ParaView-v5.7.0/VTK/IO/Movie/CMakeLists.txt =================================================================== --- ParaView-v5.7.0.orig/VTK/IO/Movie/CMakeLists.txt +++ ParaView-v5.7.0/VTK/IO/Movie/CMakeLists.txt @@ -20,3 +20,7 @@ if (WIN32 AND VTK_USE_VIDEO_FOR_WINDOWS) PRIVATE vfw32) endif () + +if(vtkIOMovie_vtkoggtheora) + target_link_libraries(vtkIOMovie PUBLIC ogg) +endif() ++++++ ParaViewGettingStarted-5.6.0.pdf -> ParaViewGettingStarted-5.8.0.pdf ++++++ (binary differes) ++++++ ParaViewGuide-5.6.0.pdf -> ParaViewGuide-5.8.0.pdf ++++++ (binary differes) ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.2YfAjL/_old 2020-04-17 13:38:56.488282987 +0200 +++ /var/tmp/diff_new_pack.2YfAjL/_new 2020-04-17 13:38:56.488282987 +0200 @@ -1,7 +1,7 @@ <constraints> <hardware> <disk> - <size unit="G">8</size> + <size unit="G">16</size> </disk> </hardware> </constraints> ++++++ bundled_exodusii_add_missing_libpthread.patch ++++++ Index: ParaView-v5.7.0/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt =================================================================== --- ParaView-v5.7.0.orig/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt +++ ParaView-v5.7.0/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt @@ -301,6 +301,8 @@ vtk_module_add_module(VTK::exodusII SOURCES ${sources} HEADERS ${headers} HEADERS_SUBDIR "vtkexodusII/include") +vtk_module_link(VTK::exodusII PUBLIC pthread) +vtk_module_link(VTK::exodusII PUBLIC hdf5) target_compile_definitions(exodusII PRIVATE exoIIc_EXPORTS) ++++++ fix-3d48a287-support-new-api-cgio_read_data_type.patch ++++++ >From 3d48a287141eb911b4888440e09c262743b4db3c Mon Sep 17 00:00:00 2001 From: Mickael PHILIT <mickey....@gmail.com> Date: Wed, 4 Mar 2020 14:54:30 +0100 Subject: [PATCH] Add support for new API cgio_read_***data***_type CGNS 4.1 removed old cgio API and now support providing memory data type. Changes are made to keep current behavior of CGNS reading. Data conversion is not let to CGNS with new API as it may only be stable for HDF5 files. --- VTKExtensions/CGNSReader/cgio_helpers.cxx | 14 +-- VTKExtensions/CGNSReader/cgio_helpers.h | 3 +- VTKExtensions/CGNSReader/vtkCGNSReader.cxx | 85 +++++++++++++------ .../CGNSReader/vtkCGNSReaderInternal.cxx | 44 +++++----- .../CGNSReader/vtkCGNSReaderInternal.h | 53 ++++++++++-- 5 files changed, 133 insertions(+), 66 deletions(-) diff --git a/VTKExtensions/CGNSReader/cgio_helpers.cxx b/VTKExtensions/CGNSReader/cgio_helpers.cxx index 1e8ecae8c5..44429a4dd0 100644 --- a/VTKExtensions/CGNSReader/cgio_helpers.cxx +++ b/VTKExtensions/CGNSReader/cgio_helpers.cxx @@ -44,7 +44,7 @@ int readNodeStringData(int cgioNum, double nodeId, std::string& data) data.resize(size); // read data - if (cgio_read_all_data(cgioNum, nodeId, (void*)data.c_str()) != CG_OK) + if (cgio_read_all_data_type(cgioNum, nodeId, "C1", (void*)data.c_str()) != CG_OK) { return 1; } @@ -80,7 +80,7 @@ int readNodeData<char>(int cgioNum, double nodeId, std::vector<char>& data) data.resize(size + 1); // read data - if (cgio_read_all_data(cgioNum, nodeId, &data[0]) != CG_OK) + if (cgio_read_all_data_type(cgioNum, nodeId, "C1", &data[0]) != CG_OK) { return 1; } @@ -167,7 +167,7 @@ int readBaseIds(int cgioNum, double rootId, std::vector<double>& baseIds) int readBaseCoreInfo(int cgioNum, double baseId, CGNSRead::BaseInformation& baseInfo) { CGNSRead::char_33 dataType; - std::vector<int> mdata; + std::vector<int32_t> mdata; if (cgio_get_name(cgioNum, baseId, baseInfo.name) != CG_OK) { @@ -187,7 +187,7 @@ int readBaseCoreInfo(int cgioNum, double baseId, CGNSRead::BaseInformation& base return 1; } - if (CGNSRead::readNodeData<int>(cgioNum, baseId, mdata) != 0) + if (CGNSRead::readNodeData<int32_t>(cgioNum, baseId, mdata) != 0) { std::cerr << "error while reading base dimension" << std::endl; return 1; @@ -209,7 +209,7 @@ int readBaseIteration(int cgioNum, double nodeId, CGNSRead::BaseInformation& bas bool createTimeStates = true; bool createIterStates = true; - std::vector<int> ndata; + std::vector<int32_t> ndata; // read node data type if (cgio_get_data_type(cgioNum, nodeId, dataType) != CG_OK) { @@ -222,7 +222,7 @@ int readBaseIteration(int cgioNum, double nodeId, CGNSRead::BaseInformation& bas return 1; } - if (CGNSRead::readNodeData<int>(cgioNum, nodeId, ndata) != 0) + if (CGNSRead::readNodeData<int32_t>(cgioNum, nodeId, ndata) != 0) { std::cerr << "error while reading number of state in base" << std::endl; return 1; @@ -298,7 +298,7 @@ int readBaseIteration(int cgioNum, double nodeId, CGNSRead::BaseInformation& bas } baseInfo.steps.clear(); - CGNSRead::readNodeData<int>(cgioNum, childrenIterative[nc], baseInfo.steps); + CGNSRead::readNodeData<int32_t>(cgioNum, childrenIterative[nc], baseInfo.steps); if (static_cast<int>(baseInfo.steps.size()) != nstates) { std::cerr << "Error reading steps node"; diff --git a/VTKExtensions/CGNSReader/cgio_helpers.h b/VTKExtensions/CGNSReader/cgio_helpers.h index bef0f3fbfa..07deb54ebe 100644 --- a/VTKExtensions/CGNSReader/cgio_helpers.h +++ b/VTKExtensions/CGNSReader/cgio_helpers.h @@ -46,6 +46,7 @@ inline int readNodeData(int cgioNum, double nodeId, std::vector<T>& data) cgsize_t size = 1; cgsize_t dimVals[12]; int ndim; + constexpr const char* dtName = CGNSRead::detail::cgns_type_name<T>(); if (cgio_get_dimensions(cgioNum, nodeId, &ndim, dimVals) != CG_OK) { @@ -65,7 +66,7 @@ inline int readNodeData(int cgioNum, double nodeId, std::vector<T>& data) data.resize(size); // read data - if (cgio_read_all_data(cgioNum, nodeId, &data[0]) != CG_OK) + if (cgio_read_all_data_type(cgioNum, nodeId, dtName, &data[0]) != CG_OK) { return 1; } diff --git a/VTKExtensions/CGNSReader/vtkCGNSReader.cxx b/VTKExtensions/CGNSReader/vtkCGNSReader.cxx index a1c417b810..7ca523997a 100644 --- a/VTKExtensions/CGNSReader/vtkCGNSReader.cxx +++ b/VTKExtensions/CGNSReader/vtkCGNSReader.cxx @@ -526,6 +526,33 @@ int StartsWithFlowSolution(const char* s) return ret; } +//---------------------------------------------------------------------------- +// Small helper +const char* get_data_type(const CGNS_ENUMT(DataType_t) dt) +{ + const char* dataType; + switch (dt) + { + case CGNS_ENUMV(Integer): + dataType = "I4"; + break; + case CGNS_ENUMV(LongInteger): + dataType = "I8"; + break; + case CGNS_ENUMV(RealSingle): + dataType = "R4"; + break; + case CGNS_ENUMV(RealDouble): + dataType = "R8"; + break; + case CGNS_ENUMV(Character): + dataType = "C1"; + break; + default: + dataType = "MT"; + } + return dataType; +} //---------------------------------------------------------------------------- vtkCGNSReader::vtkCGNSReader() @@ -672,7 +699,8 @@ int vtkCGNSReader::vtkPrivate::getGridAndSolutionNames(int base, std::string& gr { CGNSRead::char_33 gname; const cgsize_t offset = static_cast<cgsize_t>(self->ActualTimeStep * 32); - cgio_read_block_data(self->cgioNum, giterId, offset + 1, offset + 32, (void*)gname); + cgio_read_block_data_type( + self->cgioNum, giterId, offset + 1, offset + 32, "C1", (void*)gname); gname[32] = '\0'; // NOTE: Names or identifiers contain no spaces and capitalization // is used to distinguish individual words making up a name. @@ -732,9 +760,9 @@ int vtkCGNSReader::vtkPrivate::getGridAndSolutionNames(int base, std::string& gr EndsWithPointers(nodeName)) { CGNSRead::char_33 gname; - cgio_read_block_data(self->cgioNum, iterChildId[cc], + cgio_read_block_data_type(self->cgioNum, iterChildId[cc], (cgsize_t)(self->ActualTimeStep * 32 + 1), (cgsize_t)(self->ActualTimeStep * 32 + 32), - (void*)gname); + "C1", (void*)gname); gname[32] = '\0'; CGNSRead::removeTrailingWhiteSpaces(gname); std::string tmpStr = std::string(gname); @@ -1197,28 +1225,30 @@ int vtkCGNSReader::vtkPrivate::readSolution(const std::string& solutionNameStr, continue; } double cgioVarId = solChildId[ff]; + const char* fieldDataType = get_data_type(cgnsVars[ff].dt); // quick transfer of data because data types is given by cgns database if (cgnsVars[ff].isComponent == false) { - if (cgio_read_data(self->cgioNum, cgioVarId, fieldSrcStart, fieldSrcEnd, fieldSrcStride, - cellDim, fieldMemDims, fieldMemStart, fieldMemEnd, fieldMemStride, + if (cgio_read_data_type(self->cgioNum, cgioVarId, fieldSrcStart, fieldSrcEnd, fieldSrcStride, + fieldDataType, cellDim, fieldMemDims, fieldMemStart, fieldMemEnd, fieldMemStride, (void*)vtkVars[ff]->GetVoidPointer(0)) != CG_OK) { char message[81]; cgio_error_message(message); - vtkGenericWarningMacro(<< "cgio_read_data :" << message); + vtkGenericWarningMacro(<< "cgio_read_data_type :" << message); } } else { - if (cgio_read_data(self->cgioNum, cgioVarId, fieldSrcStart, fieldSrcEnd, fieldSrcStride, - cellDim, fieldVectMemDims, fieldVectMemStart, fieldVectMemEnd, fieldVectMemStride, + if (cgio_read_data_type(self->cgioNum, cgioVarId, fieldSrcStart, fieldSrcEnd, fieldSrcStride, + fieldDataType, cellDim, fieldVectMemDims, fieldVectMemStart, fieldVectMemEnd, + fieldVectMemStride, (void*)vtkVars[ff]->GetVoidPointer(cgnsVars[ff].xyzIndex - 1)) != CG_OK) { char message[81]; cgio_error_message(message); - vtkGenericWarningMacro(<< "cgio_read_data :" << message); + vtkGenericWarningMacro(<< "cgio_read_data_type :" << message); } } cgio_release_id(self->cgioNum, cgioVarId); @@ -1448,6 +1478,7 @@ int vtkCGNSReader::vtkPrivate::readBCData(const double nodeId, const int cellDim continue; } double cgioVarId = varIds[ff]; + const char* fieldDataType = get_data_type(cgnsVars[ff].dt); cgsize_t dataSize = 1; cgsize_t dimVals[12]; @@ -1474,12 +1505,12 @@ int vtkCGNSReader::vtkPrivate::readBCData(const double nodeId, const int cellDim // quick transfer of data because data types is given by cgns database if (cgnsVars[ff].isComponent == false) { - if (cgio_read_all_data( - self->cgioNum, cgioVarId, (void*)vtkVars[ff]->GetVoidPointer(0)) != CG_OK) + if (cgio_read_all_data_type(self->cgioNum, cgioVarId, fieldDataType, + (void*)vtkVars[ff]->GetVoidPointer(0)) != CG_OK) { char message[81]; cgio_error_message(message); - vtkGenericWarningMacro(<< "cgio_read_data :" << message); + vtkGenericWarningMacro(<< "cgio_read_all_data_type :" << message); } if (dataSize == 1) { @@ -1510,14 +1541,14 @@ int vtkCGNSReader::vtkPrivate::readBCData(const double nodeId, const int cellDim fieldVectMemDims[0] = fieldSrcEnd[0] * fieldVectMemStride[0]; fieldVectMemEnd[0] = fieldSrcEnd[0] * fieldVectMemStride[0]; - if (cgio_read_data(self->cgioNum, cgioVarId, fieldSrcStart, fieldSrcEnd, - fieldSrcStride, 1, fieldVectMemDims, fieldVectMemStart, fieldVectMemEnd, - fieldVectMemStride, + if (cgio_read_data_type(self->cgioNum, cgioVarId, fieldSrcStart, fieldSrcEnd, + fieldSrcStride, fieldDataType, 1, fieldVectMemDims, fieldVectMemStart, + fieldVectMemEnd, fieldVectMemStride, (void*)vtkVars[ff]->GetVoidPointer(cgnsVars[ff].xyzIndex - 1)) != CG_OK) { char message[81]; cgio_error_message(message); - vtkGenericWarningMacro(<< "cgio_read_data :" << message); + vtkGenericWarningMacro(<< "cgio_read_data_type :" << message); } if (dataSize == 1) { @@ -2231,7 +2262,7 @@ int vtkCGNSReader::GetUnstructuredZone( // CGNSRead::char_33 dataType; - std::vector<int> mdata; + std::vector<vtkTypeInt32> mdata; if (cgio_get_name(this->cgioNum, elemIdList[sec], sectionInfoList[sec].name) != CG_OK) { @@ -2246,7 +2277,7 @@ int vtkCGNSReader::GetUnstructuredZone( vtkErrorMacro(<< "Unexpected data type for dimension data of Element\n"); } - CGNSRead::readNodeData<int>(cgioNum, elemIdList[sec], mdata); + CGNSRead::readNodeData<vtkTypeInt32>(cgioNum, elemIdList[sec], mdata); if (mdata.size() != 2) { vtkErrorMacro(<< "Unexpected data for Elements_t node\n"); @@ -2267,8 +2298,8 @@ int vtkCGNSReader::GetUnstructuredZone( if (strcmp(dataType, "I4") == 0) { - std::vector<int> mdata2; - CGNSRead::readNodeData<int>(this->cgioNum, elemRangeId, mdata2); + std::vector<vtkTypeInt32> mdata2; + CGNSRead::readNodeData<vtkTypeInt32>(this->cgioNum, elemRangeId, mdata2); if (mdata2.size() != 2) { vtkErrorMacro(<< "Unexpected data for ElementRange node\n"); @@ -2278,8 +2309,8 @@ int vtkCGNSReader::GetUnstructuredZone( } else if (strcmp(dataType, "I8") == 0) { - std::vector<cglong_t> mdata2; - CGNSRead::readNodeData<cglong_t>(this->cgioNum, elemRangeId, mdata2); + std::vector<vtkTypeInt64> mdata2; + CGNSRead::readNodeData<vtkTypeInt64>(this->cgioNum, elemRangeId, mdata2); if (mdata2.size() != 2) { vtkErrorMacro(<< "Unexpected data for ElementRange node\n"); @@ -4437,8 +4468,8 @@ int vtkCGNSReader::RequestData(vtkInformation* vtkNotUsed(request), if (strcmp(dataType, "I4") == 0) { - std::vector<int> mdata; - CGNSRead::readNodeData<int>(this->cgioNum, baseChildId[zone], mdata); + std::vector<vtkTypeInt32> mdata; + CGNSRead::readNodeData<vtkTypeInt32>(this->cgioNum, baseChildId[zone], mdata); for (std::size_t index = 0; index < mdata.size(); index++) { zsize[index] = static_cast<cgsize_t>(mdata[index]); @@ -4446,8 +4477,8 @@ int vtkCGNSReader::RequestData(vtkInformation* vtkNotUsed(request), } else if (strcmp(dataType, "I8") == 0) { - std::vector<cglong_t> mdata; - CGNSRead::readNodeData<cglong_t>(this->cgioNum, baseChildId[zone], mdata); + std::vector<vtkTypeInt64> mdata; + CGNSRead::readNodeData<vtkTypeInt64>(this->cgioNum, baseChildId[zone], mdata); for (std::size_t index = 0; index < mdata.size(); index++) { zsize[index] = static_cast<cgsize_t>(mdata[index]); @@ -4724,7 +4755,7 @@ int vtkCGNSReader::CanReadFile(const char* name) } // read data - if (cgio_read_all_data(cgioFile, childId, &FileVersion)) + if (cgio_read_all_data_type(cgioFile, childId, "R4", &FileVersion)) { vtkErrorMacro(<< "read CGNS version number"); ierr = 0; diff --git a/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.cxx b/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.cxx index 92c0d6ac51..a2bcf1a443 100644 --- a/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.cxx +++ b/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.cxx @@ -36,8 +36,8 @@ int setUpRind(const int cgioNum, const double rindId, int* rind) if (strcmp(dataType, "I4") == 0) { - std::vector<int> mdata; - CGNSRead::readNodeData<int>(cgioNum, rindId, mdata); + std::vector<vtkTypeInt32> mdata; + CGNSRead::readNodeData<vtkTypeInt32>(cgioNum, rindId, mdata); for (std::size_t index = 0; index < mdata.size(); index++) { rind[index] = static_cast<int>(mdata[index]); @@ -45,8 +45,8 @@ int setUpRind(const int cgioNum, const double rindId, int* rind) } else if (strcmp(dataType, "I8") == 0) { - std::vector<cglong_t> mdata; - CGNSRead::readNodeData<cglong_t>(cgioNum, rindId, mdata); + std::vector<vtkTypeInt64> mdata; + CGNSRead::readNodeData<vtkTypeInt64>(cgioNum, rindId, mdata); for (std::size_t index = 0; index < mdata.size(); index++) { rind[index] = static_cast<int>(mdata[index]); @@ -156,12 +156,12 @@ int get_section_connectivity(const int cgioNum, const double cgioSectionId, cons if (sizeOfCnt == sizeof(vtkIdType)) { - if (cgio_read_data(cgioNum, cgioElemConnectId, srcStart, srcEnd, srcStride, dim, memDim, - memStart, memEnd, memStride, (void*)localElements) != CG_OK) + if (cgio_read_data_type(cgioNum, cgioElemConnectId, srcStart, srcEnd, srcStride, dataType, dim, + memDim, memStart, memEnd, memStride, (void*)localElements) != CG_OK) { char message[81]; cgio_error_message(message); - std::cerr << "cgio_read_data :" << message; + std::cerr << "cgio_read_data_type :" << message; return 1; } } @@ -181,13 +181,13 @@ int get_section_connectivity(const int cgioNum, const double cgioSectionId, cons std::cerr << "Allocation failed for temporary connectivity array\n"; } - if (cgio_read_data(cgioNum, cgioElemConnectId, srcStart, srcEnd, srcStride, dim, memDim, - memStart, memEnd, memStride, (void*)data) != CG_OK) + if (cgio_read_data_type(cgioNum, cgioElemConnectId, srcStart, srcEnd, srcStride, "I4", dim, + memDim, memStart, memEnd, memStride, (void*)data) != CG_OK) { delete[] data; char message[81]; cgio_error_message(message); - std::cerr << "cgio_read_data :" << message; + std::cerr << "cgio_read_data_type :" << message; return 1; } for (cgsize_t n = 0; n < nn; n++) @@ -204,13 +204,13 @@ int get_section_connectivity(const int cgioNum, const double cgioSectionId, cons std::cerr << "Allocation failed for temporary connectivity array\n"; return 1; } - if (cgio_read_data(cgioNum, cgioElemConnectId, srcStart, srcEnd, srcStride, dim, memDim, - memStart, memEnd, memStride, (void*)data) != CG_OK) + if (cgio_read_data_type(cgioNum, cgioElemConnectId, srcStart, srcEnd, srcStride, "I8", dim, + memDim, memStart, memEnd, memStride, (void*)data) != CG_OK) { delete[] data; char message[81]; cgio_error_message(message); - std::cerr << "cgio_read_data :" << message; + std::cerr << "cgio_read_data_type :" << message; return 1; } for (cgsize_t n = 0; n < nn; n++) @@ -258,12 +258,12 @@ int get_section_start_offset(const int cgioNum, const double cgioSectionId, cons if (sizeOfCnt == sizeof(vtkIdType)) { - if (cgio_read_data(cgioNum, cgioElemOffsetId, srcStart, srcEnd, srcStride, dim, memDim, - memStart, memEnd, memStride, (void*)localElementsIdx) != CG_OK) + if (cgio_read_data_type(cgioNum, cgioElemOffsetId, srcStart, srcEnd, srcStride, dataType, dim, + memDim, memStart, memEnd, memStride, (void*)localElementsIdx) != CG_OK) { char message[81]; cgio_error_message(message); - std::cerr << "cgio_read_data :" << message; + std::cerr << "cgio_read_data_type :" << message; return 1; } } @@ -283,13 +283,13 @@ int get_section_start_offset(const int cgioNum, const double cgioSectionId, cons std::cerr << "Allocation failed for temporary connectivity offset array\n"; } - if (cgio_read_data(cgioNum, cgioElemOffsetId, srcStart, srcEnd, srcStride, dim, memDim, - memStart, memEnd, memStride, (void*)data) != CG_OK) + if (cgio_read_data_type(cgioNum, cgioElemOffsetId, srcStart, srcEnd, srcStride, "I4", dim, + memDim, memStart, memEnd, memStride, (void*)data) != CG_OK) { delete[] data; char message[81]; cgio_error_message(message); - std::cerr << "cgio_read_data :" << message; + std::cerr << "cgio_read_data_type :" << message; return 1; } for (cgsize_t n = 0; n < nn; n++) @@ -306,13 +306,13 @@ int get_section_start_offset(const int cgioNum, const double cgioSectionId, cons std::cerr << "Allocation failed for temporary connectivity array\n"; return 1; } - if (cgio_read_data(cgioNum, cgioElemOffsetId, srcStart, srcEnd, srcStride, dim, memDim, - memStart, memEnd, memStride, (void*)data) != CG_OK) + if (cgio_read_data_type(cgioNum, cgioElemOffsetId, srcStart, srcEnd, srcStride, "I8", dim, + memDim, memStart, memEnd, memStride, (void*)data) != CG_OK) { delete[] data; char message[81]; cgio_error_message(message); - std::cerr << "cgio_read_data :" << message; + std::cerr << "cgio_read_data_type :" << message; return 1; } for (cgsize_t n = 0; n < nn; n++) diff --git a/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.h b/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.h index 4bcfd5c75a..3df3bae8de 100644 --- a/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.h +++ b/VTKExtensions/CGNSReader/vtkCGNSReaderInternal.h @@ -72,6 +72,39 @@ struct is_float<float> }; } +namespace detail +{ +template <typename T> +constexpr const char* cgns_type_name() noexcept +{ + return "MT"; +} + +template <> +constexpr const char* cgns_type_name<float>() noexcept +{ + return "R4"; +} + +template <> +constexpr const char* cgns_type_name<double>() noexcept +{ + return "R8"; +} + +template <> +constexpr const char* cgns_type_name<vtkTypeInt32>() noexcept +{ + return "I4"; +} + +template <> +constexpr const char* cgns_type_name<vtkTypeInt64>() noexcept +{ + return "I8"; +} +} + typedef char char_33[33]; //------------------------------------------------------------------------------ @@ -206,12 +239,12 @@ class BaseInformation public: char_33 name; - int cellDim; - int physicalDim; + int32_t cellDim; + int32_t physicalDim; // int baseNumber; - std::vector<int> steps; + std::vector<int32_t> steps; std::vector<double> times; // For unsteady meshes : @@ -469,16 +502,18 @@ int get_XYZ_mesh(const int cgioNum, const std::vector<double>& gridChildId, // quick transfer of data if same data types if (sameType == true) { - if (cgio_read_data(cgioNum, coordId, srcStart, srcEnd, srcStride, cellDim, memEnd, memStart, - memEnd, memStride, (void*)currentCoord)) + constexpr const char* dtNameT = detail::cgns_type_name<T>(); + if (cgio_read_data_type(cgioNum, coordId, srcStart, srcEnd, srcStride, dtNameT, cellDim, + memEnd, memStart, memEnd, memStride, (void*)currentCoord)) { char message[81]; cgio_error_message(message); - std::cerr << "cgio_read_data :" << message; + std::cerr << "cgio_read_data_type :" << message; } } else { + constexpr const char* dtNameY = detail::cgns_type_name<Y>(); Y* dataArray = 0; const cgsize_t memNoStride[3] = { 1, 1, 1 }; @@ -489,13 +524,13 @@ int get_XYZ_mesh(const int cgioNum, const std::vector<double>& gridChildId, std::cerr << "Error allocating buffer array\n"; break; } - if (cgio_read_data(cgioNum, coordId, srcStart, srcEnd, srcStride, cellDim, memDims, memStart, - memDims, memNoStride, (void*)dataArray)) + if (cgio_read_data_type(cgioNum, coordId, srcStart, srcEnd, srcStride, dtNameY, cellDim, + memDims, memStart, memDims, memNoStride, (void*)dataArray)) { delete[] dataArray; char message[81]; cgio_error_message(message); - std::cerr << "Buffer array cgio_read_data :" << message; + std::cerr << "Buffer array cgio_read_data_type :" << message; break; } for (vtkIdType ii = 0; ii < nPts; ++ii) -- 2.24.1 ++++++ fix-libharu-missing-m.patch ++++++ --- /var/tmp/diff_new_pack.2YfAjL/_old 2020-04-17 13:38:56.512283004 +0200 +++ /var/tmp/diff_new_pack.2YfAjL/_new 2020-04-17 13:38:56.512283004 +0200 @@ -1,24 +1,13 @@ ---- a/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt -+++ b/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt -@@ -125,6 +125,9 @@ +Index: ParaView-v5.7.0/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt +=================================================================== +--- ParaView-v5.7.0.orig/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt ++++ ParaView-v5.7.0/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt +@@ -125,6 +125,8 @@ if(PNG_FOUND) endif(PNG_FOUND) endif () -+find_library(M_LIB m) -+set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${M_LIB}) ++link_libraries(m dl pthread) + # ======================================================================= # configure header files, add compiler flags # ======================================================================= - ---- a/VTK/ThirdParty/libharu/vtklibharu/src/CMakeLists.txt -+++ b/VTK/ThirdParty/libharu/vtklibharu/src/CMakeLists.txt -@@ -102,7 +102,7 @@ - endif(LIBHPDF_SHARED) - else () - vtk_add_library(vtklibharu ${LIBHPDF_SRCS}) -- target_link_libraries(vtklibharu PRIVATE ${vtkzlib_LIBRARIES} ${vtkpng_LIBRARIES}) -+ target_link_libraries(vtklibharu PRIVATE ${vtkzlib_LIBRARIES} ${vtkpng_LIBRARIES} ${ADDITIONAL_LIBRARIES}) - if (WIN32) - set_target_properties(vtklibharu - PROPERTIES ++++++ fix-loguru-missing-links.patch ++++++ Index: ParaView-v5.7.0/VTK/ThirdParty/loguru/vtkloguru/CMakeLists.txt =================================================================== --- ParaView-v5.7.0.orig/VTK/ThirdParty/loguru/vtkloguru/CMakeLists.txt +++ ParaView-v5.7.0/VTK/ThirdParty/loguru/vtkloguru/CMakeLists.txt @@ -10,6 +12,10 @@ vtk_module_add_module(VTK::loguru HEADERS ${headers} HEADERS_SUBDIR "vtkloguru") +vtk_module_link(VTK::loguru PUBLIC m) +vtk_module_link(VTK::loguru PUBLIC dl) +vtk_module_link(VTK::loguru PUBLIC pthread) + include(GenerateExportHeader) generate_export_header(loguru EXPORT_MACRO_NAME LOGURU_EXPORT ++++++ paraview-desktop-entry-fix.patch ++++++ --- /var/tmp/diff_new_pack.2YfAjL/_old 2020-04-17 13:38:56.528283017 +0200 +++ /var/tmp/diff_new_pack.2YfAjL/_new 2020-04-17 13:38:56.532283020 +0200 @@ -1,9 +1,9 @@ -Index: ParaView-v5.4.0/Applications/ParaView/paraview.desktop.in +Index: ParaView-v5.8.0/Clients/ParaView/org.paraview.ParaView.desktop.in =================================================================== ---- ParaView-v5.4.0.orig/Applications/ParaView/paraview.desktop.in -+++ ParaView-v5.4.0/Applications/ParaView/paraview.desktop.in +--- ParaView-v5.8.0.orig/Clients/ParaView/org.paraview.ParaView.desktop.in ++++ ParaView-v5.8.0/Clients/ParaView/org.paraview.ParaView.desktop.in @@ -6,3 +6,5 @@ Comment=Parallel visualization applicati - Exec=paraview + Exec=paraview %f TryExec=paraview Icon=paraview +Categories=Graphics;2DGraphics;3DGraphics; ++++++ paraview-link-against-python.patch ++++++ Index: ParaView-v5.7.0/VTK/Web/Core/CMakeLists.txt =================================================================== --- ParaView-v5.7.0.orig/VTK/Web/Core/CMakeLists.txt +++ ParaView-v5.7.0/VTK/Web/Core/CMakeLists.txt @@ -1,3 +1,10 @@ +if ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7") + link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +else ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7") + link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}m) +endif ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7") + + set(classes vtkDataEncoder vtkObjectIdMap Index: ParaView-v5.7.0/VTK/Wrapping/PythonCore/CMakeLists.txt =================================================================== --- ParaView-v5.7.0.orig/VTK/Wrapping/PythonCore/CMakeLists.txt +++ ParaView-v5.7.0/VTK/Wrapping/PythonCore/CMakeLists.txt @@ -1,3 +1,10 @@ +if ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7") + link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +else ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7") + link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}m) +endif ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7") + + set(classes vtkPythonArgs vtkPythonCommand Index: ParaView-v5.7.0/VTK/Utilities/PythonInterpreter/CMakeLists.txt =================================================================== --- ParaView-v5.7.0.orig/VTK/Utilities/PythonInterpreter/CMakeLists.txt +++ ParaView-v5.7.0/VTK/Utilities/PythonInterpreter/CMakeLists.txt @@ -1,3 +1,9 @@ +if ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7") + link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +else ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7") + link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}m) +endif ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7") + set(classes vtkPythonInteractiveInterpreter vtkPythonInterpreter) ++++++ paraview-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.2YfAjL/_old 2020-04-17 13:38:56.556283038 +0200 +++ /var/tmp/diff_new_pack.2YfAjL/_new 2020-04-17 13:38:56.556283038 +0200 @@ -1,10 +1,6 @@ -# paraview has *.so symbolic links to other files -# and these are mistaken by rpmlint to be devel files -addFilter("devel-file-in-non-devel-package") +# A non-executable file in bindir is used by paraview to locate plugins (hard-coded) +# See https://gitlab.kitware.com/paraview/paraview/issues/19706 +addFilter("non-executable-in-bin .*/usr/bin/paraview\.conf") +addFilter("script-without-shebang .*/usr/bin/paraview\.conf") -# Upstream doesn't supply manpages, so no go here -addFilter("no-manual-page-for-binary") -# The hidden .plugin file is really needed -addFilter("hidden-file-or-dir .*/usr/lib64/paraview/.plugins") -addFilter("hidden-file-or-dir .*/usr/lib64/paraview*/.plugins")
