diff options
author | Sam James <sam@gentoo.org> | 2023-02-04 20:31:25 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-02-04 20:33:13 +0000 |
commit | b98f8c4440e4f2042dcf1b477b6a8eb87e0b4688 (patch) | |
tree | a704f6570a5a7df13f498b6f7d5ba5defab58a31 /media-libs/zmusic/files | |
parent | app-editors/vscodium: fix missing executable permissions (diff) | |
download | gentoo-b98f8c4440e4f2042dcf1b477b6a8eb87e0b4688.tar.gz gentoo-b98f8c4440e4f2042dcf1b477b6a8eb87e0b4688.tar.bz2 gentoo-b98f8c4440e4f2042dcf1b477b6a8eb87e0b4688.zip |
media-libs/zmusic: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/892814
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/zmusic/files')
-rw-r--r-- | media-libs/zmusic/files/zmusic-1.1.4-gcc-13.patch | 166 |
1 files changed, 166 insertions, 0 deletions
diff --git a/media-libs/zmusic/files/zmusic-1.1.4-gcc-13.patch b/media-libs/zmusic/files/zmusic-1.1.4-gcc-13.patch new file mode 100644 index 000000000000..54d1fd2939f8 --- /dev/null +++ b/media-libs/zmusic/files/zmusic-1.1.4-gcc-13.patch @@ -0,0 +1,166 @@ +https://github.com/ZDoom/ZMusic/pull/45 + +From 9a72e0f09558d5b047fa7f2a6ee59e10a959333b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 4 Feb 2023 20:16:24 +0000 +Subject: [PATCH] Add missing standard library includes (fix build with GCC 13) + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so <cstdint> etc is no longer transitively included. + +See https://www.gnu.org/software/gcc/gcc-13/porting_to.html. + +Bug: https://bugs.gentoo.org/892814 +--- a/source/mididevices/music_adlmidi_mididevice.cpp ++++ b/source/mididevices/music_adlmidi_mididevice.cpp +@@ -34,6 +34,7 @@ + + // HEADER FILES ------------------------------------------------------------ + ++#include <stdexcept> + #include <stdlib.h> + + #include "zmusic/zmusic_internal.h" +--- a/source/mididevices/music_fluidsynth_mididevice.cpp ++++ b/source/mididevices/music_fluidsynth_mididevice.cpp +@@ -35,6 +35,7 @@ + // HEADER FILES ------------------------------------------------------------ + + #include <mutex> ++#include <stdexcept> + #include <stdio.h> + #include <stdlib.h> + #include "zmusic/zmusic_internal.h" +--- a/source/mididevices/music_opl_mididevice.cpp ++++ b/source/mididevices/music_opl_mididevice.cpp +@@ -35,6 +35,7 @@ + + // HEADER FILES ------------------------------------------------------------ + ++#include <stdexcept> + #include "zmusic/zmusic_internal.h" + #include "mididevice.h" + #include "zmusic/mus2midi.h" +@@ -333,4 +334,4 @@ MIDIDevice* CreateOplMIDIDevice(const char* Args) + { + throw std::runtime_error("OPL device not supported in this configuration"); + } +-#endif +\ No newline at end of file ++#endif +--- a/source/mididevices/music_opnmidi_mididevice.cpp ++++ b/source/mididevices/music_opnmidi_mididevice.cpp +@@ -34,6 +34,7 @@ + + // HEADER FILES ------------------------------------------------------------ + ++#include <stdexcept> + #include "mididevice.h" + #include "zmusic/zmusic_internal.h" + +--- a/source/mididevices/music_timidity_mididevice.cpp ++++ b/source/mididevices/music_timidity_mididevice.cpp +@@ -34,6 +34,7 @@ + + // HEADER FILES ------------------------------------------------------------ + ++#include <stdexcept> + #include <stdlib.h> + #include "mididevice.h" + #include "zmusic/zmusic_internal.h" +--- a/source/mididevices/music_timiditypp_mididevice.cpp ++++ b/source/mididevices/music_timiditypp_mididevice.cpp +@@ -32,6 +32,7 @@ + ** + */ + ++#include <stdexcept> + #include "mididevice.h" + #include "zmusic/zmusic_internal.h" + +@@ -239,4 +240,4 @@ MIDIDevice* CreateTimidityPPMIDIDevice(const char* Args, int samplerate) + { + throw std::runtime_error("Timidity++ device not supported in this configuration"); + } +-#endif +\ No newline at end of file ++#endif +--- a/source/mididevices/music_wavewriter_mididevice.cpp ++++ b/source/mididevices/music_wavewriter_mididevice.cpp +@@ -38,6 +38,7 @@ + #include "mididevice.h" + #include "zmusic/m_swap.h" + #include "fileio.h" ++#include <stdexcept> + #include <errno.h> + + // MACROS ------------------------------------------------------------------ +--- a/source/mididevices/music_wildmidi_mididevice.cpp ++++ b/source/mididevices/music_wildmidi_mididevice.cpp +@@ -34,6 +34,7 @@ + + // HEADER FILES ------------------------------------------------------------ + ++#include <stdexcept> + #include "mididevice.h" + #include "zmusic/zmusic_internal.h" + +@@ -278,4 +279,4 @@ MIDIDevice* CreateWildMIDIDevice(const char* Args, int samplerate) + { + throw std::runtime_error("WildMidi device not supported in this configuration"); + } +-#endif +\ No newline at end of file ++#endif +--- a/source/musicformats/music_midi.cpp ++++ b/source/musicformats/music_midi.cpp +@@ -34,8 +34,9 @@ + + // HEADER FILES ------------------------------------------------------------ + +-#include <string> + #include <algorithm> ++#include <stdexcept> ++#include <string> + #include <assert.h> + #include "zmusic/zmusic_internal.h" + #include "zmusic/musinfo.h" +--- a/source/streamsources/music_gme.cpp ++++ b/source/streamsources/music_gme.cpp +@@ -38,9 +38,11 @@ + //#define GME_DLL + + #include <algorithm> ++#include <mutex> ++#include <stdexcept> ++ + #include "streamsource.h" + #include <gme/gme.h> +-#include <mutex> + #include "fileio.h" + + // MACROS ------------------------------------------------------------------ +--- a/source/streamsources/music_opl.cpp ++++ b/source/streamsources/music_opl.cpp +@@ -35,6 +35,8 @@ + + #ifdef HAVE_OPL + ++#include <stdexcept> ++ + #include "streamsource.h" + #include "oplsynth/opl.h" + #include "oplsynth/opl_mus_player.h" +--- a/source/zmusic/fileio.h ++++ b/source/zmusic/fileio.h +@@ -25,6 +25,7 @@ + #pragma once + #include <stdio.h> + #include <string.h> ++#include <cstdint> + #include <vector> + #include <string> + +-- +2.39.1 + |