paraview: fixes and patchs but still fails to build
This is more of a WIP of required patches and C{,XX}FLAGS because it still fails to build for x86_64-musl and i686.
This commit is contained in:
parent
cd152d1642
commit
5941d0f86d
4 changed files with 76 additions and 4 deletions
13
srcpkgs/paraview/patches/fix-page_size-macro.patch
Normal file
13
srcpkgs/paraview/patches/fix-page_size-macro.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
--- Plugins/Datamine/Readers/dmfile.cxx 2020-08-04 22:12:01.000000000 +0200
|
||||
+++ Plugins/Datamine/Readers/dmfile.cxx 2020-08-30 13:22:12.387889301 +0200
|
||||
@@ -421,8 +421,8 @@
|
||||
|
||||
// number of records per page
|
||||
// There is only 508 bytes per page ( table is 512 with 4 reserved )
|
||||
- const int PAGE_SIZE = 508;
|
||||
- int numRecsPerPage = PAGE_SIZE / recordLength;
|
||||
+ const int DM_PAGE_SIZE = 508;
|
||||
+ int numRecsPerPage = DM_PAGE_SIZE / recordLength;
|
||||
|
||||
// number of record on last page
|
||||
int numRecsLastPage = GetNLastPageRecs();
|
12
srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
Normal file
12
srcpkgs/paraview/patches/fix-vtksys-execinfo.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
--- 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 "")
|
45
srcpkgs/paraview/patches/vtk-isnan.patch
Normal file
45
srcpkgs/paraview/patches/vtk-isnan.patch
Normal file
|
@ -0,0 +1,45 @@
|
|||
--- VTK/Common/Core/vtkGenericDataArrayLookupHelper.h 2020-08-04 22:12:01.000000000 +0200
|
||||
+++ VTK/Common/Core/vtkGenericDataArrayLookupHelper.h 2020-08-29 22:33:06.824012475 +0200
|
||||
@@ -36,20 +36,20 @@
|
||||
template <typename T>
|
||||
struct has_NaN<T, true>
|
||||
{
|
||||
- static bool isnan(T x) { return std::isnan(x); }
|
||||
+ static bool vtkisnan(T x) { return std::isnan(x); }
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
struct has_NaN<T, false>
|
||||
{
|
||||
- static bool isnan(T) { return false; }
|
||||
+ static bool vtkisnan(T) { return false; }
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
-bool isnan(T x)
|
||||
+bool vtkisnan(T x)
|
||||
{
|
||||
// Select the correct partially specialized type.
|
||||
- return has_NaN<T, std::numeric_limits<T>::has_quiet_NaN>::isnan(x);
|
||||
+ return has_NaN<T, std::numeric_limits<T>::has_quiet_NaN>::vtkisnan(x);
|
||||
}
|
||||
} // namespace detail
|
||||
|
||||
@@ -127,7 +127,7 @@
|
||||
for (vtkIdType i = 0; i < num; ++i)
|
||||
{
|
||||
auto value = this->AssociatedArray->GetValue(i);
|
||||
- if (::detail::isnan(value))
|
||||
+ if (::detail::vtkisnan(value))
|
||||
{
|
||||
NanIndices.push_back(i);
|
||||
}
|
||||
@@ -140,7 +140,7 @@
|
||||
std::vector<vtkIdType>* FindIndexVec(ValueType value)
|
||||
{
|
||||
std::vector<vtkIdType>* indices{ nullptr };
|
||||
- if (::detail::isnan(value) && !this->NanIndices.empty())
|
||||
+ if (::detail::vtkisnan(value) && !this->NanIndices.empty())
|
||||
{
|
||||
indices = &this->NanIndices;
|
||||
}
|
|
@ -4,7 +4,8 @@ version=5.8.1
|
|||
revision=1
|
||||
wrksrc=ParaView-v${version}
|
||||
build_style=cmake
|
||||
configure_args="-DPARAVIEW_ENABLE_FFMPEG=ON
|
||||
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
|
||||
-DPARAVIEW_ENABLE_FFMPEG=ON
|
||||
-DPARAVIEW_ENABLE_GDAL=ON
|
||||
-DPARAVIEW_USE_PYTHON=ON
|
||||
-DPARAVIEW_USE_MPI=ON
|
||||
|
@ -14,6 +15,8 @@ configure_args="-DPARAVIEW_ENABLE_FFMPEG=ON
|
|||
-DVTKm_ENABLE_MPI=ON
|
||||
-DVTKm_ENABLE_RENDERING=ON
|
||||
-DVTKm_USE_DOUBLE_PRECISION=ON"
|
||||
#make_build_args="VERBOSE=1"
|
||||
hostmakedepends="pkg-config which"
|
||||
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
|
||||
|
@ -30,9 +33,8 @@ 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
|
||||
patch_args="-Np1"
|
||||
CFLAGS="-D_GNU_SOURCE -fcommon"
|
||||
CXXFLAGS="-D_GNU_SOURCE -fcommon"
|
||||
CFLAGS="-DYYERROR_VERBOSE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DGNU_SOURCE -fcommon"
|
||||
CXXFLAGS="${CFLAGS}"
|
||||
|
||||
# qhelpgenerator: could not find a Qt installation of ''
|
||||
export QT_SELECT="5"
|
||||
|
|
Loading…
Reference in a new issue