Date: Wed, 19 Jul 2017 06:51:10 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r446185 - in branches/2017Q2/graphics/colmap: . files Message-ID: <201707190651.v6J6pAUC083842@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Jul 19 06:51:10 2017 New Revision: 446185 URL: https://svnweb.freebsd.org/changeset/ports/446185 Log: MFH: r446135 graphics/colmap: try to unbreak on non-x86 g++5: error: unrecognized command line option '-mfpmath=sse' Reported by: pkg-fallout (aarch64) Approved by: ports-secteam blanket Added: branches/2017Q2/graphics/colmap/files/patch-no-sse - copied unchanged from r446135, head/graphics/colmap/files/patch-no-sse Modified: branches/2017Q2/graphics/colmap/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/graphics/colmap/Makefile ============================================================================== --- branches/2017Q2/graphics/colmap/Makefile Wed Jul 19 05:40:13 2017 (r446184) +++ branches/2017Q2/graphics/colmap/Makefile Wed Jul 19 06:51:10 2017 (r446185) @@ -2,7 +2,7 @@ PORTNAME= colmap DISTVERSION= 2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org Copied: branches/2017Q2/graphics/colmap/files/patch-no-sse (from r446135, head/graphics/colmap/files/patch-no-sse) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/graphics/colmap/files/patch-no-sse Wed Jul 19 06:51:10 2017 (r446185, copy of r446135, head/graphics/colmap/files/patch-no-sse) @@ -0,0 +1,50 @@ +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) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O3 -pthread -march=core2 -mfpmath=sse -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; + #if defined(_M_ARM) && _M_ARM >= 7 && !defined(DISABLE_CPU_NEON) + #include <arm_neon.h> + #define CPUPBA_USE_NEON +-#elif defined(__ARM_NEON__) && !defined(DISABLE_CPU_NEON) ++#elif defined(__ARM_NEON) && !defined(DISABLE_CPU_NEON) + #include <arm_neon.h> + #define CPUPBA_USE_NEON + #endif +-#elif defined(CPUPBA_USE_AVX) // Using AVX ++#elif defined(__AVX__) && !defined(DISABLE_CPU_AVX) // Using AVX + #include <immintrin.h> ++#define CPUPBA_USE_AVX + #undef CPUPBA_USE_SSE + #undef POINT_DATA_ALIGN4 +-#elif !defined(DISABLE_CPU_SSE) // Using SSE ++#elif defined(__SSE__) && !defined(DISABLE_CPU_SSE) // Using SSE + #define CPUPBA_USE_SSE + #include <xmmintrin.h> + #include <emmintrin.h> +--- src/ext/SiftGPU/CMakeLists.txt.orig 2017-06-15 14:32:01 UTC ++++ src/ext/SiftGPU/CMakeLists.txt +@@ -1,13 +1,9 @@ + set(SIFT_GPU_ENABLE_OPENCL FALSE) +-set(SIFT_GPU_ENABLE_SSE TRUE) + set(SIFT_GPU_ENABLE_DEVIL FALSE) + set(SIFT_GPU_PREFER_GLUT TRUE) + + if(NOT IS_MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") +- if(SIFT_GPU_ENABLE_SSE) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=core2 -mfpmath=sse") +- endif() + endif() + + if(SIFT_GPU_PREFER_GLUT)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707190651.v6J6pAUC083842>