diff --git a/.ci/AppImageBuilder.yml b/.ci/AppImageBuilder.yml index 60b491bd1..6085c5605 100644 --- a/.ci/AppImageBuilder.yml +++ b/.ci/AppImageBuilder.yml @@ -33,8 +33,6 @@ AppDir: key_url: 'https://ftp-master.debian.org/keys/archive-key-11.asc' - sourceline: 'deb http://deb.debian.org/debian bullseye-updates main' key_url: 'https://ftp-master.debian.org/keys/archive-key-11-security.asc' - - sourceline: 'deb http://deb.debian.org/debian stretch main' - key_url: 'https://ftp-master.debian.org/keys/archive-key-9.asc' include: - libdrm2 - libevdev2 @@ -46,8 +44,6 @@ AppDir: - libglvnd0 - libglx0 - libgs9 - - libopenal-data=1:1.17* - - libopenal1=1:1.17* - libpng16-16 - libqt5core5a - libqt5gui5 @@ -69,6 +65,9 @@ AppDir: - lib/udev - opt/libc/usr/share - usr/bin + - usr/include + - usr/lib/cmake + - usr/lib/pkgconfig - usr/sbin - usr/share/alsa - usr/share/apport diff --git a/.ci/build.sh b/.ci/build.sh index 91ce79ca3..a9777e014 100644 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -227,7 +227,7 @@ else esac # Establish general dependencies. - pkgs="cmake pkg-config git imagemagick wget p7zip-full wayland-protocols" + pkgs="cmake pkg-config git imagemagick wget p7zip-full wayland-protocols tar gzip" if [ "$(dpkg --print-architecture)" = "$arch_deb" ] then pkgs="$pkgs build-essential" @@ -427,6 +427,20 @@ then # TBD : else + # 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" ] + then + rm -rf openal-soft-1.21.1/build/* + 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 + 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 ../.. + # Archive Discord Game SDK library. 7z e -y -o"archive_tmp/usr/lib/$libdir" discord_game_sdk.zip "lib/$arch_discord/discord_game_sdk.so" [ ! -e "archive_tmp/usr/lib/$libdir/discord_game_sdk.so" ] && echo [!] No Discord Game SDK for architecture [$arch_discord]