Update.

1 files changed, 42 insertions, 55 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 855f6188117b..514a5c80b053 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# -*- mode: shell-script -*-
+# Maintainer: JunYoung Gwak <aur@jgwak.com>
 # Maintainer: Dylon Edwards <deltaecho at archlinux dot us>
 
 pkgbase=open3d-git
 pkgname=( {,python-}open3d-git python-py3d-git )
-pkgver=r1256.352d2f4
+pkgver=r2485.e5ba382f
 pkgrel=1
 pkgdesc="A Modern Library for 3D Data Processing"
 arch=('x86_64')
@@ -20,24 +20,20 @@ depends=(
     xorg-server-devel
 )
 optdepends=(
-    openmp
-    python
+    'openmp: Multiprocess support'
+    'pybind11: System pybind11 support'
+    'python: Python support'
+    'jupyter-notebook: Jupyter notebook support'
 )
 makedepends=(
     cmake
-    findutils
-    gawk
     git
-    make
-    pacman
-    sed
-)
-checkdepends=(
-    gtest
+    python-setuptools
 )
-changelog="${pkgbase}.changelog"
-source=("${pkgbase}::git+https://github.com/IntelVCL/Open3D.git")
-md5sums=(SKIP)
+source=("${pkgbase}::git+https://github.com/IntelVCL/Open3D.git"
+        fix_3rdparty_path.patch)
+sha256sums=('SKIP'
+            '3bf6b79fd075b356a5c2d86a557e0bc6e6df0e84d53c2077d2c6685641838d81')
 
 function pkgver() {
     cd "${pkgbase}"
@@ -45,25 +41,21 @@ function pkgver() {
 }
 
 function prepare() {
-    cd "${pkgbase}"
-    mkdir -p build
+    cd "${srcdir}/${pkgbase}"
+    patch --forward --strip=1 --input="${srcdir}/fix_3rdparty_path.patch"
+    git submodule update --init --recursive
+    mkdir build
 }
 
 function build() {
-    cd "${pkgbase}/build"
-    cmake ../src \
-          -DCMAKE_INSTALL_PREFIX=/usr \
+    cd "${srcdir}/${pkgbase}/build"
+    cmake .. \
+          -DCMAKE_INSTALL_PREFIX=${pkgdir}/usr \
           -DBUILD_SHARED_LIBS=ON \
-          -DOpen3D_BUILD_UNIT_TESTS=ON \
           -DCMAKE_BUILD_TYPE=Release
     make
 }
 
-function check() {
-    cd "${pkgbase}/build"
-    bin/unitTests
-}
-
 function package_open3d-git() {
     depends=(
         eigen
@@ -76,22 +68,13 @@ function package_open3d-git() {
         xorg-server-devel
     )
     optdepends=(
-        openmp
-    )
-    provides=(
-        open3d
+        'openmp: Multiprocess support'
     )
     conflicts=(
-        open3d
+        open3d-git
     )
-    cd "${pkgbase}/build"
-    install -m 644 -D -t "${pkgdir}/usr/lib" lib/lib*.so
-    find ../src/{Core,Experimental,IO,Python,Tools,Visualization} -name '*.h' \
-        | sed -e 's|\.\./src/||' \
-        | xargs -I{} -n1 \
-                install -m 644 -D -T ../src/{} "${pkgdir}"/usr/include/Open3D/{}
-    find bin -type f \( -not -name unitTests -not -path 'bin/Test/*' \) \
-        | xargs -I{} install -m 755 -D -t "${pkgdir}"/usr/bin {}
+    cd "${srcdir}/${pkgbase}/build"
+    make install
 }
 
 function package_python-open3d-git() {
@@ -103,24 +86,26 @@ function package_python-open3d-git() {
         libjpeg-turbo
         libpng
         mesa
-        open3d-git
+        open3d
         python
         xorg-server-devel
     )
     optdepends=(
-        openmp
+        'jupyter-notebook: Jupyter notebook support'
+        'openmp: Multiprocess support'
+        'pybind11: System pybind11 support'
     )
     privides=(
-        python-open3d
-        python-py3d{,-git}
+        python-py3d
     )
     conflicts=(
-        python-open3d
+        python-open3d-git
         python-py3d{,-git}
     )
-    cd "${pkgbase}/build"
-    local SITE_PACKAGES="$(pacman -Qlq python | grep '/site-packages/$')"
-    install -m 644 -D -t "${pkgdir}/${SITE_PACKAGES}" lib/py3d.*.so
+    cd "${srcdir}/${pkgbase}/build"
+    make python-package
+    cd "${srcdir}/${pkgbase}/build/lib/python_package"
+    python setup.py install --root="$pkgdir/" --optimize=1
 }
 
 function package_python-py3d-git() {
@@ -132,22 +117,24 @@ function package_python-py3d-git() {
         libjpeg-turbo
         libpng
         mesa
-        open3d-git
+        open3d
         python
         xorg-server-devel
     )
     optdepends=(
-        openmp
+        'jupyter-notebook: Jupyter notebook support'
+        'openmp: Multiprocess support'
+        'pybind11: System pybind11 support'
     )
     privides=(
-        python-py3d
-        python-open3d{,-git}
+        python-open3d
     )
     conflicts=(
-        python-py3d
+        python-py3d-git
         python-open3d{,-git}
     )
-    cd "${pkgbase}/build"
-    local SITE_PACKAGES="$(pacman -Qlq python | grep '/site-packages/$')"
-    install -m 644 -D -t "${pkgdir}/${SITE_PACKAGES}" lib/py3d.*.so
+    cd "${srcdir}/${pkgbase}/build"
+    make python-package
+    cd "${srcdir}/${pkgbase}/build/lib/python_package"
+    python setup.py install --root="$pkgdir/" --optimize=1
 }