[PR PATCH] vtk: enable bindings for python3

[PR PATCH] vtk: enable bindings for python3

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages vtk
https://github.com/void-linux/void-packages/pull/24531

vtk: enable bindings for python3
cc: @Piraty 

A patch file from https://github.com/void-linux/void-packages/pull/24531.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk-24531.patch --]
[-- Type: text/x-diff, Size: 3951 bytes --]

From 44cce85dee406e5a0a5e8286129872f722c8bebe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 28 Aug 2020 22:46:10 -0400
Subject: [PATCH] vtk: enable bindings for python3

---
 common/shlibs        |  7 +++++++
 srcpkgs/vtk-python3  |  1 +
 srcpkgs/vtk/template | 26 ++++++++++++++++++++------
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/vtk-python3

diff --git a/common/shlibs b/common/shlibs
index 4ee9b8a8e32..a6b5737b845 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3335,6 +3335,7 @@ libvtkIOCore-9.0.so.1 vtk-9.0.1_1
 libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
 libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
 libvtkIOExport-9.0.so.1 vtk-9.0.1_1
+libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
 libvtkIOExportOpenGL2-9.0.so.1 vtk-9.0.1_1
 libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
 libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
@@ -3343,10 +3344,12 @@ libvtkIOImport-9.0.so.1 vtk-9.0.1_1
 libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
 libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
 libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
+libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
 libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
 libvtkIOMPIParallel-9.0.so.1 vtk-9.0.1_1
 libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
 libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
+libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
 libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
 libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
 libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
@@ -3384,8 +3387,12 @@ libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
+libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
+libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
+libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
+libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
 libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
 libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
 libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
diff --git a/srcpkgs/vtk-python3 b/srcpkgs/vtk-python3
new file mode 120000
index 00000000000..02df7ecef8f
--- /dev/null
+++ b/srcpkgs/vtk-python3
@@ -0,0 +1 @@
+vtk
\ No newline at end of file
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 7940cd58db2..7513d56cd00 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,18 +1,17 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=1
+revision=2
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
-# Here only the core modules set for freecad is getting built
-configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON"
-
+# Build only the core modules plus python bindings for now
+configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
+ -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
  libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
  libxml2-devel jsoncpp-devel openmpi-devel libogg-devel libtheora-devel
- eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel"
-
+ eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel python3-devel"
 short_desc="System for 3D computer graphics, image processing, and visualization"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
@@ -27,6 +26,10 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	LDFLAGS="-lexecinfo"
 fi
 
+post_install() {
+	vlicense Copyright.txt
+}
+
 vtk-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -36,3 +39,14 @@ vtk-devel_package() {
 		vmove usr/lib/cmake
 	}
 }
+
+vtk-python3_package() {
+	short_desc+=" - Python3 bindings"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/vtkpython
+		vmove usr/lib/python3.8
+		vmove "usr/lib/lib*Python*.so.*"
+		vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+	}
+}

Re: [PR PATCH] [Updated] vtk: enable bindings for python3

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There is an updated pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages vtk
https://github.com/void-linux/void-packages/pull/24531

vtk: enable bindings for python3
cc: @Piraty 

A patch file from https://github.com/void-linux/void-packages/pull/24531.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk-24531.patch --]
[-- Type: text/x-diff, Size: 4032 bytes --]

From cc6224abc3913961cac683835716d454f2b7a5da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 28 Aug 2020 22:46:10 -0400
Subject: [PATCH] vtk: enable bindings for python3

[ci skip]
---
 common/shlibs        |  7 +++++++
 srcpkgs/vtk-python3  |  1 +
 srcpkgs/vtk/template | 28 +++++++++++++++++++++-------
 3 files changed, 29 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/vtk-python3

diff --git a/common/shlibs b/common/shlibs
index 4ee9b8a8e32..a6b5737b845 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3335,6 +3335,7 @@ libvtkIOCore-9.0.so.1 vtk-9.0.1_1
 libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
 libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
 libvtkIOExport-9.0.so.1 vtk-9.0.1_1
+libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
 libvtkIOExportOpenGL2-9.0.so.1 vtk-9.0.1_1
 libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
 libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
@@ -3343,10 +3344,12 @@ libvtkIOImport-9.0.so.1 vtk-9.0.1_1
 libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
 libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
 libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
+libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
 libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
 libvtkIOMPIParallel-9.0.so.1 vtk-9.0.1_1
 libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
 libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
+libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
 libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
 libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
 libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
@@ -3384,8 +3387,12 @@ libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
+libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
+libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
+libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
+libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
 libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
 libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
 libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
diff --git a/srcpkgs/vtk-python3 b/srcpkgs/vtk-python3
new file mode 120000
index 00000000000..02df7ecef8f
--- /dev/null
+++ b/srcpkgs/vtk-python3
@@ -0,0 +1 @@
+vtk
\ No newline at end of file
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 7940cd58db2..81ed39597b6 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,18 +1,17 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=1
+revision=2
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
-# Here only the core modules set for freecad is getting built
-configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON"
-
+# Build only the core modules plus python bindings for now
+configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
+ -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
  libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
  libxml2-devel jsoncpp-devel openmpi-devel libogg-devel libtheora-devel
- eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel"
-
+ eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel python3-devel"
 short_desc="System for 3D computer graphics, image processing, and visualization"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
@@ -27,12 +26,27 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	LDFLAGS="-lexecinfo"
 fi
 
+post_install() {
+	vlicense Copyright.txt
+}
+
 vtk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="vtk-python3>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
 		vmove usr/lib/cmake
 	}
 }
+
+vtk-python3_package() {
+	short_desc+=" - Python3 bindings"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/vtkpython
+		vmove usr/lib/python3.8
+		vmove "usr/lib/lib*Python*.so.*"
+		vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+	}
+}

Re: vtk: enable bindings for python3

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 504 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24531#issuecomment-683231281

Comment:
OK, looks like `vtk-devel` has to pull in `vtk-python3` now, because the CMake modules search for the python bindings. It *may* be possible to separate out a `vtk-python3-devel` subpackage that has just the CMake modules related to Python, but do we really care?

Also, CI fails because it's trying to build the latest `openmpi`, which hasn't hit the repo yet.

Re: [NOMERGE] vtk: enable bindings for python3

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24531#issuecomment-683234865

Comment:
This is not sufficient. `/usr/lib/cmake/vtk-9.0/VTKPython-targets.cmake`, at line 389, hard-codes the  path to the `vtkCommonCore` CPython extension, *before* `xbps-src` mangles it to `vtkCommonCore.so`. CMake fails complaining that the Python extension can't be found.

Re: [PR PATCH] [Updated] [NOMERGE] vtk: enable bindings for python3

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

There is an updated pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages vtk
https://github.com/void-linux/void-packages/pull/24531

[NOMERGE] vtk: enable bindings for python3
cc: @Piraty 

A patch file from https://github.com/void-linux/void-packages/pull/24531.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk-24531.patch --]
[-- Type: text/x-diff, Size: 4237 bytes --]

From f818d1d013fe38db537e17615b1a9ddae2cf4406 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 28 Aug 2020 22:46:10 -0400
Subject: [PATCH] vtk: enable bindings for python3

[ci skip]
---
 common/shlibs        |  7 +++++++
 srcpkgs/vtk-python3  |  1 +
 srcpkgs/vtk/template | 32 +++++++++++++++++++++++++-------
 3 files changed, 33 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/vtk-python3

diff --git a/common/shlibs b/common/shlibs
index 4ee9b8a8e32..a6b5737b845 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3335,6 +3335,7 @@ libvtkIOCore-9.0.so.1 vtk-9.0.1_1
 libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
 libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
 libvtkIOExport-9.0.so.1 vtk-9.0.1_1
+libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
 libvtkIOExportOpenGL2-9.0.so.1 vtk-9.0.1_1
 libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
 libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
@@ -3343,10 +3344,12 @@ libvtkIOImport-9.0.so.1 vtk-9.0.1_1
 libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
 libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
 libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
+libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
 libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
 libvtkIOMPIParallel-9.0.so.1 vtk-9.0.1_1
 libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
 libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
+libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
 libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
 libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
 libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
@@ -3384,8 +3387,12 @@ libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
+libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
+libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
 libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
+libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
+libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
 libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
 libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
 libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
diff --git a/srcpkgs/vtk-python3 b/srcpkgs/vtk-python3
new file mode 120000
index 00000000000..02df7ecef8f
--- /dev/null
+++ b/srcpkgs/vtk-python3
@@ -0,0 +1 @@
+vtk
\ No newline at end of file
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 7940cd58db2..be751c69812 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,18 +1,17 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=1
+revision=2
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
-# Here only the core modules set for freecad is getting built
-configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON"
-
+# Build only the core modules plus python bindings for now
+configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
+ -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
  libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
  libxml2-devel jsoncpp-devel openmpi-devel libogg-devel libtheora-devel
- eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel"
-
+ eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel python3-devel"
 short_desc="System for 3D computer graphics, image processing, and visualization"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
@@ -27,12 +26,31 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	LDFLAGS="-lexecinfo"
 fi
 
+post_install() {
+	vlicense Copyright.txt
+
+	# Mangle CPython extension names in CMake like xbps-src will do
+	vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
+		-i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-release.cmake"
+}
+
 vtk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="vtk-python3>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
 		vmove usr/lib/cmake
 	}
 }
+
+vtk-python3_package() {
+	short_desc+=" - Python3 bindings"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/vtkpython
+		vmove usr/lib/python3.8
+		vmove "usr/lib/lib*Python*.so.*"
+		vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+	}
+}

Re: vtk: enable bindings for python3

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24531#issuecomment-683237199

Comment:
After a little `vsed` magic, CMake seems to work with `freecad`. I believe this is ready to go.

Re: [PR PATCH] [Closed]: vtk: enable bindings for python3

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

There's a closed pull request on the void-packages repository

vtk: enable bindings for python3
https://github.com/void-linux/void-packages/pull/24531

Description:
cc: @Piraty