[vxl] Update to 3.5.0 (#41518)

ports/vxl/file_formats.diff

@@ -1,5 +1,5 @@
 diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 3483f9c..5040676 100644
+index 88daf27..a47c183 100644
 --- a/core/CMakeLists.txt
 +++ b/core/CMakeLists.txt
 @@ -60,6 +60,10 @@ if(VXL_BUILD_CORE_IMAGING)
@@ -13,11 +13,24 @@ index 3483f9c..5040676 100644
  endif()
  
  
+diff --git a/core/vpgl/algo/CMakeLists.txt b/core/vpgl/algo/CMakeLists.txt
+index 9ec767a..fda53dc 100644
+--- a/core/vpgl/algo/CMakeLists.txt
++++ b/core/vpgl/algo/CMakeLists.txt
+@@ -32,7 +32,7 @@ set( vpgl_algo_sources
+   vpgl_equi_rectification.h        vpgl_equi_rectification.cxx
+ )
+ include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
+-if(TIFF_FOUND)
++if(VXL_BUILD_CORE_IMAGING)
+   include_directories(${TIFF_INCLUDE_DIR})
+   include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
+   if(GEOTIFF_FOUND)
 diff --git a/core/vpgl/file_formats/CMakeLists.txt b/core/vpgl/file_formats/CMakeLists.txt
-index cd33c8e..e2501d3 100644
+index d23a2f2..6c933f0 100644
 --- a/core/vpgl/file_formats/CMakeLists.txt
 +++ b/core/vpgl/file_formats/CMakeLists.txt
-@@ -8,7 +8,7 @@ set( vpgl_file_formats_sources
+@@ -9,7 +9,7 @@ set( vpgl_file_formats_sources
  )
  
  include(${VXL_CMAKE_DIR}/FindTIFF.cmake)

ports/vxl/int_64.diff

@@ -1,60 +0,0 @@
-diff --git a/core/vsl/Templates/vsl_vector_io+uint_64-.cxx b/core/vsl/Templates/vsl_vector_io+uint_64-.cxx
-index 8807c44..a8090ca 100644
---- a/core/vsl/Templates/vsl_vector_io+uint_64-.cxx
-+++ b/core/vsl/Templates/vsl_vector_io+uint_64-.cxx
-@@ -1,6 +1,6 @@
- #include <vxl_config.h>
- 
--#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_IS_LONG_LONG )
-+#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG )
- #include <vsl/vsl_vector_io.hxx>
- VSL_VECTOR_IO_INSTANTIATE(vxl_uint_64);
- 
-diff --git a/core/vsl/vsl_binary_explicit_io.h b/core/vsl/vsl_binary_explicit_io.h
-index 9ff669f..87fff4f 100644
---- a/core/vsl/vsl_binary_explicit_io.h
-+++ b/core/vsl/vsl_binary_explicit_io.h
-@@ -141,7 +141,7 @@ macro (int);
- macro (unsigned int);
- macro (long);
- macro (unsigned long);
--#if VXL_HAS_INT_64 && ! ( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
-+#if VXL_HAS_INT_64 && ! ( VXL_INT_64_IS_LONG )
- macro (vxl_int_64);
- macro (vxl_uint_64);
- #endif
-@@ -486,7 +486,7 @@ inline std::size_t vsl_convert_from_arbitrary_length(const unsigned char* buffer
- 
- /////////////////////////////////////////////////////////////////////////
- 
--#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
-+#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG )
- 
- //: Decode a buffer of arbitrary length integers
- // Converts from the integers from the arbitrary length format into
-diff --git a/core/vsl/vsl_binary_io.cxx b/core/vsl/vsl_binary_io.cxx
-index c36142b..af76327 100644
---- a/core/vsl/vsl_binary_io.cxx
-+++ b/core/vsl/vsl_binary_io.cxx
-@@ -65,7 +65,7 @@ MACRO_MAKE_INTEGER_READ_WRITE(short);
- MACRO_MAKE_INTEGER_READ_WRITE(unsigned short);
- MACRO_MAKE_INTEGER_READ_WRITE(long);
- MACRO_MAKE_INTEGER_READ_WRITE(unsigned long);
--#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG)
-+#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG )
- MACRO_MAKE_INTEGER_READ_WRITE(vxl_int_64);
- MACRO_MAKE_INTEGER_READ_WRITE(vxl_uint_64);
- #endif
-diff --git a/core/vsl/vsl_binary_io.h b/core/vsl/vsl_binary_io.h
-index d38478a..1a68137 100644
---- a/core/vsl/vsl_binary_io.h
-+++ b/core/vsl/vsl_binary_io.h
-@@ -376,7 +376,7 @@ void vsl_b_read(vsl_b_istream& is,unsigned long& n );
- inline void vsl_print_summary(std::ostream& os, unsigned long n )
- {  os << n; }
- 
--#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
-+#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG )
- 
- //: Write  to vsl_b_ostream
- void vsl_b_write(vsl_b_ostream& os,vxl_int_64 n );

ports/vxl/mingw.diff

@@ -1,13 +1,13 @@
 diff --git a/core/vul/vul_temp_filename.cxx b/core/vul/vul_temp_filename.cxx
-index 87649e8..1fb263a 100644
+index 4921a04..731fee0 100644
 --- a/core/vul/vul_temp_filename.cxx
 +++ b/core/vul/vul_temp_filename.cxx
 @@ -11,7 +11,7 @@
  
- #if defined (_MSC_VER) || defined(__MINGW32__)
+ #if defined(_MSC_VER) || defined(__MINGW32__)
  
 -#  include <Windows.h>
 +#  include <windows.h>
  #else
- #if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
+ #  if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
  // Helper functions for Unix

ports/vxl/omit-broken-install.diff

@@ -1,13 +0,0 @@
-diff --git a/vcl/CMakeLists.txt b/vcl/CMakeLists.txt
-index dd83858..243d57b 100644
---- a/vcl/CMakeLists.txt
-+++ b/vcl/CMakeLists.txt
-@@ -115,7 +115,7 @@ vxl_configure_file(${CMAKE_CURRENT_LIST_DIR}/vcl_where_root_dir.h.in ${PROJECT_B
- 
- include_directories(${PROJECT_BINARY_DIR})
- set( vcl_sources
--  vcl_legacy_aliases.h ${VCL_COMPILER_DETECTION_HEADER}
-+  vcl_legacy_aliases.h
-   vcl_deprecated.cxx  vcl_deprecated.h
- 
-   vcl_cmath.h

ports/vxl/portfile.cmake

@@ -6,18 +6,16 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO vxl/vxl
-    REF dac1c7ed8e183e9c6de8b928c8b0294a7bd1d8ee # v2.0.2
+    REF v${VERSION}
-    SHA512 4c6f6dcd793a50cbbc9c7f61c561ed4a747ded67e3dceb09792998c0f0d4294445a441fed668d59297560f196274b1c25593ce67b0aa7597cbb773328e8612c0
+    SHA512 0b33e12557315058e7786c2049af3b01f1208e50660ccbc45f4d9a4dba4eeadfa5e3125380d8781eed2a9abf1d153ffb71c416ed2d196ab4194f5b3722fe6f2b
     HEAD_REF master
     PATCHES
         cmake-package.diff
         devendor.diff
         disable-tests.diff
         file_formats.diff
-        int_64.diff
         limits.diff
         mingw.diff
-        omit-broken-install.diff
         openjpeg.diff
 )
 file(GLOB_RECURSE vendored_sources "${SOURCE_PATH}/v3p/*.c" "${SOURCE_PATH}/v3p/*.cpp" "${SOURCE_PATH}/v3p/*.cxx")

ports/vxl/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "vxl",
-  "version": "2.0.2",
+  "version": "3.5.0",
-  "port-version": 7,
   "description": "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.",
   "homepage": "https://vxl.github.io/",
   "license": null,

scripts/ci.baseline.txt

@@ -1350,7 +1350,7 @@ vcpkg-ci-sqlpp11:x86-windows=pass
 vcpkg-ci-vxl:arm-neon-android=pass
 vcpkg-ci-vxl:arm64-android=pass
 vcpkg-ci-vxl:arm64-windows=pass
-vcpkg-ci-vxl:x64-android=fail
+vcpkg-ci-vxl:x64-android=pass
 vcpkg-ci-vxl:x64-linux=pass
 vcpkg-ci-vxl:x64-osx=pass
 vcpkg-ci-vxl:x64-windows=pass

scripts/test_ports/vcpkg-ci-vxl/project/CMakeLists.txt

@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.7)
 project(vnl-test CXX)
 
+if(APPLE)
+    set(CMAKE_CXX_STANDARD "11")
+endif()
+
 find_package(VXL CONFIG REQUIRED)
 
 # The use file doesn't only set variables,

versions/baseline.json

@@ -9485,8 +9485,8 @@
       "port-version": 0
     },
     "vxl": {
-      "baseline": "2.0.2",
+      "baseline": "3.5.0",
-      "port-version": 7
+      "port-version": 0
     },
     "wabt": {
       "baseline": "1.0.36",

versions/v-/vxl.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5678400bc3c92ba662f6678f51dc6ee1e1d6ece0",
+      "version": "3.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "53a9a629f70fb7bb7e488b889b1608eac9d3411e",
       "version": "2.0.2",