diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-06-17 11:51:10 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-06-17 11:51:10 +0000 |
| commit | e0ac7ffda92b44d0cb8f5f07a2b5b5a85ab49af1 (patch) | |
| tree | 51aacc5257a3e4f7523ac58df2017aa94ddce515 /graphics/colmap | |
| parent | bd8f458a9f4fe3303f09ccbafe80820b22771851 (diff) | |
| download | ports-e0ac7ffda92b44d0cb8f5f07a2b5b5a85ab49af1.tar.gz ports-e0ac7ffda92b44d0cb8f5f07a2b5b5a85ab49af1.zip | |
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)
Notes
Notes:
svn path=/head/; revision=504415
Diffstat (limited to 'graphics/colmap')
| -rw-r--r-- | graphics/colmap/Makefile | 3 | ||||
| -rw-r--r-- | graphics/colmap/distinfo | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index b0b1dcc6ed47..2dfb5b6db999 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -5,6 +5,9 @@ DISTVERSION= 3.5 PORTREVISION= 7 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= b5ccc54e68e3.patch:-p1 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Structure from motion and multi-view stereo diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo index e9b2708d400d..a43d729d09ee 100644 --- a/graphics/colmap/distinfo +++ b/graphics/colmap/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1535031594 SHA256 (colmap-colmap-3.5_GH0.tar.gz) = 7a23856a5662daf5466ef9cdf821eb139f2e1bd6f0d3a03d1558ace5bc49bc06 SIZE (colmap-colmap-3.5_GH0.tar.gz) = 5872165 +SHA256 (b5ccc54e68e3.patch) = 38e8328e52889ec18dd69939c4fbef8b653d5f0fe022ca8eb3ae3b521582a3a8 +SIZE (b5ccc54e68e3.patch) = 1757 |