longhuan2018 · longhuan2018 · Oct 10, 2020 · Oct 9, 2020 · Oct 9, 2020 · Oct 9, 2020
diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL
@@ -1,5 +1,5 @@
 Source: drogon
-Version: v1.0.0-beta21
+Version: 1.0.0
 Homepage: https://github.com/an-tao/drogon
 Description:Drogon: A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows
 Build-Depends: trantor, zlib, jsoncpp, libmariadb, libpq, sqlite3, brotli, libuuid (!windows)
diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/drogon
-    REF v1.0.0-beta21
-    SHA512 bacd3c0d20c9d5eb22e6c872c8bea6865a6beb93d83165e117b11a30b7fffd65de48838b599cda81043e7ae1394a9d13390910baa4b84d8cfad3050f152a4c36
+    REF v1.0.0
+    SHA512 3ea447bee4be1956018af597d5c97d54ff04a6403cc3a0bda36ed905d459c15db8a5134cad0b68d5f628725c5488f8cb6aabbcd281faf5d62775d739b02d4c45
     HEAD_REF master
     PATCHES
         vcpkg.patch

diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL
@@ -1,6 +1,6 @@
 Source: freeimage
 Version: 3.18.0
-Port-Version: 16
+Port-Version: 17
 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr
 Homepage: https://sourceforge.net/projects/freeimage/
 Description: Support library for graphics image formats
diff --git a/ports/freeimage/use-external-png-zlib.patch b/ports/freeimage/use-external-png-zlib.patch
@@ -9,7 +9,7 @@ index ba2ef17..c3c5cd6 100644
 -#include "../ZLib/zlib.h"
 -#include "../LibPNG/png.h"
 +#include <zlib.h>
-+#include <png.h>
++#include <libpng16/png.h>
 
  // ----------------------------------------------------------
 

diff --git a/ports/gcem/CONTROL b/ports/gcem/CONTROL
@@ -1,3 +1,3 @@
 Source: gcem
-Version: 1.12.0
+Version: 1.13.1
 Description: A C++ compile-time math library using generalized constant expressions
diff --git a/ports/gcem/portfile.cmake b/ports/gcem/portfile.cmake
@@ -1,9 +1,8 @@
-include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kthohr/gcem
-    REF v1.12.0
-    SHA512 cb28dce44e8aac2a4369bc1dd796243f0f9ff25bdd2effcff198b6e4ad1161ed4d33d2fdc7aca0ca9b538c769c1ae36ebfd7fcfbefd289bb1a62cdbea1957f74
+    REF v1.13.1
+    SHA512 77acd210bf57b796ec3b9cf982c552bb9c0d2176f2f91aa68fd2181dabdb099c42b8ff3d4d20331e6af8a8c3cf87dc2d027e0ce29dc7400d225ee55746f82ba3
     HEAD_REF master
 )
 
