From 62a2530385517147049ba41cc80affa905c8bdb5 Mon Sep 17 00:00:00 2001
From: TsukasaSugiura <t.sugiura0204@gmail.com>
Date: Mon, 12 Nov 2018 19:55:47 +0900
Subject: [PATCH] [vxl] Update to VXL v1.18.0

Update vxl port to VXL v1.18.0.
---
 ports/vxl/CONTROL        |  5 +++--
 ports/vxl/portfile.cmake | 42 +++++++++++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/ports/vxl/CONTROL b/ports/vxl/CONTROL
index 52d725f456..bb187ed71e 100644
--- a/ports/vxl/CONTROL
+++ b/ports/vxl/CONTROL
@@ -1,4 +1,5 @@
 Source: vxl
-Version: 20180414-7a130cf-1
-Build-Depends: zlib, tiff, expat, libpng, bzip2, libjpeg-turbo, shapelib, libgeotiff
+Version: v1.18.0-1
+Build-Depends: bzip2, libgeotiff, libjpeg-turbo, libpng, tiff, zlib, expat, shapelib
+# Build-Depends: bzip2, dcmtk, libgeotiff, libjpeg-turbo, openjpeg, libpng, tiff, zlib
 Description: A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.
diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake
index 7e27591e58..89a82219c7 100644
--- a/ports/vxl/portfile.cmake
+++ b/ports/vxl/portfile.cmake
@@ -1,29 +1,45 @@
 include(vcpkg_common_functions)
 
+if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openjpeg.h")
+    message(FATAL_ERROR "Can't build VXL with non built-in OpenJpeg in current version. Please remove OpenJpeg, and try install VXL again.")
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO vxl/vxl
-    REF 7a130cf05e907a6500e3e717297082c46e77f524
-    SHA512 b9f7e48e37b44469031c6de1bf2a3d0aa0ecf4d3c2f4dd0d1a84c273ca8a778b48f3caf7ec6ef0f2dea1dc534ebfdb6b2cde47a56d81aa4f0685114c0bda157c
+    REF v1.18.0
+    SHA512 6666d647b2e7010b91cb0b05016b5f49ae46d198f6bd160fe13fc09bc674eff5b937331fa11d81a8496473968b63452d950eee4fc2512152af57304a14bed63f
     HEAD_REF master
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS)
+
+set(USE_WIN_WCHAR_T OFF)
+if(WIN32)
+    set(USE_WIN_WCHAR_T ON)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DVXL_USING_NATIVE_ZLIB=ON
-        -DVXL_USING_NATIVE_BZLIB2=ON
-        -DVXL_USING_NATIVE_JPEG=ON
-        -DVXL_USING_NATIVE_TIFF=ON
-        -DVXL_USING_NATIVE_EXPAT=ON
-        -DVXL_USING_NATIVE_PNG=ON
-        -DVXL_USING_NATIVE_SHAPELIB=ON
-        -DVXL_USING_NATIVE_GEOTIFF=ON
-        -DVXL_FORCE_V3P_OPENJPEG2=ON
-        -DVXL_FORCE_V3P_J2K=ON
-        -DBUILD_TESTING=OFF
+        -DBUILD_SHARED_LIBS=${VXL_SHARED_LIBS}
         -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTING=OFF
+        -DVXL_FORCE_V3P_BZLIB2=OFF
+        -DVXL_USING_NATIVE_BZLIB2=TRUE # for disable build built-in bzip2 (v3p/bzlib/CMakeLists.txt#L10-L26)
+        -DVXL_FORCE_V3P_CLIPPER=ON # TODO : need add clipper port to turn off
+        -DVXL_FORCE_V3P_DCMTK=OFF
+        -DVXL_FORCE_V3P_GEOTIFF=OFF
+        -DVXL_FORCE_V3P_J2K=OFF
+        -DVXL_FORCE_V3P_JPEG=OFF
+        -DVXL_FORCE_V3P_OPENJPEG2=ON # TODO : need fix compile error when using openjpeg port to turn off
+        -DVXL_FORCE_V3P_PNG=OFF
+        -DVXL_FORCE_V3P_TIFF=OFF
+        -DVXL_FORCE_V3P_ZLIB=OFF
+        -DVXL_USE_DCMTK=OFF # TODO : need fix dcmtk support to turn on
+        -DXVL_USE_GEOTIFF=ON
+        -DVXL_USE_WIN_WCHAR_T=${USE_WIN_WCHAR_T}
 )
 
 vcpkg_install_cmake()