sdl2: update

src/sdl2-1.patch

@@ -10,10 +10,10 @@ This patch has been taken from:
 https://bugzilla.libsdl.org/show_bug.cgi?id=1739
 
 diff --git a/configure.in b/configure.in
-index 3d8a2de..7afa09e 100644
+index f585d01..48bd9eb 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2406,7 +2406,7 @@ AC_HELP_STRING([--enable-directx], [use DirectX for Windows audio/video [[defaul
+@@ -2585,7 +2585,7 @@ AC_HELP_STRING([--enable-directx], [use DirectX for Windows audio/video [[defaul
          # FIXME: latest Cygwin finds dinput headers, but we die on other win32 headers.
          # FIXME:  ...so force it off for now.
          case "$host" in
@@ -41,7 +41,7 @@ These fix compiles in a strictly shared build (with --disable-static) by always
 building libSDL2main.a and libSDL2_test.a staticly
 
 diff --git a/Makefile.in b/Makefile.in
-index da42661..688847a 100644
+index b66e0f5..e1fc6a3 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -33,10 +33,10 @@ TARGET  = libSDL2.la
@@ -56,27 +56,27 @@ index da42661..688847a 100644
 +SDLTEST_TARGET = libSDL2_test.la
  SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
  
- SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake configure configure.in debian include Makefile.* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC Xcode Xcode-iOS
-@@ -123,15 +123,13 @@ update-revision:
+ SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake cmake_uninstall.cmake.in configure configure.in debian docs include Makefile.* sdl2-config.cmake.in sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC VisualC-WinRT Xcode Xcode-iOS
+@@ -138,15 +138,13 @@ update-revision:
  .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
  
  $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
 +	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
  
  $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--	$(AR) cru $@ $(SDLMAIN_OBJECTS)
--	$(RANLIB) $@
+-	$(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS)
+-	$(RUN_CMD_RANLIB)$(RANLIB) $@
 +	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
  
  $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
--	$(AR) cru $@ $(SDLTEST_OBJECTS)
--	$(RANLIB) $@
+-	$(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS)
+-	$(RUN_CMD_RANLIB)$(RANLIB) $@
 +	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
  
  install: all install-bin install-hdrs install-lib install-data
  install-bin:
-@@ -152,10 +150,8 @@ install-hdrs: update-revision
+@@ -167,10 +165,8 @@ install-hdrs: update-revision
  install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
  	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
  	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
@@ -90,10 +90,10 @@ index da42661..688847a 100644
  	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
  	$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
 diff --git a/configure.in b/configure.in
-index 7afa09e..34efcb0 100644
+index f585d01..48bd9eb 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -3136,23 +3136,23 @@ done
+@@ -3464,23 +3464,23 @@ done
  
  VERSION_OBJECTS=`echo $VERSION_SOURCES`
  VERSION_DEPENDS=`echo $VERSION_SOURCES`
@@ -112,7 +112,7 @@ index 7afa09e..34efcb0 100644
  SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
 -\\$(objects)/\\2.o: \\1/\\2.c\\\\
 +\\$(objects)/\\2.lo: \\1/\\2.c\\\\
- 	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
+ 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
  
  SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
  SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
@@ -121,7 +121,7 @@ index 7afa09e..34efcb0 100644
  SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
 -\\$(objects)/\\2.o: \\1/\\2.c\\\\
 +\\$(objects)/\\2.lo: \\1/\\2.c\\\\
- 	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
+ 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
  
  # Set runtime shared library paths as needed
 -- 
@@ -135,10 +135,10 @@ Subject: [PATCH 3/4] suppress redeclarations
 
 
 diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c
-index dbffd50..d7376d8 100644
+index a48eace..0b01537 100644
 --- a/src/render/direct3d11/SDL_render_d3d11.c
 +++ b/src/render/direct3d11/SDL_render_d3d11.c
-@@ -131,6 +131,7 @@ typedef struct
+@@ -136,6 +136,7 @@ typedef struct
  } D3D11_RenderData;
  
  
@@ -146,7 +146,7 @@ index dbffd50..d7376d8 100644
  /* Defined here so we don't have to include uuid.lib */
  static const GUID IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } };
  static const GUID IID_IDXGIDevice1 = { 0x77db970f, 0x6276, 0x48ba, { 0xba, 0x28, 0x07, 0x01, 0x43, 0xb4, 0x39, 0x2c } };
-@@ -138,6 +139,7 @@ static const GUID IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0x
+@@ -144,6 +145,7 @@ static const GUID IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0x
  static const GUID IID_ID3D11Device1 = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } };
  static const GUID IID_ID3D11DeviceContext1 = { 0xbb2c6faa, 0xb5fb, 0x4082, { 0x8e, 0x6b, 0x38, 0x8b, 0x8c, 0xfa, 0x90, 0xe1 } };
  static const GUID IID_ID3D11Debug = { 0x79cf2233, 0x7536, 0x4948, { 0x9d, 0x36, 0x1e, 0x46, 0x92, 0xdc, 0x57, 0x60 } };
@@ -169,7 +169,7 @@ diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SD
 index d7376d8..59272ae 100644
 --- a/src/render/direct3d11/SDL_render_d3d11.c
 +++ b/src/render/direct3d11/SDL_render_d3d11.c
-@@ -886,6 +886,14 @@ D3D11_DestroyRenderer(SDL_Renderer * renderer)
+@@ -935,6 +937,14 @@ D3D11_DestroyRenderer(SDL_Renderer * renderer)
      SDL_free(renderer);
  }
  
@@ -184,7 +184,7 @@ index d7376d8..59272ae 100644
  static HRESULT
  D3D11_CreateBlendMode(SDL_Renderer * renderer,
                        BOOL enableBlending,
-@@ -912,7 +920,7 @@ D3D11_CreateBlendMode(SDL_Renderer * renderer,
+@@ -961,7 +971,7 @@ D3D11_CreateBlendMode(SDL_Renderer * renderer,
      blendDesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
      result = ID3D11Device_CreateBlendState(data->d3dDevice, &blendDesc, blendStateOutput);
      if (FAILED(result)) {
@@ -193,7 +193,7 @@ index d7376d8..59272ae 100644
          return result;
      }
  
-@@ -994,14 +1002,14 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1043,14 +1053,14 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
  
      result = CreateDXGIFactoryFunc(&IID_IDXGIFactory2, &data->dxgiFactory);
      if (FAILED(result)) {
@@ -210,7 +210,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1030,25 +1038,25 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1079,25 +1089,25 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
          &d3dContext /* Returns the device immediate context. */
          );
      if (FAILED(result)) {
@@ -240,7 +240,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1057,7 +1065,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1106,7 +1116,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
       */
      result = IDXGIDevice1_SetMaximumFrameLatency(dxgiDevice, 1);
      if (FAILED(result)) {
@@ -249,7 +249,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1086,7 +1094,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1135,7 +1145,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
              break;
  
          default:
@@ -258,7 +258,7 @@ index d7376d8..59272ae 100644
              result = E_FAIL;
              goto done;
      }
-@@ -1099,7 +1107,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1148,7 +1158,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
          &data->vertexShader
          );
      if (FAILED(result)) {
@@ -267,7 +267,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1112,7 +1120,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1161,7 +1171,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
          &data->inputLayout
          );
      if (FAILED(result)) {
@@ -276,7 +276,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1124,7 +1132,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1173,7 +1183,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
          &data->colorPixelShader
          );
      if (FAILED(result)) {
@@ -285,7 +285,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1135,7 +1143,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1184,7 +1194,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
          &data->texturePixelShader
          );
      if (FAILED(result)) {
@@ -294,7 +294,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1146,7 +1154,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1195,7 +1205,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
          &data->yuvPixelShader
          );
      if (FAILED(result)) {
@@ -303,7 +303,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1161,7 +1169,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1210,7 +1220,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
          &data->vertexShaderConstants
          );
      if (FAILED(result)) {
@@ -312,7 +312,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1181,7 +1189,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1230,7 +1240,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
          &data->nearestPixelSampler
          );
      if (FAILED(result)) {
@@ -321,7 +321,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1191,7 +1199,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1240,7 +1250,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
          &data->linearSampler
          );
      if (FAILED(result)) {
@@ -330,7 +330,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1209,14 +1217,14 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+@@ -1258,14 +1268,14 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer)
      rasterDesc.SlopeScaledDepthBias = 0.0f;
      result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->mainRasterizer);
      if (FAILED(result)) {
@@ -347,7 +347,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1376,7 +1384,7 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h)
+@@ -1444,7 +1454,7 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h)
              &data->swapChain
              );
          if (FAILED(result)) {
@@ -356,7 +356,7 @@ index d7376d8..59272ae 100644
              goto done;
          }
      } else if (usingXAML) {
-@@ -1386,18 +1394,18 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h)
+@@ -1454,18 +1464,18 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h)
              NULL,
              &data->swapChain);
          if (FAILED(result)) {
@@ -378,30 +378,32 @@ index d7376d8..59272ae 100644
          result = E_FAIL;
          goto done;
  #endif
-@@ -1416,11 +1424,11 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h)
+@@ -1484,13 +1494,13 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h)
              &data->swapChain
              );
          if (FAILED(result)) {
 -            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForHwnd", result);
-+            wrapper_SetErrorFromHRESULT(__FUNCTION__, "IDXGIFactory2::CreateSwapChainForHwnd", result);
++            wrapper_SetErrorFromHRESULT(__FUNCTION__ ,"IDXGIFactory2::CreateSwapChainForHwnd", result);
              goto done;
          }
