From owner-svn-ports-all@freebsd.org Sun Feb 11 08:21:31 2018 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 60056F21D91; Sun, 11 Feb 2018 08:21:31 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1597A6B99E; Sun, 11 Feb 2018 08:21:31 +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 10A4D205DD; Sun, 11 Feb 2018 08:21:31 +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 w1B8LUox068076; Sun, 11 Feb 2018 08:21:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1B8LUxD068075; Sun, 11 Feb 2018 08:21:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201802110821.w1B8LUxD068075@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 11 Feb 2018 08:21:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r461470 - branches/2018Q1/graphics/colmap/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/graphics/colmap/files X-SVN-Commit-Revision: 461470 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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: Sun, 11 Feb 2018 08:21:31 -0000 Author: jbeich Date: Sun Feb 11 08:21:30 2018 New Revision: 461470 URL: https://svnweb.freebsd.org/changeset/ports/461470 Log: MFH: r461466 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 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 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( Approved by: ports-secteam blanket Modified: branches/2018Q1/graphics/colmap/files/patch-no-sse Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/graphics/colmap/files/patch-no-sse ============================================================================== --- branches/2018Q1/graphics/colmap/files/patch-no-sse Sun Feb 11 08:16:43 2018 (r461469) +++ branches/2018Q1/graphics/colmap/files/patch-no-sse Sun Feb 11 08:21:30 2018 (r461470) @@ -2,14 +2,13 @@ build: don't force SSE on i386 --- src/ext/PBA/CMakeLists.txt.orig 2017-06-15 14:32:01 UTC +++ src/ext/PBA/CMakeLists.txt -@@ -1,7 +1,3 @@ --if(NOT IS_MSVC) +@@ -1,5 +1,5 @@ + if(NOT IS_MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O3 -pthread -march=core2 -mfpmath=sse -Wno-c++11-narrowing") --endif() -- ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing") + endif() + if(CUDA_ENABLED) - # Fix for Ubuntu 16.04. - add_definitions("-D_FORCE_INLINES") --- src/ext/PBA/SparseBundleCPU.cpp.orig 2017-06-15 14:32:01 UTC +++ src/ext/PBA/SparseBundleCPU.cpp @@ -52,15 +52,16 @@ using std::max;