Merge remote-tracking branch 'mixxxdj/2.5' into 2.5-rel

ports/ade/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencv/ade
     REF "v${VERSION}"
-    SHA512 5ee9a13b8bff062fc742d117dc0315bb5d6ff2c747ce5c7df0c233870506ec5f2afbd2852fc3d6bb28b86426013fd7fdf0a1e49164f7cd644e78443904dc8711
+    SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348
     HEAD_REF master
 )
 

ports/ade/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "ade",
-  "version-string": "0.1.2c",
+  "version-string": "0.1.2d",
   "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.",
   "dependencies": [
     {

ports/ankurvdev-embedresource/portfile.cmake

@@ -0,0 +1,29 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ankurvdev/embedresource
+    REF "v${VERSION}"
+    SHA512 96d2208fd5d654dad5662968296fa363cea0a935fec8474b780717c9303d2dd763833370bcdf02d6d63e264368b0955fa1f13c6e55685280df5fdaf9e72b8c9f
+    HEAD_REF main)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+vcpkg_copy_tools(TOOL_NAMES embedresource AUTO_CLEAN)
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/embedresource/EmbedResourceConfig.cmake" config_contents)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/embedresource/EmbedResourceConfig.cmake"
+"find_program(
+    EMBEDRESOURCE_EXECUTABLE embedresource
+    PATHS
+        \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/${PORT}\"
+    NO_DEFAULT_PATH
+    REQUIRED)
+${config_contents}"
+)

ports/ankurvdev-embedresource/vcpkg.json

@@ -0,0 +1,17 @@
+{
+  "name": "ankurvdev-embedresource",
+  "version": "0.0.10",
+  "description": "Cross Platform Resource Embedding",
+  "homepage": "https://github.com/ankurvdev/embedresource",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    {
+      "name": "ankurvdev-embedresource",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}

ports/asiosdk/portfile.cmake

@@ -1,29 +1,32 @@
-set(VERSION 2.3.3)
-
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip"
-    FILENAME "asiosdk_2.3.3_2019-06-14-eac6c1a57829.zip"
-	SHA512 eac6c1a57829b7f722a681c54b2f6469d54695523f08f727d0dd6744dcd7fce4f3249c57689bb15ed7a8bcb912833b226439d800913e122e0ef9ab73672f6542
+    FILENAME "asiosdk_2.3.3_2019-06-14-d74c0bc09162.zip"
+    SHA512 d74c0bc09162640a377aaab2f2ce716f9ee7a6ef8d1aa1aa6bc223a4748c60fa900cc77b1cf6db66f8a4064a074b31a71d75cccc7de3634347865238d9c039af
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    SOURCE_BASE ${VERSION}
+    ARCHIVE "${ARCHIVE}"
+    SOURCE_BASE "${VERSION}"
 )
 
-file(INSTALL ${SOURCE_PATH}/asio/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/asio)
-file(INSTALL ${SOURCE_PATH}/common/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/common)
-file(INSTALL ${SOURCE_PATH}/driver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/driver)
-file(INSTALL ${SOURCE_PATH}/host/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/host)
-file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/changes.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement 2.0.1 - 2019.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${SOURCE_PATH}/ASIO SDK 2.3.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL "${SOURCE_PATH}/asio/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/asio")
+file(INSTALL "${SOURCE_PATH}/common/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/common")
+file(INSTALL "${SOURCE_PATH}/driver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/driver")
+file(INSTALL "${SOURCE_PATH}/host/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/host")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/readme.txt")
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(
+    INSTALL
+        "${SOURCE_PATH}/changes.txt"
+        "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip"
+        "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement V2.0.3 - 2023.pdf"
+        "${SOURCE_PATH}/ASIO SDK 2.3.pdf"
+        "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake"
+        "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
+    DESTINATION
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

ports/asiosdk/usage

@@ -1,4 +1,4 @@
 The package asiosdk provides CMake integration:
 
     find_package(asiosdk REQUIRED)
-    target_include_directories(<my_target> PRIVATE ${ASIOSDK_INCLUDE_DIRS})
+    target_include_directories(main PRIVATE ${ASIOSDK_INCLUDE_DIR})

ports/asiosdk/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "asiosdk",
   "version": "2.3.3",
-  "port-version": 6,
+  "port-version": 7,
   "description": "ASIO is a low latency audio API from Steinberg.",
   "homepage": "https://www.steinberg.net/en/company/developers.html",
   "supports": "windows & !(arm | uwp)"

ports/assimp/build_fixes.patch

@@ -80,7 +80,7 @@ index 6551dcb..0796448 100644
 +find_dependency(pugixml CONFIG)
 +if(NOT @BUILD_SHARED_LIBS@)
 +    find_dependency(kubazip CONFIG)
-+    find_dependency(minizip CONFIG)
++    find_dependency(unofficial-minizip CONFIG)
 +    #find_dependency(openddlparser CONFIG)
 +    find_dependency(poly2tri CONFIG)
 +    find_dependency(polyclipping CONFIG)
@@ -268,7 +268,8 @@ index 5339454..45e07c0 100644
 -  hunter_add_package(minizip)
 +IF(1)
 +  #hunter_add_package(minizip)
-   find_package(minizip CONFIG REQUIRED)
+-  find_package(minizip CONFIG REQUIRED)
++  find_package(unofficial-minizip CONFIG REQUIRED)
  ELSE()
    SET( unzip_SRCS
 @@ -969,9 +969,9 @@ ENDIF()
@@ -383,7 +384,8 @@ index 5339454..45e07c0 100644
 +      ${OPENDDL_PARSER_LIBRARIES}
 -      #poly2tri::poly2tri
 +      poly2tri::poly2tri
-       minizip::minizip
+-      minizip::minizip
++      unofficial::minizip::minizip
 -      ZLIB::zlib
 -      RapidJSON::rapidjson
 +      ZLIB::ZLIB

ports/assimp/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "assimp",
   "version": "5.3.1",
+  "port-version": 2,
   "description": "The Open Asset import library",
   "homepage": "https://github.com/assimp/assimp",
   "license": "BSD-3-Clause",

ports/atl/portfile.cmake

@@ -0,0 +1,10 @@
+find_path(ATLBASE_H
+  NAMES atlbase.h
+  PATHS $ENV{INCLUDE}
+)
+
+if(NOT ATLBASE_H)
+  message(FATAL_ERROR "Unable to locate 'atlbase.h'. Ensure you have installed the Active Template Library (ATL) component of Visual Studio.")
+endif()
+
+SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)

ports/atl/vcpkg.json

@@ -0,0 +1,6 @@
+{
+  "name": "atl",
+  "version": "0",
+  "description": "A stub package that ensures Visual Studio has Active Template Library (ATL) installed.",
+  "supports": "windows"
+}

ports/atlmfc/vcpkg.json

@@ -1,7 +1,10 @@
 {
   "name": "atlmfc",
   "version": "0",
-  "port-version": 2,
-  "description": "a stub package that ensures VS has ATL/MFC installed.",
-  "supports": "windows"
+  "port-version": 3,
+  "description": "A stub package that ensures Visual Studio has ATL/MFC installed.",
+  "supports": "windows",
+  "dependencies": [
+    "atl"
+  ]
 }