Merge remote-tracking branch 'Microsoft/master' into update_2.7_from_upstream

Author: JoergAtGithub

.github/workflows/check_issues.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         with:
           script: |
             let issue_query = {

ports/ableton-link/correct_cmake_include_directory.patch

@@ -0,0 +1,16 @@
+diff --git "a/AbletonLinkConfig.cmake" "b/AbletonLinkConfig.cmake"
+index 43b66e7..1e84fa5 100644
+--- "a/cmake_include/ConfigureAbletonLink.cmake"
++++ "b/cmake_include/ConfigureAbletonLink.cmake"
+@@ -30,6 +30,11 @@ function(ConfigureAbletonLink PATH_TO_LINK)
+       INTERFACE_COMPILE_DEFINITIONS
+       LINK_PLATFORM_WINDOWS=1
+     )
++  elseif(CMAKE_SYSTEM_NAME MATCHES "Android")
++    set_property(TARGET Ableton::Link APPEND PROPERTY
++      INTERFACE_COMPILE_DEFINITIONS
++      LINK_PLATFORM_LINUX=1
++    )
+     elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD|GNU")
+       set_property(TARGET Ableton::Link APPEND PROPERTY
+         INTERFACE_COMPILE_DEFINITIONS

ports/ableton-link/fix_android_build.patch

@@ -5,17 +5,19 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Ableton/link
     REF "Link-${VERSION}"
-    SHA512 889aa8cf56df19631a15cc4e245f3b7165a1d08aa199446de3b209c5be58904c11776899e9202900e73cc90ea63d366c6c3b2628657dac96db5a16a5217b3df7
+    SHA512 21ab3f47b1b2a7961cae238ca846adf0190341e8379a33938824acc49d3b95d8823b61bc321b1dfcbb3864f740425ac81d8c5c581e882394e1edac230f4c34e4
     HEAD_REF master
     PATCHES
         replace_local_asiostandalone_by_vcpkg_asio.patch
         replace_asiosdk_download_by_vcpkg_asiosdk.patch
         replace_local_catch_by_vcpkg_catch2.patch
         no-werror.patch
+        fix_android_build.patch
 )
+
 # Note that the dependencies ASIO and ASIOSDK are completely different things:
 # -ASIO (ASyncronous IO) is a cross-platform C++ library for network and low-level I/O programming
-# -ASIOSDK is the SDK for the Steinberg ASIO (Audio Stream Input/Output) driver, for profesional Windows audio applications
+# -ASIOSDK is the SDK for the Steinberg ASIO (Audio Stream Input/Output) driver, for professional Windows audio applications
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 FEATURES
@@ -50,35 +52,35 @@ vcpkg_cmake_configure(
     OPTIONS    
         -DNEED_CATCH2=${NEED_CATCH2}
         -DLINK_BUILD_ASIO=${NEED_ASIOSDK}
+        ${FEATURE_OPTIONS}
 )
 
