Fixes source locatio nfor future project location (see: https://github.com/Open-3D/Open3D/issues/31)

3 files changed, 24 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 111a146a006a..fd2d9ccff4a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = open3d
 	pkgdesc = A Modern Library for 3D Data Processing
-	pkgver = 0.1.2
-	pkgrel = 1
+	pkgver = v0.1.2.r3.fb969e1
+	pkgrel = 2
+	epoch = 1
 	url = http://www.open-3d.org
 	changelog = open3d.changelog
 	arch = x86_64
@@ -19,8 +20,8 @@ pkgbase = open3d
 	depends = xorg-server-devel
 	optdepends = openmp
 	optdepends = python
-	source = Open3D-0.1.2.tar.gz::https://github.com/Open-3D/Open3D/archive/v0.1.2.tar.gz
-	md5sums = 466a9edd042484e115986ebceeae77b2
+	source = open3d::git+http://code.open-3d.org
+	md5sums = SKIP
 
 pkgname = open3d
 	depends = eigen
diff --git a/PKGBUILD b/PKGBUILD
index 110501480924..944a224093bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,9 @@
 
 pkgbase=open3d
 pkgname=( {,python-}open3d )
-pkgver=0.1.2
-pkgrel=1
+pkgver=v0.1.2.r3.fb969e1
+pkgrel=2
+epoch=1
 pkgdesc="A Modern Library for 3D Data Processing"
 arch=('x86_64')
 url="http://www.open-3d.org"
@@ -29,16 +30,23 @@ makedepends=(
     make
 )
 changelog="${pkgbase}.changelog"
-source=("Open3D-${pkgver}.tar.gz::https://github.com/Open-3D/Open3D/archive/v0.1.2.tar.gz")
-md5sums=('466a9edd042484e115986ebceeae77b2')
+source=("${pkgbase}::git+http://code.open-3d.org")
+md5sums=(SKIP)
+
+function pkgver() {
+    cd "${pkgbase}"
+    # grab the latest tag
+    git describe --tags --long \
+        | sed 's/\([^-]*-\)g/r\1/;s/-/./g'
+}
 
 function prepare() {
-    cd "Open3D-${pkgver}"
+    cd "${pkgbase}"
     mkdir -p build
 }
 
 function build() {
-    cd "Open3D-${pkgver}/build"
+    cd "${pkgbase}/build"
     cmake .. \
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DBUILD_SHARED_LIBS=ON \
@@ -60,7 +68,7 @@ function package_open3d() {
     optdepends=(
         openmp
     )
-    cd "Open3D-${pkgver}/build"
+    cd "${pkgbase}/build"
     local SITE_PACKAGES="$(awk 'BEGIN {FS="="} /^PYTHON_SITE_PACKAGES:PATH\>/ {print $2}' CMakeCache.txt)"
     install -m 644 -D -t "${pkgdir}/usr/lib" lib/libopen3d*.so
     install -d "${pkgdir}/usr/include"
@@ -83,7 +91,7 @@ function package_python-open3d() {
     optdepends=(
         openmp
     )
-    cd "Open3D-${pkgver}/build"
+    cd "${pkgbase}/build"
     local SITE_PACKAGES="$(awk 'BEGIN {FS="="} /^PYTHON_SITE_PACKAGES:PATH\>/ {print $2}' CMakeCache.txt)"
     install -m 644 -D -t "${pkgdir}/${SITE_PACKAGES}" lib/open3d.*.so
 }
diff --git a/open3d.changelog b/open3d.changelog
index dd76c28d3725..3a20235c95f4 100644
--- a/open3d.changelog
+++ b/open3d.changelog
@@ -1,2 +1,5 @@
+2018-04-29 Dylon Edwards <deltaecho at archlinux dot us>
+	* open3d 0.1.2 Fixed source location for future project location (see: https://github.com/Open-3D/Open3D/issues/31)
+
 2018-04-28 Dylon Edwards <deltaecho at archlinux dot us>
 	* open3d 0.1.2