Osyotr · pull · Feb 15, 2024 · Feb 15, 2024 · Feb 15, 2024 · Feb 15, 2024
diff --git a/ports/directxmath/portfile.cmake b/ports/directxmath/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXMath
-    REF dec2023
-    SHA512 ddb5fdb4ef2d524990b0eba254e8395e0c3278a49c37889eef97c977b9d72c4983305c7e2a5b732e05ee54819e0d4aea134a1419f713dda4da386d1bad2d3580
+    REF feb2024
+    SHA512 01bd31dcf22d6800b9c0d6a102fd87a22ed2e113525775c95b56b0c8dc7268627b8c1386cf7296224951e8d96231b1feb3e3471f8c35a169a672b1134acf39fa
     HEAD_REF main
 )
 
@@ -20,9 +20,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmath)
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     vcpkg_download_distfile(
         SAL_HEADER
-        URLS "https://raw.githubusercontent.com/dotnet/corert/master/src/Native/inc/unix/sal.h"
+        URLS "https://raw.githubusercontent.com/dotnet/runtime/v8.0.1/src/coreclr/pal/inc/rt/sal.h"
         FILENAME "sal.h"
-        SHA512 1643571673195d9eb892d2f2ac76eac7113ef7aa0ca116d79f3e4d3dc9df8a31600a9668b7e7678dfbe5a76906f9e0734ef8d6db0903ccc68fc742dd8238d8b0
+        SHA512 0f5a80b97564217db2ba3e4624cc9eb308e19cc9911dae21d983c4ab37003f4756473297ba81b386c498514cedc1ef5a3553d7002edc09aeb6a1335df973095f
     )
 
     file(INSTALL

diff --git a/ports/directxmath/vcpkg.json b/ports/directxmath/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "directxmath",
-  "version-date": "2023-12-31",
+  "version-date": "2024-02-14",
   "description": "DirectXMath SIMD C++ math library",
   "homepage": "https://github.com/Microsoft/DirectXMath",
   "documentation": "https://docs.microsoft.com/windows/win32/dxmath/directxmath-portal",

diff --git a/ports/etl/portfile.cmake b/ports/etl/portfile.cmake
@@ -1,19 +1,27 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ETLCPP/etl
-    REF "${VERSION}"
-    SHA512 fcfa30f4e702444b7cc9a41c97ba8c370e18468782a11fcde40d198f7f0475b3f6e45531c8fe2898e5ab0086c24f0cf9dc72ebf8c16480ac3c09dd301c476f0a
+    REF "${VERSION}"
+    SHA512 fcfa30f4e702444b7cc9a41c97ba8c370e18468782a11fcde40d198f7f0475b3f6e45531c8fe2898e5ab0086c24f0cf9dc72ebf8c16480ac3c09dd301c476f0a
     HEAD_REF master
 )
 
+# header-only
+set(VCPKG_BUILD_TYPE "release")
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTS=OFF
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+vcpkg_cmake_config_fixup(CONFIG_PATH share/etl/cmake)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/etl/.vscode")
+# remove templates used for generating headers
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/etl/generators")
+file(GLOB_RECURSE PNG_FILES "${CURRENT_PACKAGES_DIR}/include/etl/*.png")
+file(REMOVE ${PNG_FILES})
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/etl/vcpkg.json b/ports/etl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "etl",
   "version": "20.38.10",
+  "port-version": 1,
   "description": "A C++ template library for embedded applications",
   "homepage": "https://www.etlcpp.com",
   "license": "MIT",

