[arch-commits] Commit in openvdb/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Monday, October 7, 2019 @ 22:11:45
  Author: svenstaro
Revision: 514144

upgpkg: openvdb 6.2.1-1

Modified:
  openvdb/trunk/PKGBUILD

----------+
 PKGBUILD |   39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-07 21:28:24 UTC (rev 514143)
+++ PKGBUILD	2019-10-07 22:11:45 UTC (rev 514144)
@@ -1,29 +1,24 @@
 # Maintainer : Sven-Hendrik Haase <svenstaro at gmail.com>
 
 pkgname=openvdb
-pkgver=6.1.0
-pkgrel=2
+pkgver=6.2.1
+pkgrel=1
 pkgdesc='A large suite of tools for the efficient storage and manipulation of sparse volumetric data discretized on three-dimensional grids'
 url='https://github.com/dreamworksanimation/openvdb'
 arch=('x86_64')
 license=('MPL')
-depends=('openexr' 'boost-libs' 'intel-tbb' 'zlib' 'jemalloc' 'blosc')
-makedepends=('doxygen' 'boost' 'cmake' 'mesa' 'cppunit' 'glfw-x11' 'glu' 'python' 'python-numpy')
+depends=('openexr' 'boost-libs' 'intel-tbb' 'zlib' 'jemalloc' 'blosc' 'log4cplus' 'openexr')
+makedepends=('doxygen' 'boost' 'cmake' 'mesa' 'cppunit' 'glfw-x11' 'glu' 'python' 'python-numpy' 'ninja')
 optdepends=('glfw: for tools'
             'glu: for tools'
             'python-numpy: python module')
-source=("https://github.com/dreamworksanimation/openvdb/archive/v${pkgver}.tar.gz"
-        https://patch-diff.githubusercontent.com/raw/AcademySoftwareFoundation/openvdb/pull/428.patch)
-sha512sums=('99ebbb50104ef87792ab73989e8714c4f283fb02d04c3033126b5f0d927ff7bbdebe35c8214ded841692941d8ed8ae551fd6d1bf90ad7dc07bedc3b38b9c4b38'
-            '2eba70b5dde0d9f319841963a93f74915ecc65a13629fec282a04ceb260f30dd475c43b445e7bb121dbc0381c638ddbae102775279aef46b80b1d3093497b916')
+source=("https://github.com/dreamworksanimation/openvdb/archive/v${pkgver}.tar.gz")
+sha512sums=('f5d830880316b5ca3921c77c75f3a254aba47d144ac6c0223fc2732d99cbd6b7ffb7f27049f8ab3760ad77b3658fc08a82728325ba753bc29932aa46336457de')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i "s|DESTINATION docs|DESTINATION share/doc/$pkgname|" openvdb/CMakeLists.txt
   sed -i "s/MINIMUM_PYTHON_VERSION 2.7/MINIMUM_PYTHON_VERSION 3.7/g" CMakeLists.txt
 
-  patch -Np1 -i "$srcdir"/428.patch
-
   mkdir build
 }
 
@@ -30,34 +25,24 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"/build
 
-  export CXXFLAGS="${CXXFLAGS} -DPY_OPENVDB_USE_NUMPY"
   cmake .. \
-    -DBLOSC_LOCATION=/usr/ \
-    -DTBB_LOCATION=/usr/ \
-    -DUSE_GLFW3=ON \
-    -DGLFW3_LOCATION=/usr/ \
-    -DILMBASE_NAMESPACE_VERSIONING=OFF \
-    -DOPENEXR_NAMESPACE_VERSIONING=OFF \
-    -DILMBASE_LOCATION=/usr/ \
-    -DOPENEXR_LOCATION=/usr/ \
-    -DCPPUNIT_LOCATION=/usr/include/cppunit \
+    -GNinja \
+    -DUSE_NUMPY=ON \
+    -DUSE_LOG4CPLUS=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DOPENVDB_BUILD_PYTHON_MODULE=ON \
     -DOPENVDB_BUILD_DOCS=ON \
     -DOPENVDB_BUILD_UNITTESTS=OFF \
-    -DPYTHON_INCL_DIR=/usr/include/python3.7m \
-    -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-    -DPYTHON_LIB_DIR=/usr/lib \
     -DPython_LIBRARY=/usr/lib/libpython3.7m.so \
 
-  sed -i "s/isystem/I/g" $(find . -name flags.make)
-  make
+  sed -i "s/isystem/I/g" build.ninja
+  ninja
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/build"
 
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }
 
 # vim:set sw=2 sts=2 et: