1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
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
|
GitWeb