diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-07-19 06:51:10 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-07-19 06:51:10 +0000 |
| commit | f798f38e74524473f2413ef060593a25aa20fb0f (patch) | |
| tree | 28a16f8bccf658cdfe728dc5aa44725b770ea833 | |
| parent | 60d33320b62b3d64a3ef194207656913232de339 (diff) | |
| download | ports-f798f38e74524473f2413ef060593a25aa20fb0f.tar.gz ports-f798f38e74524473f2413ef060593a25aa20fb0f.zip | |
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
Notes
Notes:
svn path=/branches/2017Q2/; revision=446185
| -rw-r--r-- | graphics/colmap/Makefile | 2 | ||||
| -rw-r--r-- | graphics/colmap/files/patch-no-sse | 50 |
2 files changed, 51 insertions, 1 deletions
diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index 7ef61731e7c6..af7a7a582373 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -2,7 +2,7 @@ PORTNAME= colmap DISTVERSION= 2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/colmap/files/patch-no-sse b/graphics/colmap/files/patch-no-sse new file mode 100644 index 000000000000..5b3204ed219a --- /dev/null +++ b/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) |