Merge pull request #71 from daschuer/master_merge

Master merge
mixxxdj · Jun 8, 2023 · ee6a820 · ee6a820
2 parents 55d482c + 89fc575
commit ee6a820
Show file tree

Hide file tree

Showing 2,953 changed files with 32,471 additions and 13,967 deletions.
diff --git a/.github/workflows/check_issues.yml b/.github/workflows/check_issues.yml
@@ -0,0 +1,32 @@
+name: Check For Common Issues
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  missing-windows-sdk-issue:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            let issue_query = {
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            };
+            let issue = await github.rest.issues.get(issue_query)
+            let reg = /RC Pass 1: command "rc .*" failed \(exit code 0\) with the following output:/;
+            if (reg.test(issue.data.body)){
+              await github.rest.issues.removeAllLabels(issue_query);
+              await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]});
+              let body = "Thanks for posting this issue. Please make sure you have the following installed.\n" +
+                         "- Visual Studio Desktop development with C++.\n" +
+                         "- Windows 10 SDK or Windows 11 SDK.";
+              await github.rest.issues.createComment({...issue_query, body}); 
+              // Close the issue? 
+            }
diff --git a/overlay/osx/qt5-base/cmake/qt_download_submodule.cmake b/overlay/osx/qt5-base/cmake/qt_download_submodule.cmake
@@ -17,7 +17,7 @@ function(qt_download_submodule)
     set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz")
 
     vcpkg_download_distfile(ARCHIVE_FILE
-        URLS "https://download.qt.io/archive/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
+        URLS "https://download.qt.io/new_archive/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
         FILENAME ${ARCHIVE_NAME}
         SHA512 ${QT_HASH_${PORT}}
     )

diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake
@@ -1,14 +1,3 @@
-# Check architecture:
-if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(BUILD_ARCH "Win32")
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(BUILD_ARCH "x64")
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    set(BUILD_ARCH "ARM")
-else()
-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-endif()
-
 # Check library linkage:
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
 
@@ -28,14 +17,12 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # UWP:
     vcpkg_install_msbuild(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "3FD/3FD.WinRT.UWP.vcxproj"
-        PLATFORM ${BUILD_ARCH}
         USE_VCPKG_INTEGRATION
     )
 elseif (NOT VCPKG_CMAKE_SYSTEM_NAME) # Win32:
     vcpkg_install_msbuild(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "3FD/3FD.vcxproj"
-        PLATFORM ${BUILD_ARCH}
         TARGET Build
         USE_VCPKG_INTEGRATION
     )

diff --git a/ports/3fd/vcpkg.json b/ports/3fd/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "3fd",
   "version": "2.6.3",
-  "port-version": 2,
+  "port-version": 3,
   "description": "C++ Framework For Fast Development",
   "supports": "windows & !static & !arm64",
   "dependencies": [

diff --git a/ports/absent/vcpkg.json b/ports/absent/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "absent",
-  "version-string": "0.3.1",
-  "port-version": 2,
+  "version": "0.3.1",
+  "port-version": 3,
   "description": "A small C++17 library meant to simplify the composition of nullable types in a generic, type-safe, and declarative way",
   "homepage": "https://github.com/rvarago/absent",
   "dependencies": [

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
@@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES)
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz"
         FILENAME "ACE-TAO-${VERSION}.tar.gz"
-        SHA512 7210091f0512fa9c7ba2ea9e3f805a2ba0aab4d848a8e9e5651a824dcac65ddd50b95c98f4da86900487fa0a79aede126d021f4eb109f224224fc88a58133f79
+        SHA512 a40a4761d396f1e7dc96287075810a3d874794f56057cf1f18b2bd27fbb89e024c2926890fd0a8efe825c31865c382b91e90477d78cba64877b93ba9909b7da2
     )
 else()
     # Don't change to vcpkg_from_github! This points to a release and not an archive
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz"
         FILENAME "ACE-src-${VERSION}.tar.gz"
-        SHA512 6e8b63ee8fa691656544a7a9e5887b499a8791f25766a8081df1d64e911f667a95fed26c1eb6355f6ce1233694f8ef11c1a986ca16a686e21fb1e375035a29ed
+        SHA512 716b27e347e013b866fa08f7ab182c60faf108e8000089b90717db86d6dd92d8c7e776d4850be27c5f50c8e31543f573ce19466efcd9b4b7bc8836eec5447860
     )
 endif()
 
@@ -65,12 +65,6 @@ vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_PATH ${PERL} DIRECTORY)
 vcpkg_add_to_path("${PERL_PATH}")
 
-if (TRIPLET_SYSTEM_ARCH MATCHES "x86")
-    set(MSBUILD_PLATFORM "Win32")
-else ()
-    set(MSBUILD_PLATFORM "${TRIPLET_SYSTEM_ARCH}")
-endif()
-
 # Add ace/config.h file
 # see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html
 if(VCPKG_TARGET_IS_WINDOWS)
@@ -142,7 +136,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
     SOURCE_PATH "${SOURCE_PATH}"
     PROJECT_SUBPATH ${PROJECT_SUBPATH}
     LICENSE_SUBPATH COPYING
-    PLATFORM ${MSBUILD_PLATFORM}
     SKIP_CLEAN
   )
 
@@ -285,7 +278,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
       SOURCE_PATH "${SOURCE_PATH}"
       PROJECT_SUBPATH ${PROJECT_SUBPATH_XML}
       LICENSE_SUBPATH COPYING
-      PLATFORM ${MSBUILD_PLATFORM}
       SKIP_CLEAN
     )
 

diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ace",
-  "version": "7.0.11",
-  "port-version": 2,
+  "version": "7.1.0",
+  "port-version": 1,
   "maintainers": "Johnny Willemsen <jwillemsen@remedy.nl>",
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://github.com/DOCGroup/ACE_TAO",

diff --git a/ports/activemq-cpp/activemq-cppConfig.cmake b/ports/activemq-cpp/activemq-cppConfig.cmake
@@ -133,9 +133,9 @@ if (ACTIVEMQ_CPP_DLL_RELEASE)
     #
     if (ACTIVEMQ_CPP_LIB_RELEASE AND ACTIVEMQ_CPP_DLL_DEBUG AND ACTIVEMQ_CPP_LIB_DEBUG)
         _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.lib")
-        _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.dll")
+        _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/bin/libapr-1.dll")
         _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.lib")
-        _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.dll")
+        _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/bin/libapr-1.dll")
         if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_DLL_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG AND ACTIVEMQ_CPP_APR_DLL_DEBUG)
             _activemq_cpp_windows_dependencies()
             if (${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND)

diff --git a/ports/activemq-cpp/portfile.cmake b/ports/activemq-cpp/portfile.cmake
@@ -1,5 +1,3 @@
-set(VERSION 3.9.5)
-
 set(PATCHES )
 if (NOT VCPKG_TARGET_IS_LINUX)
     set(PATCHES FunctionLevelLinkingOn.diff)
@@ -15,9 +13,9 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME "activemq-cpp-library-${VERSION}-src.tar.bz2"
     SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2
 )
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
     PATCHES ${PATCHES}
 )
 
@@ -65,12 +63,10 @@ else()
         vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" ";libapr-1.lib" ";apr-1.lib")
     endif()
 
-    if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
+    if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
         set(BUILD_ARCH "Win32")
-    elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
-        set(BUILD_ARCH "x64")
     else()
-        message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+        set(BUILD_ARCH "${VCPKG_TARGET_ARCHITECTURE}")
     endif()
 
     string(REPLACE "/" "\\" WIN_SOURCE_PATH "${SOURCE_PATH}")
@@ -108,13 +104,13 @@ else()
         endif()
     endif()
 
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
         file(COPY
             "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib"
             DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib"
         )
 
-        if (ACTIVEMQCPP_SHARED_LIB)
+        if(ACTIVEMQCPP_SHARED_LIB)
             file(COPY
                 "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll"
                 DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin"

diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "activemq-cpp",
   "version-semver": "3.9.5",
-  "port-version": 10,
+  "port-version": 13,
   "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
   "license": "Apache-2.0",
   "supports": "!(uwp | osx)",

diff --git a/ports/ada-url/portfile.cmake b/ports/ada-url/portfile.cmake
@@ -0,0 +1,36 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ada-url/ada
+    REF "v${VERSION}"
+    SHA512 689dcdc3e89f2ae51e039f6d354efea3231d3ff025c58f572596d87cebd7d5f2bf5ca8c530df8514369a14831dfdb1c65bc1d93a0ece579031eb3f0dd47548c0
+    HEAD_REF main
+)
+
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools ADA_TOOLS
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DADA_BENCHMARKS=OFF
+        -DBUILD_TESTING=OFF
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME ada CONFIG_PATH "lib/cmake/ada")
+
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES adaparse AUTO_CLEAN)
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-APACHE" "${SOURCE_PATH}/LICENSE-MIT")
diff --git a/ports/ada-url/vcpkg.json b/ports/ada-url/vcpkg.json
@@ -0,0 +1,23 @@
+{
+  "name": "ada-url",
+  "version": "2.4.2",
+  "description": "WHATWG-compliant and fast URL parser written in modern C++",
+  "homepage": "https://ada-url.com/",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tools": {
+      "description": "Build CLI tools (adaparse)",
+      "supports": "!uwp"
+    }
+  }
+}
diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake
diff --git a/ports/akali/vcpkg.json b/ports/akali/vcpkg.json
diff --git a/ports/aklomp-base64/portfile.cmake b/ports/aklomp-base64/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_cmake_config_fixup(
+	PACKAGE_NAME base64
 	CONFIG_PATH "lib/cmake/base64"
 )
 

diff --git a/ports/aklomp-base64/vcpkg.json b/ports/aklomp-base64/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aklomp-base64",
   "version-date": "2023-01-06",
+  "port-version": 1,
   "description": "Implementation of a base64 stream encoding/decoding library in C99 with SIMD (AVX2, AVX512, NEON, AArch64/NEON, SSSE3, SSE4.1, SSE4.2, AVX) and OpenMP acceleration",
   "homepage": "https://github.com/aklomp/base64",
   "license": "BSD-2-Clause",

diff --git a/ports/alac-decoder/vcpkg.json b/ports/alac-decoder/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "alac-decoder",
-  "version-string": "0.2",
-  "port-version": 6,
+  "version": "0.2",
+  "port-version": 7,
   "description": "ALAC C implementation of a decoder, written from reverse engineering the file format",
   "homepage": "https://distfiles.macports.org/alac_decoder",
   "dependencies": [

diff --git a/ports/alac/vcpkg.json b/ports/alac/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "alac",
-  "version-string": "2017-11-03-c38887c5",
-  "port-version": 3,
+  "version": "2017-11-03-c38887c5",
+  "port-version": 4,
   "description": "The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.",
   "homepage": "https://github.com/macosforge/alac",
   "supports": "!uwp",

diff --git a/ports/alembic/disable-warnings-as-error.patch b/ports/alembic/disable-warnings-as-error.patch