From b60ca87ca40da5f58a5965dbb402bba4b5b9d2e3 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Tue, 15 Feb 2022 19:45:10 -0300 Subject: [PATCH] Jenkins: Build our own rtmidi without JACK --- .ci/AppImageBuilder.yml | 2 +- .ci/build.sh | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.ci/AppImageBuilder.yml b/.ci/AppImageBuilder.yml index 64d5200c8..2efaa6222 100644 --- a/.ci/AppImageBuilder.yml +++ b/.ci/AppImageBuilder.yml @@ -47,7 +47,6 @@ AppDir: - libqt5core5a - libqt5gui5 - libqt5widgets5 - - librtmidi5 - libslirp0 - libsndio7.0 - libwayland-client0 @@ -90,6 +89,7 @@ AppDir: - usr/share/pkgconfig - usr/share/poppler - usr/share/readline + - usr/share/rtmidi - usr/share/sounds - usr/share/X11 - usr/share/xml diff --git a/.ci/build.sh b/.ci/build.sh index 53c25a0b2..7b382da43 100644 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -427,6 +427,8 @@ then # TBD : else + cwd_root=$(pwd) + # Build openal-soft 1.21.1 manually to fix audio issues. This is a temporary # workaround until a newer version of openal-soft trickles down to Debian repos. if [ -d "openal-soft-1.21.1" ] @@ -435,11 +437,25 @@ else else wget -qO - https://github.com/kcat/openal-soft/archive/refs/tags/1.21.1.tar.gz | tar zxf - fi - cwd_root=$(pwd) cd openal-soft-1.21.1/build + [ -e Makefile ] && make clean cmake -G "Unix Makefiles" -D "CMAKE_TOOLCHAIN_FILE=$cwd_root/toolchain.cmake" -D "CMAKE_INSTALL_PREFIX=$cwd_root/archive_tmp/usr" .. make -j$(nproc) install - cd ../.. + cd "$cwd_root" + + # Build rtmidi without JACK support to remove the dependency on libjack. + if [ -d "rtmidi-4.0.0" ] + then + rm -rf rtmidi-4.0.0/CMakeCache.txt rtmidi-4.0.0/CMakeFiles + else + wget -qO - http://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-4.0.0.tar.gz | tar zxf - + fi + cwd_root=$(pwd) + cd rtmidi-4.0.0 + [ -e Makefile ] && make clean + cmake -G "Unix Makefiles" -D RTMIDI_API_JACK=OFF -D "CMAKE_TOOLCHAIN_FILE=$cwd_root/toolchain.cmake" -D "CMAKE_INSTALL_PREFIX=$cwd_root/archive_tmp/usr" . + make -j$(nproc) install + cd "$cwd_root" # Archive Discord Game SDK library. 7z e -y -o"archive_tmp/usr/lib" discord_game_sdk.zip "lib/$arch_discord/discord_game_sdk.so"