aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Krupenik <dennis@krupenik.com>2020-08-25 01:46:45 +0300
committerRasmus Thomsen <oss@cogitri.dev>2020-08-30 16:35:06 +0000
commitd284ddc902d10d3c99f08b4458539f0b40f8ed10 (patch)
tree36a96f7c1c2c4ae200e34fc98b1bf07352e0466e
parent6666a0f9a3d8dc10dcb08cafd1e839a12fb3e016 (diff)
testing/vtk: upgrade to 9.0.1
-rw-r--r--testing/vtk/APKBUILD25
-rw-r--r--testing/vtk/pthreads_declaration.patch11
2 files changed, 10 insertions, 26 deletions
diff --git a/testing/vtk/APKBUILD b/testing/vtk/APKBUILD
index 858fac044f0..d85375ea138 100644
--- a/testing/vtk/APKBUILD
+++ b/testing/vtk/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=vtk
-pkgver=8.2.0
-pkgrel=4
+pkgver=9.0.1
+pkgrel=0
pkgdesc="A software system for 3D computer graphics, image processing and visualization"
url="https://vtk.org/"
arch="x86_64" # dependency pdal-dev is only provided for x86_64
license="BSD-3-Clause"
makedepends="cmake boost-dev zlib-dev tk-dev glew-dev qt5-qtbase-dev
- qt5-qtx11extras-dev qt5-qttools-dev libpng-dev sqlite-dev doxygen ffmpeg-dev
+ qt5-qtx11extras-dev qt5-qttools-dev libexecinfo-dev libpng-dev sqlite-dev doxygen ffmpeg-dev
jpeg-dev libxml2-dev openmpi-dev gdal-dev pdal-dev unixodbc-dev
"
subpackages="$pkgname-doc $pkgname-dev"
@@ -16,18 +16,15 @@ source="
https://www.vtk.org/files/release/${pkgver%.*}/VTK-$pkgver.tar.gz
https://www.vtk.org/files/release/${pkgver%.*}/VTKData-$pkgver.tar.gz
https://www.vtk.org/files/release/${pkgver%.*}/VTKLargeData-$pkgver.tar.gz
- pthreads_declaration.patch
fix-build.patch
"
builddir="$srcdir/VTK-$pkgver"
options="!check" # No unit tests provided
build() {
- mkdir -p build
- cd build
- cmake .. \
+ cmake -B build \
-Wno-dev \
- -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_SKIP_INSTALL_RPATH=ON \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -40,16 +37,14 @@ build() {
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
-DVTK_INSTALL_INCLUDE_DIR=include/vtk \
-DCMAKE_BUILD_TYPE=None
- make
+ make -C build
}
package() {
- cd build
- make DESTDIR="$pkgdir" install
+ make -C build DESTDIR="$pkgdir" install
}
-sha512sums="521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286 VTK-8.2.0.tar.gz
-517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b VTKData-8.2.0.tar.gz
-8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588 VTKLargeData-8.2.0.tar.gz
-ce72da79026681cbc2ad46e68cc555c42d232650b8a28b5b76ad4d5bbe3f576ebae3724f76e90a5d81e6ff1ab4b46f9631bfb2402c2f1ac6b493b6168ec7d192 pthreads_declaration.patch
+sha512sums="eb2508e2409ad302cc5db65282a9c1ff4477ac8a93e0fee898ad8f0974d72decc7d5d444dc825a3c2f7952ebf59853616097ebe0d134649cab0d49a9619065bf VTK-9.0.1.tar.gz
+2fc418a6e15bd4e30ce181bb209c39666982645dbdbe2d6491683497662b72712689e58cf54b7af91865d0e3d0cb3f9ab66606b02964d57bf88d769d292dd938 VTKData-9.0.1.tar.gz
+b3303d633f063a6f3bfcc61b441f445611ff7cff6f006c77d8452eb5a3af89a18b2a1201a2dbd230af085b9e45b9abb70319d2f41db0f1e19c632286e7b02ec2 VTKLargeData-9.0.1.tar.gz
c814628a7ce9e1015cb02d4c9ad7ae7c6ad6d5d83b553f0c484414744488e4d0fa313924b4fd0f579a363352832347035147d1be3aca6f6a4885b6f9a1590b9e fix-build.patch"
diff --git a/testing/vtk/pthreads_declaration.patch b/testing/vtk/pthreads_declaration.patch
deleted file mode 100644
index dc8cfd79d20..00000000000
--- a/testing/vtk/pthreads_declaration.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VTK-8.2.0.bak/ThirdParty/libxml2/vtklibxml2/threads.c
-+++ VTK-8.2.0/ThirdParty/libxml2/vtklibxml2/threads.c
-@@ -49,7 +49,7 @@
- #ifdef HAVE_PTHREAD_H
-
- static int libxml_is_threaded = -1;
--#ifdef __GNUC__
-+#if 0
- #ifdef linux
- #if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3)
- extern int pthread_once (pthread_once_t *__once_control,