+ 
+         IDXGIFactory_MakeWindowAssociation(data->dxgiFactory, windowinfo.info.win.window, DXGI_MWA_NO_WINDOW_CHANGES);
  #else
 -        SDL_SetError(__FUNCTION__", Unable to find something to attach a swap chain to");
 +        SDL_SetError("D3D11_CreateSwapChain, Unable to find something to attach a swap chain to");
          goto done;
  #endif  /* ifdef __WIN32__ / else */
      }
-@@ -1466,7 +1474,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
-             0
-             );
-         if (FAILED(result)) {
+@@ -1545,7 +1555,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
+              */
+             goto done;
+         } else if (FAILED(result)) {
 -            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::ResizeBuffers", result);
 +            wrapper_SetErrorFromHRESULT(__FUNCTION__, "IDXGISwapChain::ResizeBuffers", result);
              goto done;
          }
  #endif
-@@ -1487,7 +1495,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
+@@ -1576,7 +1586,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
      if (data->swapEffect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL) {
          result = IDXGISwapChain1_SetRotation(data->swapChain, data->rotation);
          if (FAILED(result)) {
@@ -410,7 +412,7 @@ index d7376d8..59272ae 100644
              goto done;
          }
      }
-@@ -1499,7 +1507,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
+@@ -1588,7 +1598,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
          &backBuffer
          );
      if (FAILED(result)) {
@@ -419,7 +421,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1510,7 +1518,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
+@@ -1599,7 +1609,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
          &data->mainRenderTargetView
          );
      if (FAILED(result)) {
@@ -428,7 +430,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -1630,7 +1638,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+@@ -1747,7 +1757,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
          );
      if (FAILED(result)) {
          D3D11_DestroyTexture(renderer, texture);
@@ -437,7 +439,7 @@ index d7376d8..59272ae 100644
          return -1;
      }
  
