Merge branch 'master' into dev

ports/ableton-link/portfile.cmake

@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Ableton/link
     REF "Link-${VERSION}"
-    SHA512 d82529d08897833c3fd6f19eca1689dfbfeac945daa4f1cb5a5719248ba1428875084155761d4de9521d486552e82ea47c71009fa8ef868ed4dca86a561f5c3e
+    SHA512 889aa8cf56df19631a15cc4e245f3b7165a1d08aa199446de3b209c5be58904c11776899e9202900e73cc90ea63d366c6c3b2628657dac96db5a16a5217b3df7
     HEAD_REF master
     PATCHES
         replace_local_asiostandalone_by_vcpkg_asio.patch

ports/ableton-link/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "ableton-link",
-  "version": "3.1.1",
-  "port-version": 1,
+  "version": "3.1.2",
   "description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.",
   "homepage": "https://www.ableton.com/en/link/",
   "documentation": "http://ableton.github.io/link/",

ports/aom/export-config.diff

@@ -0,0 +1,36 @@
+diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake
+index 2c263e9..fc9c2ca 100644
+--- a/build/cmake/aom_install.cmake
++++ b/build/cmake/aom_install.cmake
+@@ -91,8 +91,31 @@ macro(setup_aom_install_targets)
+     install(FILES "${AOM_PKG_CONFIG_FILE}"
+             DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+     install(TARGETS ${AOM_INSTALL_LIBS};${AOM_INSTALL_BINS}
++            EXPORT unofficial-aom-targets
+             RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+             LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+             ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++    target_include_directories(aom PUBLIC $<INSTALL_INTERFACE:include>)
++    install(EXPORT unofficial-aom-targets
++      FILE unofficial-aom-targets.cmake
++      NAMESPACE unofficial::
++      DESTINATION share/aom)
++    include(CMakePackageConfigHelpers)
++    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/aom-config.cmake.in [[
++@PACKAGE_INIT@
++include(CMakeFindDependencyMacro)
++set(THREADS_PREFER_PTHREAD_FLAG ON)
++find_dependency(Threads)
++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-aom-targets.cmake")
++]])
++    configure_package_config_file(${CMAKE_CURRENT_BINARY_DIR}/aom-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/aom-config.cmake
++      INSTALL_DESTINATION lib/cmake/aom
++      NO_SET_AND_CHECK_MACRO
++      NO_CHECK_REQUIRED_COMPONENTS_MACRO)
++    write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/aom-config-version.cmake
++      VERSION ${SO_FILE_VERSION}
++      COMPATIBILITY SameMajorVersion)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/aom-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/aom-config-version.cmake
++      DESTINATION share/aom)
+   endif()
+ endmacro()

ports/aom/portfile.cmake

@@ -1,24 +1,17 @@
-# NASM is required to build AOM
-vcpkg_find_acquire_program(NASM)
-get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
-vcpkg_add_to_path(${NASM_EXE_PATH})
-
-# Perl is required to build AOM
-vcpkg_find_acquire_program(PERL)
-get_filename_component(PERL_PATH ${PERL} DIRECTORY)
-vcpkg_add_to_path(${PERL_PATH})
-
 vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
     URL "https://aomedia.googlesource.com/aom"
-    REF bb6430482199eaefbeaaa396600935082bc43f66
+    REF 8ad484f8a18ed1853c094e7d3a4e023b2a92df28 # v3.9.1
+    HEAD_REF main
     PATCHES
         aom-rename-static.diff
         aom-uninitialized-pointer.diff
-        # Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream
-        aom-install.diff
+        export-config.diff
 )
 
