summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-07-31 10:01:05 +0200
committerbartus2020-07-31 10:01:05 +0200
commitd338031bb5c9f2309030fbb5f1f253752e83dc66 (patch)
tree7861e3d7cd4a3ab7af475259621ab0fb7aaf9756
parent46c299c700e99e16e3ea7b9fd9855788688698db (diff)
downloadaur-d338031bb5c9f2309030fbb5f1f253752e83dc66.tar.gz
Pop version, fix nvm-export.patch.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--nvm-export.patch2
3 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9b6852380eec..f2a8ed514248 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = colmap-git
pkgdesc = General-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface.
- pkgver = 3.6.dev.3.r32.g19bf5b2
+ pkgver = 3.6.r3.gd1176fe
pkgrel = 1
url = https://colmap.github.io/
arch = i686
@@ -32,7 +32,7 @@ pkgbase = colmap-git
source = vocabulary-tree-256K.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words256K.bin
source = vocabulary-tree-1M.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words1M.bin
sha256sums = SKIP
- sha256sums = d8985b9af868edfc50f69257faf132f959398437758ccb6baa266a1bbddb3b36
+ sha256sums = 566331937811f643da5e4c2e5decae3927e7df293c0647acf2e4789ff2a43750
sha256sums = 531181351f30cfcb531fc961439152840048ff4fa71a27b1efae46421f1ab686
sha256sums = d37d8f19ee0a49705c4c0b06967a08cedfed5cf86519eada3271497256732bc2
sha256sums = d2055600452a531b5b0a62aa5943e1a07195273dc4eeebcf23d3a924d881d53a
diff --git a/PKGBUILD b/PKGBUILD
index dd8010e6d28a..98748712e219 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ _name=colmap
#fragment="#commit=5bea89263bf5f3ed623b8e6e6a5f022a0ed9c1de"
_fragment="#branch=dev"
pkgname=${_name}-git
-pkgver=3.6.dev.3.r32.g19bf5b2
+pkgver=3.6.r3.gd1176fe
pkgrel=1
pkgdesc="General-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface."
arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ depends=('cgal' 'ceres-solver' 'gflags' 'suitesparse' 'freeglut' 'glew' 'google-
makedepends=('boost' 'cmake' 'eigen' 'git' 'ninja' 'python-sphinx' )
if [ "$_BUILD_CUDA" == "ON" ] ; then
makedepends+=('cuda-sdk')
- optdepends=('cuda-toolkit: for cuda sfm/mvs acceleration')
+ optdepends+=('cuda-toolkit: for cuda sfm/mvs acceleration')
fi
source=("${pkgname}::git+https://github.com/colmap/colmap.git${_fragment}"
"nvm-export.patch"
@@ -30,7 +30,7 @@ source=("${pkgname}::git+https://github.com/colmap/colmap.git${_fragment}"
"vocabulary-tree-1M.bin::https://demuc.de/colmap/vocab_tree_flickr100K_words1M.bin"
)
sha256sums=('SKIP'
- 'd8985b9af868edfc50f69257faf132f959398437758ccb6baa266a1bbddb3b36'
+ '566331937811f643da5e4c2e5decae3927e7df293c0647acf2e4789ff2a43750'
'531181351f30cfcb531fc961439152840048ff4fa71a27b1efae46421f1ab686'
'd37d8f19ee0a49705c4c0b06967a08cedfed5cf86519eada3271497256732bc2'
'd2055600452a531b5b0a62aa5943e1a07195273dc4eeebcf23d3a924d881d53a'
diff --git a/nvm-export.patch b/nvm-export.patch
index d1442038e1f2..55514b96f542 100644
--- a/nvm-export.patch
+++ b/nvm-export.patch
@@ -31,7 +31,7 @@ index 7cb5ffb..c2b1d84 100755
--- a/src/base/reconstruction.h
+++ b/src/base/reconstruction.h
@@ -229,7 +229,7 @@ class Reconstruction {
- void ImportPLY(const std::string& path);
+ void ImportPLY(const std::vector<PlyPoint>& ply_points);
// Export to other data formats.
- bool ExportNVM(const std::string& path) const;