From 0fff241eeb8d3f70a2c7c3dbe3430e7216af8a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 21 Mar 2021 14:37:24 +0700 Subject: [PATCH] paraview: update to 5.9.0. --- srcpkgs/paraview/patches/cmake-py39.patch | 11 ------ .../patches/fix-vtksys-execinfo.patch | 12 ------- srcpkgs/paraview/patches/musl-unistd.patch | 23 +++++++++++++ ...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 +++++++++++ srcpkgs/paraview/template | 34 +++++++++++-------- 5 files changed, 62 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/paraview/patches/cmake-py39.patch delete mode 100644 srcpkgs/paraview/patches/fix-vtksys-execinfo.patch create mode 100644 srcpkgs/paraview/patches/musl-unistd.patch create mode 100644 srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch diff --git a/srcpkgs/paraview/patches/cmake-py39.patch b/srcpkgs/paraview/patches/cmake-py39.patch deleted file mode 100644 index b309d596c816..000000000000 --- a/srcpkgs/paraview/patches/cmake-py39.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- VTK/CMake/patches/99/FindPython/Support.cmake.orig 2020-10-08 00:54:51.788984364 -0400 -+++ VTK/CMake/patches/99/FindPython/Support.cmake 2020-10-08 00:54:56.640977251 -0400 -@@ -46,7 +46,7 @@ - message (FATAL_ERROR "FindPython: INTERNAL ERROR") - endif() - if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3) -- set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+ set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2) - set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) - else() diff --git a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch b/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch deleted file mode 100644 index fc17223a066a..000000000000 --- a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:24:27.200081977 +0200 -+++ VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:26:38.533088752 +0200 -@@ -592,7 +592,8 @@ - # check for simple stack trace - # usually it's in libc but on FreeBSD - # it's in libexecinfo -- FIND_LIBRARY(EXECINFO_LIB "execinfo") -+ FIND_PACKAGE(PkgConfig REQUIRED) -+ PKG_CHECK_MODULES(EXECINFO IMPORTED_TARGET libexecinfo) - MARK_AS_ADVANCED(EXECINFO_LIB) - IF (NOT EXECINFO_LIB) - SET(EXECINFO_LIB "") diff --git a/srcpkgs/paraview/patches/musl-unistd.patch b/srcpkgs/paraview/patches/musl-unistd.patch new file mode 100644 index 000000000000..dee1c232d1d9 --- /dev/null +++ b/srcpkgs/paraview/patches/musl-unistd.patch @@ -0,0 +1,23 @@ +Index: VTK/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C +=================================================================== +--- VTK/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C.orig ++++ VTK/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C +@@ -40,7 +40,7 @@ + #include + + #ifndef _MSC_VER +-#include ++#include + #else + #include + #include +@@ -61,9 +61,6 @@ + + #include + #include +-#ifndef _MSC_VER +-#include +-#endif + + namespace { + bool internal_access(const std::string &name, int mode); diff --git a/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch new file mode 100644 index 000000000000..b95015c859cf --- /dev/null +++ b/srcpkgs/paraview/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch @@ -0,0 +1,19 @@ + https://gitlab.kitware.com/vtk/vtk/-/issues/18033 +--- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig ++++ VTK/ThirdParty/freetype/vtk_freetype.h.in +@@ -20,6 +20,15 @@ + + #ifdef VTK_USE_SYSTEM_FREETYPE + # include ++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */ ++/* has been moved to */ ++# 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 */ + #else + # include + #endif diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template index 20a7f5589677..623d0cd434ed 100644 --- a/srcpkgs/paraview/template +++ b/srcpkgs/paraview/template @@ -1,23 +1,28 @@ # Template file for 'paraview' pkgname=paraview -version=5.8.1 -revision=3 +version=5.9.0 +revision=1 wrksrc=ParaView-v${version} build_style=cmake -configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr +configure_args=" + -DCMAKE_BUILD_TYPE=None -DPARAVIEW_ENABLE_FFMPEG=ON -DPARAVIEW_ENABLE_GDAL=ON -DPARAVIEW_USE_PYTHON=ON -DPARAVIEW_USE_MPI=ON - -DVTK_PYTHON_FULL_THREADSAFE=ON - -DVTK_PYTHON_VERSION=3 - -DVTK_SMP_IMPLEMENTATION_TYPE=TBB - -DVTKm_ENABLE_MPI=ON - -DVTKm_ENABLE_RENDERING=ON - -DVTKm_USE_DOUBLE_PRECISION=ON" + -DPARAVIEW_BUILD_SHARED_LIBS=ON + -DPARAVIEW_BUILD_WITH_EXTERNAL=ON + -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns=OFF + -DVTK_FORBID_DOWNLOADS=ON + -DVTK_USE_EXTERNAL=ON + -DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF + -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF + -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF + -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3" #make_build_args="VERBOSE=1" -hostmakedepends="pkg-config which python3" +hostmakedepends="pkg-config which python3 protobuf" # TODO: find some way of making this work with system vtk +# CMake/ParaViewOptions.cmake:/PARAVIEW_USE_EXTERNAL_VTK makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel openmpi-devel qt5-devel qt5-x11extras-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds @@ -25,15 +30,15 @@ makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel expat-devel freetype-devel glew-devel hdf5-devel libjpeg-turbo-devel jsoncpp-devel proj-devel libxml2-devel liblzma-devel liblz4-devel netcdf-devel libogg-devel libpng-devel pugixml-devel libtheora-devel tiff-devel zlib-devel - protobuf-devel protobuf python3-Pygments ffmpeg-devel tbb-devel boost-devel - libgdal-devel python3-mpi4py" + protobuf-devel libprotoc-devel python3-Pygments ffmpeg-devel tbb-devel + boost-devel libgdal-devel python3-mpi4py gl2ps-devel proj-devel" depends="openmpi" short_desc="Application for interactive, scientific visualization" maintainer="Anders Damsgaard " license="BSD-3-Clause" homepage="https://www.paraview.org" -distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz" -checksum=7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034 +distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>ParaView-v${version}.tar.xz" +checksum=b03258b7cddb77f0ee142e3e77b377e5b1f503bcabc02bfa578298c99a06980d CFLAGS="-DYYERROR_VERBOSE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DGNU_SOURCE -fcommon" CXXFLAGS="${CFLAGS}" @@ -43,6 +48,7 @@ export QT_SELECT="5" if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" libexecinfo-devel" + export LDFLAGS=-lexecinfo configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo" fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then