Skip to content

Commit 9e71d42

Browse files
ankith26ankith26
committed
Bump/update SDL_mixer deps
1 parent ed9bc52 commit 9e71d42

File tree

11 files changed

+64
-15
lines changed

11 files changed

+64
-15
lines changed

‎buildconfig/macdependencies/build_mac_deps.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ bash wavpack/build-wavpack.sh
9090

9191
# fluidsynth (for sdl_mixer)
9292
# bash gettext/build-gettext.sh
93-
bash glib/build-glib.sh
93+
# bash glib/build-glib.sh
9494
bash sndfile/build-sndfile.sh
9595
bash fluidsynth/build-fluidsynth.sh
9696

‎buildconfig/manylinux-build/docker_base/Dockerfile-aarch64‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ RUN ["bash", "/libxmp_build/build-libxmp.sh"]
142142
# ADD gettext /gettext_build/
143143
# RUN ["bash", "/gettext_build/build-gettext.sh"]
144144

145-
ADD glib /glib_build/
146-
RUN ["bash", "/glib_build/build-glib.sh"]
145+
# ADD glib /glib_build/
146+
# RUN ["bash", "/glib_build/build-glib.sh"]
147147

148148
ADD fluidsynth /fluidsynth_build/
149149
RUN ["bash", "/fluidsynth_build/build-fluidsynth.sh"]

‎buildconfig/manylinux-build/docker_base/Dockerfile-i686‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ RUN ["linux32", "bash", "/libxmp_build/build-libxmp.sh"]
142142
# ADD gettext /gettext_build/
143143
# RUN ["bash", "/gettext_build/build-gettext.sh"]
144144

145-
ADD glib /glib_build/
146-
RUN ["linux32", "bash", "/glib_build/build-glib.sh"]
145+
# ADD glib /glib_build/
146+
# RUN ["linux32", "bash", "/glib_build/build-glib.sh"]
147147

148148
ADD fluidsynth /fluidsynth_build/
149149
RUN ["linux32", "bash", "/fluidsynth_build/build-fluidsynth.sh"]

‎buildconfig/manylinux-build/docker_base/Dockerfile-x86_64‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ RUN ["bash", "/libxmp_build/build-libxmp.sh"]
142142
# ADD gettext /gettext_build/
143143
# RUN ["bash", "/gettext_build/build-gettext.sh"]
144144

145-
ADD glib /glib_build/
146-
RUN ["bash", "/glib_build/build-glib.sh"]
145+
# ADD glib /glib_build/
146+
# RUN ["bash", "/glib_build/build-glib.sh"]
147147

148148
ADD fluidsynth /fluidsynth_build/
149149
RUN ["bash", "/fluidsynth_build/build-fluidsynth.sh"]

‎buildconfig/manylinux-build/docker_base/buildtools/install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717

1818
# pin versions for stability (remember to keep updated)
1919
python3 -m pip install $PG_PIP_EXTRA_FLAGS \
20-
setuptools==80.9.0 meson==1.8.2 ninja==1.11.1.4
20+
setuptools==80.9.0 meson==1.9.1 ninja==1.13.0
2121