+vcpkg_find_acquire_program(NASM)
+vcpkg_find_acquire_program(PERL)
+
 set(aom_target_cpu "")
 if(VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^arm"))
     # UWP + aom's assembler files result in weirdness and build failures
@@ -27,7 +20,7 @@ if(VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE
 endif()
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_TARGET_IS_LINUX)
-  set(aom_target_cpu "-DENABLE_NEON=OFF")
+    set(aom_target_cpu "-DENABLE_NEON=OFF")
 endif()
 
 vcpkg_cmake_configure(
@@ -39,29 +32,26 @@ vcpkg_cmake_configure(
         -DENABLE_TESTDATA=OFF
         -DENABLE_TESTS=OFF
         -DENABLE_TOOLS=OFF
+        -DTHREADS_PREFER_PTHREAD_FLAGS=ON
+        "-DCMAKE_ASM_NASM_COMPILER=${NASM}"
+        "-DPERL_EXECUTABLE=${PERL}"
 )
 
 vcpkg_cmake_install()
-
+vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
-
 vcpkg_fixup_pkgconfig()
 
-if(VCPKG_TARGET_IS_WINDOWS)
-  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/aom.pc" " -lm" "")
-  if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/aom.pc" " -lm" "")
-  endif()
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VPCKG_TARGET_IS_MINGW)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/aom.pc" " -lm" "")
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/aom.pc" " -lm" "")
+    endif()
 endif()
 
-# Move cmake configs
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
-
-# Remove duplicate files
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
-                    ${CURRENT_PACKAGES_DIR}/debug/share)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
 
-vcpkg_fixup_pkgconfig()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

ports/aom/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "aom",
-  "version-semver": "3.8.1",
-  "port-version": 1,
+  "version-semver": "3.9.1",
   "description": "AV1 codec library",
   "homepage": "https://aomedia.googlesource.com/aom",
   "license": "BSD-2-Clause",

ports/bddisasm/portfile.cmake

@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bitdefender/bddisasm
     REF "v${VERSION}"
-    SHA512 60e823845318e2608c9909462299512f2b932323bf527e45b859f61958e884c6ccff6b11aecb40edb8d628278a57e37ac49f0ca2a351763746fc7e5f792381e1
+    SHA512 254aa303f5957327de85715cc05c8bcf33f27bd18ad90959a74b2d817ee393d672878d66c83de63c9ec1e6d65df7ae2657e3a585ead24dbc093a035a7daeea4a
     HEAD_REF master
 )
 

ports/bddisasm/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "bddisasm",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "maintainers": "Cristi Anichitei <[email protected]>",
   "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.",
   "homepage": "https://github.com/bitdefender/bddisasm",

ports/boost-stacktrace/features.cmake

@@ -22,16 +22,10 @@
 
     # When ON, builds the boost_stacktrace_windbg_cached library variant. Defaults to ON under Windows when WinDbg support is autodetected and when thread_local is supported, otherwise OFF.
 
-list(APPEND FEATURE_OPTIONS 
-  -DBOOST_STACKTRACE_ENABLE_BACKTRACE=OFF 
-  )
-
-if(VCPKG_TARGET_IS_WINDOWS)
-  list(APPEND FEATURE_OPTIONS 
-   -DBOOST_STACKTRACE_ENABLE_WINDBG=ON
-  )
-else()
-  list(APPEND FEATURE_OPTIONS 
-   -DBOOST_STACKTRACE_ENABLE_WINDBG=OFF
-  )
-endif()
+vcpkg_check_features(
+  OUT_FEATURE_OPTIONS
+    FEATURE_OPTIONS
+  FEATURES
+    "backtrace" BOOST_STACKTRACE_ENABLE_BACKTRACE
+    "windbg"    BOOST_STACKTRACE_ENABLE_WINDBG
+)

ports/boost-stacktrace/vcpkg.json

@@ -2,7 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-stacktrace",
   "version": "1.85.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Boost stacktrace module",
   "homepage": "https://www.boost.org/libs/stacktrace",
   "license": "BSL-1.0",
@@ -40,5 +40,31 @@
       "name": "boost-winapi",
       "version>=": "1.85.0"
     }
