From owner-svn-ports-head@freebsd.org Tue Dec 5 20:52:59 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5CD77E81273; Tue, 5 Dec 2017 20:52:59 +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 mx1.freebsd.org (Postfix) with ESMTPS id 36F326EF4E; Tue, 5 Dec 2017 20:52:59 +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 vB5Kqw5M005934; Tue, 5 Dec 2017 20:52:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB5KqwtZ005931; Tue, 5 Dec 2017 20:52:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201712052052.vB5KqwtZ005931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 5 Dec 2017 20:52:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455621 - in head/graphics/colmap: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/colmap: . files X-SVN-Commit-Revision: 455621 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2017 20:52:59 -0000 Author: jbeich Date: Tue Dec 5 20:52:57 2017 New Revision: 455621 URL: https://svnweb.freebsd.org/changeset/ports/455621 Log: graphics/colmap: update to 3.3 Changes: https://github.com/colmap/colmap/blob/3.3/CHANGELOG.txt Deleted: head/graphics/colmap/files/patch-pba-nostd Modified: head/graphics/colmap/Makefile (contents, props changed) head/graphics/colmap/distinfo (contents, props changed) head/graphics/colmap/files/patch-vlfeat-rtcpu (contents, props changed) Modified: head/graphics/colmap/Makefile ============================================================================== --- head/graphics/colmap/Makefile Tue Dec 5 20:35:45 2017 (r455620) +++ head/graphics/colmap/Makefile Tue Dec 5 20:52:57 2017 (r455621) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= colmap -DISTVERSION= 3.2 -PORTREVISION= 4 +DISTVERSION= 3.3 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org Modified: head/graphics/colmap/distinfo ============================================================================== --- head/graphics/colmap/distinfo Tue Dec 5 20:35:45 2017 (r455620) +++ head/graphics/colmap/distinfo Tue Dec 5 20:52:57 2017 (r455621) @@ -1,3 +1,3 @@ -TIMESTAMP = 1504347098 -SHA256 (colmap-colmap-3.2_GH0.tar.gz) = 7d86d3a0a68efdbcdde7bf4f24fdf40f695e61454c8497d519e9c823d148e424 -SIZE (colmap-colmap-3.2_GH0.tar.gz) = 5674070 +TIMESTAMP = 1511304389 +SHA256 (colmap-colmap-3.3_GH0.tar.gz) = 7fba029a14a68d827ebd57383a8c6271d259c0edbdee7f1e4f0874477f1c3e99 +SIZE (colmap-colmap-3.3_GH0.tar.gz) = 5683574 Modified: head/graphics/colmap/files/patch-vlfeat-rtcpu ============================================================================== --- head/graphics/colmap/files/patch-vlfeat-rtcpu Tue Dec 5 20:35:45 2017 (r455620) +++ head/graphics/colmap/files/patch-vlfeat-rtcpu Tue Dec 5 20:52:57 2017 (r455621) @@ -1,6 +1,6 @@ build: don't force SSE2/AVX, enable at runtime instead ---- CMakeLists.txt.orig 2017-05-22 13:02:37 UTC +--- CMakeLists.txt.orig 2017-11-21 22:46:29 UTC +++ CMakeLists.txt @@ -17,8 +17,6 @@ include(CheckCXXCompilerFlag) # the CMake policies in this file @@ -17,36 +17,37 @@ build: don't force SSE2/AVX, enable at runtime instead +option(SIMD_ENABLED "Whether to enable SIMD optimizations" ON) option(OPENMP_ENABLED "Whether to enable OpenMP" ON) - option(LTO_ENABLED "Whether to enable link-time optimization" ON) + option(IPO_ENABLED "Whether to enable interprocedural optimization" ON) option(CUDA_ENABLED "Whether to enable CUDA, if available" ON) ---- src/ext/VLFeat/CMakeLists.txt.orig 2017-09-02 10:11:38 UTC +--- src/ext/VLFeat/CMakeLists.txt.orig 2017-11-21 22:46:29 UTC +++ src/ext/VLFeat/CMakeLists.txt -@@ -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) +@@ -70,16 +70,16 @@ set(VLFEAT_SOURCE_FILES + vlad.h) -- 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() + if(IS_GNU OR IS_CLANG) +- if(HAS_AVX_EXTENSION) +- list(APPEND VLFEAT_SOURCE_FILES ++ if(SIMD_ENABLED AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86|amd64|AMD64") ++ set(AVX_SOURCES + mathop_avx.c + mathop_avx.h) + else() + add_definitions(-DVL_DISABLE_AVX) + endif() +- if(HAS_SSE2_EXTENSION) +- list(APPEND VLFEAT_SOURCE_FILES ++ if(SIMD_ENABLED AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86|amd64|AMD64") ++ set(SSE2_SOURCES + mathop_sse2.c + mathop_sse2.h + imopv_sse2.c +@@ -88,8 +88,12 @@ if(IS_GNU OR IS_CLANG) + add_definitions(-DVL_DISABLE_SSE2) + endif() + - 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 -+ imopv_sse2.h -+ mathop_sse2.c -+ mathop_sse2.h) -+ set(AVX_SOURCES -+ mathop_avx.c -+ mathop_avx.h) -+ + list(APPEND VLFEAT_SOURCE_FILES ${AVX_SOURCES} ${SSE2_SOURCES}) + + set_source_files_properties(${AVX_SOURCES} @@ -56,32 +57,3 @@ build: don't force SSE2/AVX, enable at runtime instead else() add_definitions(-DVL_DISABLE_AVX) add_definitions(-DVL_DISABLE_SSE2) -@@ -18,7 +29,7 @@ if(NOT OPENMP_ENABLED OR NOT OPENMP_FOUND) - add_definitions(-DVL_DISABLE_OPENMP) - endif() - --set(VLFEAT_SOURCE_FILES -+list(APPEND VLFEAT_SOURCE_FILES - aib.c - aib.h - array.c -@@ -52,8 +63,6 @@ set(VLFEAT_SOURCE_FILES - ikmeans_lloyd.tc - imopv.c - imopv.h -- imopv_sse2.c -- imopv_sse2.h - kdtree.c - kdtree.h - kmeans.c -@@ -64,10 +73,6 @@ set(VLFEAT_SOURCE_FILES - liop.h - mathop.c - mathop.h -- mathop_avx.c -- mathop_avx.h -- mathop_sse2.c -- mathop_sse2.h - mser.c - mser.h - pgm.c