Skip to content

Commit 3a60095

Browse files
committed
CI: enforce fluidsynth, do not require sdl_mixer
1 parent d010528 commit 3a60095

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

.github/scripts/Linux/arm/bootstrap.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ apt -y install libavcodec-dev libavformat-dev libswscale-dev libraspberrypi-dev
3131
apt -y install \
3232
cmake \
3333
libdrm-dev\
34-
libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev\
34+
libfluidsynth-devl\
35+
libsdl2-dev libsdl2-ttf-dev\
3536
libva-dev\
3637
libvulkan-dev\
3738

.github/scripts/Linux/prepare.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ sudo apt install appstream `# appstreamcli for mkappimage AppStream validation`
2020
asciidoc
2121
sudo apt install fonts-dejavu-core
2222
sudo apt --no-install-recommends install nvidia-cuda-toolkit
23+
sudo apt install libfluidsynth-dev
2324
sudo apt install libglew-dev libglfw3-dev
2425
sudo apt install libglm-dev
2526
sudo apt install imagemagick libmagickwand-dev
26-
sudo apt install libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev
27+
sudo apt install libsdl2-dev libsdl2-ttf-dev
2728
sudo apt install libsoxr-dev libspeexdsp-dev
2829
sudo apt install libssl-dev
2930
sudo apt install libasound-dev libcaca-dev libjack-jackd2-dev libnatpmp-dev libv4l-dev portaudio19-dev

.github/scripts/Windows/prepare_msys.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,15 @@ $PACMAN_INSTALL automake autoconf git make pkgconf \
5050
$m-gcc-compat \
5151
unzip zip
5252
$PACMAN_INSTALL $m-asciidoc \
53+
$m-libcaca\
5354
$m-ffmpeg \
55+
$m-fluidsynth\
56+
$m-glew $m-glfw\
5457
$m-libnatpmp \
5558
$m-vulkan-headers $m-vulkan-loader \
5659

5760
$PACMAN_INSTALL $m-libsoxr $m-speexdsp
58-
$PACMAN_INSTALL $m-glew $m-libcaca $m-SDL2 $m-SDL2_mixer $m-SDL2_ttf $m-glfw
61+
$PACMAN_INSTALL $m-SDL2 $m-SDL2_ttf
5962
$PACMAN_INSTALL $m-glm
6063
$PACMAN_INSTALL $m-portaudio # in case of problems build PA with --with-winapi=wmme,directx,wasapi
6164
$PACMAN_INSTALL $m-curl # RTSP capture

.github/scripts/environment.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export FEATURES="\
4545
--enable-caca\
4646
--enable-decklink\
4747
--enable-file\
48+
--enable-fluidsynth\
4849
--enable-gl\
4950
--enable-gl-display\
5051
--enable-holepunch\
@@ -64,7 +65,6 @@ export FEATURES="\
6465
--enable-scale\
6566
--enable-screen\
6667
--enable-sdl=2\
67-
--enable-sdl_mixer\
6868
--enable-sdp-http\
6969
--enable-soxr\
7070
--enable-speexdsp\

.github/scripts/macOS/prepare.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ set -- \
3636
autoconf \
3737
automake \
3838
ffmpeg \
39+
fluidsynth \
3940
glm \
4041
imagemagick \
4142
jack \
@@ -50,7 +51,6 @@ set -- \
5051
portaudio \
5152
qt \
5253
sdl2 \
53-
sdl2_mixer \
5454
sdl2_ttf \
5555
speexdsp \
5656
vulkan-headers \

.github/workflows/coverity-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
run: |
6868
. .github/scripts/environment.sh
6969
.github/scripts/Linux/prepare.sh
70-
sudo apt install libavcodec-dev libavformat-dev libswscale-dev libsdl2-mixer-dev libsdl2-ttf-dev
70+
sudo apt install libavcodec-dev libavformat-dev libswscale-dev libfluidsynth-dev libsdl2-ttf-dev
7171
7272
- name: configure
7373
if: ${{ env.coverity_token }}

0 commit comments

Comments
 (0)