-  ]
+  ],
+  "default-features": [
+    {
+      "name": "backtrace",
+      "platform": "!windows"
+    },
+    {
+      "name": "windbg",
+      "platform": "windows"
+    }
+  ],
+  "features": {
+    "backtrace": {
+      "description": "Use boost_stacktrace_backtrace",
+      "supports": "!windows",
+      "dependencies": [
+        {
+          "name": "libbacktrace",
+          "platform": "!windows"
+        }
+      ]
+    },
+    "windbg": {
+      "description": "Use boost_stacktrace_windbg",
+      "supports": "windows"
+    }
+  }
 }

ports/buck-yeh-bux-mariadb-client/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO buck-yeh/bux-mariadb-client
-    REF aa7a543ed98081f357f1f27e2d77b66b81d727d6 # v1.0.3
-    SHA512 35877ec1f17f43c4215c2662613ec00fc4e8a851087809aadcf4770ef1691b645a6804bfd12124af39db9338e28e9c1ed87fe03bf38e1675651a9c325df23b24
+    REF "${VERSION}"
+    SHA512 89ae1d7c49ed9f1bd600a4da91aa4ff0853cdb8a3e3724bf0902aecdcd8706f6ee1d5355926e1cf2a6225063b109a055efa28a40475e31d22f9c57a38582483a
     HEAD_REF main
 )
 

ports/buck-yeh-bux-mariadb-client/vcpkg.json

@@ -1,14 +1,12 @@
 {
   "name": "buck-yeh-bux-mariadb-client",
-  "version": "1.0.3",
-  "port-version": 1,
+  "version": "1.0.4",
   "description": "Loose-coupled throw-on-error C++20 wrapper classes and utilities over mysql/mariadb Connector/C API",
   "homepage": "https://github.com/buck-yeh/bux-mariadb-client",
   "license": "MIT",
-  "supports": "!(arm | uwp | osx | linux)",
+  "supports": "!(android | linux | osx | uwp)",
   "dependencies": [
     "buck-yeh-bux",
-    "fmt",
     "libmariadb",
     {
       "name": "vcpkg-cmake",

ports/buck-yeh-bux/portfile.cmake

@@ -2,10 +2,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO buck-yeh/bux
     REF "${VERSION}"
-    SHA512 7b58e67d0744ead50fb5a826118d1026dc85b6bd880a2d3f30a9d355fc20f48697057eec139ad3960a65cebfbd0e30b99bee42b71bd23058c815a50b6df10c5c
+    SHA512 4ef6578d16f96bfaa96f85a0deda69e7d766b263972fa5f2a894902dc8d8db930f9169e0c36146e7ac69a2f3655e8dbf2108e7187440866bcace2c90cb3bcbfe
     HEAD_REF main
-    PATCHES
-        fix-build-error-with-fmt11.patch
 )
 
 vcpkg_cmake_configure(

ports/buck-yeh-bux/vcpkg.json

@@ -1,13 +1,11 @@
 {
   "name": "buck-yeh-bux",
-  "version": "1.6.8",
-  "port-version": 2,
+  "version": "1.7.0",
   "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.",
   "homepage": "https://github.com/buck-yeh/bux",
   "license": "MIT",
-  "supports": "!(arm | uwp | osx | linux)",
+  "supports": "!(android | linux | osx | uwp)",
   "dependencies": [
-    "fmt",
     {
       "name": "vcpkg-cmake",
       "host": true

ports/bzip2/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5...3.29)
 project(bzip2 C)
 
 if(CMAKE_BUILD_TYPE STREQUAL Debug)

ports/bzip2/portfile.cmake

@@ -1,5 +1,6 @@
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceware.org/pub/bzip2/bzip2-${VERSION}.tar.gz"
+         "https://www.mirrorservice.org/sites/sourceware.org/pub/bzip2/bzip2-${VERSION}.tar.gz"
     FILENAME "bzip2-${VERSION}.tar.gz"
     SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 )

ports/bzip2/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "bzip2",
   "version-semver": "1.0.8",
-  "port-version": 5,
+  "port-version": 6,
   "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.",
   "homepage": "https://sourceware.org/bzip2/",
   "documentation": "https://sourceware.org/bzip2/docs.html",