80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Jenkins: Temporarily compile a newer version of openal-soft to fix audio issues

Browse Source
This commit is contained in:
RichardG867
2022-02-14 13:41:52 -03:00
parent 17a6aabcec
commit 32941b3c5b
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.ci/AppImageBuilder.yml
View File

@@ -33,8 +33,6 @@ AppDir:
key_url: 'https://ftp-master.debian.org/keys/archive-key-11.asc' key_url: 'https://ftp-master.debian.org/keys/archive-key-11.asc'
- sourceline: 'deb http://deb.debian.org/debian bullseye-updates main' - sourceline: 'deb http://deb.debian.org/debian bullseye-updates main'
key_url: 'https://ftp-master.debian.org/keys/archive-key-11-security.asc' 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: include:
- libdrm2 - libdrm2
- libevdev2 - libevdev2
@@ -46,8 +44,6 @@ AppDir:
- libglvnd0 - libglvnd0
- libglx0 - libglx0
- libgs9 - libgs9
- libopenal-data=1:1.17*
- libopenal1=1:1.17*
- libpng16-16 - libpng16-16
- libqt5core5a - libqt5core5a
- libqt5gui5 - libqt5gui5
@@ -69,6 +65,9 @@ AppDir:
- lib/udev - lib/udev
- opt/libc/usr/share - opt/libc/usr/share
- usr/bin - usr/bin
- usr/include
- usr/lib/cmake
- usr/lib/pkgconfig
- usr/sbin - usr/sbin
- usr/share/alsa - usr/share/alsa
- usr/share/apport - usr/share/apport

16
.ci/build.sh
View File

@@ -227,7 +227,7 @@ else
esac esac
# Establish general dependencies. # 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" ] if [ "$(dpkg --print-architecture)" = "$arch_deb" ]
then then
pkgs="$pkgs build-essential" pkgs="$pkgs build-essential"
@@ -427,6 +427,20 @@ then
# TBD # TBD
: :
else 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. # 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" 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] [ ! -e "archive_tmp/usr/lib/$libdir/discord_game_sdk.so" ] && echo [!] No Discord Game SDK for architecture [$arch_discord]