1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-06 06:30:19 +00:00

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)
This commit is contained in:
Jan Beich 2019-06-17 11:51:10 +00:00
parent bd8f458a9f
commit e0ac7ffda9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=504415
2 changed files with 5 additions and 0 deletions

View File

@ -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

View File

@ -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