From owner-svn-ports-all@freebsd.org Mon Jun 17 11:51:11 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64D8415B66B1; Mon, 17 Jun 2019 11:51:11 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0430D8CB83; Mon, 17 Jun 2019 11:51:11 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB782253B9; Mon, 17 Jun 2019 11:51:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5HBpATk020161; Mon, 17 Jun 2019 11:51:10 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5HBpAkG020160; Mon, 17 Jun 2019 11:51:10 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201906171151.x5HBpAkG020160@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 17 Jun 2019 11:51:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504415 - head/graphics/colmap X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/colmap X-SVN-Commit-Revision: 504415 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0430D8CB83 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2019 11:51:11 -0000 Author: jbeich Date: Mon Jun 17 11:51:10 2019 New Revision: 504415 URL: https://svnweb.freebsd.org/changeset/ports/504415 Log: 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) Modified: head/graphics/colmap/Makefile (contents, props changed) head/graphics/colmap/distinfo (contents, props changed) Modified: head/graphics/colmap/Makefile ============================================================================== --- head/graphics/colmap/Makefile Mon Jun 17 11:46:50 2019 (r504414) +++ head/graphics/colmap/Makefile Mon Jun 17 11:51:10 2019 (r504415) @@ -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 Modified: head/graphics/colmap/distinfo ============================================================================== --- head/graphics/colmap/distinfo Mon Jun 17 11:46:50 2019 (r504414) +++ head/graphics/colmap/distinfo Mon Jun 17 11:51:10 2019 (r504415) @@ -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