diff --git a/mingw-w64-SDL_mixer/mikmod1.patch b/mingw-w64-SDL_mixer/001-mikmod1.patch similarity index 100% rename from mingw-w64-SDL_mixer/mikmod1.patch rename to mingw-w64-SDL_mixer/001-mikmod1.patch diff --git a/mingw-w64-SDL_mixer/mikmod2.patch b/mingw-w64-SDL_mixer/002-mikmod2.patch similarity index 100% rename from mingw-w64-SDL_mixer/mikmod2.patch rename to mingw-w64-SDL_mixer/002-mikmod2.patch diff --git a/mingw-w64-SDL_mixer/fluidsynth-volume.patch b/mingw-w64-SDL_mixer/003-fluidsynth-volume.patch similarity index 100% rename from mingw-w64-SDL_mixer/fluidsynth-volume.patch rename to mingw-w64-SDL_mixer/003-fluidsynth-volume.patch diff --git a/mingw-w64-SDL_mixer/double-free-crash.patch b/mingw-w64-SDL_mixer/004-double-free-crash.patch similarity index 100% rename from mingw-w64-SDL_mixer/double-free-crash.patch rename to mingw-w64-SDL_mixer/004-double-free-crash.patch diff --git a/mingw-w64-SDL_mixer/SDL_mixer-find_lib.mingw.patch b/mingw-w64-SDL_mixer/005-SDL_mixer-find_lib.mingw.patch similarity index 100% rename from mingw-w64-SDL_mixer/SDL_mixer-find_lib.mingw.patch rename to mingw-w64-SDL_mixer/005-SDL_mixer-find_lib.mingw.patch diff --git a/mingw-w64-SDL_mixer/autoreconf-fix.patch b/mingw-w64-SDL_mixer/006-autoreconf-fix.patch similarity index 100% rename from mingw-w64-SDL_mixer/autoreconf-fix.patch rename to mingw-w64-SDL_mixer/006-autoreconf-fix.patch diff --git a/mingw-w64-SDL_mixer/non-void-return-value.patch b/mingw-w64-SDL_mixer/007-non-void-return-value.patch similarity index 100% rename from mingw-w64-SDL_mixer/non-void-return-value.patch rename to mingw-w64-SDL_mixer/007-non-void-return-value.patch diff --git a/mingw-w64-SDL_mixer/008-missing-fluidsynth.patch b/mingw-w64-SDL_mixer/008-missing-fluidsynth.patch new file mode 100644 index 0000000000..e8163cb204 --- /dev/null +++ b/mingw-w64-SDL_mixer/008-missing-fluidsynth.patch @@ -0,0 +1,14 @@ +diff -bur SDL_mixer-1.2.12-o/mixer.c SDL_mixer-1.2.12/mixer.c +--- SDL_mixer-1.2.12-o/mixer.c 2025-04-13 21:48:38.415353500 -0600 ++++ SDL_mixer-1.2.12/mixer.c 2025-04-13 21:49:14.857172700 -0600 +@@ -39,6 +39,10 @@ + #include "dynamic_mp3.h" + #include "dynamic_ogg.h" + ++#ifdef USE_FLUIDSYNTH_MIDI ++ #include "dynamic_fluidsynth.h" ++#endif ++ + #define __MIX_INTERNAL_EFFECT__ + #include "effects_internal.h" + diff --git a/mingw-w64-SDL_mixer/PKGBUILD b/mingw-w64-SDL_mixer/PKGBUILD index 95dd2dad8f..657ff54c46 100644 --- a/mingw-w64-SDL_mixer/PKGBUILD +++ b/mingw-w64-SDL_mixer/PKGBUILD @@ -4,10 +4,10 @@ _realname=SDL_mixer pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=1.2.12 -pkgrel=9 +pkgrel=10 pkgdesc="A simple multi-channel audio mixer (mingw-w64)" arch=('any') -mingw_arch=('mingw64' 'ucrt64' 'clang64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://libsdl.org/projects/SDL_mixer/" license=('custom') depends=("${MINGW_PACKAGE_PREFIX}-SDL" @@ -23,13 +23,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-smpeg") optdepends=("${MINGW_PACKAGE_PREFIX}-fluidsynth: MIDI software synth, replaces built-in timidity") source=(https://libsdl.org/projects/SDL_mixer/release/${_realname}-${pkgver}.tar.gz - mikmod1.patch - mikmod2.patch - fluidsynth-volume.patch - double-free-crash.patch - SDL_mixer-find_lib.mingw.patch - autoreconf-fix.patch - non-void-return-value.patch) + 001-mikmod1.patch + 002-mikmod2.patch + 003-fluidsynth-volume.patch + 004-double-free-crash.patch + 005-SDL_mixer-find_lib.mingw.patch + 006-autoreconf-fix.patch + 007-non-void-return-value.patch + 008-missing-fluidsynth.patch) sha256sums=('1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a' '17bc8704a0e6e66b1a79ae4f58f0fdf0a58ff64db86980b2e0fa7ef352042cdb' '7a0fd237def865ec8376ec0f534e75ad4bc1ba6dff66774112cd2f2700ae9a9c' @@ -37,22 +38,33 @@ sha256sums=('1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a' '912d5b8342eec3626fe61389531f7fe941c9aa6f463cf2681948a739d3c53f35' 'b204e67c0489dfa9dba32e6f5a6ed554fca6c61d155701af35a41fea5b4db589' 'cdd0f47ac42890fe1d8110fa1cd6106b8e143ab8e9ddb7967e891ac149380add' - '20e3e7881960ed86b036ad64c2c4f336d72be0779ce9176bca865b7c35e41253') + '20e3e7881960ed86b036ad64c2c4f336d72be0779ce9176bca865b7c35e41253' + '6d6be57e3812e385b9eb59ab2f9eb7d650bd54a1d61a30c3081f555c528fb09d') noextract=(${_realname}-${pkgver}.tar.gz) +apply_patch_with_msg() { + for _fname in "$@" + do + msg2 "Applying ${_fname}" + patch -Nbp1 -i "${srcdir}"/${_fname} + done +} + prepare() { [[ -d "${srcdir}"/${_realname}-${pkgver} ]] && rm -rf "${srcdir}"/${_realname}-${pkgver} tar -xzf "${srcdir}"/${_realname}-${pkgver}.tar.gz -C "${srcdir}" || true cd "${srcdir}/${_realname}-${pkgver}" - patch -Np1 -i "${srcdir}"/mikmod1.patch - patch -Np1 -i "${srcdir}"/mikmod2.patch - patch -Np1 -i "${srcdir}"/fluidsynth-volume.patch - patch -Np1 -i "${srcdir}"/double-free-crash.patch - patch -Np1 -i "${srcdir}"/SDL_mixer-find_lib.mingw.patch - patch -Np1 -i "${srcdir}"/autoreconf-fix.patch - patch -Np1 -i "${srcdir}"/non-void-return-value.patch + apply_patch_with_msg \ + 001-mikmod1.patch \ + 002-mikmod2.patch \ + 003-fluidsynth-volume.patch \ + 004-double-free-crash.patch \ + 005-SDL_mixer-find_lib.mingw.patch \ + 006-autoreconf-fix.patch \ + 007-non-void-return-value.patch \ + 008-missing-fluidsynth.patch #sed -e "/CONFIG_FILE_ETC/s|/etc/timidity.cfg|/etc/timidity++/timidity.cfg|" \ # -e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \