Date: Monday, February 6, 2023 @ 16:51:33
Author: dvzrv
Revision: 1394725
archrelease: copy trunk to community-x86_64
Added:
mayavi/repos/community-x86_64/PKGBUILD
(from rev 1394724, mayavi/trunk/PKGBUILD)
mayavi/repos/community-x86_64/disable-openvdb-and-openvr.patch
(from rev 1394724, mayavi/trunk/disable-openvdb-and-openvr.patch)
mayavi/repos/community-x86_64/mayavi.csh
(from rev 1394724, mayavi/trunk/mayavi.csh)
mayavi/repos/community-x86_64/mayavi.sh
(from rev 1394724, mayavi/trunk/mayavi.sh)
Deleted:
mayavi/repos/community-x86_64/PKGBUILD
mayavi/repos/community-x86_64/disable-openvdb-and-openvr.patch
mayavi/repos/community-x86_64/mayavi.csh
mayavi/repos/community-x86_64/mayavi.sh
----------------------------------+
PKGBUILD | 234 ++++++++++++++++++-------------------
disable-openvdb-and-openvr.patch | 60 ++++-----
mayavi.csh | 2
mayavi.sh | 2
4 files changed, 150 insertions(+), 148 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-02-06 16:51:16 UTC (rev 1394724)
+++ PKGBUILD 2023-02-06 16:51:33 UTC (rev 1394725)
@@ -1,116 +0,0 @@
-# Maintainer: Andrzej Giniewicz <[email protected]>
-# Contributor: Jingbei Li <[email protected]>
-
-pkgname=mayavi
-pkgver=4.8.1
-pkgrel=3
-pkgdesc="A 3-dimensional visualizer of scientific data"
-arch=('x86_64')
-url="https://github.com/enthought/mayavi";
-license=('BSD')
-depends=(
- 'adios2'
- 'cgns'
- 'ffmpeg'
- 'fmt'
- 'gl2ps'
- 'libharu'
- 'liblas'
- 'mariadb-libs'
- 'netcdf'
- 'openmpi'
- 'openvr'
- 'ospray'
- 'pdal'
- 'postgresql-libs'
- 'pugixml'
- 'python-apptools'
- 'python-configobj' # python-apptools optdepends
- 'python-envisage'
- 'python-numpy'
- 'python-packaging'
- 'python-pygments'
- 'python-pyqt5'
- 'python-setuptools' # required for version check
- 'python-traits'
- 'python-traitsui'
- 'unixodbc'
- 'vtk'
-)
-makedepends=(
- 'glew'
- 'python-build'
- 'python-installer'
- 'python-wheel'
-)
-checkdepends=(
- 'python-pillow'
- 'python-pytest'
-)
-replaces=('python-mayavi')
-provides=('python-mayavi')
-options=(!emptydirs)
-
-source=(
-
"$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/archive/${pkgver}.tar.gz";
- "disable-openvdb-and-openvr.patch"
- "mayavi.sh"
- "mayavi.csh"
-)
-sha256sums=('903dc4fe340ddfbb5245b3da92d244912b36f2043aaeea938788689fb965cb1c'
- '4f9eb2bfd3d610c70949ffc6a5e5eb2cf8fa217a6674c91271f7defc22a1add2'
- 'abb34e78105abf15197bdd05c02ba3b080755d46aa81e4cfaeaba4994d05effe'
- '034b36bf9d279d926c39c858bf18992e34de880725d778f8435b293259f4775d')
-b2sums=('4001a4fb109e64989a3788209fbb719eeda4fae5665240e017f56448369fe627e12d6c80b81c7c00e50752d43abc24656e2aa8ff80c5eebd39ee55fa6d30767e'
-
'817b4c7d0db203527f8c092607f566be37d96ddd385de6b119bb91cfa697caf13d0bbedfbad1ff829f99b326bd2bc45b6163f01f95d0814a3c379311a4a2af0a'
-
'9fc7b1d4e448c0f926e7bf146857f9d082a4ddcdfe67a34911c07355811d3850986552bf95f8b726de5ec7ed2d3d3e611fa7429d05c3d7baf6dfba65920c410f'
-
'bc6a6f5ea58beba806564c52ac77cb9fff51a8cf6b0428cf10225054283bfefacaf00a46811f8cab73f8ba27d1e88cc063913908317c402c25fd6efb1e947e18')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # remove unresolvable build requirements
- sed -e '/vtk/d; /numpy/d' -i pyproject.toml
- # remove unresolvable runtime requirements
- sed -e '/vtk/d' -i $pkgname/__init__.py
-
- # skip vtk 9.1.0 classes which cause segfaults
- patch -Np1 -i ../disable-openvdb-and-openvr.patch
-}
-
-build() {
- cd $pkgname-$pkgver
-
- python -m build --wheel --no-isolation
-}
-
-check() {
- local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
-
- cd $pkgname-$pkgver
- # install to temporary location, as importlib is used
- python -m installer --destdir=test_dir dist/*.whl
- export PYTHONPATH="test_dir/$site_packages:$PYTHONPATH"
- export ETS_TOOLKIT=null
- pytest -vv $pkgname/
- # NOTE: skipping tests for tvtk, since we are not building vtk 9.1.0 classes
- # pytest -vv tvtk/
-}
-
-package() {
- local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
-
- cd $pkgname-$pkgver
-
- python -m installer --destdir="$pkgdir" dist/*.whl
- install -vDm 644 docs/mayavi2.man "$pkgdir"/usr/share/man/man1/mayavi2.1
- install -vDm 644 LICENSE.txt -t "$pkgdir"/usr/share/licenses/$pkgname/
-
- # Force Qt
- install -vDm 644 ../mayavi.sh -t "$pkgdir/etc/profile.d/"
- install -vDm 644 ../mayavi.csh -t "$pkgdir/etc/profile.d/"
-
- # remove tests and unneeded files
- rm -frv "$pkgdir/$site_packages/$pkgname/tests/"
- rm -frv "$pkgdir/$site_packages/tvtk/"{setup.py,tests/}
-}
Copied: mayavi/repos/community-x86_64/PKGBUILD (from rev 1394724,
mayavi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-02-06 16:51:33 UTC (rev 1394725)
@@ -0,0 +1,118 @@
+# Maintainer: Andrzej Giniewicz <[email protected]>
+# Contributor: Jingbei Li <[email protected]>
+
+pkgname=mayavi
+pkgver=4.8.1
+pkgrel=4
+pkgdesc="A 3-dimensional visualizer of scientific data"
+arch=('x86_64')
+url="https://github.com/enthought/mayavi";
+license=('BSD')
+depends=(
+ 'adios2'
+ 'cgns'
+ 'ffmpeg'
+ 'fmt'
+ 'gl2ps'
+ 'libharu'
+ 'liblas'
+ 'mariadb-libs'
+ 'netcdf'
+ 'openmpi'
+ 'openvr'
+ 'ospray'
+ 'pdal'
+ 'postgresql-libs'
+ 'pugixml'
+ 'python-apptools'
+ 'python-configobj' # python-apptools optdepends
+ 'python-envisage'
+ 'python-numpy'
+ 'python-packaging'
+ 'python-pygments'
+ 'python-pyqt5'
+ 'python-setuptools' # required for version check
+ 'python-traits'
+ 'python-traitsui'
+ 'unixodbc'
+ 'vtk'
+)
+makedepends=(
+ 'glew'
+ 'python-build'
+ 'python-installer'
+ 'python-wheel'
+)
+checkdepends=(
+ 'python-pillow'
+ 'python-pytest'
+)
+replaces=('python-mayavi')
+provides=('python-mayavi')
+options=(!emptydirs)
+
+source=(
+
"$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/archive/${pkgver}.tar.gz";
+ "disable-openvdb-and-openvr.patch"
+ "mayavi.sh"
+ "mayavi.csh"
+)
+sha256sums=('903dc4fe340ddfbb5245b3da92d244912b36f2043aaeea938788689fb965cb1c'
+ '4f9eb2bfd3d610c70949ffc6a5e5eb2cf8fa217a6674c91271f7defc22a1add2'
+ 'abb34e78105abf15197bdd05c02ba3b080755d46aa81e4cfaeaba4994d05effe'
+ '034b36bf9d279d926c39c858bf18992e34de880725d778f8435b293259f4775d')
+b2sums=('4001a4fb109e64989a3788209fbb719eeda4fae5665240e017f56448369fe627e12d6c80b81c7c00e50752d43abc24656e2aa8ff80c5eebd39ee55fa6d30767e'
+
'817b4c7d0db203527f8c092607f566be37d96ddd385de6b119bb91cfa697caf13d0bbedfbad1ff829f99b326bd2bc45b6163f01f95d0814a3c379311a4a2af0a'
+
'9fc7b1d4e448c0f926e7bf146857f9d082a4ddcdfe67a34911c07355811d3850986552bf95f8b726de5ec7ed2d3d3e611fa7429d05c3d7baf6dfba65920c410f'
+
'bc6a6f5ea58beba806564c52ac77cb9fff51a8cf6b0428cf10225054283bfefacaf00a46811f8cab73f8ba27d1e88cc063913908317c402c25fd6efb1e947e18')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # remove unresolvable build requirements
+ sed -e '/vtk/d; /numpy/d' -i pyproject.toml
+ # remove unresolvable runtime requirements
+ sed -e '/vtk/d' -i $pkgname/__init__.py
+ # remove requirement for tests during runtime:
https://github.com/enthought/mayavi/issues/1208
+ sed '/m2_tests/d' -i $pkgname/api.py
+
+ # skip vtk 9.1.0 classes which cause segfaults
+ patch -Np1 -i ../disable-openvdb-and-openvr.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ python -m build --wheel --no-isolation
+}
+
+check() {
+ local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
+
+ cd $pkgname-$pkgver
+ # install to temporary location, as importlib is used
+ python -m installer --destdir=test_dir dist/*.whl
+ export PYTHONPATH="test_dir/$site_packages:$PYTHONPATH"
+ export ETS_TOOLKIT=null
+ pytest -vv $pkgname/
+ # NOTE: skipping tests for tvtk, since we are not building vtk 9.1.0 classes
+ # pytest -vv tvtk/
+}
+
+package() {
+ local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
+
+ cd $pkgname-$pkgver
+
+ python -m installer --destdir="$pkgdir" dist/*.whl
+ install -vDm 644 docs/mayavi2.man "$pkgdir"/usr/share/man/man1/mayavi2.1
+ install -vDm 644 LICENSE.txt -t "$pkgdir"/usr/share/licenses/$pkgname/
+
+ # Force Qt
+ install -vDm 644 ../mayavi.sh -t "$pkgdir/etc/profile.d/"
+ install -vDm 644 ../mayavi.csh -t "$pkgdir/etc/profile.d/"
+
+ # remove tests and unneeded files
+ rm -frv "$pkgdir/$site_packages/$pkgname/tests/"
+ rm -frv "$pkgdir/$site_packages/tvtk/"{setup.py,tests/}
+}
Deleted: disable-openvdb-and-openvr.patch
===================================================================
--- disable-openvdb-and-openvr.patch 2023-02-06 16:51:16 UTC (rev 1394724)
+++ disable-openvdb-and-openvr.patch 2023-02-06 16:51:33 UTC (rev 1394725)
@@ -1,30 +0,0 @@
-diff -upr mayavi-4.7.4.orig/tvtk/vtk_module.py mayavi-4.7.4/tvtk/vtk_module.py
---- mayavi-4.7.4.orig/tvtk/vtk_module.py 2021-11-13 15:54:28.000000000
+0200
-+++ mayavi-4.7.4/tvtk/vtk_module.py 2021-12-10 06:58:30.885406494 +0200
-@@ -33,11 +33,25 @@ if vtk_version in ['9.0.3', '9.0.2']:
- del vtkDataEncoder, vtkWebApplication
-
- if vtk_version == '9.1.0':
-- SKIP = ['vtkOpenGLAvatar']
-+ SKIP = ['vtkOpenGLAvatar',
-+ 'vtkOpenVDBWriter',
-+ 'vtkOpenVRCamera',
-+ 'vtkOpenVRControlsHelper',
-+ 'vtkOpenVRDefaultOverlay',
-+ 'vtkOpenVRInteractorStyle',
-+ 'vtkOpenVRModel',
-+ 'vtkOpenVROverlay',
-+ 'vtkOpenVRRenderWindow',
-+ 'vtkOpenVRRenderWindowInteractor',
-+ 'vtkOpenVRRenderer']
- try:
- del vtkOpenGLAvatar
- except NameError:
- pass
-+ del vtkOpenVDBWriter, vtkOpenVRCamera, vtkOpenVRControlsHelper, \
-+ vtkOpenVRDefaultOverlay, vtkOpenVRInteractorStyle, vtkOpenVRModel, \
-+ vtkOpenVROverlay, vtkOpenVRRenderWindow, \
-+ vtkOpenVRRenderWindowInteractor, vtkOpenVRRenderer
-
- if vtk_version == '9.2.0':
- SKIP = ['vtkPlotBar']
Copied: mayavi/repos/community-x86_64/disable-openvdb-and-openvr.patch (from
rev 1394724, mayavi/trunk/disable-openvdb-and-openvr.patch)
===================================================================
--- disable-openvdb-and-openvr.patch (rev 0)
+++ disable-openvdb-and-openvr.patch 2023-02-06 16:51:33 UTC (rev 1394725)
@@ -0,0 +1,30 @@
+diff -upr mayavi-4.7.4.orig/tvtk/vtk_module.py mayavi-4.7.4/tvtk/vtk_module.py
+--- mayavi-4.7.4.orig/tvtk/vtk_module.py 2021-11-13 15:54:28.000000000
+0200
++++ mayavi-4.7.4/tvtk/vtk_module.py 2021-12-10 06:58:30.885406494 +0200
+@@ -33,11 +33,25 @@ if vtk_version in ['9.0.3', '9.0.2']:
+ del vtkDataEncoder, vtkWebApplication
+
+ if vtk_version == '9.1.0':
+- SKIP = ['vtkOpenGLAvatar']
++ SKIP = ['vtkOpenGLAvatar',
++ 'vtkOpenVDBWriter',
++ 'vtkOpenVRCamera',
++ 'vtkOpenVRControlsHelper',
++ 'vtkOpenVRDefaultOverlay',
++ 'vtkOpenVRInteractorStyle',
++ 'vtkOpenVRModel',
++ 'vtkOpenVROverlay',
++ 'vtkOpenVRRenderWindow',
++ 'vtkOpenVRRenderWindowInteractor',
++ 'vtkOpenVRRenderer']
+ try:
+ del vtkOpenGLAvatar
+ except NameError:
+ pass
++ del vtkOpenVDBWriter, vtkOpenVRCamera, vtkOpenVRControlsHelper, \
++ vtkOpenVRDefaultOverlay, vtkOpenVRInteractorStyle, vtkOpenVRModel, \
++ vtkOpenVROverlay, vtkOpenVRRenderWindow, \
++ vtkOpenVRRenderWindowInteractor, vtkOpenVRRenderer
+
+ if vtk_version == '9.2.0':
+ SKIP = ['vtkPlotBar']
Deleted: mayavi.csh
===================================================================
--- mayavi.csh 2023-02-06 16:51:16 UTC (rev 1394724)
+++ mayavi.csh 2023-02-06 16:51:33 UTC (rev 1394725)
@@ -1 +0,0 @@
-setenv ETS_TOOLKIT "qt"
Copied: mayavi/repos/community-x86_64/mayavi.csh (from rev 1394724,
mayavi/trunk/mayavi.csh)
===================================================================
--- mayavi.csh (rev 0)
+++ mayavi.csh 2023-02-06 16:51:33 UTC (rev 1394725)
@@ -0,0 +1 @@
+setenv ETS_TOOLKIT "qt"
Deleted: mayavi.sh
===================================================================
--- mayavi.sh 2023-02-06 16:51:16 UTC (rev 1394724)
+++ mayavi.sh 2023-02-06 16:51:33 UTC (rev 1394725)
@@ -1 +0,0 @@
-export ETS_TOOLKIT="qt"
Copied: mayavi/repos/community-x86_64/mayavi.sh (from rev 1394724,
mayavi/trunk/mayavi.sh)
===================================================================
--- mayavi.sh (rev 0)
+++ mayavi.sh 2023-02-06 16:51:33 UTC (rev 1394725)
@@ -0,0 +1 @@
+export ETS_TOOLKIT="qt"
