Merge remote-tracking branch 'upstream/2.7' into 2.7-rel

Author: acolombier

.github/workflows/build.yml

@@ -105,16 +105,54 @@ jobs:
           sudo xcode-select --switch "$DEVELOPER_DIR"
           xcrun --show-sdk-version
 
+    - name: "[Ubuntu] Install dependencies for nuget & vcpkg"
+      if: runner.os == 'Linux'
+      run: |
+          # Install all dependencies needed for the host (x64-linux-release). 
+          # Most of them are related to Qt-related ports build also include some build essentials as well as the Android SDK manager
+          sudo apt-get update && \
+          sudo apt-get install -y \
+            '^libxcb.*-dev' \
+            autoconf \
+            autoconf-archive \
+            automake \
+            bison \
+            flex \
+            mono-complete \
+            libasound2-dev \
+            libegl1-mesa-dev \
+            libghc-resolv-dev \
+            libglu1-mesa-dev \
+            libltdl-dev \
+            libudev-dev \
+            libx11-xcb-dev \
+            libxi-dev \
+            libxkbcommon-dev \
+            libxkbcommon-x11-dev \
+            libxrender-dev \
+            linux-libc-dev \
+            nasm \
+            pkg-config \
+            python3-jinja2
+          # Install NuGET
+          sudo curl -o /usr/local/bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+          sudo tee /usr/local/bin/nuget <<EOF
+          #!/bin/sh
+          mono /usr/local/bin/nuget.exe "\$@"
+          EOF
+          sudo chmod +x /usr/local/bin/nuget
+          echo "VCPKG_MAX_CONCURRENCY=3" >> "${GITHUB_ENV}"
+
     - name: "Authenticate to GitHub Packages (readwrite)"
-      if: runner.os != 'Linux' && github.event_name == 'push' && github.repository_owner == 'mixxxdj'
+      if: github.event_name == 'push' && github.repository_owner == 'mixxxdj'
       shell: bash
       run: |
         nuget sources add -Name "mixxx-github-packages" -Source "https://nuget.pkg.github.com/mixxxdj/index.json" -UserName "${{ github.repository_owner }}" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText
         nuget setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "mixxx-github-packages"
         echo "VCPKG_BINARY_SOURCES=clear;nuget,mixxx-github-packages,readwrite;" >> "${GITHUB_ENV}"
         
     - name: "Authenticate to GitHub Packages (read only)"
-      if: runner.os != 'Linux' && (github.event_name == 'pull_request' || github.repository_owner != 'mixxxdj') 
+      if: github.event_name == 'pull_request'
       shell: bash
       run: |
         nuget sources add -Name "mixxx-github-packages" -Source "https://nuget.pkg.github.com/mixxxdj/index.json" -UserName "${{ github.repository_owner }}" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText
@@ -131,32 +169,12 @@ jobs:
       run: ${{ matrix.vcpkg_bootstrap }}
       working-directory: ${{ matrix.vcpkg_path }}
 
-    - name: "[android] Bootstrap vcpkg"
+    - name: "[android] Install Android SDK"
       if: startsWith(matrix.deps_name, 'arm64-android')
       run: |
-          # Install all dependencies needed for the host (x64-linux-release). 
-          # Most of them are related to Qt-related ports build also include some build essentials as well as the Android SDK manager
           sudo apt-get install -y \
-            '^libxcb.*-dev' \
-            autoconf \
-            autoconf-archive \
-            bison \
-            flex \
             google-android-cmdline-tools-13.0-installer \
-            libasound2-dev \
-            libegl1-mesa-dev \
-            libghc-resolv-dev \
-            libglu1-mesa-dev \
-            libltdl-dev \
-            libx11-xcb-dev \
-            libxi-dev \
-            libxkbcommon-dev \
-            libxkbcommon-x11-dev \
-            libxrender-dev \
-            linux-libc-dev \
-            openjdk-17-jdk \
-            pkg-config \
-            python3-jinja2
+            openjdk-17-jdk
           yes | sudo sdkmanager "platforms;android-${{ matrix.android_api }}" "platform-tools" "build-tools;${{ matrix.android_version }}" "ndk;${{ matrix.android_ndk }}"
           echo "ANDROID_NDK_HOME=/usr/lib/android-sdk/ndk/${{ matrix.android_ndk }}" >> "${GITHUB_ENV}"   
           sudo sdkmanager --list_installed

overlay/ports/taglib/portfile.cmake

@@ -0,0 +1,50 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO taglib/taglib
+    REF "v${VERSION}"
+    SHA512 92955d8ae13772dcdf8e3125069c1793a2e20e75f1dbb82ef4e380da501963384f94d11cec49978203668b0915a587cab1c4e3fbea677cb7a006313a3d009062
+    HEAD_REF master
+)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    set(WINRT_OPTIONS -DHAVE_VSNPRINTF=1 -DPLATFORM_WINRT=1)
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DBUILD_EXAMPLES=OFF
+        ${WINRT_OPTIONS}
+)
+vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/taglib)
+
+set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/taglib.pc")
+if(EXISTS "${pcfile}")
+    vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib" IGNORE_UNCHANGED)
+    vcpkg_replace_string("${pcfile}" " -lz" "")
+endif()
+set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/taglib.pc")
+if(EXISTS "${pcfile}")
+    vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib" IGNORE_UNCHANGED)
+    vcpkg_replace_string("${pcfile}" " -lz" "")
+endif()
+
+# remove the debug/include files
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/taglib-config.cmd" "${CURRENT_PACKAGES_DIR}/debug/bin/taglib-config.cmd") # Contains absolute paths
+
+# remove bin directory for static builds (taglib creates a cmake batch file there)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/taglib/taglib_export.h" "defined(TAGLIB_STATIC)" "1")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+vcpkg_copy_pdbs()
+
+# copyright file
+file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib")
+file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright")

overlay/ports/taglib/vcpkg.json

@@ -0,0 +1,19 @@
+{
+  "name": "taglib",
+  "version-string": "2.2beta",
+  "description": "TagLib Audio Meta-Data Library",
+  "homepage": "https://taglib.org/",
+  "license": "LGPL-2.1-only OR MPL-1.1",
+  "dependencies": [
+    "utfcpp",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}

versions/t-/taglib.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "74d93db16634cc647501e5eadfab96792e6a13d1",
+      "version-string": "2.2beta",
+      "port-version": 0
+    },
     {
       "git-tree": "e00ac8989e0d8ecc37cc52d00f075a8244eec44e",
       "version": "2.0.2",