diff options
| -rw-r--r-- | .SRCINFO | 41 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 97 | ||||
| -rw-r--r-- | fix_3rdparty_path.patch | 10 |
4 files changed, 74 insertions, 75 deletions
@@ -1,19 +1,13 @@ pkgbase = open3d-git pkgdesc = A Modern Library for 3D Data Processing - pkgver = r1256.352d2f4 + pkgver = r2485.e5ba382f pkgrel = 1 url = http://www.open3d.org - changelog = open3d-git.changelog arch = x86_64 license = MIT - checkdepends = gtest makedepends = cmake - makedepends = findutils - makedepends = gawk makedepends = git - makedepends = make - makedepends = pacman - makedepends = sed + makedepends = python-setuptools depends = eigen depends = glew depends = glfw-x11 @@ -22,10 +16,14 @@ pkgbase = open3d-git depends = libpng depends = mesa depends = xorg-server-devel - optdepends = openmp - optdepends = python + optdepends = openmp: Multiprocess support + optdepends = pybind11: System pybind11 support + optdepends = python: Python support + optdepends = jupyter-notebook: Jupyter notebook support source = open3d-git::git+https://github.com/IntelVCL/Open3D.git - md5sums = SKIP + source = fix_3rdparty_path.patch + sha256sums = SKIP + sha256sums = 3bf6b79fd075b356a5c2d86a557e0bc6e6df0e84d53c2077d2c6685641838d81 pkgname = open3d-git depends = eigen @@ -36,9 +34,8 @@ pkgname = open3d-git depends = libpng depends = mesa depends = xorg-server-devel - optdepends = openmp - provides = open3d - conflicts = open3d + optdepends = openmp: Multiprocess support + conflicts = open3d-git pkgname = python-open3d-git depends = eigen @@ -48,11 +45,13 @@ pkgname = python-open3d-git depends = libjpeg-turbo depends = libpng depends = mesa - depends = open3d-git + depends = open3d depends = python depends = xorg-server-devel - optdepends = openmp - conflicts = python-open3d + optdepends = jupyter-notebook: Jupyter notebook support + optdepends = openmp: Multiprocess support + optdepends = pybind11: System pybind11 support + conflicts = python-open3d-git conflicts = python-py3d conflicts = python-py3d-git @@ -64,11 +63,13 @@ pkgname = python-py3d-git depends = libjpeg-turbo depends = libpng depends = mesa - depends = open3d-git + depends = open3d depends = python depends = xorg-server-devel - optdepends = openmp - conflicts = python-py3d + optdepends = jupyter-notebook: Jupyter notebook support + optdepends = openmp: Multiprocess support + optdepends = pybind11: System pybind11 support + conflicts = python-py3d-git conflicts = python-open3d conflicts = python-open3d-git diff --git a/.gitignore b/.gitignore index b568e813bcb4..5de8efb8e332 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ !/.SRCINFO !/.gitignore !/PKGBUILD +!/*.patch @@ -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 } diff --git a/fix_3rdparty_path.patch b/fix_3rdparty_path.patch new file mode 100644 index 000000000000..2074c35ceae0 --- /dev/null +++ b/fix_3rdparty_path.patch @@ -0,0 +1,10 @@ +diff --unified --recursive --text open3d/3rdparty/libjpeg-turbo/libjpeg-turbo.cmake open3d_patch/3rdparty/libjpeg-turbo/libjpeg-turbo.cmake +--- open3d/3rdparty/libjpeg-turbo/libjpeg-turbo.cmake 2019-12-09 02:09:55.853560635 -0800 ++++ open3d_patch/3rdparty/libjpeg-turbo/libjpeg-turbo.cmake 2019-12-09 02:09:31.837228165 -0800 +@@ -78,7 +78,7 @@ + set(JPEG_TURBO_LIBRARIES ${lib_name}) + + set(turbojpeg_LIB_FILES +- ${3RDPARTY_INSTALL_PREFIX}/${LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX} ++ ${3RDPARTY_INSTALL_PREFIX}/lib64/${CMAKE_STATIC_LIBRARY_PREFIX}${lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX} + ) |