microsoft · vicroms · Mar 1, 2019 · Nov 21, 2018 · Nov 21, 2018 · Jan 11, 2019
diff --git a/.gitignore b/.gitignore
@@ -309,3 +309,4 @@ __pycache__/
 ############################################################
 # vcpkg - End
 ############################################################
+archives
diff --git a/ports/boost-vcpkg-helpers/CONTROL b/ports/boost-vcpkg-helpers/CONTROL
@@ -1,3 +1,3 @@
 Source: boost-vcpkg-helpers
-Version: 4
+Version: 5
 Description: a set of vcpkg-internal scripts used to modularize boost
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2019.01.28.00
+Version: 2019.01.28.00-1
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
 Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread
 Default-Features: zlib

diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
@@ -76,6 +76,20 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/folly)
 
+# Release folly-targets.cmake does not link to the right libraries in debug mode.
+# We substitute with generator expressions so that the right libraries are linked for debug and release.
+set(FOLLY_TARGETS_CMAKE "${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake")
+FILE(READ ${FOLLY_TARGETS_CMAKE} _contents)
+STRING(REPLACE 
+[[
+"Threads::Threads;Iphlpapi.lib;Ws2_32.lib;${_IMPORT_PREFIX}/lib/boost_context-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_chrono-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_date_time-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_filesystem-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_program_options-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_regex-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_system-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_thread-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_atomic-vc140-mt.lib;${_IMPORT_PREFIX}/lib/double-conversion.lib;${_IMPORT_PREFIX}/lib/ssleay32.lib;${_IMPORT_PREFIX}/lib/libeay32.lib;${_IMPORT_PREFIX}/lib/zlib.lib;gflags;glog::glog;event"
+]]
+[[
+"Threads::Threads;Iphlpapi.lib;Ws2_32.lib;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_context-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_context-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_chrono-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_chrono-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_date_time-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_date_time-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_filesystem-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_filesystem-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_program_options-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_program_options-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_regex-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_regex-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_system-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_system-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_thread-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_thread-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_atomic-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_atomic-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/double-conversion.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/double-conversion.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/ssleay32.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/ssleay32.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/libeay32.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/libeay32.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/zlib.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/zlibd.lib>;gflags;glog::glog;event"
+]]
+    _contents "${_contents}")
+FILE(WRITE ${FOLLY_TARGETS_CMAKE} "${_contents}")
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright

diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL
@@ -1,3 +1,3 @@
 Source: glbinding
-Version: 3.0.2-4
+Version: 3.0.2-5
 Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API
diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake
@@ -22,10 +22,32 @@ vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding/cmake/glbinding TARGET_PATH share/glbinding/cmake/glbinding)
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding/cmake/glbinding-aux TARGET_PATH share/glbinding/cmake/glbinding-aux)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding/cmake)
 
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/cmake/glbinding/glbinding-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/cmake/glbinding-aux/glbinding-aux-export.cmake)\nset(glbinding_FOUND TRUE)\n")
+# _IMPORT_PREFIX needs to go up one extra level in the directory tree.
+# These files should be modified.
+#     /share/glbinding/glbinding-export.cmake 
+#     /share/glbinding-aux/glbinding-aux-export.cmake
+file(GLOB_RECURSE TARGET_CMAKES "${CURRENT_PACKAGES_DIR}/*-export.cmake")
+foreach(TARGET_CMAKE IN LISTS TARGET_CMAKES)
+    file(READ ${TARGET_CMAKE} _contents)
+    string(REPLACE 
+[[
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+]]
+[[
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+]]
+        _contents "${_contents}")
+    file(WRITE ${TARGET_CMAKE} "${_contents}")
+endforeach()
+
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/glbinding/glbinding-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/glbinding-aux/glbinding-aux-export.cmake)\nset(glbinding_FOUND TRUE)\n")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright

diff --git a/ports/libevent/CONTROL b/ports/libevent/CONTROL
@@ -1,4 +1,4 @@
 Source: libevent
-Version: 2.1.8-3
+Version: 2.1.8-4
 Build-Depends: openssl
 Description: An event notification library
diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake
@@ -9,12 +9,8 @@ vcpkg_from_github(
     REPO libevent/libevent
     REF release-2.1.8-stable
     SHA512 0d5c872dc797b69ab8ea4b83aebcbac20735b8c6f5adfcc2950aa4d6013d240f5fac3376e817da75ae0ccead50cec0d931619e135a050add438777457b086549
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/fix-target-files.patch"
+        "fix-target-files.patch"
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/liblemon/CONTROL b/ports/liblemon/CONTROL
@@ -1,3 +1,3 @@
 Source: liblemon
-Version: 1.3.1-2
+Version: 1.3.1-3
 Description: Library for Efficient Modeling and Optimization in Networks
diff --git a/ports/liblemon/portfile.cmake b/ports/liblemon/portfile.cmake
@@ -6,19 +6,20 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
 endif()
 
 set(VERSION 1.3.1)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lemon-${VERSION})
