COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View
Stereo (MVS) pipeline with a graphical and command-line interface. It
offers a wide range of features for reconstruction of ordered and
unordered image collections.
===> The following configuration options are available for colmap-4.2.1:
CGAL=on: Graph-cut on Delaunay triangulation based meshing algorithm
DOCS=on: Build and/or install documentation
ONNX=on: Use Open Neural Network Exchange (ONNX)
SIMD=on: Use CPU-specific optimizations
===> Use 'make config' to modify these settings
graphics/colmap: update to 4.1.0
- comes with a new GPU-based backend (caspar) which I haven't
hooked up for now.
- disable the ONNX option on i386 to have the port build there
Changelog: https://github.com/colmap/colmap/releases/tag/4.1.0
graphics/colmap: update to 3.12.6
- remove option OPENMP, it makes no sense not to have it when
available
- convert to Qt6. Port can still do Qt5, but it doesn't seem
to be too useful to support both.
Changelog: https://github.com/colmap/colmap/releases/tag/3.12.6
graphics/colmap: no longer depend on libboost_system
This boost component is no longer a shared library.
Patch cmake build scripts so it doesn't try to detect it.
Also remove now unreferenced BOOST_STATIC options.
Reported by: fluffy
graphics/colmap: touch up
- document expected test suite failures
- add missing TEST_DEPENDS
- remove outdated commented out Makefile chunk
See also: https://github.com/colmap/colmap/issues/3021
*/*: Update fuz@fuz.su to fuz@FreeBSD.org
www/writefreely had a stray duplicate MAINTAINER block
from an earlier botched commit. I did intentionally not
touch the entry in UPDATING.
Reviewed by: eduardo, flo
Differential Revision: https://reviews.freebsd.org/D38435
Mk/Uses: always use colon for build/run suffix
Most USES use a colon for build/run(/test) suffixes. Change kde.mk,
qt.mk and pyqt.mk to do the same, and update all ports using that.
Document in CHANGES.
PR: 266034
Exp-run by: antoine
Approved by: tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D36349
Remove WWW entries moved into port Makefiles
Commit b7f05445c00f has added WWW entries to port Makefiles based on
WWW: lines in pkg-descr files.
This commit removes the WWW: lines of moved-over URLs from these
pkg-descr files.
Approved by: portmgr (tcberner)
Add WWW entries to port Makefiles
It has been common practice to have one or more URLs at the end of the
ports' pkg-descr files, one per line and prefixed with "WWW:". These
URLs should point at a project website or other relevant resources.
Access to these URLs required processing of the pkg-descr files, and
they have often become stale over time. If more than one such URL was
present in a pkg-descr file, only the first one was tarnsfered into
the port INDEX, but for many ports only the last line did contain the
port specific URL to further information.
There have been several proposals to make a project URL available as
a macro in the ports' Makefiles, over time.
(Only the first 15 lines of the commit message are shown above )
graphics/mesa-libs: Bump reverse deps for libglvnd
Per discussion with bapt on helping pkg handle the changing of these
deps and avoiding impossible upgrade senarios.
PR: 246767
Reviewed by: manu, bapt
Approved by: x11
Differential Revision: https://reviews.freebsd.org/D30824
- Upgrade math/eigen3 to 3.3.8;
- Add some dependencies which might be detected by Find_Package but not
registered;
- Bump PORTREVISION of consumers.
PR: 250833
Submitted by: /me
Approved by: tcberner@ (KDE / maintainer) + exp-run
Update Sphinx
- Repocopy textproc/py-sphinx to textproc/py-sphinx18
Update it to 1.8.5 (latest version from 1.8.X).
This version supports Python 2 and 3.
Add test target.
- textproc/py-sphinx: Update to 3.0.2
Python 3 only (3.5+).
Add test target.
- Mk/Uses/python.mk: Add PY_SPHINX
(Only the first 15 lines of the commit message are shown above )
smath/cgal: Update to 5.0.2
The new version of CGAL brings improvements and a lot of changes, including 2
major ones [1](header only[2] and require c++14) requiring to patch all software
depending on it.
[1] https://www.cgal.org/2019/11/08/cgal50/
[2] https://doc.cgal.org/latest/Manual/installation.html
math/cgal:
- Update to 5.0.2
databases/sfcgal:
- Fix with cgal5 : use c++14 and add gmpxx link
(Only the first 15 lines of the commit message are shown above )
Add USES=xorg USES=gl, ports categories g
Add USES=xorg and USES=gl to ports in categories starting with 'g'.
While here, try to sprinkle other USES (mostly gnome and sdl) as needed.
Drop C++11 workaround for GCC < 6 after r449590
lang/gcc5 will expire in ~1 month. If someone still uses lang/gcc48
they should backport C++11 fix instead. QA on GCC architecuters is
currently limited to powerpc64 which uses GCC_DEFAULT.
PR: 193528
Bump PORTREVISION for ports depending on the canonical version of GCC
as defined in Mk/bsd.default-versions.mk which has moved from GCC 8.3
to GCC 9.1 under most circumstances now after revision 507371.
This includes ports
- with USE_GCC=yes or USE_GCC=any,
- with USES=fortran,
- using Mk/bsd.octave.mk which in turn features USES=fortran, and
- with USES=compiler specifying openmp, nestedfct, c11, c++0x, c++11-lang,
c++11-lib, c++14-lang, c++17-lang, or gcc-c++11-lib
plus, everything INDEX-11 shows with a dependency on lang/gcc9 now.
PR: 238330
graphics/colmap: unbreak OPENMP with GCC 9
In file included from lib/VLFeat/kmeans.h:21,
from lib/VLFeat/kmeans.c:363:
lib/VLFeat/kmeans.c: In function '_vl_kmeans_quantize_f':
lib/VLFeat/mathop.h:92:37: error: 'vl_infinity_d' not specified in enclosing
'parallel'
92 | #define VL_INFINITY_D (vl_infinity_d.value)
| ~~~~~~~~~~~~~~^~~~~~~
lib/VLFeat/kmeans.c:685:34: note: in expansion of macro 'VL_INFINITY_D'
685 | TYPE bestDistance = (TYPE) VL_INFINITY_D ;
| ^~~~~~~~~~~~~
In file included from lib/VLFeat/kmeans.c:1782:
lib/VLFeat/kmeans.c:672:9: error: enclosing 'parallel'
672 | #pragma omp parallel default(none) \
| ^~~
In file included from lib/VLFeat/kmeans.c:1788:
lib/VLFeat/kmeans.c: In function '_vl_kmeans_quantize_d':
lib/VLFeat/kmeans.c:685:27: error: 'vl_infinity_d' not specified in enclosing
'parallel'
685 | TYPE bestDistance = (TYPE) VL_INFINITY_D ;
lib/VLFeat/kmeans.c:672:9: error: enclosing 'parallel'
672 | #pragma omp parallel default(none) \
| ^~~
PR: 238330
Reported by: antoine (via exp-run)
math/ceres-solver: don't force GCC for OpenMP on -CURRENT
Limited to amd64 and i386. LLVM openmp doesn't support other
architectures on FreeBSD (unlike Linux) but it's only important where
Clang is default e.g., aarch64, armv6, armv7.
math/ceres-solver: drop GCC RPATH after r499061
USES=fortran was used to ensure linking against libceres picks up
correct libgcc_s to satisfy dependencies e.g., suitesparse, *blas.
Related to revision 499061 bump ports with USES=fortran to have them
benefit from the improved situation where libgcc_s is only used when
absolutely necessary.
Suggested by: tijl
Fix Qt5 symbol version scripts to put the catch-all clause first. When
a symbol matches multiple clauses the last one takes precedence. If the
catch-all is last it captures everything. In the case of Qt5 libraries
this caused all symbols to have a Qt_5 label while some should have
Qt_5_PRIVATE_API. This only affects lld because GNU ld always gives the
catch-all lowest priority.
Older versions of Qt5Webengine exported some memory allocation symbols from
the bundled Chromium. Version 5.9 stopped exporting these [1] but the
symbols were kept as weak wrappers for the standard allocation functions to
maintain binary compatibility. [2][3] The problem is that the call to the
standard function in these weak wrappers is only resolved to the standard
function if there's a call to this standard function in other parts of
Qt5Webengine, because only then is there a non-weak symbol that takes
precedence over the weak one. If there's no such non-weak symbol the call
(Only the first 15 lines of the commit message are shown above )
Bump PORTREVISION for ports depending on the canonical version of GCC
defined via Mk/bsd.default-versions.mk which has moved from GCC 7.4 t
GCC 8.2 under most circumstances.
This includes ports
- with USE_GCC=yes or USE_GCC=any,
- with USES=fortran,
- using Mk/bsd.octave.mk which in turn features USES=fortran, and
- with USES=compiler specifying openmp, nestedfct, c11, c++0x, c++11-lang,
c++11-lib, c++14-lang, c++17-lang, or gcc-c++11-lib
plus, as a double check, everything INDEX-11 showed depending on lang/gcc7.
PR: 231590
Change x11/xorgproto to become a build dep
Change x11/xorgproto to become a build time dependency when added to
USE_XORG. Change the dependency to be on the port, rather than a file the
port installs.
Fix fallout.
Bump portrevision on depending ports.
PR: 230909
Reviewed by: eadler
Approved by: portmgr (antoine)
Obtained
from: https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xorgproto
exp-run: antoine
Differential Revision: https://reviews.freebsd.org/D16906
Bump PORTREVISION for ports depending on the canonical version of GCC
in the ports tree (via Mk/bsd.default-versions.mk and lang/gcc) which
has now moved from GCC 6 to GCC 7 by default.
This includes ports
- featuring USE_GCC=yes or USE_GCC=any,
- featuring USES=fortran,
- using Mk/bsd.octave.mk which in turn features USES=fortran, and those
- with USES=compiler specifying one of openmp, nestedfct, c11, c++0x,
c++11-lib, c++11-lang, c++14-lang, c++17-lang, or gcc-c++11-lib.
PR: 222542
Replace bsd.qt.mk by Uses/qt.mk and Uses/qt-dist.mk
From now on, ports that depend on Qt4 will have to set
USES= qt:4
USE_QT= foo bar
ports depending on Qt5 will use
USES= qt:5
USE_QT= foo bar
PR: 229225
Exp-run by: antoine
Reviewed by: mat
Approved by: portmgr (antoine)
Differential Revision: -https://reviews.freebsd.org/D15540
graphics/colmap: unbreak OPENMP=off after r446135
src/ext/PBA/SparseBundleCPU.cpp:1208:7: error: non-constant-expression cannot be
narrowed from type 'size_t' (aka 'unsigned long') to 'int' in initializer list
[-Wc++11-narrowing]
RUN_THREAD(ComputeProjection, threads[i], last - first, camera, point,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ext/PBA/SparseBundleCPU.cpp:933:3: note: expanded from macro 'RUN_THREAD'
DECLEAR_THREAD_DATA(X, __VA_ARGS__); \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ext/PBA/SparseBundleCPU.cpp:908:30: note: expanded from macro
'DECLEAR_THREAD_DATA'
X##_STRUCT<Float> tdata = {i, __VA_ARGS__}; \
^
src/ext/PBA/SparseBundleCPU.cpp:1537:68: error: non-constant-expression cannot
be narrowed from type 'size_t' (aka 'unsigned long') to 'int' in initializer
list [-Wc++11-narrowing]
intrinsic_fixed, radial_distortion, shuffle, jct, first);
^~~~~
src/ext/PBA/SparseBundleCPU.cpp:933:26: note: expanded from macro 'RUN_THREAD'
DECLEAR_THREAD_DATA(X, __VA_ARGS__); \
^~~~~~~~~~~
src/ext/PBA/SparseBundleCPU.cpp:908:33: note: expanded from macro
'DECLEAR_THREAD_DATA'
X##_STRUCT<Float> tdata = {i, __VA_ARGS__}; \
^~~~~~~~~~~
src/ext/PBA/SparseBundleCPU.cpp:1537:68: note: insert an explicit cast to
silence this issue
intrinsic_fixed, radial_distortion, shuffle, jct, first);
^~~~~
static_cast<int>(
New USES=eigen
Usage:
USES=eigen:<version>[,<type>]
version: 2 or 3 (required)
type: build (default), run
For example:
USES=eigen:2,build,run
will add a BUILD- and RUN_DEPENDS on math/eigen2, and
USES=eigen:3
will add a BUILD_DEPENDS on math/eigen3.
* Convert the existing ports to use it
- biology/iqtree: remove run time dependency (seemed not to be needed)
- graphics/movit: remove run time dependency (seemed not to be needed)
- science/avogadro: add run time dependeny (installed cmake file requires it
to be present)
Reviewed by: rakuco, mat
Differential Revision: https://reviews.freebsd.org/D13702
Bump PORTREVISION for ports depending on the canonical version of GCC
(via Mk/bsd.default-versions.mk and lang/gcc) which has moved from
GCC 5.4 to GCC 6.4 under most circumstances.
This includes ports
- with USE_GCC=yes or USE_GCC=any,
- with USES=fortran,
- using Mk/bsd.octave.mk which in turn features USES=fortran, and
- with USES=compiler specifying openmp, nestedfct, c++11-lib, c++11-lang,
c++14-lang, c++0x, c11, or gcc-c++11-lib.
PR: 219275
graphics/colmap: try#2 to unbreak on non-x86
../ext/VLFeat/libvlfeat.a(host.c.o): In function `_vl_x86cpu_info_init':
host.c:(.text+0x1c): undefined reference to `_vl_cpuid'
host.c:(.text+0x40): undefined reference to `_vl_cpuid'
collect2: error: ld returned 1 exit status
Reported by: pkg-fallout (aarch64, armv6)
