svn commit: r449264 - in head/graphics/colmap: . files

[Jan Beich]

Author: jbeich
Date: Tue Sep  5 01:05:19 2017
New Revision: 449264
URL: https://svnweb.freebsd.org/changeset/ports/449264

Log:
  graphics/colmap: update to 3.2
  
  Changes:	https://github.com/colmap/colmap/blob/3.2/CHANGELOG.txt

Modified:
  head/graphics/colmap/Makefile   (contents, props changed)
  head/graphics/colmap/distinfo   (contents, props changed)
  head/graphics/colmap/files/patch-no-sse   (contents, props changed)
  head/graphics/colmap/files/patch-vlfeat-rtcpu   (contents, props changed)

Modified: head/graphics/colmap/Makefile
==============================================================================
--- head/graphics/colmap/Makefile	Tue Sep  5 01:00:15 2017	(r449263)
+++ head/graphics/colmap/Makefile	Tue Sep  5 01:05:19 2017	(r449264)
@@ -1,9 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	colmap
-DISTVERSION=	3.1-4
-DISTVERSIONSUFFIX=	-g542ce21 # doc fixes
-PORTREVISION=	1
+DISTVERSION=	3.2
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -28,7 +26,7 @@ LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 
 USES=		cmake compiler:${OPENMP}c++11-lib fortran localbase sqlite
 USE_GITHUB=	yes
-USE_GL=		gl glew glut
+USE_GL=		gl glew
 USE_QT5=	qmake_build buildtools_build core gui opengl_build widgets
 EXCLUDE=	SQLite
 EXTRACT_AFTER_ARGS=	${EXCLUDE:S,^,--exclude src/ext/,}

Modified: head/graphics/colmap/distinfo
==============================================================================
--- head/graphics/colmap/distinfo	Tue Sep  5 01:00:15 2017	(r449263)
+++ head/graphics/colmap/distinfo	Tue Sep  5 01:05:19 2017	(r449264)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497537121
-SHA256 (colmap-colmap-3.1-4-g542ce21_GH0.tar.gz) = c8b6c5f9eea30f8e5ff95fe87ff1cc6123639c450602035082d33609b6e275de
-SIZE (colmap-colmap-3.1-4-g542ce21_GH0.tar.gz) = 5657539
+TIMESTAMP = 1504347098
+SHA256 (colmap-colmap-3.2_GH0.tar.gz) = 7d86d3a0a68efdbcdde7bf4f24fdf40f695e61454c8497d519e9c823d148e424
+SIZE (colmap-colmap-3.2_GH0.tar.gz) = 5674070

Modified: head/graphics/colmap/files/patch-no-sse
==============================================================================
--- head/graphics/colmap/files/patch-no-sse	Tue Sep  5 01:00:15 2017	(r449263)
+++ head/graphics/colmap/files/patch-no-sse	Tue Sep  5 01:05:19 2017	(r449264)
@@ -32,19 +32,3 @@ build: don't force SSE on i386
  #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)

Modified: head/graphics/colmap/files/patch-vlfeat-rtcpu
==============================================================================
--- head/graphics/colmap/files/patch-vlfeat-rtcpu	Tue Sep  5 01:00:15 2017	(r449263)
+++ head/graphics/colmap/files/patch-vlfeat-rtcpu	Tue Sep  5 01:05:19 2017	(r449264)
@@ -19,18 +19,24 @@ build: don't force SSE2/AVX, enable at runtime instead
  option(OPENMP_ENABLED "Whether to enable OpenMP" ON)
  option(LTO_ENABLED "Whether to enable link-time optimization" ON)
  option(CUDA_ENABLED "Whether to enable CUDA, if available" ON)
---- src/ext/VLFeat/CMakeLists.txt.orig	2016-12-07 13:47:54 UTC
+--- src/ext/VLFeat/CMakeLists.txt.orig	2017-09-02 10:11:38 UTC
 +++ src/ext/VLFeat/CMakeLists.txt
-@@ -1,8 +1,27 @@
--if(IS_MSVC OR NOT HAS_AVX_EXTENSION)
--    add_definitions(-DVL_DISABLE_AVX)
+@@ -1,14 +1,25 @@
+-if(IS_GNU OR IS_CLANG)
+-    if(NOT HAS_AVX_EXTENSION)
+-        add_definitions(-DVL_DISABLE_AVX)
+-    endif()
 +set(VLFEAT_SOURCE_FILES)
-+
+ 
+-    if(NOT HAS_SSE2_EXTENSION)
+-        add_definitions(-DVL_DISABLE_SSE2)
+-    endif()
 +if(CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86|amd64|AMD64")
 +    set(IS_X86 TRUE)
- endif()
++endif()
  
--if(IS_MSVC OR NOT HAS_SSE2_EXTENSION)
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SSE_FLAGS}")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}")
 +if(SIMD_ENABLED AND IS_X86 AND NOT IS_MSVC)
 +    set(SSE2_SOURCES
 +        imopv_sse2.c
@@ -47,12 +53,10 @@ build: don't force SSE2/AVX, enable at runtime instead
 +        PROPERTIES COMPILE_FLAGS "-mavx")
 +    set_source_files_properties(${SSE2_SOURCES}
 +        PROPERTIES COMPILE_FLAGS "-msse2")
-+else()
-+    add_definitions(-DVL_DISABLE_AVX)
+ else()
+     add_definitions(-DVL_DISABLE_AVX)
      add_definitions(-DVL_DISABLE_SSE2)
- endif()
- 
-@@ -10,7 +29,7 @@ if(NOT OPENMP_ENABLED OR NOT OPENMP_FOUN
+@@ -18,7 +29,7 @@ if(NOT OPENMP_ENABLED OR NOT OPENMP_FOUND)
      add_definitions(-DVL_DISABLE_OPENMP)
  endif()
  
@@ -61,7 +65,7 @@ build: don't force SSE2/AVX, enable at runtime instead
      aib.c
      aib.h
      array.c
-@@ -44,8 +63,6 @@ set(VLFEAT_SOURCE_FILES
+@@ -52,8 +63,6 @@ set(VLFEAT_SOURCE_FILES
      ikmeans_lloyd.tc
      imopv.c
      imopv.h
@@ -70,7 +74,7 @@ build: don't force SSE2/AVX, enable at runtime instead
      kdtree.c
      kdtree.h
      kmeans.c
-@@ -56,10 +73,6 @@ set(VLFEAT_SOURCE_FILES
+@@ -64,10 +73,6 @@ set(VLFEAT_SOURCE_FILES
      liop.h
      mathop.c
      mathop.h