@@ -20,5 +19,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gcem)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/gcem/LICENSE ${CURRENT_PACKAGES_DIR}/share/gcem/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/mikktspace/CMakeLists.txt b/ports/mikktspace/CMakeLists.txt
@@ -0,0 +1,41 @@
+cmake_minimum_required(VERSION 3.8)
+project(mikktspace C)
+
+set(CMAKE_DEBUG_POSTFIX d)
+
+add_library(${PROJECT_NAME} "")
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+target_include_directories(
+	${PROJECT_NAME}
+	PUBLIC
+		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+		$<INSTALL_INTERFACE:include>
+)
+
+target_sources(
+	${PROJECT_NAME}
+	PRIVATE
+		${CMAKE_CURRENT_SOURCE_DIR}/mikktspace.c
+)
+
+install(
+	TARGETS ${PROJECT_NAME}
+	EXPORT ${PROJECT_NAME}_target
+	ARCHIVE DESTINATION lib
+	LIBRARY DESTINATION lib
+	RUNTIME DESTINATION bin
+)
+
+if(NOT MIKKTSPACE_SKIP_HEADERS)
+    install(FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/mikktspace.h
+        DESTINATION include
+    )
+endif()
+
+install(
+	EXPORT ${PROJECT_NAME}_target
+	NAMESPACE ${PROJECT_NAME}::
+	FILE ${PROJECT_NAME}-config.cmake
+	DESTINATION share/${PROJECT_NAME}
+)
diff --git a/ports/mikktspace/CONTROL b/ports/mikktspace/CONTROL
@@ -0,0 +1,4 @@
+Source: mikktspace
+Version: 2020-10-06
+Homepage: https://github.com/mmikk/MikkTSpace
+Description: A common standard for tangent space used in baking tools to produce normal maps
diff --git a/ports/mikktspace/portfile.cmake b/ports/mikktspace/portfile.cmake
@@ -0,0 +1,23 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mmikk/MikkTSpace
+    REF 3e895b49d05ea07e4c2133156cfa94369e19e409
+    SHA512 3ca433bd4efd0e048138f9efc5ba9021e4f3f78a535ea48733088ba5f43e60aad7f840f00e0597a0c053cda4776177bf6deb14cecf4d172b9b68acf00d5a1ca7
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG
+        -DMIKKTSPACE_SKIP_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets()
+
+file(INSTALL ${SOURCE_PATH}/mikktspace.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/tinyexpr/CMakeLists.txt b/ports/tinyexpr/CMakeLists.txt
@@ -0,0 +1,48 @@
+cmake_minimum_required(VERSION 3.14)
+
+project(tinyexpr LANGUAGES C)
+
+include(CheckSymbolExists)
+include(GNUInstallDirs)
+
+if(WIN32 AND BUILD_SHARED_LIBS)
+    add_library(tinyexpr tinyexpr.c exports.def)
+else()
+    add_library(tinyexpr tinyexpr.c)
+endif()
+
+target_include_directories(
+    tinyexpr
+    PUBLIC
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+# https://stackoverflow.com/questions/32816646/can-cmake-detect-if-i-need-to-link-to-libm-when-using-pow-in-c
+if(NOT POW_FUNCTION_EXISTS AND NOT NEED_LINKING_AGAINST_LIBM)
+    check_symbol_exists(pow "math.h" POW_FUNCTION_EXISTS)
+    if(NOT POW_FUNCTION_EXISTS)
+        unset(POW_FUNCTION_EXISTS CACHE)
+        list(APPEND CMAKE_REQUIRED_LIBRARIES m)
+        check_symbol_exists(pow "math.h" POW_FUNCTION_EXISTS)
+        if(POW_FUNCTION_EXISTS)
+            set(NEED_LINKING_AGAINST_LIBM True CACHE BOOL "" FORCE)
+        else()
+            message(FATAL_ERROR "Failed making the pow() function available")
+        endif()
+    endif()
+endif()
+
+if(NEED_LINKING_AGAINST_LIBM)
+    target_link_libraries(tinyexpr PUBLIC m)
+endif()
+
+set_target_properties(tinyexpr PROPERTIES PUBLIC_HEADER tinyexpr.h)
+
+install(TARGETS tinyexpr EXPORT unofficial-tinyexpr-config)
+
+install(
+    EXPORT unofficial-tinyexpr-config
+    NAMESPACE unofficial::tinyexpr::
+    DESTINATION share/unofficial-tinyexpr
+    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+)
diff --git a/ports/tinyexpr/exports.def b/ports/tinyexpr/exports.def
@@ -0,0 +1,6 @@
+EXPORTS 
+	te_compile
+	te_eval
+	te_free
+	te_interp
+	te_print
diff --git a/ports/tinyexpr/fix-issue-34.patch b/ports/tinyexpr/fix-issue-34.patch
@@ -0,0 +1,16 @@
+diff --git a/tinyexpr.c b/tinyexpr.c
+index 90ed8fc..570f2fd 100755
+--- a/tinyexpr.c
++++ b/tinyexpr.c
+@@ -49,6 +49,11 @@ For log = natural log uncomment the next line. */
+ #define INFINITY (1.0/0.0)
+ #endif
+
++/* https://github.com/codeplea/tinyexpr/issues/34 */
++#ifdef _MSC_VER
++#pragma function(ceil)
++#pragma function(floor)
++#endif
+
+ typedef double (*te_fun2)(double, double);
+
diff --git a/ports/tinyexpr/portfile.cmake b/ports/tinyexpr/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO codeplea/tinyexpr
+    REF ffb0d41b13e5f8d318db95feb071c220c134fe70
+    SHA512 fe4975f8b444a50d7ba8135450a42007a81f1545eebd7775f92307b87b72bc9abee4591e56ddeb76ec9e5aa41f0852ba98c99881d671f47a58caca8bd1ca9999
+    HEAD_REF master
+    PATCHES
+        fix-issue-34.patch
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT})
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/tinyexpr/vcpkg.json b/ports/tinyexpr/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "tinyexpr",
+  "version-string": "2020-09-25",
+  "description": "Tiny recursive descent parser and evaluation engine in C",
+  "homepage": "https://codeplea.com/tinyexpr",
+  "license": "Zlib"
+}