aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--ports/cli11/CONTROL3
-rw-r--r--ports/cli11/portfile.cmake29
-rw-r--r--ports/libuv/CMakeLists.txt20
-rw-r--r--ports/libuv/CONTROL2
-rw-r--r--ports/libuv/portfile.cmake4
-rw-r--r--ports/range-v3/CONTROL2
-rw-r--r--ports/range-v3/portfile.cmake4
-rw-r--r--ports/tiff/CONTROL2
-rw-r--r--ports/tiff/portfile.cmake4
-rw-r--r--ports/vxl/CONTROL5
-rw-r--r--ports/vxl/portfile.cmake39
-rw-r--r--scripts/vcpkgTools.xml38
13 files changed, 106 insertions, 48 deletions
diff --git a/README.md b/README.md
index 23cb4e5f4..71a4091e0 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Prerequisites:
- Windows 10, 8.1, 7, Linux, or MacOS
- Visual Studio 2017 or Visual Studio 2015 Update 3 (on Windows)
- Git
-- *Optional:* CMake 3.10.2
+- *Optional:* CMake 3.12.4
To get started:
```
diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL
new file mode 100644
index 000000000..5174d7037
--- /dev/null
+++ b/ports/cli11/CONTROL
@@ -0,0 +1,3 @@
+Source: cli11
+Version: 1.6.1
+Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. <https://github.com/CLIUtils/CLI11>
diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake
new file mode 100644
index 000000000..bda9fa2b3
--- /dev/null
+++ b/ports/cli11/portfile.cmake
@@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO CLIUtils/CLI11
+ REF v1.6.1
+ SHA512 df12510bb78823908535a68af65fb8ea0b8b33b362e0b5f2cfa91223db7ebd9e71a55dfe31902c5d10e29c02a9bb59be58f8c69da7a9b4ab456ace64f200ac93
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DCLI11_TESTING=OFF
+ -DCLI11_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CLI11)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cli11 RENAME copyright)
+
+# Post-build test for cmake libraries
+# vcpkg_test_cmake(PACKAGE_NAME cli11)
diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt
index 33878471c..c4b7c3882 100644
--- a/ports/libuv/CMakeLists.txt
+++ b/ports/libuv/CMakeLists.txt
@@ -19,22 +19,32 @@ file(GLOB UV_SOURCES_UNIX
src/unix/stream.c
src/unix/tcp.c
src/unix/thread.c
- src/unix/timer.c
src/unix/tty.c
src/unix/udp.c
- src/unix/proctitle.c
)
file(GLOB UV_SOURCES_LINUX
+ src/unix/proctitle.c
src/unix/linux-core.c
src/unix/linux-inotify.c
src/unix/linux-syscalls.c
+ src/unix/procfs-exepath.c
+ src/unix/sysinfo-loadavg.c
+ src/unix/sysinfo-memory.c
)
file(GLOB UV_SOURCES_DARWIN
- src/unix/kqueue.c
+ src/unix/proctitle.c
src/unix/darwin.c
src/unix/fsevents.c
- src/unix/pthread-barrier.c
src/unix/darwin-proctitle.c
+ src/unix/bsd-ifaddrs.c
+ src/unix/kqueue.c
+)
+file(GLOB UV_SOURCES_FREEBSD
+ src/unix/freebsd.c
+ src/unix/posix-hrtime.c
+ src/unix/bsd-proctitle.c
+ src/unix/bsd-ifaddrs.c
+ src/unix/kqueue.c
)
file(GLOB UV_SOURCES_WIN src/win/*.c)
@@ -44,6 +54,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsSt
target_link_libraries(libuv iphlpapi psapi shell32 userenv ws2_32)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_DARWIN})
+elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_FREEBSD})
else() # Assume some Linux variant
add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_LINUX})
endif()
diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL
index a2bee52b5..e90eaa545 100644
--- a/ports/libuv/CONTROL
+++ b/ports/libuv/CONTROL
@@ -1,3 +1,3 @@
Source: libuv
-Version: 1.23.2
+Version: 1.24.0
Description: libuv is a multi-platform support library with a focus on asynchronous I/O.
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index c8c7daf88..782d946c3 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libuv/libuv
- REF v1.23.2
- SHA512 f91accf4ba9987fad23cc546a9821c3d643f8505cae22e0cbe28c4d5d5cb6b370b3483c6d95195cff3bcddd1e94f1bdab740075c3eaf22f8f673f7a57c1fdfc5
+ REF v1.24.0
+ SHA512 b75dac19e99497b059b9b8ce646266c4fa10f1259f5fd74554f7f614f7b70f4b62b9c756316d9a3eed6cf6b9d61f5acde9f6eedb88d30431f6a5c87169487ec6
HEAD_REF v1.x
)
diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL
index 1ed4dc94c..1c5cb114d 100644
--- a/ports/range-v3/CONTROL
+++ b/ports/range-v3/CONTROL
@@ -1,3 +1,3 @@
Source: range-v3
-Version: 0.4.0-01ccd0e
+Version: 0.4.0-87a6c31
Description: Range library for C++11/14/17.
diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake
index f1d78711b..203ef211c 100644
--- a/ports/range-v3/portfile.cmake
+++ b/ports/range-v3/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ericniebler/range-v3
- REF 01ccd0e552860efe00e4e3e55bf823be445aabb4
- SHA512 5e6c3e597dc40128ae0642ca43340c88654c25d9239e6929edda44035f23b7dec3735baecd486ca3b161b453c8fe826f82124ced24da66e288e0e93fa5d51c54
+ REF 87a6c31cdd9d13f0673da4f650b44c2171cb2744
+ SHA512 8ddf91adf02599bdb87622d80a00fa02da060331572d4e614aec9e22bc6e1890a00da68fcf27d83f9c8de576ec043296e2a7c99a3676b6ddaec6d10d19387479
HEAD_REF master
)
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL
index cb40597b4..866437737 100644
--- a/ports/tiff/CONTROL
+++ b/ports/tiff/CONTROL
@@ -1,4 +1,4 @@
Source: tiff
-Version: 4.0.9-6
+Version: 4.0.10
Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp)
Description: A library that supports the manipulation of TIFF image files
diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake
index 7062c1ce1..13d8ac7bc 100644
--- a/ports/tiff/portfile.cmake
+++ b/ports/tiff/portfile.cmake
@@ -1,11 +1,11 @@
include(vcpkg_common_functions)
-set(LIBTIFF_VERSION 4.0.9)
+set(LIBTIFF_VERSION 4.0.10)
vcpkg_download_distfile(ARCHIVE
URLS "http://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz"
FILENAME "tiff-${LIBTIFF_VERSION}.tar.gz"
- SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
+ SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/vxl/CONTROL b/ports/vxl/CONTROL
index 52d725f45..d9340d9f3 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-2
+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 7e27591e5..75d89ee2d 100644
--- a/ports/vxl/portfile.cmake
+++ b/ports/vxl/portfile.cmake
@@ -1,29 +1,42 @@
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
)
+set(USE_WIN_WCHAR_T OFF)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ 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_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()
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 747963c07..eaf84caa3 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -1,32 +1,32 @@
<?xml version="1.0"?>
<tools version="2">
<tool name="cmake" os="windows">
- <version>3.11.4</version>
- <exeRelativePath>cmake-3.11.4-win32-x86\bin\cmake.exe</exeRelativePath>
- <url>https://cmake.org/files/v3.11/cmake-3.11.4-win32-x86.zip</url>
- <sha512>3d866ef3c41a9cf738427fccf4730ccf8fd86bb4d13e9a1671b156bbdb2bc6beeecc7e7e8190cea8297498cfd67366c71231e9e08b121d4cd6e5ceac04124c19</sha512>
- <archiveName>cmake-3.11.4-win32-x86.zip</archiveName>
+ <version>3.12.4</version>
+ <exeRelativePath>cmake-3.12.4-win32-x86\bin\cmake.exe</exeRelativePath>
+ <url>https://cmake.org/files/v3.12/cmake-3.12.4-win32-x86.zip</url>
+ <sha512>ca7097c5917101c39d5fa5325cd256ad3aa616a7e5811915cb2869c24961dc133726015b3576908fbd0666f89c8e31886bed9cf6b532a3fe44681d5245bc25c7</sha512>
+ <archiveName>cmake-3.12.4-win32-x86.zip</archiveName>
</tool>
<tool name="cmake" os="osx">
- <version>3.11.4</version>
- <exeRelativePath>cmake-3.11.4-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
- <url>https://cmake.org/files/v3.11/cmake-3.11.4-Darwin-x86_64.tar.gz</url>
- <sha512>eeb967dc5b6e46e8dee06939b8b416d40f644baad79ffd90f86ad18e1e3b58b50dec0f064e60467125be9bedb7de8c48fbcb8a97ca731645939539f97645db54</sha512>
- <archiveName>cmake-3.11.4-Darwin-x86_64.tar.gz</archiveName>
+ <version>3.12.4</version>
+ <exeRelativePath>cmake-3.12.4-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
+ <url>https://cmake.org/files/v3.12/cmake-3.12.4-Darwin-x86_64.tar.gz</url>
+ <sha512>67ce23394d9679818ab0f2792f5d585c8c6f385e18584d488a47d48b768d1ee20b58247d22945aeff1ff9f84b7e843457dac98a50801ac3068ab1fbcbe0b0f45</sha512>
+ <archiveName>cmake-3.12.4-Darwin-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="linux">
- <version>3.11.4</version>
- <exeRelativePath>cmake-3.11.4-Linux-x86_64/bin/cmake</exeRelativePath>
- <url>https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz</url>
- <sha512>70d92eea972710684582154dc1b884536aba5abda130a431257750b54437c46397aea39c2cc31056ecf36ddadbc1cf5c22434794fb314ea67c15a9be3bd20092</sha512>
- <archiveName>cmake-3.11.4-Linux-x86_64.tar.gz</archiveName>
+ <version>3.12.4</version>
+ <exeRelativePath>cmake-3.12.4-Linux-x86_64/bin/cmake</exeRelativePath>
+ <url>https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.tar.gz</url>
+ <sha512>ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f</sha512>
+ <archiveName>cmake-3.12.4-Linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="git" os="windows">
- <version>2.17.1</version>
+ <version>2.19.1</version>
<exeRelativePath>cmd\git.exe</exeRelativePath>
- <url>https://github.com/git-for-windows/git/releases/download/v2.17.1.windows.1/MinGit-2.17.1-32-bit.zip</url>
- <sha512>8bf93f6d3b6eb8a4ccbf840ff0b8b11a8b3a28fc5cd27aaa98dab5964acebbd17307e8ecec4e0cdd8b8ba095491d39bc9d55f4330284089cf3dadcab1d3fb7a4</sha512>
- <archiveName>MinGit-2.17.1-32-bit.zip</archiveName>
+ <url>https://github.com/git-for-windows/git/releases/download/v2.19.1.windows.1/MinGit-2.19.1-32-bit.zip</url>
+ <sha512>8a6d2caae2cbaacee073a641cda21465a749325c0af620dabd0e5521c84c92c8d747caa468b111d2ec52b99aee2ee3e6ec41a0a07a8fff582f4c8da568ea329e</sha512>
+ <archiveName>MinGit-2.19.1-32-bit.zip</archiveName>
</tool>
<tool name="git" os="linux">
<version>2.7.4</version>
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-01 19:17:09 +0000