+
 vcpkg_download_distfile(ARCHIVE
     URLS "http://lemon.cs.elte.hu/pub/sources/lemon-${VERSION}.zip"
     FILENAME "lemon-${VERSION}.zip"
     SHA512 86d15914b8c3cd206a20c37dbe3b8ca4b553060567a07603db7b6f8dd7dcf9cb043cca31660ff1b7fb77e359b59fac5ca0aab57fd415fda5ecca0f42eade6567
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${VERSION}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/cmake.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fixup-targets.patch
+        "cmake.patch"
+        "fixup-targets.patch"
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL
@@ -1,4 +1,4 @@
 Source: libpng
-Version: 1.6.36
+Version: 1.6.36-1
 Build-Depends: zlib
 Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files.
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
@@ -6,13 +6,9 @@ vcpkg_from_github(
     REF v1.6.36
     SHA512 aeb00b48347c9e84d31995b3fe7e40580029734aa8103d774eee5745f5ca1fd1fd91a15f32d492277ab94346e4e7f731ee9bfea1783f930094f9f87eb3d9397d
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch
-        ${CMAKE_CURRENT_LIST_DIR}/skip-install-symlink.patch
+        "use-abort-on-all-platforms.patch"
+        "skip-install-symlink.patch"
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL
@@ -1,3 +1,3 @@
 Source: libsodium
-Version: 1.0.17
+Version: 1.0.17-1
 Description: A modern and easy-to-use crypto library
diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake
@@ -6,12 +6,8 @@ vcpkg_from_github(
     REF 1.0.17
     SHA512 faf6ab57d113b6b1614b51390823a646f059018327b6f493e9e918a908652d0932a75a1a6683032b7a3869f516f387d67acdf944568387feddff7b2f5b6e77d6
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-    ${CMAKE_CURRENT_LIST_DIR}/disable-tests.patch
+        "disable-tests.patch"
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

diff --git a/ports/libui/fix-cmake.patch → ports/libui/001-fix-cmake.patch b/ports/libui/fix-cmake.patch → ports/libui/001-fix-cmake.patch
diff --git a/ports/libui/002-fix-macosx-build.patch b/ports/libui/002-fix-macosx-build.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 50c997f..a23b84d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,13 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
+ # TODO figure out what other variables must be set with CACHE
+ # TODO figure out if FORCE is needed here
+ # TODO figure out whether STRING "" is best or if something else is better; also what FORCE does because I forget and later I say it's needed
+-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "" FORCE)
++
++# VCPKG PATCH NOTE: Fix build on MacOS 
++# Due to a bug in CMake (https://gitlab.kitware.com/cmake/cmake/issues/18396) we change CMAKE_OSX_DEPLOYMENT_TARGET to "10.9".
++# See the discussion here: 
++# 	* https://github.com/andlabs/libui/issues/422
++#	* https://github.com/andlabs/libui/issues/457 
++set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE)
+
+ # we want to disable incremental linking
+ # see also:
diff --git a/ports/libui/CONTROL b/ports/libui/CONTROL
@@ -1,3 +1,3 @@
 Source: libui
-Version: 2018-11-03
+Version: 2018-11-03-1
 Description: Simple and portable (but not inflexible) native GUI library in C.
diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake
@@ -7,7 +7,8 @@ vcpkg_from_github(
     SHA512 3a9fb27d0c376479f58ba2fc5be3579efa5f462776a7e725313b92413ce78f3ca60897e63b580c419eeaee2cd2101de2be1ee5af80a547ef433c6284a3053d45
     HEAD_REF master
     PATCHES
-        fix-cmake.patch
+        "001-fix-cmake.patch"
+        "002-fix-macosx-build.patch"
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL
@@ -1,4 +1,4 @@
 Source: mongo-c-driver
-Version: 1.9.5-2
+Version: 1.9.5-3
 Build-Depends: libbson, openssl (uwp)
 Description: Client library written in C for MongoDB.
diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake
@@ -32,6 +32,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libmongoc-static-1.0")
 else()
@@ -86,6 +87,24 @@ endif()
 
 # Create cmake files for _both_ find_package(mongo-c-driver) and find_package(libmongoc-static-1.0)/find_package(libmongoc-1.0)
 file(READ ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver/libmongoc-${PORT_POSTFIX}-config.cmake LIBMONGOC_CONFIG_CMAKE)
+
+# Patch: Set _IMPORT_PREFIX and replace PACKAGE_PREFIX_DIR
+string(REPLACE 
+[[
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
+]]
+[[
+# VCPKG PATCH SET IMPORT_PREFIX
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+]]
+    LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}")
+string(REPLACE [[PACKAGE_PREFIX_DIR]] [[_IMPORT_PREFIX]] LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}")
+
 string(REPLACE "/include/libmongoc-1.0" "/include" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}")
 string(REPLACE "mongoc-static-1.0" "mongoc-1.0" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver/libmongoc-${PORT_POSTFIX}-config.cmake "${LIBMONGOC_CONFIG_CMAKE}")

diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL
@@ -1,4 +1,4 @@
 Source: mongo-cxx-driver
-Version: 3.2.0-1
+Version: 3.2.0-2
 Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility
 Description: MongoDB C++ Driver.
diff --git a/ports/nvtt/001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch b/ports/nvtt/001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch
@@ -0,0 +1,16 @@
+diff --git a/src/nvconfig.h.in b/src/nvconfig.h.in
+index 16da646..ada6be0 100644
+--- a/src/nvconfig.h.in
++++ b/src/nvconfig.h.in
+@@ -1,7 +1,11 @@
+ #ifndef NV_CONFIG
+ #define NV_CONFIG
+
++#if NV_OS_DARWIN & !NV_OS_IOS
++#cmakedefine01 HAVE_UNISTD_H
++#else
+ #cmakedefine HAVE_UNISTD_H
++#endif
+ #cmakedefine HAVE_STDARG_H
+ #cmakedefine HAVE_SIGNAL_H
+ #cmakedefine HAVE_EXECINFO_H
diff --git a/ports/nvtt/CONTROL b/ports/nvtt/CONTROL
@@ -1,3 +1,3 @@
 Source: nvtt
-Version: 2.1.0
+Version: 2.1.0-1
 Description: Texture processing tools with support for Direct3D 10 and 11 formats.
diff --git a/ports/nvtt/portfile.cmake b/ports/nvtt/portfile.cmake
@@ -18,6 +18,8 @@ vcpkg_from_github(
     REF 2.1.0
     SHA512 6c5c9588af57023fc384de080cbe5c5ccd8707d04a9533384c606efd09730d780cb21bcf2d3576102a3facd2f281cacb2625958d74575e71550fd98da92e38b6
     HEAD_REF master
+    PATCHES
+        "001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch"
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL
@@ -1,5 +1,5 @@
 Source: ogre
-Version: 1.11.3-3
+Version: 1.11.3-4
 Build-Depends: freeimage, freetype, zlib, zziplib
 Description: 3D Object-Oriented Graphics Rendering Engine
 

diff --git a/ports/podofo/002-HAVE_UNISTD_H.patch b/ports/podofo/002-HAVE_UNISTD_H.patch
@@ -0,0 +1,15 @@
+diff --git a/podofo_config.h.in b/podofo_config.h.in
+index fea9ada..a813c7b 100644
+--- a/podofo_config.h.in
++++ b/podofo_config.h.in
+@@ -59,3 +59,10 @@
+ #cmakedefine PODOFO_HAVE_OPENSSL_NO_RC4
+ #cmakedefine PODOFO_HAVE_LIBIDN
+ #cmakedefine PODOFO_HAVE_UNISTRING_LIB
++
++/* Fix build for MacOS 10.13 */
++#if defined(__APPLE__) && !defined(__IOS__)
++#cmakedefine01 HAVE_UNISTD_H
++#else
++#cmakedefine HAVE_UNISTD_H
++#endif
diff --git a/ports/podofo/CONTROL b/ports/podofo/CONTROL
@@ -1,5 +1,5 @@
 Source: podofo
-Version: 0.9.6-3
+Version: 0.9.6-5
 Description: PoDoFo is a library to work with the PDF file format
 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl (!windows&!uwp), freetype
 

diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake
@@ -10,7 +10,9 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF ${PODOFO_VERSION}
-    PATCHES unique_ptr.patch
+    PATCHES 
+        "unique_ptr.patch"
+        "002-HAVE_UNISTD_H.patch"
 )
 
 set(PODOFO_NO_FONTMANAGER ON)

diff --git a/ports/qhull/CONTROL b/ports/qhull/CONTROL
@@ -1,3 +1,3 @@
 Source: qhull
-Version: 2015.2-3
+Version: 7.2.1-2
 Description: computes the convex hull, Delaunay triangulation, Voronoi diagram
diff --git a/ports/qhull/portfile.cmake b/ports/qhull/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO qhull/qhull
-    REF 5a79a0009454c86e9848646b3c296009125231bf # Qhull 2015.2
-    SHA512 ebcbf452eff420c62f92b734e5359b275493930b3e6798801eb1a81aa4fbf631b41e298a6071698c3b18c0939c55ddbc1b66b7019091bb4988dcfc7deb25e287
+    REF v7.2.1 # Qhull 2015.2
+    SHA512 8f5177ea45f82fa28f13e95105497e7e29086d7301e1cb8d3860fff09ebf8d0f01cfcb0f044c422f0ac0ba94b845bba223232e5eeb613bf671f65a569b8766d0
     HEAD_REF master
 )
 

diff --git a/ports/smpeg2/correct-sdl-headers-dir.patch → .../smpeg2/001-correct-sdl-headers-dir.patch b/ports/smpeg2/correct-sdl-headers-dir.patch → .../smpeg2/001-correct-sdl-headers-dir.patch