-@@ -1648,7 +1656,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+@@ -1765,7 +1775,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
              );
          if (FAILED(result)) {
              D3D11_DestroyTexture(renderer, texture);
@@ -446,7 +448,7 @@ index d7376d8..59272ae 100644
              return -1;
          }
  
-@@ -1659,7 +1667,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+@@ -1776,7 +1786,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
              );
          if (FAILED(result)) {
              D3D11_DestroyTexture(renderer, texture);
@@ -455,7 +457,7 @@ index d7376d8..59272ae 100644
              return -1;
          }
      }
-@@ -1675,7 +1683,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+@@ -1792,7 +1802,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
          );
      if (FAILED(result)) {
          D3D11_DestroyTexture(renderer, texture);
@@ -464,7 +466,7 @@ index d7376d8..59272ae 100644
          return -1;
      }
  
-@@ -1687,7 +1695,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+@@ -1804,7 +1814,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
              );
          if (FAILED(result)) {
              D3D11_DestroyTexture(renderer, texture);
@@ -473,7 +475,7 @@ index d7376d8..59272ae 100644
              return -1;
          }
          result = ID3D11Device_CreateShaderResourceView(rendererData->d3dDevice,
-@@ -1697,7 +1705,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+@@ -1814,7 +1824,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
              );
          if (FAILED(result)) {
              D3D11_DestroyTexture(renderer, texture);
@@ -482,7 +484,7 @@ index d7376d8..59272ae 100644
              return -1;
          }
      }
