Osyotr · Osyotr · Oct 28, 2023 · Oct 25, 2023 · Oct 25, 2023 · Oct 25, 2023
diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "azure-core-cpp",
   "version-semver": "1.10.3",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Core SDK for C++",
     "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++."
@@ -64,7 +65,7 @@
     },
     "winhttp": {
       "description": "WinHTTP HTTP transport implementation",
-      "supports": "windows",
+      "supports": "windows & !uwp",
       "dependencies": [
         {
           "name": "azure-core-cpp",

diff --git a/ports/bloomberg-quantum/portfile.cmake b/ports/bloomberg-quantum/portfile.cmake
@@ -0,0 +1,22 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO bloomberg/quantum
+    REF f4b872f99480bc7f2ab60620d99823e8f2d3b0d6
+    SHA512 c41930c8bb0a1b70fdd4123ef349a0e8e892e0ecd52b412a171b1ce05386323a9ed2376a792ac12cd69f7d5a97a257bc08c2b85ce8a5f16b6f4e75740823b53b
+    HEAD_REF master
+    PATCHES rename-config-file-and-namespace.patch
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS 
+        -DQUANTUM_EXPORT_PKGCONFIG=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH "share/cmake/unofficial-${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/bloomberg-quantum/rename-config-file-and-namespace.patch b/ports/bloomberg-quantum/rename-config-file-and-namespace.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d22f0f..55d6f65 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,8 +33,9 @@ endif()
+ if (NOT QUANTUM_PKGCONFIG_DIR)
+     set(QUANTUM_PKGCONFIG_DIR share/pkgconfig)
+ endif()
++set(PROJECT_NAMESPACE_NAME unofficial-bloomberg-${PROJECT_NAME})
+ if (NOT QUANTUM_CMAKE_CONFIG_DIR)
+-    set(QUANTUM_CMAKE_CONFIG_DIR share/cmake/${PROJECT_NAME})
++    set(QUANTUM_CMAKE_CONFIG_DIR share/cmake/${PROJECT_NAMESPACE_NAME})
+ endif()
+
+ #Global options
+diff --git a/cmake/QuantumConfig.cmake.in b/cmake/unofficial-bloomberg-QuantumConfig.cmake.in
+similarity index 100%
+rename from cmake/QuantumConfig.cmake.in
+rename to cmake/unofficial-bloomberg-QuantumConfig.cmake.in
+diff --git a/quantum/CMakeLists.txt b/quantum/CMakeLists.txt
+index 1a721f9..1e93bc4 100644
+--- a/quantum/CMakeLists.txt
++++ b/quantum/CMakeLists.txt
+@@ -21,10 +21,10 @@ make_quantum_header()
+
+ set(PKG_DIR             "${CMAKE_BINARY_DIR}/package")
+ set(PKGCONFIG_FILE      "${PKG_DIR}/${PROJECT_TARGET_NAME}.pc")
+-set(TARGET_CONFIG_FILE  "${PKG_DIR}/${PROJECT_NAME}Config.cmake")
+-set(TARGET_VERSION_FILE "${PKG_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
++set(TARGET_CONFIG_FILE  "${PKG_DIR}/${PROJECT_NAMESPACE_NAME}Config.cmake")
++set(TARGET_VERSION_FILE "${PKG_DIR}/${PROJECT_NAMESPACE_NAME}ConfigVersion.cmake")
+ set(TARGET_EXPORT_NAME   ${PROJECT_NAME}Targets)
+-set(NAMESPACE           "${PROJECT_NAME}::")
++set(NAMESPACE           "${PROJECT_NAMESPACE_NAME}::")
+
+ add_library(${PROJECT_TARGET_NAME} INTERFACE)
+ set(QUANTUM_DEPENDENCIES Boost::context pthread)
+@@ -70,7 +70,7 @@ if (QUANTUM_EXPORT_CMAKE_CONFIG)
+
+     # Generate CMAKE configuration file and exported targets
+     configure_package_config_file(
+-        "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in"
++        "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAMESPACE_NAME}Config.cmake.in"
+         "${TARGET_CONFIG_FILE}"
+         INSTALL_DESTINATION "${QUANTUM_CMAKE_CONFIG_DIR}"
+         PATH_VARS CMAKE_INSTALL_PREFIX CMAKE_INSTALL_INCLUDEDIR
diff --git a/ports/bloomberg-quantum/vcpkg.json b/ports/bloomberg-quantum/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "bloomberg-quantum",
+  "version-date": "2023-02-03",
+  "description": "Powerful multi-threaded coroutine dispatcher and parallel execution engine",
+  "homepage": "https://github.com/bloomberg/quantum/",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "boost-context",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/cppp-reiconv/portfile.cmake b/ports/cppp-reiconv/portfile.cmake
@@ -0,0 +1,28 @@
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/cppp-project/cppp-reiconv/releases/download/v${VERSION}/cppp-reiconv-v${VERSION}.zip"
+    FILENAME "cppp-reiconv-v${VERSION}.zip"
+    SHA512 56294d63a71818842ec3f4a513bdc022ea3f472b582e16d377ec61282005965e7a08d619b9620cc036feb391e5b2eab3bfb4a1a21dcc860df89234e847048678
+)
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+     OPTIONS -DENABLE_TEST=OFF -DENABLE_EXTRA=ON
+)
+
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/cppp-reiconv/vcpkg.json b/ports/cppp-reiconv/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "cppp-reiconv",
+  "version": "2.1.0",
+  "description": "cppp-reiconv: A character set conversion library based on GNU LIBICONV for The C++ Plus Project.",
+  "homepage": "https://github.com/cppp-project/cppp-reiconv",
+  "license": "LGPL-3.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/dylib/portfile.cmake b/ports/dylib/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martin-olivier/dylib
+    REF "v${VERSION}"
+    SHA512 8e691c1bc73f381ce8ec50d85165c122ba55167b050e696c8b26ccf1ba14999ca8129fb6c5b6c3320166f606acb2c21867d0786347c341d1267815580beb5c0a
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/dylib)
+
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/dylib/vcpkg.json b/ports/dylib/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "dylib",
+  "version-semver": "2.2.1",
+  "description": "C++ cross-platform wrapper around dynamic loading of shared libraries",
+  "homepage": "https://github.com/martin-olivier/dylib",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/fastrtps/vcpkg.json b/ports/fastrtps/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "fastrtps",
   "version": "2.7.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.",
   "homepage": "https://www.eprosima.com/",
   "license": "Apache-2.0",
+  "supports": "!uwp",
   "dependencies": [
     "asio",
     "fastcdr",

diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake
@@ -20,7 +20,7 @@ if (ENABLE_GLSLANG_BINARIES)
     vcpkg_add_to_path("${PYTHON_PATH}")
 endif ()
 
-if (WIN32)
+if (VCPKG_TARGET_IS_WINDOWS)
     set(PLATFORM_OPTIONS "-DOVERRIDE_MSVCCRT=OFF")
 endif ()
 
@@ -46,6 +46,9 @@ vcpkg_copy_pdbs()
 
 if (ENABLE_GLSLANG_BINARIES)
     vcpkg_copy_tools(TOOL_NAMES glslangValidator spirv-remap AUTO_CLEAN)
+    if(VCPKG_TARGET_IS_WINDOWS)
+        vcpkg_copy_tools(TOOL_NAMES glslang AUTO_CLEAN)
+    endif()
 endif ()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "glslang",
   "version": "13.0.0",
+  "port-version": 1,
   "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.",
   "homepage": "https://github.com/KhronosGroup/glslang",
   "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",

diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gstreamer",
   "version": "1.22.5",
-  "port-version": 4,
+  "port-version": 5,
   "description": "GStreamer open-source multimedia framework core library",
   "homepage": "https://gstreamer.freedesktop.org/",
   "license": "LGPL-2.0-only",
@@ -424,7 +424,7 @@
     },
     "nvcodec": {
       "description": "Enable support for the NVCODEC encoders and decoders",
-      "supports": "!uwp",
+      "supports": "!osx & !ios & !android & !emscripten",
       "dependencies": [
         {
           "name": "gstreamer",

diff --git a/ports/gts/CMakeLists.txt b/ports/gts/CMakeLists.txt
@@ -1,24 +1,28 @@
 cmake_minimum_required(VERSION 3.14)
 
-project(gts C)
+project(gts VERSION "${VERSION}" LANGUAGES C)
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET)
 
 if(WIN32)
     add_definitions(-DNATIVE_WIN32 -D_USE_MATH_DEFINES)
 else()
-    add_definitions(-DHAVE_FPU_CONTROL_H)
+    include(CheckIncludeFile)
+    check_include_file("fpu_control.h" HAVE_FPU_CONTROL_H)
+    if(HAVE_FPU_CONTROL_H)
+        add_definitions(-DHAVE_FPU_CONTROL_H)
+    endif()
 endif()
 
 add_definitions(
     -DGTS_COMPILATION
-    -DGTS_MAJOR_VERSION=0
-    -DGTS_MINOR_VERSION=7
-    -DGTS_MICRO_VERSION=6
+    -DGTS_MAJOR_VERSION=${PROJECT_VERSION_MAJOR}
+    -DGTS_MINOR_VERSION=${PROJECT_VERSION_MINOR}
+    -DGTS_MICRO_VERSION=${PROJECT_VERSION_PATCH}
     -DGTS_INTERFACE_AGE=1
     -DGTS_BINARY_AGE=1
-    -DGTS_VERSION=${GTS_MAJOR_VERSION}.${GTS_MINOR_VERSION}.${GTS_MICRO_VERSION}
+    -DGTS_VERSION=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
 )
 
 file(GLOB src src/*.c src/gts.def)

diff --git a/ports/gts/fix-dllexport_2.patch b/ports/gts/fix-dllexport_2.patch
diff --git a/ports/gts/fix_missing_extern.patch b/ports/gts/fix_missing_extern.patch
diff --git a/ports/gts/portfile.cmake b/ports/gts/portfile.cmake
@@ -1,16 +1,11 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    set(patches fix-dllexport.patch)
-elseif(VCPKG_TARGET_IS_WINDOWS)
-    set(patches fix-dllexport_2.patch fix_missing_extern.patch)
-endif()
-
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gts/gts
     REF 0.7.6
     FILENAME gts-0.7.6.tar.gz
     SHA512 645123b72dba3d04dad3c5d936d7e55947826be0fb25e84595368919b720deccddceb7c3b30865a5a40f2458254c2af793b7c014e6719cf07e7f8e6ff30890f8
-    PATCHES ${patches}
+    PATCHES
+        fix-dllexport.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
@@ -21,14 +16,14 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+        "-DVERSION=${VERSION}"
 )
 
 vcpkg_cmake_install()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/gts/usage b/ports/gts/usage
@@ -1,6 +1,5 @@
-The port gts supports consumption from CMake:
+gts can be imported via CMake FindPkgConfig module:
 
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(GTS gts REQUIRED)
-    target_compile_options(main PRIVATE ${GTS_CFLAGS})
-    target_link_libraries(main PRIVATE ${GTS_LDFLAGS})
+    pkg_check_modules(GTS gts REQUIRED IMPORTED_TARGET)
+    target_link_libraries(main PRIVATE PkgConfig::GTS)
diff --git a/ports/gts/vcpkg.json b/ports/gts/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "gts",
   "version": "0.7.6",
-  "port-version": 7,
+  "port-version": 8,
   "description": "3D surfaces meshed with interconnected triangles",
-  "homepage": "http://gts.sourceforge.net/",
-  "supports": "!osx",
+  "homepage": "https://gts.sourceforge.net/",
+  "license": "LGPL-2.0-or-later",
   "dependencies": [
     "glib",
     {