Use vcpkg for Linux CI

.github/workflows/build.yml

@@ -7,8 +7,8 @@ concurrency:
 jobs:
   linux:
     name: linux
-    runs-on: ubuntu-latest
-    container: ghcr.io/lmms/linux.gcc:20.04
+    runs-on: ubuntu-20.04
+    container: ubuntu:20.04
     env:
       CMAKE_OPTS: >-
         -DUSE_WERROR=ON
@@ -17,14 +17,55 @@ jobs:
       CCACHE_MAXSIZE: 0
       CCACHE_NOCOMPRESS: 1
       MAKEFLAGS: -j2
+      DEBIAN_FRONTEND: noninteractive
     steps:
       - name: Configure git
-        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+        run: |
+          apt update && apt install sudo
+          sudo apt-get install --yes git
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Check out
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
           submodules: recursive
+      - name: Prepare to install system packages
+        run: |
+          echo "APT_DEPENDENCIES=$(xargs < .github/workflows/deps-ubuntu-20.04-gcc.txt)" >> "$GITHUB_ENV"
+          .github/workflows/setup-wine.sh
+          .github/workflows/setup-cmake.sh
+          # Manually install apt-fast to fix awalsh128/cache-apt-pkgs-action
+          sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime
+          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common
+          sudo add-apt-repository -y ppa:apt-fast/stable
+          sudo apt update
+          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y apt-fast
+      - name: Install system packages
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: ${{ env.APT_DEPENDENCIES }}
+          version: 1.0
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: '5.15.2'
+          arch: 'gcc_64'
+          archives: qtbase qtsvg qttools qtx11extras icu
+          cache: true
+          setup-python: false
+      - name: Download and bootstrap vcpkg
+        run: |
+          git clone --branch 2024.05.24 https://github.com/microsoft/vcpkg.git
+          ./vcpkg/bootstrap-vcpkg.sh
+          echo "VCPKG_INSTALLATION_ROOT=${GITHUB_WORKSPACE}/vcpkg" >> "$GITHUB_ENV"
+      - name: Cache vcpkg dependencies
+        id: cache-deps
+        uses: actions/cache@v3
+        with:
+          key: vcpkg-linux-${{ hashFiles('vcpkg.json') }}
+          restore-keys: |
+            vcpkg-linux-
+          path: build/vcpkg_installed
       - name: Cache ccache data
         uses: actions/cache@v3
         with:
@@ -36,9 +77,17 @@ jobs:
       - name: Configure
         run: |
           ccache --zero-stats
-          source /opt/qt5*/bin/qt5*-env.sh || true
-          mkdir build && cd build
-          cmake .. $CMAKE_OPTS -DCMAKE_INSTALL_PREFIX=./install
+          cmake -S . \
+                -B build \
+                --toolchain "${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" \
+                -DVCPKG_TARGET_TRIPLET="x64-linux" \
+                -DVCPKG_HOST_TRIPLET="x64-linux" \
+                -DVCPKG_MANIFEST_INSTALL="${{ env.should_install_manifest }}" \
+                -DCMAKE_INSTALL_PREFIX=./build/install \
+                $CMAKE_OPTS
+        env:
+          should_install_manifest:
+            ${{ steps.cache-deps.outputs.cache-hit == 'true' && 'NO' || 'YES' }}
       - name: Build
         run: cmake --build build
       - name: Run tests

.github/workflows/deps-ubuntu-20.04-gcc.txt

@@ -0,0 +1,53 @@
+autoconf
+binutils
+bison
+ca-certificates
+ccache
+cmake
+curl
+file
+flex
+fluid
+g++
+g++-multilib
+gcc
+gcc-multilib
+git
+gperf
+gpg
+libasound2-dev
+libc6-dev
+libc6-dev-i386
+libfltk1.3-dev
+libgig-dev
+libjack-jackd2-dev
+liblilv-dev
+liblist-moreutils-perl
+libsndio-dev
+libsuil-dev
+libtool
+libx11-xcb-dev
+libxcb-keysyms1-dev
+libxcb-util0-dev
+libxml-perl
+libxml2-utils
+lsb-release
+lv2-dev
+make
+nasm
+perl
+portaudio19-dev
+python3-distutils
+python3-jinja2
+python3-pip
+software-properties-common
+ssh-client
+stk
+sudo
+tar
+unzip
+wget
+wine-staging-dev
+winehq-staging
+zip
+zstd

.github/workflows/setup-cmake.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Add Kitware APT repo for latest CMake --- See: https://apt.kitware.com/
+# As of 5/21/2024, only focal and jammy are supported
+. /etc/os-release
+if [ "$UBUNTU_CODENAME" = "focal" ] || [ "$UBUNTU_CODENAME" = "jammy" ]; then
+    sudo apt-get install --yes wget gpg
+    test -f /usr/share/doc/kitware-archive-keyring/copyright || \
+        wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
+        | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+    echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${UBUNTU_CODENAME} main" \
+        | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
+    sudo apt-get update
+    test -f /usr/share/doc/kitware-archive-keyring/copyright || \
+        sudo rm /usr/share/keyrings/kitware-archive-keyring.gpg
+    sudo apt-get install -y kitware-archive-keyring
+fi

.github/workflows/setup-wine.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Add WineHQ APT repo
+sudo dpkg --add-architecture i386
+sudo apt-get install --yes wget
+sudo mkdir -pm755 /etc/apt/keyrings
+sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+. /etc/os-release
+sudo wget -NP /etc/apt/sources.list.d/ "https://dl.winehq.org/wine-builds/ubuntu/dists/${UBUNTU_CODENAME}/winehq-${UBUNTU_CODENAME}.sources"
+sudo apt-get update

