diff --git a/libSDL_mixer-1.2.12-c99.patch b/libSDL_mixer-1.2.12-c99.patch new file mode 100644 index 0000000..f01a41e --- /dev/null +++ b/libSDL_mixer-1.2.12-c99.patch @@ -0,0 +1,26 @@ +For declarations of Mix_QuitFluidSynth, Mix_InitFluidSynth. + +This code was removed upstream in: + +commit a65a84adb8a898a1479e026c3e3520b8ce95b728 +Author: Sam Lantinga +Date: Tue Oct 17 02:33:47 2017 -0700 + + Rewrote music.c to support any number of decode libraries using a compiled-in plugin interface + Mix_LoadWAV_RW() can now load sound formats that were previously available only as music. + + This is still work in progress. Testing and project updates need to happen on other platforms. + + +diff --git a/mixer.c b/mixer.c +index 2f28384474b9d4d1..f87d29a8bd3320bf 100644 +--- a/mixer.c ++++ b/mixer.c +@@ -35,6 +35,7 @@ + #include "load_ogg.h" + #include "load_flac.h" + #include "dynamic_flac.h" ++#include "dynamic_fluidsynth.h" + #include "dynamic_mod.h" + #include "dynamic_mp3.h" + #include "dynamic_ogg.h" diff --git a/libSDL_mixer.spec b/libSDL_mixer.spec index 3149056..31b85ff 100644 --- a/libSDL_mixer.spec +++ b/libSDL_mixer.spec @@ -1,6 +1,6 @@ Name: libSDL_mixer Version: 1.2.12 -Release: 2mamba +Release: 3mamba Summary: SDL_mixer is a sample multi-channel audio mixer library Group: System/Libraries Vendor: openmamba @@ -13,17 +13,13 @@ Patch1: libSDL_mixer-1.2.12-fluidsynth-use-after-free.patch Patch2: libSDL_mixer-1.2.12-fluidsynth-volume.patch Patch3: libSDL_mixer-1.2.12-mikmod1.patch Patch4: libSDL_mixer-1.2.12-mikmod2.patch +Patch5: libSDL_mixer-1.2.12-c99.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libSDL-devel -BuildRequires: libdirectfb-devel -BuildRequires: libstdc++6-devel -BuildRequires: libts-devel -BuildRequires: libz-devel +BuildRequires: libsdl12-compat-devel ## AUTOBUILDREQ-END BuildRequires: libvorbis-devel -BuildRequires: libsmpeg-devel BuildRequires: libmikmod-devel %description @@ -54,11 +50,13 @@ This package contains static the tools provided with %{name}. %prep %setup -q -n SDL_mixer-%{version} -%patch0 -p1 -b .double-free-crash -%patch1 -p1 -b .fluidsynth-use-after-free -%patch2 -p1 -b .fluidsynth-volume -%patch3 -p1 -b .mikmod1 -%patch4 -p1 -b .mikmod2 +%patch 0 -p1 -b .double-free-crash +%patch 1 -p1 -b .fluidsynth-use-after-free +%patch 2 -p1 -b .fluidsynth-volume +%patch 3 -p1 -b .mikmod1 +%patch 4 -p1 -b .mikmod2 +%patch 5 -p1 -b .c99 + sed -i "s,| arm-\* |,| aarch64-\* | arm-\* |," build-scripts/config.sub %build @@ -85,7 +83,6 @@ sed -i "s,| arm-\* |,| aarch64-\* | arm-\* |," build-scripts/config.sub %defattr(-,root,root) %{_includedir}/SDL/*.h %{_libdir}/libSDL_mixer.a -%{_libdir}/libSDL_mixer.la %{_libdir}/libSDL_mixer.so %{_libdir}/pkgconfig/SDL_mixer.pc %doc CHANGES README @@ -96,6 +93,9 @@ sed -i "s,| arm-\* |,| aarch64-\* | arm-\* |," build-scripts/config.sub %{_bindir}/playwave %changelog +* Wed Jun 19 2024 Silvan Calarco 1.2.12-3mamba +- rebuilt without .la file + * Tue Feb 08 2022 Silvan Calarco 1.2.12-2mamba - rbuilt with debug package, -tools subpackage and patches taken from Arch Linux