Index: branches/2017Q3/graphics/colmap/files/patch-src_ext_VLFeat_host.c
===================================================================
--- branches/2017Q3/graphics/colmap/files/patch-src_ext_VLFeat_host.c	(nonexistent)
+++ branches/2017Q3/graphics/colmap/files/patch-src_ext_VLFeat_host.c	(revision 449271)
@@ -0,0 +1,20 @@
+vlfeat: don't try to use CPUID on non-x86
+
+--- src/ext/VLFeat/host.c.orig	2017-06-15 14:32:01 UTC
++++ src/ext/VLFeat/host.c
+@@ -441,6 +441,7 @@ _vl_cpuid (vl_int32* info, int function)
+ 
+ #endif
+ 
++#if defined(VL_ARCH_IX86) || defined(VL_ARCH_X64) || defined(VL_ARCH_IA64)
+ void
+ _vl_x86cpu_info_init (VlX86CpuInfo *self)
+ {
+@@ -487,6 +488,7 @@ _vl_x86cpu_info_to_string_copy (VlX86CpuInfo const *se
+   }
+   return string ;
+ }
++#endif
+ 
+ /** ------------------------------------------------------------------
+  ** @brief Human readable static library configuration

Property changes on: branches/2017Q3/graphics/colmap/files/patch-src_ext_VLFeat_host.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q3
===================================================================
--- branches/2017Q3	(revision 449270)
+++ branches/2017Q3	(revision 449271)

Property changes on: branches/2017Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r449270