Update to v0.13.0

3 files changed, 63 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb628bcc29c9..59fd61a31df4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = open3d
 	pkgdesc = A Modern Library for 3D Data Processing
-	pkgver = 0.9.0
-	pkgrel = 2
-	epoch = 3
+	pkgver = 0.13.0
+	pkgrel = 1
+	epoch = 0
 	url = http://www.open3d.org
 	arch = x86_64
 	license = MIT
@@ -10,48 +10,60 @@ pkgbase = open3d
 	makedepends = git
 	makedepends = python-setuptools
 	depends = eigen
+	depends = flann
+    depends = fmt
 	depends = glew
 	depends = glfw-x11
+    depends = gtest
 	depends = jsoncpp
 	depends = libjpeg-turbo
+    depends = liblzf
 	depends = libpng
 	depends = mesa
+	depends = python
+    depend = pybind11
 	depends = xorg-server-devel
 	optdepends = openmp: Multiprocess support
-	optdepends = pybind11: System pybind11 support
-	optdepends = python: Python support
 	optdepends = jupyter-notebook: Jupyter notebook support
 	source = open3d::git+https://github.com/intel-isl/Open3D.git#tag=v0.9.0
-	source = fix_3rdparty_path.patch
 	sha256sums = SKIP
-	sha256sums = 3bf6b79fd075b356a5c2d86a557e0bc6e6df0e84d53c2077d2c6685641838d81
 
 pkgname = open3d
 	depends = eigen
+	depends = flann
+    depends = fmt
 	depends = glew
 	depends = glfw-x11
+    depends = gtest
 	depends = jsoncpp
 	depends = libjpeg-turbo
+    depends = liblzf
 	depends = libpng
 	depends = mesa
+	depends = python
+    depend = pybind11
 	depends = xorg-server-devel
 	optdepends = openmp: Multiprocess support
 	conflicts = open3d-git
 
 pkgname = python-open3d
 	depends = eigen
+	depends = flann
+    depends = fmt
 	depends = glew
 	depends = glfw-x11
+    depends = gtest
 	depends = jsoncpp
 	depends = libjpeg-turbo
+    depends = liblzf
 	depends = libpng
 	depends = mesa
-	depends = open3d
 	depends = python
+    depend = pybind11
 	depends = xorg-server-devel
+	depends = open3d
 	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
@@ -59,18 +71,21 @@ pkgname = python-open3d
 
 pkgname = python-py3d
 	depends = eigen
+	depends = flann
+    depends = fmt
 	depends = glew
 	depends = glfw-x11
+    depends = gtest
 	depends = jsoncpp
 	depends = libjpeg-turbo
+    depends = liblzf
 	depends = libpng
 	depends = mesa
-	depends = open3d
 	depends = python
-	depends = xorg-server-devel
+    depend = pybind11
+	depends = open3d
 	optdepends = jupyter-notebook: Jupyter notebook support
 	optdepends = openmp: Multiprocess support
-	optdepends = pybind11: System pybind11 support
 	provides = python-open3d
 	conflicts = python-py3d-git
 	conflicts = python-open3d
diff --git a/PKGBUILD b/PKGBUILD
index 51319c506c0c..eedcecc82f86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,31 @@
 
 pkgbase=open3d
 pkgname=( {,python-}open3d python-py3d )
-pkgver=0.9.0
+pkgver=0.13.0
 pkgrel=1
-epoch=3
+epoch=0
 pkgdesc="A Modern Library for 3D Data Processing"
 arch=('x86_64')
 url="http://www.open3d.org"
 license=('MIT')
 depends=(
     eigen
+    flann
+    fmt
     glew
     glfw-x11
+    gtest
     jsoncpp
     libjpeg-turbo
+    liblzf
     libpng
     mesa
+    python
+    pybind11
     xorg-server-devel
 )
 optdepends=(
     'openmp: Multiprocess support'
-    'pybind11: System pybind11 support'
-    'python: Python support'
     'jupyter-notebook: Jupyter notebook support'
 )
 makedepends=(
@@ -31,14 +35,11 @@ makedepends=(
     git
     python-setuptools
 )
-source=("${pkgbase}::git+https://github.com/intel-isl/Open3D.git#tag=v${pkgver}"
-        fix_3rdparty_path.patch)
-sha256sums=('SKIP'
-            '3bf6b79fd075b356a5c2d86a557e0bc6e6df0e84d53c2077d2c6685641838d81')
+source=("${pkgbase}::git+https://github.com/intel-isl/Open3D.git#tag=v${pkgver}")
+sha256sums=('SKIP')
 
 function prepare() {
     cd "${srcdir}/${pkgbase}"
-    patch --forward --strip=1 --input="${srcdir}/fix_3rdparty_path.patch"
     git submodule update --init --recursive
     mkdir build
 }
@@ -49,19 +50,34 @@ function build() {
     cmake .. \
           -DCMAKE_INSTALL_PREFIX=${pkgdir}/usr \
           -DBUILD_SHARED_LIBS=ON \
-          -DCMAKE_BUILD_TYPE=Release
+          -DCMAKE_BUILD_TYPE=Release \
+          -DUSE_SYSTEM_FLANN=ON \
+          -DUSE_SYSTEM_FMT=ON \
+          -DUSE_SYSTEM_GLEW=ON \
+          -DUSE_SYSTEM_GLFW=ON \
+          -DUSE_SYSTEM_GOOGLETEST=ON \
+          -DUSE_SYSTEM_JPEG=ON \
+          -DUSE_SYSTEM_LIBLZF=ON \
+          -DUSE_SYSTEM_PNG=ON \
+          -DUSE_SYSTEM_PYBIND11=ON
     make -j$(nproc)
 }
 
 function package_open3d() {
     depends=(
         eigen
+        flann
+        fmt
         glew
         glfw-x11
+        gtest
         jsoncpp
         libjpeg-turbo
+        liblzf
         libpng
         mesa
+        python
+        pybind11
         xorg-server-devel
     )
     optdepends=(
@@ -77,20 +93,24 @@ function package_open3d() {
 function package_python-open3d() {
     depends=(
         eigen
+        flann
+        fmt
         glew
         glfw-x11
+        gtest
         jsoncpp
         libjpeg-turbo
+        liblzf
         libpng
         mesa
         open3d
         python
+        pybind11
         xorg-server-devel
     )
     optdepends=(
         'jupyter-notebook: Jupyter notebook support'
         'openmp: Multiprocess support'
-        'pybind11: System pybind11 support'
     )
     provides=(
         python-py3d
@@ -108,20 +128,24 @@ function package_python-open3d() {
 function package_python-py3d() {
     depends=(
         eigen
+        flann
+        fmt
         glew
         glfw-x11
+        gtest
         jsoncpp
         libjpeg-turbo
+        liblzf
         libpng
         mesa
         open3d
         python
+        pybind11
         xorg-server-devel
     )
     optdepends=(
         'jupyter-notebook: Jupyter notebook support'
         'openmp: Multiprocess support'
-        'pybind11: System pybind11 support'
     )
     provides=(
         python-open3d
diff --git a/fix_3rdparty_path.patch b/fix_3rdparty_path.patch
deleted file mode 100644
index 2074c35ceae0..000000000000
--- a/fix_3rdparty_path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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}
- )