ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/smpeg2/002-use-SDL2-headers.patch

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