Page MenuHomeFreeBSD
Files F163632238

D38512.id116996.diff
No OneTemporary
Actions

D38512.id116996.diff
View Options

Index: graphics/colmap/Makefile
===================================================================
--- graphics/colmap/Makefile
+++ graphics/colmap/Makefile
@@ -1,6 +1,5 @@
PORTNAME= colmap
-DISTVERSION= 3.7
-PORTREVISION= 1
+DISTVERSION= 3.8
CATEGORIES= graphics
MAINTAINER= fuz@FreeBSD.org
@@ -20,8 +19,11 @@
LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
libceres.so:math/ceres-solver \
+ libflann.so:math/flann \
libfreeimage.so:graphics/freeimage \
- libglog.so:devel/glog
+ libglog.so:devel/glog \
+ liblz4.so:archivers/liblz4 \
+ libmetis.so:math/metis
USES= cmake compiler:${OPENMP}c++11-lib desktop-file-utils eigen:3 gl \
localbase python:env qt:5 sqlite
@@ -63,11 +65,6 @@
# XXX math/flann has -DUSE_OPENMP=OFF and lacks tunning:
# https://github.com/colmap/colmap/commit/4b594eb85c13
# https://github.com/colmap/colmap/commit/1e9f1f3324cd
- @${REINPLACE_CMD} -e '/SQLite/d' \
- ${WRKSRC}/lib/CMakeLists.txt
- @${REINPLACE_CMD} -e 's,SQLite/,,' \
- ${WRKSRC}/src/base/database.h \
- ${WRKSRC}/src/util/sqlite3_utils.h
.if !defined(DISPLAY) # QApplication
@${REINPLACE_CMD} -e '/opengl_utils_test/d' \
${WRKSRC}/src/util/CMakeLists.txt
Index: graphics/colmap/distinfo
===================================================================
--- graphics/colmap/distinfo
+++ graphics/colmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667929528
-SHA256 (colmap-colmap-3.7_GH0.tar.gz) = ceb7cca204550d65b890cd0082c66f4bc69193daf9da64616d8147a46b76cc55
-SIZE (colmap-colmap-3.7_GH0.tar.gz) = 6354531
+TIMESTAMP = 1675295251
+SHA256 (colmap-colmap-3.8_GH0.tar.gz) = 02288f8f61692fe38049d65608ed832b31246e7792692376afb712fa4cef8775
+SIZE (colmap-colmap-3.8_GH0.tar.gz) = 3698389
Index: graphics/colmap/pkg-plist
===================================================================
--- graphics/colmap/pkg-plist
+++ graphics/colmap/pkg-plist
@@ -63,61 +63,6 @@
include/colmap/feature/sift.h
include/colmap/feature/types.h
include/colmap/feature/utils.h
-include/colmap/lib/FLANN/algorithms/all_indices.h
-include/colmap/lib/FLANN/algorithms/autotuned_index.h
-include/colmap/lib/FLANN/algorithms/center_chooser.h
-include/colmap/lib/FLANN/algorithms/composite_index.h
-include/colmap/lib/FLANN/algorithms/dist.h
-include/colmap/lib/FLANN/algorithms/hierarchical_clustering_index.h
-include/colmap/lib/FLANN/algorithms/kdtree_cuda_3d_index.h
-include/colmap/lib/FLANN/algorithms/kdtree_cuda_builder.h
-include/colmap/lib/FLANN/algorithms/kdtree_index.h
-include/colmap/lib/FLANN/algorithms/kdtree_single_index.h
-include/colmap/lib/FLANN/algorithms/kmeans_index.h
-include/colmap/lib/FLANN/algorithms/linear_index.h
-include/colmap/lib/FLANN/algorithms/lsh_index.h
-include/colmap/lib/FLANN/algorithms/nn_index.h
-include/colmap/lib/FLANN/config.h
-include/colmap/lib/FLANN/config.h.in
-include/colmap/lib/FLANN/defines.h
-include/colmap/lib/FLANN/ext/lz4.h
-include/colmap/lib/FLANN/ext/lz4hc.h
-include/colmap/lib/FLANN/flann.h
-include/colmap/lib/FLANN/flann.hpp
-include/colmap/lib/FLANN/general.h
-include/colmap/lib/FLANN/io/hdf5.h
-include/colmap/lib/FLANN/mpi/client.h
-include/colmap/lib/FLANN/mpi/index.h
-include/colmap/lib/FLANN/mpi/matrix.h
-include/colmap/lib/FLANN/mpi/queries.h
-include/colmap/lib/FLANN/mpi/server.h
-include/colmap/lib/FLANN/nn/ground_truth.h
-include/colmap/lib/FLANN/nn/index_testing.h
-include/colmap/lib/FLANN/nn/simplex_downhill.h
-include/colmap/lib/FLANN/util/allocator.h
-include/colmap/lib/FLANN/util/any.h
-include/colmap/lib/FLANN/util/cuda/heap.h
-include/colmap/lib/FLANN/util/cuda/result_set.h
-include/colmap/lib/FLANN/util/cutil_math.h
-include/colmap/lib/FLANN/util/dynamic_bitset.h
-include/colmap/lib/FLANN/util/heap.h
-include/colmap/lib/FLANN/util/logger.h
-include/colmap/lib/FLANN/util/lsh_table.h
-include/colmap/lib/FLANN/util/matrix.h
-include/colmap/lib/FLANN/util/object_factory.h
-include/colmap/lib/FLANN/util/params.h
-include/colmap/lib/FLANN/util/random.h
-include/colmap/lib/FLANN/util/result_set.h
-include/colmap/lib/FLANN/util/sampling.h
-include/colmap/lib/FLANN/util/saving.h
-include/colmap/lib/FLANN/util/serialization.h
-include/colmap/lib/FLANN/util/timer.h
-include/colmap/lib/Graclus/metisLib/defs.h
-include/colmap/lib/Graclus/metisLib/macros.h
-include/colmap/lib/Graclus/metisLib/metis.h
-include/colmap/lib/Graclus/metisLib/proto.h
-include/colmap/lib/Graclus/metisLib/rename.h
-include/colmap/lib/Graclus/metisLib/struct.h
include/colmap/lib/LSD/lsd.h
include/colmap/lib/PBA/ConfigBA.h
include/colmap/lib/PBA/CuTexImage.h
@@ -311,8 +256,6 @@
include/colmap/util/types.h
include/colmap/util/version.h
lib/colmap/libcolmap.a
-lib/colmap/libflann.a
-lib/colmap/libgraclus.a
lib/colmap/liblsd.a
lib/colmap/libpba.a
lib/colmap/libpoisson_recon.a
@@ -322,6 +265,10 @@
%%DATADIR%%/COLMAPConfig.cmake
%%DATADIR%%/COLMAPConfigVersion.cmake
%%DATADIR%%/cmake/FindEigen3.cmake
+%%DATADIR%%/cmake/FindFLANN.cmake
%%DATADIR%%/cmake/FindFreeImage.cmake
%%DATADIR%%/cmake/FindGlew.cmake
%%DATADIR%%/cmake/FindGlog.cmake
+%%DATADIR%%/cmake/FindLZ4.cmake
+%%DATADIR%%/cmake/FindMetis.cmake
+%%DATADIR%%/cmake/FindSQLite3.cmake

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 26, 12:43 AM (6 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35506873
Default Alt Text
D38512.id116996.diff (5 KB)

Event Timeline