]> git.proxmox.com Git - ceph.git/blame - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/smpeg2/002-use-SDL2-headers.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / smpeg2 / 002-use-SDL2-headers.patch
CommitLineData
1e59de90
TL
1diff --git a/MPEG.cpp b/MPEG.cpp\r
2index 1645965..9d44166 100644\r
3--- a/MPEG.cpp\r
4+++ b/MPEG.cpp\r
5@@ -1,4 +1,4 @@\r
6-#include "SDL.h"\r
7+#include "SDL2/SDL.h"\r
8 \r
9 #include "MPEG.h"\r
10 \r
11diff --git a/MPEG.h b/MPEG.h\r
12index ca04260..d0b0d55 100644\r
13--- a/MPEG.h\r
14+++ b/MPEG.h\r
15@@ -28,7 +28,7 @@\r
16 #include <stdio.h>\r
17 #include <string.h>\r
18 \r
19-#include "SDL.h"\r
20+#include "SDL2/SDL.h"\r
21 \r
22 #include "MPEGerror.h"\r
23 #include "MPEGstream.h"\r
24diff --git a/MPEGaction.h b/MPEGaction.h\r
25index f9da3a3..ea0b94f 100644\r
26--- a/MPEGaction.h\r
27+++ b/MPEGaction.h\r
28@@ -24,7 +24,7 @@\r
29 #ifndef _MPEGACTION_H_\r
30 #define _MPEGACTION_H_\r
31 \r
32-#include "SDL.h"\r
33+#include "SDL2/SDL.h"\r
34 #include "MPEGframe.h"\r
35 \r
36 typedef enum {\r
37diff --git a/MPEGaudio.h b/MPEGaudio.h\r
38index 3f315d2..2ec4377 100644\r
39--- a/MPEGaudio.h\r
40+++ b/MPEGaudio.h\r
41@@ -24,7 +24,7 @@\r
42 #ifndef _MPEGAUDIO_H_\r
43 #define _MPEGAUDIO_H_\r
44 \r
45-#include "SDL.h"\r
46+#include "SDL2/SDL.h"\r
47 #include "MPEGerror.h"\r
48 #include "MPEGaction.h"\r
49 \r
50diff --git a/MPEGlist.h b/MPEGlist.h\r
51index 3a58a5f..fe0dbac 100644\r
52--- a/MPEGlist.h\r
53+++ b/MPEGlist.h\r
54@@ -6,7 +6,7 @@\r
55 #ifndef _MPEGLIST_H_\r
56 #define _MPEGLIST_H_\r
57 \r
58-#include "SDL.h"\r
59+#include "SDL2/SDL.h"\r
60 \r
61 class MPEGlist {\r
62 public:\r
63diff --git a/MPEGring.cpp b/MPEGring.cpp\r
64index 6d9dabb..0350d54 100644\r
65--- a/MPEGring.cpp\r
66+++ b/MPEGring.cpp\r
67@@ -23,7 +23,7 @@\r
68 #include <assert.h>\r
69 #include <string.h>\r
70 \r
71-#include "SDL_timer.h"\r
72+#include "SDL2/SDL_timer.h"\r
73 \r
74 #include "MPEGring.h"\r
75 \r
76diff --git a/MPEGring.h b/MPEGring.h\r
77index 89172ac..550fbcc 100644\r
78--- a/MPEGring.h\r
79+++ b/MPEGring.h\r
80@@ -24,8 +24,8 @@\r
81 #ifndef _MPEGRING_H\r
82 #define _MPEGRING_H\r
83 \r
84-#include "SDL_types.h"\r
85-#include "SDL_thread.h"\r
86+#include "SDL2/SDL_types.h"\r
87+#include "SDL2/SDL_thread.h"\r
88 \r
89 class MPEG_ring {\r
90 public:\r
91diff --git a/MPEGstream.h b/MPEGstream.h\r
92index b96c631..50e0c3a 100644\r
93--- a/MPEGstream.h\r
94+++ b/MPEGstream.h\r
95@@ -22,7 +22,7 @@\r
96 #ifndef _MPEGSTREAM_H_\r
97 #define _MPEGSTREAM_H_\r
98 \r
99-#include "SDL_types.h"\r
100+#include "SDL2/SDL_types.h"\r
101 #include "MPEGerror.h"\r
102 #include "MPEGvideo.h"\r
103 #include "MPEGaudio.h"\r
104diff --git a/MPEGsystem.h b/MPEGsystem.h\r
105index 823b679..28454b3 100644\r
106--- a/MPEGsystem.h\r
107+++ b/MPEGsystem.h\r
108@@ -6,8 +6,8 @@\r
109 #define _MPEGSYSTEM_H_\r
110 #define USE_SYSTEM_TIMESTAMP\r
111 \r
112-#include "SDL.h"\r
113-#include "SDL_thread.h"\r
114+#include "SDL2/SDL.h"\r
115+#include "SDL2/SDL_thread.h"\r
116 #include "MPEGerror.h"\r
117 \r
118 class MPEGstream;\r
119diff --git a/MPEGvideo.h b/MPEGvideo.h\r
120index 12da092..9f1ed43 100644\r
121--- a/MPEGvideo.h\r
122+++ b/MPEGvideo.h\r
123@@ -24,8 +24,8 @@\r
124 #ifndef _MPEGVIDEO_H_\r
125 #define _MPEGVIDEO_H_\r
126 \r
127-#include "SDL.h"\r
128-#include "SDL_thread.h"\r
129+#include "SDL2/SDL.h"\r
130+#include "SDL2/SDL_thread.h"\r
131 #include "MPEGerror.h"\r
132 #include "MPEGaction.h"\r
133 \r
134diff --git a/README.SDL_mixer b/README.SDL_mixer\r
135index c01b575..5cacc4f 100644\r
136--- a/README.SDL_mixer\r
137+++ b/README.SDL_mixer\r
138@@ -5,7 +5,7 @@ You can have the SDL mixer library mix audio from a movie by hooking into\r
139 the SDL mixer music hooks:\r
140 \r
141 #include "smpeg.h"\r
142-#include "SDL_mixer.h"\r
143+#include "SDL2/SDL_mixer.h"\r
144 \r
145 .. set up the mixer audio ...\r
146 \r
147diff --git a/acinclude/sdl2.m4 b/acinclude/sdl2.m4\r
148index 93bc4b0..776ad42 100644\r
149--- a/acinclude/sdl2.m4\r
150+++ b/acinclude/sdl2.m4\r
151@@ -84,7 +84,7 @@ dnl\r
152 #include <stdio.h>\r
153 #include <stdlib.h>\r
154 #include <string.h>\r
155-#include "SDL.h"\r
156+#include "SDL2/SDL.h"\r
157 \r
158 char*\r
159 my_strdup (char *str)\r
160@@ -167,7 +167,7 @@ int main (int argc, char *argv[])\r
161 LIBS="$LIBS $SDL_LIBS"\r
162 AC_TRY_LINK([\r
163 #include <stdio.h>\r
164-#include "SDL.h"\r
165+#include "SDL2/SDL.h"\r
166 \r
167 int main(int argc, char *argv[])\r
168 { return 0; }\r
169diff --git a/configure b/configure\r
170index 4ac7e60..ee1d934 100644\r
171--- a/configure\r
172+++ b/configure\r
173@@ -15270,7 +15270,7 @@ else\r
174 #include <stdio.h>\r
175 #include <stdlib.h>\r
176 #include <string.h>\r
177-#include "SDL.h"\r
178+#include "SDL2/SDL.h"\r
179 \r
180 char*\r
181 my_strdup (char *str)\r
182@@ -15367,7 +15367,7 @@ $as_echo "no" >&6; }\r
183 /* end confdefs.h. */\r
184 \r
185 #include <stdio.h>\r
186-#include "SDL.h"\r
187+#include "SDL2/SDL.h"\r
188 \r
189 int main(int argc, char *argv[])\r
190 { return 0; }\r
191diff --git a/video/gdith.cpp b/video/gdith.cpp\r
192index c56da96..53ba388 100644\r
193--- a/video/gdith.cpp\r
194+++ b/video/gdith.cpp\r
195@@ -52,7 +52,7 @@\r
196 #include "video.h"\r
197 #include "proto.h"\r
198 #include "dither.h"\r
199-#include "SDL_timer.h"\r
200+#include "SDL2/SDL_timer.h"\r
201 \r
202 #ifdef __STDC__\r
203 #include <stdlib.h>\r
204diff --git a/video/readfile.cpp b/video/readfile.cpp\r
205index eb71194..a19e66d 100644\r
206--- a/video/readfile.cpp\r
207+++ b/video/readfile.cpp\r
208@@ -56,7 +56,7 @@\r
209 #include <string.h>\r
210 #include <signal.h>\r
211 \r
212-#include "SDL_endian.h"\r
213+#include "SDL2/SDL_endian.h"\r
214 #include "video.h"\r
215 #include "proto.h"\r
216 #include "util.h"\r
217diff --git a/video/video.h b/video/video.h\r
218index 96de89b..a35095b 100644\r
219--- a/video/video.h\r
220+++ b/video/video.h\r
221@@ -400,7 +400,7 @@ extern unsigned int cacheMiss[8][8];\r
222 #define __SCO__ 1\r
223 #endif\r
224 \r
225-#include "SDL_endian.h"\r
226+#include "SDL2/SDL_endian.h"\r
227 #if SDL_BYTEORDER == SDL_BIG_ENDIAN\r
228 #ifdef LITTLE_ENDIAN_ARCHITECTURE\r
229 #undef LITTLE_ENDIAN_ARCHITECTURE\r