cmake/modules/FindAlsa.cmake

@@ -18,7 +18,13 @@ include(CheckIncludeFileCXX)
 include(CheckLibraryExists)
 
 # Already done by toplevel
-find_library(ASOUND_LIBRARY asound)
+# Using NO_DEFAULT_PATH to ignore vcpkg's alsa package
+find_library(ASOUND_LIBRARY
+    NAMES asound
+    HINTS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu
+    PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu
+    NO_DEFAULT_PATH)
+
 set(ASOUND_LIBRARY_DIR "")
 if(ASOUND_LIBRARY)
    get_filename_component(ASOUND_LIBRARY_DIR ${ASOUND_LIBRARY} PATH)

plugins/Sf2Player/Sf2Player.cpp

@@ -50,6 +50,8 @@
 #include "embed.h"
 #include "plugin_export.h"
 
+#define HAS_EFFECT_GROUPS (FLUIDSYNTH_VERSION_MAJOR >= 2 && FLUIDSYNTH_VERSION_MINOR >= 2)
+
 namespace lmms
 {
 
@@ -504,35 +506,58 @@ void Sf2Instrument::updateGain()
 
 void Sf2Instrument::updateReverbOn()
 {
-	fluid_synth_set_reverb_on( m_synth, m_reverbOn.value() ? 1 : 0 );
+#if HAS_EFFECT_GROUPS
+		fluid_synth_reverb_on(m_synth, 0, m_reverbOn.value() ? 1 : 0);
+#else
+		fluid_synth_set_reverb_on(m_synth, m_reverbOn.value() ? 1 : 0);
+#endif
 }
 
 
 
 
 void Sf2Instrument::updateReverb()
 {
-	fluid_synth_set_reverb( m_synth, m_reverbRoomSize.value(),
+#if HAS_EFFECT_GROUPS
+		fluid_synth_set_reverb_group_roomsize(m_synth, 0, m_reverbRoomSize.value());
+		fluid_synth_set_reverb_group_damp(m_synth, 0, m_reverbDamping.value());
+		fluid_synth_set_reverb_group_width(m_synth, 0, m_reverbWidth.value());
+		fluid_synth_set_reverb_group_level(m_synth, 0, m_reverbLevel.value());
+#else
+		fluid_synth_set_reverb(m_synth, m_reverbRoomSize.value(),
 			m_reverbDamping.value(), m_reverbWidth.value(),
-			m_reverbLevel.value() );
+			m_reverbLevel.value());
+#endif
 }
 
 
 
 
 void  Sf2Instrument::updateChorusOn()
 {
-	fluid_synth_set_chorus_on( m_synth, m_chorusOn.value() ? 1 : 0 );
+#if HAS_EFFECT_GROUPS
+		fluid_synth_chorus_on(m_synth, 0, m_chorusOn.value() ? 1 : 0);
+#else
+		fluid_synth_set_chorus_on(m_synth, m_chorusOn.value() ? 1 : 0);
+#endif
 }
 
 
 
 
 void  Sf2Instrument::updateChorus()
 {
-	fluid_synth_set_chorus( m_synth, static_cast<int>( m_chorusNum.value() ),
+#if HAS_EFFECT_GROUPS
+		fluid_synth_set_chorus_group_nr(m_synth, 0, static_cast<int>(m_chorusNum.value()));
+		fluid_synth_set_chorus_group_level(m_synth, 0, m_chorusLevel.value());
+		fluid_synth_set_chorus_group_speed(m_synth, 0, m_chorusSpeed.value());
+		fluid_synth_set_chorus_group_depth(m_synth, 0, m_chorusDepth.value());
+		fluid_synth_set_chorus_group_type(m_synth, 0, FLUID_CHORUS_MOD_SINE);
+#else
+		fluid_synth_set_chorus(m_synth, static_cast<int>(m_chorusNum.value()),
 			m_chorusLevel.value(), m_chorusSpeed.value(),
-			m_chorusDepth.value(), 0 );
+			m_chorusDepth.value(), FLUID_CHORUS_MOD_SINE);
+#endif
 }
 
 

src/core/SampleDecoder.cpp

@@ -31,6 +31,7 @@
 #include <sndfile.h>
 
 #ifdef LMMS_HAVE_OGGVORBIS
+#define OV_EXCLUDE_STATIC_CALLBACKS
 #include <vorbis/vorbisfile.h>
 #endif
 

vcpkg.json

@@ -12,7 +12,8 @@
 		},
 		{
 			"name": "fltk",
-			"default-features": false
+			"default-features": false,
+			"platform": "!linux"
 		},
 		{
 			"name": "fluidsynth",
@@ -45,21 +46,39 @@
 			"name": "libvorbis",
 			"default-features": false
 		},
+		{
+			"name": "libxft",
+			"default-features": false,
+			"platform": "linux"
+		},
+		{
+			"name": "libxinerama",
+			"default-features": false,
+			"platform": "linux"
+		},
 		{
 			"name": "lilv",
-			"default-features": false
+			"default-features": false,
+			"platform": "!linux"
 		},
 		{
 			"name": "lv2",
-			"default-features": false
+			"default-features": false,
+			"platform": "!linux"
 		},
 		{
 			"name": "mp3lame",
 			"default-features": false
 		},
 		{
 			"name": "portaudio",
-			"default-features": false
+			"default-features": false,
+			"platform": "!linux"
+		},
+		{
+			"name": "pulseaudio",
+			"default-features": false,
+			"platform": "linux"
 		},
 		{
 			"name": "sdl2",