svn commit: r446137 - in branches/2017Q3/graphics/colmap: . files

[Jan Beich]

Author: jbeich
Date: Tue Jul 18 11:33:04 2017
New Revision: 446137
URL: https://svnweb.freebsd.org/changeset/ports/446137

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/2017Q3/graphics/colmap/files/patch-no-sse
     - copied unchanged from r446135, head/graphics/colmap/files/patch-no-sse
Modified:
  branches/2017Q3/graphics/colmap/Makefile
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/graphics/colmap/Makefile
==============================================================================
--- branches/2017Q3/graphics/colmap/Makefile	Tue Jul 18 11:32:56 2017	(r446136)
+++ branches/2017Q3/graphics/colmap/Makefile	Tue Jul 18 11:33:04 2017	(r446137)
@@ -3,6 +3,7 @@
 PORTNAME=	colmap
 DISTVERSION=	3.1-4
 DISTVERSIONSUFFIX=	-g542ce21 # doc fixes
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich at FreeBSD.org

Copied: branches/2017Q3/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/2017Q3/graphics/colmap/files/patch-no-sse	Tue Jul 18 11:33:04 2017	(r446137, 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)