diff options
| -rw-r--r-- | .SRCINFO | 38 | ||||
| -rw-r--r-- | PKGBUILD | 199 |
2 files changed, 90 insertions, 147 deletions
@@ -20,22 +20,14 @@ pkgbase = open3d-git optdepends = pybind11: System pybind11 support optdepends = python: Python support optdepends = jupyter-notebook: Jupyter notebook support - source = open3d-git::git+https://github.com/intel-isl/Open3D.git + source = open3d-git::git+https://github.com/isl-org/Open3D.git source = fix_3rdparty_path.patch sha256sums = SKIP sha256sums = 3bf6b79fd075b356a5c2d86a557e0bc6e6df0e84d53c2077d2c6685641838d81 pkgname = open3d-git - depends = eigen - depends = glew - depends = glfw-x11 - depends = jsoncpp - depends = libjpeg-turbo - depends = libpng - depends = mesa - depends = xorg-server-devel optdepends = openmp: Multiprocess support - provides = open3d + provides = open3d=r2539.f3c7158a conflicts = open3d pkgname = python-open3d-git @@ -46,33 +38,13 @@ pkgname = python-open3d-git depends = libjpeg-turbo depends = libpng depends = mesa - depends = open3d-git - depends = python depends = xorg-server-devel - optdepends = jupyter-notebook: Jupyter notebook support - optdepends = openmp: Multiprocess support - optdepends = pybind11: System pybind11 support - provides = python-py3d - conflicts = python-open3d-git - conflicts = python-py3d - conflicts = python-py3d-git - -pkgname = python-py3d-git - depends = eigen - depends = glew - depends = glfw-x11 - depends = jsoncpp - depends = libjpeg-turbo - depends = libpng - depends = mesa depends = open3d-git depends = python - depends = xorg-server-devel optdepends = jupyter-notebook: Jupyter notebook support optdepends = openmp: Multiprocess support optdepends = pybind11: System pybind11 support - provides = python-open3d - conflicts = python-py3d-git + provides = python-open3d=r2539.f3c7158a + provides = python-py3d=r2539.f3c7158a conflicts = python-open3d - conflicts = python-open3d-git - + conflicts = python-py3d @@ -1,143 +1,114 @@ -# Maintainer: JunYoung Gwak <aur@jgwak.com> -# Maintainer: Dylon Edwards <deltaecho at archlinux dot us> +# Maintainer: Pellegrino Prevete (tallero) <pellegrinoprevete@gmail.com> +# Contributor: JunYoung Gwak <aur@jgwak.com> +# Contributor: Dylon Edwards <deltaecho at archlinux dot us> -pkgbase=open3d-git -pkgname=( {,python-}open3d-git python-py3d-git ) +_py="python" +_pkg="open3d" +pkgbase="${_pkg}-git" +pkgname=( + {,"${_py}-"}"${_pkg}-git" +) pkgver=r2539.f3c7158a pkgrel=1 pkgdesc="A Modern Library for 3D Data Processing" arch=('x86_64') -url="http://www.open3d.org" +url="http://www.${_pkg}.org" +_url="https://github.com/isl-org/Open3D" license=('MIT') depends=( - eigen - glew - glfw-x11 - jsoncpp - libjpeg-turbo - libpng - mesa - xorg-server-devel + eigen + glew + glfw-x11 + jsoncpp + libjpeg-turbo + libpng + mesa + xorg-server-devel ) optdepends=( - 'openmp: Multiprocess support' - 'pybind11: System pybind11 support' - 'python: Python support' - 'jupyter-notebook: Jupyter notebook support' + 'openmp: Multiprocess support' + 'pybind11: System pybind11 support' + "${_py}: Python support" + 'jupyter-notebook: Jupyter notebook support' ) makedepends=( - cmake - git - python-setuptools + cmake + git + "${_py}-setuptools" +) +source=( + "${pkgbase}::git+${_url}.git" + fix_3rdparty_path.patch +) +sha256sums=( + 'SKIP' + '3bf6b79fd075b356a5c2d86a557e0bc6e6df0e84d53c2077d2c6685641838d81' ) -source=("${pkgbase}::git+https://github.com/intel-isl/Open3D.git" - fix_3rdparty_path.patch) -sha256sums=('SKIP' - '3bf6b79fd075b356a5c2d86a557e0bc6e6df0e84d53c2077d2c6685641838d81') function pkgver() { - cd "${pkgbase}" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + cd "${pkgbase}" + printf "r%s.%s" "$(git rev-list --count HEAD)" \ + "$(git rev-parse --short HEAD)" } function prepare() { cd "${srcdir}/${pkgbase}" - patch --forward --strip=1 --input="${srcdir}/fix_3rdparty_path.patch" - git submodule update --init --recursive + sed -i '/^CMAKE_ARGS.*/a -DCMAKE_INSTALL_DEFAULT_LIBDIR="lib"' \ + "3rdparty/libjpeg-turbo/libjpeg-turbo.cmake" + # patch --forward \ + # --strip=1 \ + # --input="${srcdir}/fix_3rdparty_path.patch" + git submodule update --init \ + --recursive mkdir build } function build() { - cd "${srcdir}/${pkgbase}/build" - cmake .. \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}/usr \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release - make + local _cmake_opts=( + -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" + -DBUILD_SHARED_LIBS=ON + -DCMAKE_BUILD_TYPE=Release + ) + cd "${srcdir}/${pkgbase}/build" + cmake .. "${_cmake_opts[@]}" + make } function package_open3d-git() { - depends=( - eigen - glew - glfw-x11 - jsoncpp - libjpeg-turbo - libpng - mesa - xorg-server-devel - ) - provides=( - open3d - ) - optdepends=( - 'openmp: Multiprocess support' - ) - conflicts=( - open3d - ) - cd "${srcdir}/${pkgbase}/build" - make install + optdepends=( + 'openmp: Multiprocess support' + ) + provides=( + "${_pkg}=${pkgver}" + ) + conflicts=( + "${_pkg}" + ) + cd "${srcdir}/${pkgbase}/build" + make install } function package_python-open3d-git() { - depends=( - eigen - glew - glfw-x11 - jsoncpp - libjpeg-turbo - libpng - mesa - open3d-git - python - xorg-server-devel - ) - optdepends=( - 'jupyter-notebook: Jupyter notebook support' - 'openmp: Multiprocess support' - 'pybind11: System pybind11 support' - ) - provides=( - python-py3d - ) - conflicts=( - python-open3d-git - python-py3d{,-git} - ) - 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() { - depends=( - eigen - glew - glfw-x11 - jsoncpp - libjpeg-turbo - libpng - mesa - open3d-git - python - xorg-server-devel - ) - optdepends=( - 'jupyter-notebook: Jupyter notebook support' - 'openmp: Multiprocess support' - 'pybind11: System pybind11 support' - ) - provides=( - python-open3d - ) - conflicts=( - python-py3d-git - python-open3d{,-git} - ) - cd "${srcdir}/${pkgbase}/build" - make python-package - cd "${srcdir}/${pkgbase}/build/lib/python_package" - python setup.py install --root="$pkgdir/" --optimize=1 + depends+=( + "${_pkg}-git" + "${_py}" + ) + optdepends=( + 'jupyter-notebook: Jupyter notebook support' + 'openmp: Multiprocess support' + 'pybind11: System pybind11 support' + ) + provides=( + "${_py}-${_pkg}=${pkgver}" + "${_py}-py3d=${pkgver}" + ) + conflicts=( + "${_py}-${_pkg}" + "${_py}-py3d" + ) + cd "${srcdir}/${pkgbase}/build" + make "${_py}-package" + cd "${srcdir}/${pkgbase}/build/lib/${_py}_package" + "${_py}" setup.py install --root="${pkgdir}" \ + --optimize=1 } |