2222
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
2323
cp /root/.local/bin/* /usr/bin

‎buildconfig/manylinux-build/docker_base/fluidsynth/build-fluidsynth.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ set -e -x
33

44
cd $(dirname `readlink -f "$0"`)
55

6-
FSYNTH_VER="2.4.7"
6+
FSYNTH_VER="2.5.0"
77
FSYNTH="fluidsynth-$FSYNTH_VER"
88

99
curl -sL --retry 10 https://github.com/FluidSynth/fluidsynth/archive/v${FSYNTH_VER}.tar.gz > ${FSYNTH}.tar.gz
1010
sha512sum -c fluidsynth.sha512
1111
tar xzf ${FSYNTH}.tar.gz
1212

1313
cd $FSYNTH
14+
# Vendor in the fix from https://github.com/FluidSynth/fluidsynth/pull/1687
15+
# this can be removed when we bump fluidsynth next
16+
patch -p1 < ../pr-1687.patch
1417
mkdir build
1518
cd build
1619

@@ -22,6 +25,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
2225
fi
2326

2427
cmake .. $PG_BASE_CMAKE_FLAGS -Denable-readline=OFF $FLUIDSYNTH_EXTRA_PLAT_FLAGS \
28+
-Denable-openmp=OFF -Dosal=cpp11 -Denable-libinstpatch=0 \
2529
-Denable-pulseaudio=NO \
2630
-Denable-pipewire=NO
2731

‎buildconfig/manylinux-build/docker_base/fluidsynth/fluidsynth.sha512‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8f5d9e20ab5a50b966ae9abee349913611a3e4ebb6c4a39c8b0f56aaba06483e82a761e3d38a37af689e45a0940957c9db9d324ff77352b0841da40be1ff3899 fluidsynth-2.4.7.tar.gz
1+
8f326db4049b3241c7a0472aa5db8c715dcfc0a1ce9c5fda492bf84e6c17e27a2298131a58a51e275797259a434e59bfe3f53d85358f903652dca8de753a3376 fluidsynth-2.5.0.tar.gz

‎buildconfig/manylinux-build/docker_base/fluidsynth/pr-1687.patch‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
From 2dc377b4e7b59d01b71d6389a12e787231a792c5 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Pedro=20L=C3=B3pez-Cabanillas?= <plcl@users.sourceforge.net>
3+
Date: Sat, 18 Oct 2025 20:45:46 +0200
4+
Subject: [PATCH 1/2] alternate std::filesystem CMake check for mac
5+
6+
---
7+
CMakeLists.txt | 4 +++-
8+
1 file changed, 3 insertions(+), 1 deletion(-)
9+
10+
diff --git a/CMakeLists.txt b/CMakeLists.txt
11+
index 350a1dcef..0344240fa 100644
12+
--- a/CMakeLists.txt
13+
+++ b/CMakeLists.txt
14+
@@ -567,7 +567,9 @@ unset ( HAVE_CXX_FILESYSTEM CACHE )
15+
if ( osal STREQUAL "cpp11" )
16+
# Will silently fall back to a lower standard version if not available
17+
set( CMAKE_CXX_STANDARD 17 )
18+
- check_include_file_cxx ( filesystem HAVE_CXX_FILESYSTEM )
19+
+ include( CheckCXXSourceCompiles )
20+
+ check_cxx_source_compiles( "#include <filesystem>
21+
+ int main() { std::filesystem::path path = std::filesystem::current_path(); }" HAVE_CXX_FILESYSTEM )
22+
if ( NOT HAVE_CXX_FILESYSTEM )
23+
message ( WARNING "C++ filesystem support not found, some file operations will be stubs" )
24+
endif ( NOT HAVE_CXX_FILESYSTEM )
25+
26+
From 5ae4455c409fb0eb01112880bed7cb1262e3668b Mon Sep 17 00:00:00 2001
27+
From: =?UTF-8?q?Pedro=20L=C3=B3pez-Cabanillas?= <plcl@users.sourceforge.net>
28+
Date: Sat, 18 Oct 2025 22:56:59 +0200
29+
Subject: [PATCH 2/2] additional check for feature-test macro
30+
31+
---
32+
CMakeLists.txt | 2 +-
33+
1 file changed, 1 insertion(+), 1 deletion(-)
34+
35+
diff --git a/CMakeLists.txt b/CMakeLists.txt
36+
index 0344240fa..400855416 100644
37+
--- a/CMakeLists.txt
38+
+++ b/CMakeLists.txt
39+
@@ -569,7 +569,7 @@ if ( osal STREQUAL "cpp11" )
40+
set( CMAKE_CXX_STANDARD 17 )
41+
include( CheckCXXSourceCompiles )
42+
check_cxx_source_compiles( "#include <filesystem>
43+
- int main() { std::filesystem::path path = std::filesystem::current_path(); }" HAVE_CXX_FILESYSTEM )
44+
+ int main() { static_assert(__cpp_lib_filesystem == 201703L); std::filesystem::path p = std::filesystem::current_path(); }" HAVE_CXX_FILESYSTEM )
45+
if ( NOT HAVE_CXX_FILESYSTEM )
46+
message ( WARNING "C++ filesystem support not found, some file operations will be stubs" )
47+
endif ( NOT HAVE_CXX_FILESYSTEM )

‎buildconfig/manylinux-build/docker_base/mpg123/build-mpg123.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

44
cd $(dirname `readlink -f "$0"`)
55

6-
MPG123="mpg123-1.33.0"
6+
MPG123="mpg123-1.33.2"
77

88
curl -sL --retry 10 https://downloads.sourceforge.net/sourceforge/mpg123/${MPG123}.tar.bz2 > ${MPG123}.tar.bz2
99
sha512sum -c mpg123.sha512

‎buildconfig/manylinux-build/docker_base/mpg123/mpg123.sha512‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c2c6a3536f18334e310337dc2cc7d4af141c1f7fffb02fc079d645f46113581d457587c562cf353d39375d721af6716cb4db6a964ef83284e390b597744c52ea mpg123-1.33.0.tar.bz2
1+
9e9a4d6433e9073470c4cee909dfbfcd4717b1f1534eefeee453870993967026155f913c12b6ca187fb96059e73d9184e71df8a62736b43092d3842b9814c980 mpg123-1.33.2.tar.bz2

0 commit comments

Comments
 (0)