-if ("coretest" IN_LIST FEATURES)
-    vcpkg_cmake_build(TARGET LinkCoreTest)
-    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkCoreTest${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-endif()
-if ("discoverytest" IN_LIST FEATURES)
-    vcpkg_cmake_build(TARGET LinkDiscoveryTest)
-    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkDiscoveryTest${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-endif()
-if ("hut" IN_LIST FEATURES)
-    vcpkg_cmake_build(TARGET LinkHut)
-    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkHut${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-endif()
-if ("hutsilent" IN_LIST FEATURES)
-    vcpkg_cmake_build(TARGET LinkHutSilent)
-    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkHutSilent${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-endif()
+# Helper function to build and install helper executables
+function(install_test_executable FEATURE_NAME TARGET_NAME)
+    if(${FEATURE_NAME} IN_LIST FEATURES)
+        vcpkg_cmake_build(TARGET ${TARGET_NAME})
+        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/${TARGET_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
+             DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+        if(NOT VCPKG_BUILD_TYPE)
+            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/${TARGET_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
+                 DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}")
+        endif()
+    endif()
+endfunction()
+
+# Install test executables
+install_test_executable("coretest" "LinkCoreTest")
+install_test_executable("discoverytest" "LinkDiscoveryTest")
+install_test_executable("hut" "LinkHut")
+install_test_executable("hutsilent" "LinkHutSilent")
 
 # We must not correct the CMake include path before build
-vcpkg_apply_patches(
-    SOURCE_PATH "${SOURCE_PATH}"
-    PATCHES 
-        correct_cmake_include_directory.patch
-)
+file(READ "${SOURCE_PATH}/cmake_include/ConfigureAbletonLink.cmake" CONFIG_CONTENT)
+string(REPLACE "\${PATH_TO_LINK}/include/ableton/Link.hpp" "\${PATH_TO_LINK}/../../include/ableton/Link.hpp" CONFIG_CONTENT "${CONFIG_CONTENT}")
+string(REPLACE "\${PATH_TO_LINK}/include" "\${PATH_TO_LINK}/../../include/ableton" CONFIG_CONTENT "${CONFIG_CONTENT}")
+file(WRITE "${SOURCE_PATH}/cmake_include/ConfigureAbletonLink.cmake" "${CONFIG_CONTENT}")
 
 file(INSTALL "${SOURCE_PATH}/AbletonLinkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/abletonlink")
 file(INSTALL "${SOURCE_PATH}/cmake_include/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/abletonlink/cmake_include/")
 file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" PATTERN "CMakeLists.txt" EXCLUDE)
-
-# Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/ableton-link/portfile.cmake

@@ -46,3 +46,26 @@ diff --git "a/examples/CMakeLists.txt" "b/examples/CMakeLists.txt"
  endif()
 
  #     _             _ _
+@@ -102,7 +96,20 @@ function(configure_linkhut_audio_sources target)
+         -DLINKHUT_AUDIO_PLATFORM_JACK=1
+       )
+     else()
+-      target_link_libraries(${target} asound portaudio)
++      if(LinkHut)
++        find_package(ALSA REQUIRED)
++        find_package(portaudio CONFIG REQUIRED)
++        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
++          set(PORTAUDIO_LIB "${portaudio_DIR}/../../debug/lib/libportaudio.a")
++        else()
++          set(PORTAUDIO_LIB "${portaudio_DIR}/../../lib/libportaudio.a")
++        endif()
++        # PortAudio built with JACK support needs JACK library
++        find_library(JACK_LIB NAMES jack)
++        if(JACK_LIB)
++          target_link_libraries(${target} ALSA::ALSA ${PORTAUDIO_LIB} ${JACK_LIB})
++        endif()
++      endif()
+       target_compile_definitions(${target} PRIVATE
+         -DLINKHUT_AUDIO_PLATFORM_PORTAUDIO=1
+       )
+ 

ports/ableton-link/replace_asiosdk_download_by_vcpkg_asiosdk.patch

@@ -1,19 +1,22 @@
-diff  a/cmake_include/AsioStandaloneConfig.cmake b/AsioStandaloneConfig.cmake
-
---- a/cmake_include/AsioStandaloneConfig.cmake
-+++ b/cmake_include/AsioStandaloneConfig.cmake
-@@ -1,6 +1,10 @@
- add_library(AsioStandalone::AsioStandalone IMPORTED INTERFACE)
- 
--set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY
--  INTERFACE_INCLUDE_DIRECTORIES
--  ${CMAKE_CURRENT_LIST_DIR}/../modules/asio-standalone/asio/include
--)
-+find_package(asio REQUIRED)
-+if(asio_FOUND)
-+  message(STATUS "Dependency asio found in ${asio_DIR}")   
-+  set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY
-+    INTERFACE_INCLUDE_DIRECTORIES
-+    ${asio_DIR}/../../include
-+  )
-+endif()
+diff  a/cmake_include/ConfigureAsioStandalone.cmake b/ConfigureAsioStandalone.cmake
+
+--- a/cmake_include/ConfigureAsioStandalone.cmake
++++ b/cmake_include/ConfigureAsioStandalone.cmake
+@@ -2,9 +2,13 @@ function(ConfigureAsioStandalone PATH_TO_LINK)
+ 
+   add_library(AsioStandalone::AsioStandalone IMPORTED INTERFACE)
+ 
+-  set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY
+-    INTERFACE_INCLUDE_DIRECTORIES
+-    ${PATH_TO_LINK}/modules/asio-standalone/asio/include
+-  )
++  find_package(asio REQUIRED)
++  if(asio_FOUND)
++    message(STATUS "Dependency asio found in ${asio_DIR}")
++    set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY
++      INTERFACE_INCLUDE_DIRECTORIES
++      ${asio_DIR}/../../include
++    )
++  endif()
+ 
+ endfunction()

ports/ableton-link/replace_local_asiostandalone_by_vcpkg_asio.patch

@@ -1,6 +1,6 @@
 {
   "name": "ableton-link",
-  "version": "3.1.2",
+  "version": "3.1.5",
   "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/",
@@ -33,10 +33,19 @@
     },
     "hut": {
       "description": "Build LinkHut command line tool",
+      "supports": "!android",
       "dependencies": [
+        {
+          "name": "alsa",
+          "platform": "linux | android | freebsd | openbsd"
+        },
         {
           "name": "asiosdk",
           "platform": "windows"
+        },
+        {
+          "name": "portaudio",
+          "platform": "linux | android | freebsd | openbsd"
         }
       ]
     },

ports/ableton-link/vcpkg.json

@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ada-url/ada
     REF "v${VERSION}"
-    SHA512 728bf278fcac51a8ffdf5571cb486e789cd49511674c61e354c802bbfaeea64598fb22cd28ef4b02eacdd42c1c3437f40666ca8dba8097e0ecebbae1095de77f
+    SHA512 49957af82afb06d36846351d61ad5d1705bf68efd072eb966f44ee67b4b0119c5b35da842092e2cea800d304a8ec6966d4170758fab04d7dbd375b4212ff08ea
     HEAD_REF main
     PATCHES
         no-cpm.patch