-@@ -1714,7 +1722,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+@@ -1831,7 +1841,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
              &textureData->mainTextureRenderTargetView);
          if (FAILED(result)) {
              D3D11_DestroyTexture(renderer, texture);
@@ -491,7 +493,7 @@ index d7376d8..59272ae 100644
              return -1;
          }
      }
-@@ -1770,7 +1778,7 @@ D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *tex
+@@ -1887,7 +1897,7 @@ D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *tex
          NULL,
          &stagingTexture);
      if (FAILED(result)) {
@@ -500,7 +502,7 @@ index d7376d8..59272ae 100644
          return -1;
      }
  
-@@ -1783,7 +1791,7 @@ D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *tex
+@@ -1900,7 +1910,7 @@ D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *tex
          &textureMemory
          );
      if (FAILED(result)) {
@@ -509,7 +511,7 @@ index d7376d8..59272ae 100644
          SAFE_RELEASE(stagingTexture);
          return -1;
      }
-@@ -1945,7 +1953,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+@@ -2062,7 +2072,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
          NULL,
          &textureData->stagingTexture);
      if (FAILED(result)) {
@@ -518,7 +520,7 @@ index d7376d8..59272ae 100644
          return -1;
      }
  
-@@ -1958,7 +1966,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+@@ -2075,7 +2085,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
          &textureMemory
          );
      if (FAILED(result)) {
@@ -527,7 +529,7 @@ index d7376d8..59272ae 100644
          SAFE_RELEASE(textureData->stagingTexture);
          return -1;
      }
-@@ -2240,7 +2248,7 @@ D3D11_UpdateVertexBuffer(SDL_Renderer *renderer,
+@@ -2359,7 +2369,7 @@ D3D11_UpdateVertexBuffer(SDL_Renderer *renderer,
              &mappedResource
              );
          if (FAILED(result)) {
@@ -536,7 +538,7 @@ index d7376d8..59272ae 100644
              return -1;
          }
          SDL_memcpy(mappedResource.pData, vertexData, dataSizeInBytes);
-@@ -2264,7 +2272,7 @@ D3D11_UpdateVertexBuffer(SDL_Renderer *renderer,
+@@ -2383,7 +2393,7 @@ D3D11_UpdateVertexBuffer(SDL_Renderer *renderer,
              &rendererData->vertexBuffer
              );
          if (FAILED(result)) {
@@ -545,7 +547,7 @@ index d7376d8..59272ae 100644
              return -1;
          }
  
-@@ -2734,7 +2742,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+@@ -2853,7 +2863,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
          &backBuffer
          );
      if (FAILED(result)) {
@@ -554,7 +556,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -2751,7 +2759,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+@@ -2870,7 +2880,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
          NULL,
          &stagingTexture);
      if (FAILED(result)) {
@@ -563,7 +565,7 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -2783,7 +2791,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+@@ -2902,7 +2912,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
          0,
          &textureMemory);
      if (FAILED(result)) {
@@ -572,16 +574,16 @@ index d7376d8..59272ae 100644
          goto done;
      }
  
-@@ -2802,7 +2810,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+@@ -2921,7 +2931,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
           * Get the error message, and attach some extra data to it.
           */
          char errorMessage[1024];
 -        SDL_snprintf(errorMessage, sizeof(errorMessage), __FUNCTION__ ", Convert Pixels failed: %s", SDL_GetError());
 +        SDL_snprintf(errorMessage, sizeof(errorMessage), "D3D11_RenderReadPixels, Convert Pixels failed: %s", SDL_GetError());
-         SDL_SetError(errorMessage);
+         SDL_SetError("%s", errorMessage);
          goto done;
      }
-@@ -2871,7 +2879,7 @@ D3D11_RenderPresent(SDL_Renderer * renderer)
+@@ -2991,7 +3001,7 @@ D3D11_RenderPresent(SDL_Renderer * renderer)
              /* We probably went through a fullscreen <-> windowed transition */
              D3D11_CreateWindowSizeDependentResources(renderer);
          } else {

src/sdl2.mk

@@ -3,8 +3,8 @@
 
 PKG             := sdl2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.0.3
-$(PKG)_CHECKSUM := a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c
+$(PKG)_VERSION  := 2.0.4
+$(PKG)_CHECKSUM := da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b
 $(PKG)_SUBDIR   := SDL2-$($(PKG)_VERSION)
 $(PKG)_FILE     := SDL2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libsdl.org/release/$($(PKG)_FILE)