diff --git a/ports/libassert/include-dir.patch b/ports/libassert/include-dir.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c653d61..c9e599f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,7 +43,7 @@ target_include_directories(
+   assert
+   PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
+-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/assert/assert>
++  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/assert>
+ )
+
+ #set(CMAKE_CXX_FLAGS_REL_WITH_ASSERTS "-O3")
+@@ -119,7 +121,7 @@ if(NOT CMAKE_SKIP_INSTALL_RULES)
+   install(
+     FILES
+     include/assert.hpp
+-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/assert/assert
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/assert
+   )
+
+   install(
diff --git a/ports/libassert/magic-enum.patch b/ports/libassert/magic-enum.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c653d61..a5d9980 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,6 +94,8 @@ endif()
+
+ if(ASSERT_USE_MAGIC_ENUM)
+   target_compile_definitions(assert PUBLIC ASSERT_USE_MAGIC_ENUM)
++  find_package(magic_enum CONFIG REQUIRED)
++  target_link_libraries(assert PUBLIC magic_enum::magic_enum)
+ endif()
+
+ if(NOT "${ASSERT_FAIL}" STREQUAL "")
+diff --git a/include/assert.hpp b/include/assert.hpp
+index b49c633..299a47e 100644
+--- a/include/assert.hpp
++++ b/include/assert.hpp
+@@ -34,7 +34,7 @@
+ #ifdef ASSERT_USE_MAGIC_ENUM
+  // this is a temporary hack to make testing thing in compiler explorer quicker (it disallows simple relative includes)
+  #include \
+- "../third_party/magic_enum.hpp"
++ <magic_enum.hpp>
+ #endif
+
+ #define LIBASSERT_IS_CLANG 0
diff --git a/ports/libassert/portfile.cmake b/ports/libassert/portfile.cmake
@@ -5,25 +5,32 @@ vcpkg_from_github(
     SHA512 beba94e033f7e43c84123736a32725a333c915392d5dc57c26a63f832a507564d79f290a151cb136de8bded3d8d343dad3c4bf2efec9977d878df3c9a8677554
     HEAD_REF main
     PATCHES
-      runtime_destination.patch
+        runtime_destination.patch
+        magic-enum.patch
+        include-dir.patch
 )
 
-vcpkg_list(SET options -DASSERT_USE_EXTERNAL_CPPTRACE=On)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-  vcpkg_list(APPEND options -DASSERT_STATIC=On)
-endif()
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS ${options}
+    OPTIONS
+        -DASSERT_USE_EXTERNAL_CPPTRACE=ON
+        -DASSERT_STATIC=${BUILD_STATIC}
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(
-    PACKAGE_NAME "libassert"
-    CONFIG_PATH "lib/cmake/assert"
+    PACKAGE_NAME assert
+    CONFIG_PATH lib/cmake/assert
 )
+vcpkg_copy_pdbs()
+
+file(APPEND "${CURRENT_PACKAGES_DIR}/share/assert/assert-config.cmake" "include(CMakeFindDependencyMacro)
+find_dependency(magic_enum)
+find_dependency(cpptrace)")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/assert/third_party")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/libassert/vcpkg.json b/ports/libassert/vcpkg.json
@@ -1,12 +1,14 @@
 {
   "name": "libassert",
   "version": "1.2.2",
+  "port-version": 1,
   "description": "The most over-engineered and overpowered C++ assertion library.",
   "homepage": "https://github.com/jeremy-rifkin/libassert",
   "license": "MIT",
   "supports": "!uwp",
   "dependencies": [
     "cpptrace",
+    "magic-enum",
     {
       "name": "vcpkg-cmake",
       "host": true

diff --git a/ports/libdwarf/dependencies.diff b/ports/libdwarf/dependencies.diff
@@ -1,32 +1,33 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 70839abd..04b0f86f 100644
+index 70839abd..cb3b5d8f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -196,6 +196,12 @@ if (ENABLE_DECOMPRESSION)
-     set(HAVE_ZSTD TRUE)
-     set(HAVE_ZSTD_H TRUE)
-   endif()
-+  find_package(zstd CONFIG REQUIRED)
-+  if(TARGET zstd::libzstd_shared)
-+    set(ZSTD_LIB zstd::libzstd_shared)
-+  else()
-+    set(ZSTD_LIB zstd::libzstd_static)
-+  endif()
- endif ()
-
- message(STATUS "CMAKE_SIZEOF_VOID_P ... " ${CMAKE_SIZEOF_VOID_P} )
+@@ -184,12 +184,9 @@ endif()
 
- #  DW_FWALLXX are gnu C++ options.
+ if (ENABLE_DECOMPRESSION)
+   # Zlib and ZSTD need to be found otherwise disable it
+-  if(NOT TARGET ZLIB::ZLIB)
+-    find_package(ZLIB)
+-  endif()
+-  if(NOT TARGET ZSTD::ZSTD)
+-    find_package(ZSTD)
+-  endif()
++  find_package(ZLIB REQUIRED)
++  find_package(zstd CONFIG REQUIRED)
++  set(ZSTD_FOUND TRUE)
+   if (ZLIB_FOUND AND ZSTD_FOUND )
+     set(HAVE_ZLIB TRUE)
+     set(HAVE_ZLIB_H TRUE)
 diff --git a/src/lib/libdwarf/CMakeLists.txt b/src/lib/libdwarf/CMakeLists.txt
-index 7500c9f4..ae367cc1 100644
+index 7500c9f4..faf1bd7a 100644
 --- a/src/lib/libdwarf/CMakeLists.txt
 +++ b/src/lib/libdwarf/CMakeLists.txt
 @@ -105,7 +105,7 @@ target_include_directories(dwarf PUBLIC
-     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libdwarf>
    )
  if(ZLIB_FOUND AND ZSTD_FOUND)
 -  target_link_libraries(dwarf PRIVATE  ZLIB::ZLIB ZSTD::ZSTD ) 
-+  target_link_libraries(dwarf PRIVATE  ZLIB::ZLIB ${ZSTD_LIB} ) 
++  target_link_libraries(dwarf PRIVATE  ZLIB::ZLIB $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static> ) 
  endif()
  set_target_properties(dwarf PROPERTIES PUBLIC_HEADER "libdwarf.h;dwarf.h")
 

diff --git a/ports/libdwarf/include-dir.diff b/ports/libdwarf/include-dir.diff
@@ -0,0 +1,31 @@
+diff --git a/src/lib/libdwarf/CMakeLists.txt b/src/lib/libdwarf/CMakeLists.txt
+index 7500c9f4..78bb1a1a 100644
+--- a/src/lib/libdwarf/CMakeLists.txt
++++ b/src/lib/libdwarf/CMakeLists.txt
+@@ -102,7 +102,7 @@ msvc_posix(dwarf)
+ target_compile_definitions(dwarf PUBLIC ${DEFS})
+ target_include_directories(dwarf PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
++    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libdwarf>
+   )
+ if(ZLIB_FOUND AND ZSTD_FOUND)
+   target_link_libraries(dwarf PRIVATE  ZLIB::ZLIB ZSTD::ZSTD ) 
+@@ -113,7 +113,7 @@ install(TARGETS dwarf
+         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+         ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-        PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++        PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libdwarf"
+         )
+
+ configure_file(libdwarf.pc.cmake libdwarf.pc @ONLY)
+@@ -125,7 +125,7 @@ configure_file(libdwarf.pc.cmake libdwarf.pc @ONLY)
+ install(TARGETS dwarf EXPORT libdwarfTargets
+         ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-        PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
++        PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libdwarf")
+ install(EXPORT libdwarfTargets
+         FILE libdwarf-targets.cmake
+         NAMESPACE libdwarf::
diff --git a/ports/libdwarf/portfile.cmake b/ports/libdwarf/portfile.cmake
@@ -5,6 +5,7 @@ vcpkg_from_github(
     SHA512 8e1addaf2b970db792c4488fa416b712c7b48dfe501bbfd5c40a7eaf71f07377abaa70f682982d11de9cf9573d8fd8dc5fd16c020eb9b68b5be558139a0799a1
     HEAD_REF main
     PATCHES
+        include-dir.diff
         dependencies.diff
         msvc-runtime.diff
         off_t.diff
@@ -18,16 +19,18 @@ vcpkg_cmake_configure(
     OPTIONS
         -DBUILD_NON_SHARED=${BUILD_NON_SHARED}
         -DBUILD_SHARED=${BUILD_SHARED}
+    OPTIONS_DEBUG
+        -DBUILD_DWARFDUMP=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libdwarf")
 vcpkg_fixup_pkgconfig()
-
+vcpkg_copy_pdbs()
 vcpkg_copy_tools(TOOL_NAMES dwarfdump AUTO_CLEAN)
 
 if(BUILD_SHARED)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libdwarf.h" "ifndef LIBDWARF_STATIC" "if 1")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libdwarf/libdwarf.h" "ifndef LIBDWARF_STATIC" "if 1")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

diff --git a/ports/libdwarf/vcpkg.json b/ports/libdwarf/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libdwarf",
   "version": "0.9.1",
+  "port-version": 1,
   "description": "A library for reading DWARF2 and later DWARF.",
   "homepage": "https://github.com/davea42/libdwarf-code",
   "license": "LGPL-2.1-only",

diff --git a/ports/libnick/portfile.cmake b/ports/libnick/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO NickvisionApps/libnick
     REF "${VERSION}"
-    SHA512 239e82f3a658d8b1e9dd261bd8b86e47f4bf399e70f7c2b297deb202af4a1b483753d3cf6738825136d4f6382ea10aa42a4e3a58d98c0405fc1ff70ea39ce4a6
+    SHA512 f71c5e9b0dd949033a46382a594b9b155ae54571c483973a4157669233f8ee73a9fc13cdbb5ab7b0dea17d48f3926146a412cb230a2b7f6194dc4c451900d90f
     HEAD_REF main
 )
 

diff --git a/ports/libnick/vcpkg.json b/ports/libnick/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libnick",
-  "version": "2024.2.3",
+  "version": "2024.2.4",
   "maintainers": "Nicholas Logozzo [email protected]",
   "description": "A cross-platform base for native Nickvision applications.",
   "homepage": "https://github.com/NickvisionApps/libnick",

diff --git a/ports/python3/0018-fix-sysconfig-include.patch b/ports/python3/0018-fix-sysconfig-include.patch
@@ -2,18 +2,6 @@ diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
 index ebe371182..e351df7da 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
-@@ -30,9 +30,9 @@
-         'purelib': '{base}/lib/python{py_version_short}/site-packages',
-         'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
-         'include':
--            '{installed_base}/include/python{py_version_short}{abiflags}',
-+            '{installed_base}/../../include/python{py_version_short}{abiflags}',
-         'platinclude':
--            '{installed_platbase}/include/python{py_version_short}{abiflags}',
-+            '{installed_platbase}/../../include/python{py_version_short}{abiflags}',
-         'scripts': '{base}/bin',
-         'data': '{base}',
-         },
 @@ -51,8 +51,8 @@
          'platstdlib': '{base}/Lib',
          'purelib': '{base}/Lib/site-packages',

diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "python3",
   "version": "3.11.5",
-  "port-version": 4,
+  "port-version": 5,
   "description": "The Python programming language",
   "homepage": "https://github.com/python/cpython",
   "license": "Python-2.0",

diff --git a/ports/rtmfp-cpp/portfile.cmake b/ports/rtmfp-cpp/portfile.cmake
@@ -2,21 +2,20 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zenomt/rtmfp-cpp
     REF "v${VERSION}"
-    SHA512 e83df63d01207300f53dcbece150e8c2db8630f19a5b477292285833ad3406a09037c3055181b9f67b6a6a0f528e1c36f72577c86451591161fd3ccd945f5841
+    SHA512 cc8eac88c70b6a00a92a76bee66a3b319857a009fbfd82e9a710fe1c0fc452cf9fdf4128529e3f10931ed33c26eaf69253cab3b3e5a739eca6dd37a13f72800b
     HEAD_REF main
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCMAKE_REQUIRE_FIND_PACKAGE_OpenSSL=ON
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/rtmfp)
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-set(LICENSE_FILES "${SOURCE_PATH}/LICENSE")
-# Copyright and license
-vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/rtmfp-cpp/vcpkg.json b/ports/rtmfp-cpp/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "rtmfp-cpp",
-  "version": "1.4.0-20230213.18168ec",
+  "version": "1.5.1",
   "description": "Secure Real-Time Media Flow Protocol Library (RTMFP)",
   "homepage": "https://github.com/zenomt/rtmfp-cpp",
   "license": "MIT",
-  "supports": "x64 & !uwp",
   "dependencies": [
     "openssl",
     {