From 0595326da1f2755edc3dcf0f05a79ec7528261cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 May 2014 17:42:01 +0000 Subject: [PATCH 01/43] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 838589b1b2c4ea561dbb43df96b7cf4dad16b097 Mon Sep 17 00:00:00 2001 From: Marcel Wysocki Date: Mon, 19 May 2014 12:03:19 +0200 Subject: [PATCH 02/43] initial import --- .gitignore | 1 + mingw-SDL2.spec | 114 ++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 116 insertions(+) create mode 100644 mingw-SDL2.spec diff --git a/.gitignore b/.gitignore index e69de29..e78ecee 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/SDL2-2.0.3.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec new file mode 100644 index 0000000..c57323f --- /dev/null +++ b/mingw-SDL2.spec @@ -0,0 +1,114 @@ +%{?mingw_package_header} + +Name: mingw-SDL2 +Version: 2.0.3 +Release: 3%{?dist} +Summary: MinGW Windows port of SDL2 cross-platform multimedia library + +License: LGPLv2+ +Group: Development/Libraries +URL: http://www.libsdl.org/ +Source0: http://www.libsdl.org/release/SDL2-%{version}.tar.gz + +BuildArch: noarch + +BuildRequires: dos2unix + +BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-gcc + +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc + +# Not required at the moment, but SDL does contain plenty of C++ code, +# I just haven't worked out how to enable it. +#BuildRequires: mingw32-gcc-c++ + +%ifarch %{ix86} +BuildRequires: nasm +%endif + + +%description +Simple DirectMedia Layer (SDL) is a cross-platform multimedia library +designed to provide fast access to the graphics frame buffer and audio +device. + + +# Win32 +%package -n mingw32-SDL2 +Summary: MinGW Windows port of SDL cross-platform multimedia library + +%description -n mingw32-SDL2 +Simple DirectMedia Layer (SDL) is a cross-platform multimedia library +designed to provide fast access to the graphics frame buffer and audio +device. + +# Win32 +%package -n mingw64-SDL2 +Summary: MinGW Windows port of SDL cross-platform multimedia library + +%description -n mingw64-SDL2 +Simple DirectMedia Layer (SDL) is a cross-platform multimedia library +designed to provide fast access to the graphics frame buffer and audio +device. + + +%?mingw_debug_package + + +%prep +%setup -q -n SDL2-%{version} +dos2unix COPYING.txt README.txt + + +%build +%mingw_configure +%mingw_make %{?_smp_mflags} + + +%install +%mingw_make DESTDIR=$RPM_BUILD_ROOT install + +# Remove static libraries but DON'T remove *.dll.a files. +rm $RPM_BUILD_ROOT%{mingw32_libdir}/libSDL2.a +rm $RPM_BUILD_ROOT%{mingw64_libdir}/libSDL2.a +rm $RPM_BUILD_ROOT%{mingw32_libdir}/libSDL2_test.a +rm $RPM_BUILD_ROOT%{mingw64_libdir}/libSDL2_test.a + +# Drop all .la files +find $RPM_BUILD_ROOT -name "*.la" -delete + + +# Win32 +%files -n mingw32-SDL2 +%doc README.txt COPYING.txt +%{mingw32_bindir}/SDL2.dll +%{mingw32_bindir}/sdl2-config +%{mingw32_libdir}/libSDL2.dll.a +%{mingw32_libdir}/libSDL2main.a +%{mingw32_libdir}/pkgconfig/sdl2.pc +%{mingw32_datadir}/aclocal/sdl2.m4 +%{mingw32_includedir}/SDL2 + +# Win64 +%files -n mingw64-SDL2 +%doc README.txt COPYING.txt +%{mingw64_bindir}/SDL2.dll +%{mingw64_bindir}/sdl2-config +%{mingw64_libdir}/libSDL2.dll.a +%{mingw64_libdir}/libSDL2main.a +%{mingw64_libdir}/pkgconfig/sdl2.pc +%{mingw64_datadir}/aclocal/sdl2.m4 +%{mingw64_includedir}/SDL2 + + +%changelog +* Fri May 16 2014 Marcel Wysocki - 2.0.3-3 +- Fix rpmlint warnings + +* Tue May 13 2014 Marcel Wysocki - 2.0.3-2 +- Removed redundant BuildRequires + +* Mon May 12 2014 Marcel Wysocki - 2.0.3-1 +- Initial rpm diff --git a/sources b/sources index e69de29..a6923be 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +fe6c61d2e9df9ef570e7e80c6e822537 SDL2-2.0.3.tar.gz From f8ece4bcca741927e108f2c26004c2c3e242fe11 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 04:25:02 -0500 Subject: [PATCH 03/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index c57323f..bcdb165 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -104,6 +104,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 16 2014 Marcel Wysocki - 2.0.3-3 - Fix rpmlint warnings From f888e80eda443e798b7cd787d5780d7a5925d8fd Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 29 Mar 2015 19:25:12 +0200 Subject: [PATCH 04/43] Fix FTBFS against latest mingw-w64 --- mingw-SDL2.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index bcdb165..a2dc754 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -28,6 +28,12 @@ BuildRequires: mingw64-gcc BuildRequires: nasm %endif +# Don't try to re-implement D3D11 pieces which are already part of mingw-w64 +Patch0: SDL2-prevent-duplicate-d3d11-declarations.patch + +# Workaround a gcc compatibility issue +Patch1: SDL2-fix-gcc-compatibility.patch + %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -59,6 +65,8 @@ device. %prep %setup -q -n SDL2-%{version} +%patch0 -p0 -b .d3d11 +%patch1 -p0 -b .gcc dos2unix COPYING.txt README.txt @@ -104,6 +112,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Sun Mar 29 2015 Erik van Pienbroek - 2.0.3-5 +- Don't try to re-implement D3D11 pieces which are already part of mingw-w64 +- Workaround a gcc compatibility issue + * Sat Jun 07 2014 Fedora Release Engineering - 2.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 12fbd401c47e86f73500b769b61f20ee0cdb15d7 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Mon, 27 Apr 2015 20:06:30 +0200 Subject: [PATCH 05/43] Add missing patches --- SDL2-fix-gcc-compatibility.patch | 413 ++++++++++++++++++ ...prevent-duplicate-d3d11-declarations.patch | 27 ++ 2 files changed, 440 insertions(+) create mode 100644 SDL2-fix-gcc-compatibility.patch create mode 100644 SDL2-prevent-duplicate-d3d11-declarations.patch diff --git a/SDL2-fix-gcc-compatibility.patch b/SDL2-fix-gcc-compatibility.patch new file mode 100644 index 0000000..650853b --- /dev/null +++ b/SDL2-fix-gcc-compatibility.patch @@ -0,0 +1,413 @@ +--- src/render/direct3d11/SDL_render_d3d11.c.orig 2015-03-21 20:17:57.816864185 +0100 ++++ src/render/direct3d11/SDL_render_d3d11.c 2015-03-21 22:21:30.123045735 +0100 +@@ -46,6 +46,9 @@ + #endif /* __WINRT__ */ + + ++#define SDL_DEBUG_STRINGIFY_ARG(str) #str ++#define SDL_DEBUG(str) SDL_DEBUG_STRINGIFY_ARG(__FUNCTION__) str ++ + #define SAFE_RELEASE(X) if ((X)) { IUnknown_Release(SDL_static_cast(IUnknown*, X)); X = NULL; } + + +@@ -910,7 +925,7 @@ + blendDesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; + result = ID3D11Device_CreateBlendState(data->d3dDevice, &blendDesc, blendStateOutput); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBlendState", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateBlendState"), result); + return result; + } + +@@ -992,14 +1007,14 @@ + + result = CreateDXGIFactoryFunc(&IID_IDXGIFactory2, &data->dxgiFactory); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", CreateDXGIFactory", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", CreateDXGIFactory"), result); + goto done; + } + + /* FIXME: Should we use the default adapter? */ + result = IDXGIFactory2_EnumAdapters(data->dxgiFactory, 0, &data->dxgiAdapter); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", D3D11CreateDevice"), result); + goto done; + } + +@@ -1028,25 +1043,25 @@ + &d3dContext /* Returns the device immediate context. */ + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", D3D11CreateDevice"), result); + goto done; + } + + result = ID3D11Device_QueryInterface(d3dDevice, &IID_ID3D11Device1, &data->d3dDevice); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to ID3D11Device1", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device to ID3D11Device1"), result); + goto done; + } + + result = ID3D11DeviceContext_QueryInterface(d3dContext, &IID_ID3D11DeviceContext1, &data->d3dContext); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext to ID3D11DeviceContext1", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext to ID3D11DeviceContext1"), result); + goto done; + } + + result = ID3D11Device_QueryInterface(d3dDevice, &IID_IDXGIDevice1, &dxgiDevice); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to IDXGIDevice1", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device to IDXGIDevice1"), result); + goto done; + } + +@@ -1055,7 +1070,7 @@ + */ + result = IDXGIDevice1_SetMaximumFrameLatency(dxgiDevice, 1); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIDevice1::SetMaximumFrameLatency", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIDevice1::SetMaximumFrameLatency"), result); + goto done; + } + +@@ -1084,7 +1099,7 @@ + break; + + default: +- SDL_SetError(__FUNCTION__ ", Unexpected feature level: %d", data->featureLevel); ++ SDL_SetError("%s, Unexpected feature level: %d", __FUNCTION__, data->featureLevel); + result = E_FAIL; + goto done; + } +@@ -1097,7 +1112,7 @@ + &data->vertexShader + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateVertexShader", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateVertexShader"), result); + goto done; + } + +@@ -1110,7 +1125,7 @@ + &data->inputLayout + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateInputLayout", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateInputLayout"), result); + goto done; + } + +@@ -1122,7 +1137,7 @@ + &data->colorPixelShader + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['color' shader]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreatePixelShader ['color' shader]"), result); + goto done; + } + +@@ -1133,7 +1148,7 @@ + &data->texturePixelShader + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['textures' shader]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreatePixelShader ['textures' shader]"), result); + goto done; + } + +@@ -1144,7 +1159,7 @@ + &data->yuvPixelShader + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['yuv' shader]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreatePixelShader ['yuv' shader]"), result); + goto done; + } + +@@ -1159,7 +1174,7 @@ + &data->vertexShaderConstants + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex shader constants]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateBuffer [vertex shader constants]"), result); + goto done; + } + +@@ -1179,7 +1194,7 @@ + &data->nearestPixelSampler + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [nearest-pixel filter]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateSamplerState [nearest-pixel filter]"), result); + goto done; + } + +@@ -1189,7 +1204,7 @@ + &data->linearSampler + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [linear filter]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateSamplerState [linear filter]"), result); + goto done; + } + +@@ -1207,14 +1222,14 @@ + rasterDesc.SlopeScaledDepthBias = 0.0f; + result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->mainRasterizer); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [main rasterizer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateRasterizerState [main rasterizer]"), result); + goto done; + } + + rasterDesc.ScissorEnable = TRUE; + result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->clippedRasterizer); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [clipped rasterizer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateRasterizerState [clipped rasterizer]"), result); + goto done; + } + +@@ -1374,7 +1389,7 @@ + &data->swapChain + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForCoreWindow", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIFactory2::CreateSwapChainForCoreWindow"), result); + goto done; + } + } else if (usingXAML) { +@@ -1384,18 +1399,18 @@ + NULL, + &data->swapChain); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForComposition", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIFactory2::CreateSwapChainForComposition"), result); + goto done; + } + + #if WINAPI_FAMILY == WINAPI_FAMILY_APP + result = ISwapChainBackgroundPanelNative_SetSwapChain(WINRT_GlobalSwapChainBackgroundPanelNative, (IDXGISwapChain *) data->swapChain); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ISwapChainBackgroundPanelNative::SetSwapChain", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ISwapChainBackgroundPanelNative::SetSwapChain"), result); + goto done; + } + #else +- SDL_SetError(__FUNCTION__ ", XAML support is not yet available for Windows Phone"); ++ SDL_SetError(SDL_DEBUG(", XAML support is not yet available for Windows Phone")); + result = E_FAIL; + goto done; + #endif +@@ -1414,7 +1429,7 @@ + &data->swapChain + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForHwnd", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIFactory2::CreateSwapChainForHwnd"), result); + goto done; + } + #else +@@ -1464,7 +1479,7 @@ + 0 + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::ResizeBuffers", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain::ResizeBuffers"), result); + goto done; + } + #endif +@@ -1485,7 +1500,7 @@ + if (data->swapEffect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL) { + result = IDXGISwapChain1_SetRotation(data->swapChain, data->rotation); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::SetRotation", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain1::SetRotation"), result); + goto done; + } + } +@@ -1497,7 +1512,7 @@ + &backBuffer + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::GetBuffer [back-buffer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain::GetBuffer [back-buffer]"), result); + goto done; + } + +@@ -1508,7 +1523,7 @@ + &data->mainRenderTargetView + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device::CreateRenderTargetView", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device::CreateRenderTargetView"), result); + goto done; + } + +@@ -1628,7 +1643,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D"), result); + return -1; + } + +@@ -1646,7 +1661,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D"), result); + return -1; + } + +@@ -1657,7 +1672,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D"), result); + return -1; + } + } +@@ -1673,7 +1688,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG("ID3D11Device1::CreateShaderResourceView"), result); + return -1; + } + +@@ -1685,7 +1700,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG("ID3D11Device1::CreateShaderResourceView"), result); + return -1; + } + result = ID3D11Device_CreateShaderResourceView(rendererData->d3dDevice, +@@ -1695,7 +1710,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG("ID3D11Device1::CreateShaderResourceView"), result); + return -1; + } + } +@@ -1712,7 +1727,7 @@ + &textureData->mainTextureRenderTargetView); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRenderTargetView", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateRenderTargetView"), result); + return -1; + } + } +@@ -1768,7 +1783,7 @@ + NULL, + &stagingTexture); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D [create staging texture]"), result); + return -1; + } + +@@ -1781,7 +1796,7 @@ + &textureMemory + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [map staging texture]"), result); + SAFE_RELEASE(stagingTexture); + return -1; + } +@@ -1943,7 +1958,7 @@ + NULL, + &textureData->stagingTexture); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D [create staging texture]"), result); + return -1; + } + +@@ -1956,7 +1971,7 @@ + &textureMemory + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [map staging texture]"), result); + SAFE_RELEASE(textureData->stagingTexture); + return -1; + } +@@ -2238,7 +2253,7 @@ + &mappedResource + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [vertex buffer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [vertex buffer]"), result); + return -1; + } + SDL_memcpy(mappedResource.pData, vertexData, dataSizeInBytes); +@@ -2262,7 +2277,7 @@ + &rendererData->vertexBuffer + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex buffer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateBuffer [vertex buffer]"), result); + return -1; + } + +@@ -2732,7 +2747,7 @@ + &backBuffer + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::GetBuffer [get back buffer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain1::GetBuffer [get back buffer]"), result); + goto done; + } + +@@ -2749,7 +2764,7 @@ + NULL, + &stagingTexture); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D [create staging texture]"), result); + goto done; + } + +@@ -2781,7 +2796,7 @@ + 0, + &textureMemory); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [map staging texture]"), result); + goto done; + } + +@@ -2800,7 +2815,7 @@ + * 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), "%s, Convert Pixels failed: %s", __FUNCTION__, SDL_GetError()); + SDL_SetError(errorMessage); + goto done; + } +@@ -2869,7 +2884,7 @@ + /* We probably went through a fullscreen <-> windowed transition */ + D3D11_CreateWindowSizeDependentResources(renderer); + } else { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::Present", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain::Present"), result); + } + } + } diff --git a/SDL2-prevent-duplicate-d3d11-declarations.patch b/SDL2-prevent-duplicate-d3d11-declarations.patch new file mode 100644 index 0000000..e63737f --- /dev/null +++ b/SDL2-prevent-duplicate-d3d11-declarations.patch @@ -0,0 +1,27 @@ +--- src/render/direct3d11/SDL_render_d3d11.c.orig 2015-03-21 20:17:57.816864185 +0100 ++++ src/render/direct3d11/SDL_render_d3d11.c 2015-03-21 22:16:38.285858676 +0100 +@@ -132,12 +132,24 @@ + + + /* Defined here so we don't have to include uuid.lib */ ++#ifndef __IDXGIFactory2_INTERFACE_DEFINED__ + static const GUID IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } }; ++#endif ++#ifndef __IDXGIDevice1_INTERFACE_DEFINED__ + static const GUID IID_IDXGIDevice1 = { 0x77db970f, 0x6276, 0x48ba, { 0xba, 0x28, 0x07, 0x01, 0x43, 0xb4, 0x39, 0x2c } }; ++#endif ++#ifndef __ID3D11Texture2D_INTERFACE_DEFINED__ + static const GUID IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0xb4, 0x48, 0x95, 0x35, 0xd3, 0x4f, 0x9c } }; ++#endif ++#ifndef __ID3D11Device1_INTERFACE_DEFINED__ + static const GUID IID_ID3D11Device1 = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } }; ++#endif ++#ifndef __ID3D11DeviceContext1_INTERFACE_DEFINED__ + static const GUID IID_ID3D11DeviceContext1 = { 0xbb2c6faa, 0xb5fb, 0x4082, { 0x8e, 0x6b, 0x38, 0x8b, 0x8c, 0xfa, 0x90, 0xe1 } }; ++#endif ++#ifndef __ID3D11Debug_INTERFACE_DEFINED__ + static const GUID IID_ID3D11Debug = { 0x79cf2233, 0x7536, 0x4948, { 0x9d, 0x36, 0x1e, 0x46, 0x92, 0xdc, 0x57, 0x60 } }; ++#endif + + /* Direct3D 11.x shaders + From dada2254cb032f5f33df87ddca56c0963dc03c67 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 20:10:02 +0000 Subject: [PATCH 06/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index a2dc754..5dd47f3 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -112,6 +112,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Mar 29 2015 Erik van Pienbroek - 2.0.3-5 - Don't try to re-implement D3D11 pieces which are already part of mingw-w64 - Workaround a gcc compatibility issue From 731da0ee2fa4a11c2dfc830dc0ff4de2ddf1344d Mon Sep 17 00:00:00 2001 From: Marcel Wysocki Date: Fri, 18 Sep 2015 13:44:51 +0200 Subject: [PATCH 07/43] Added static package. --- mingw-SDL2.spec | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 5dd47f3..192b8f3 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -50,7 +50,17 @@ Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed to provide fast access to the graphics frame buffer and audio device. -# Win32 +# Win32 (static) +%package -n mingw32-SDL2-static +Summary: MinGW Windows port of SDL cross-platform multimedia library +Requires: mingw32-SDL2 = %{version}-%{release} + +%description -n mingw32-SDL2-static +Simple DirectMedia Layer (SDL) is a cross-platform multimedia library +designed to provide fast access to the graphics frame buffer and audio +device. + +# Win64 %package -n mingw64-SDL2 Summary: MinGW Windows port of SDL cross-platform multimedia library @@ -59,6 +69,16 @@ Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed to provide fast access to the graphics frame buffer and audio device. +# Win64 (static) +%package -n mingw64-SDL2-static +Summary: MinGW Windows port of SDL cross-platform multimedia library +Requires: mingw64-SDL2 = %{version}-%{release} + +%description -n mingw64-SDL2-static +Simple DirectMedia Layer (SDL) is a cross-platform multimedia library +designed to provide fast access to the graphics frame buffer and audio +device. + %?mingw_debug_package @@ -78,9 +98,7 @@ dos2unix COPYING.txt README.txt %install %mingw_make DESTDIR=$RPM_BUILD_ROOT install -# Remove static libraries but DON'T remove *.dll.a files. -rm $RPM_BUILD_ROOT%{mingw32_libdir}/libSDL2.a -rm $RPM_BUILD_ROOT%{mingw64_libdir}/libSDL2.a +# Remove test library. rm $RPM_BUILD_ROOT%{mingw32_libdir}/libSDL2_test.a rm $RPM_BUILD_ROOT%{mingw64_libdir}/libSDL2_test.a @@ -99,6 +117,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw32_datadir}/aclocal/sdl2.m4 %{mingw32_includedir}/SDL2 +# Win32 (static) +%files -n mingw32-SDL2-static +%{mingw32_libdir}/libSDL2.a + # Win64 %files -n mingw64-SDL2 %doc README.txt COPYING.txt @@ -110,8 +132,15 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw64_datadir}/aclocal/sdl2.m4 %{mingw64_includedir}/SDL2 +# Win64 (static) +%files -n mingw64-SDL2-static +%{mingw64_libdir}/libSDL2.a + %changelog +* Tue Sep 15 2015 Anonymous Maarten - 2.0.3-7 +- Added static package. + * Wed Jun 17 2015 Fedora Release Engineering - 2.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From c48f542452c317432c6d66b1ca8c4f4fd1b428d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 08:03:03 +0000 Subject: [PATCH 08/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 192b8f3..d78bb4b 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -138,6 +138,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.0.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Sep 15 2015 Anonymous Maarten - 2.0.3-7 - Added static package. From 09369f67d92fd835119a63aff7247c4d641de27c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 24 Oct 2016 12:50:01 +0200 Subject: [PATCH 09/43] Update to 2.0.5 --- .gitignore | 1 + SDL2-fix-gcc-compatibility.patch | 413 ------------------ ...prevent-duplicate-d3d11-declarations.patch | 27 -- mingw-SDL2.spec | 18 +- sources | 2 +- 5 files changed, 9 insertions(+), 452 deletions(-) delete mode 100644 SDL2-fix-gcc-compatibility.patch delete mode 100644 SDL2-prevent-duplicate-d3d11-declarations.patch diff --git a/.gitignore b/.gitignore index e78ecee..62239de 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /SDL2-2.0.3.tar.gz +/SDL2-2.0.5.tar.gz diff --git a/SDL2-fix-gcc-compatibility.patch b/SDL2-fix-gcc-compatibility.patch deleted file mode 100644 index 650853b..0000000 --- a/SDL2-fix-gcc-compatibility.patch +++ /dev/null @@ -1,413 +0,0 @@ ---- src/render/direct3d11/SDL_render_d3d11.c.orig 2015-03-21 20:17:57.816864185 +0100 -+++ src/render/direct3d11/SDL_render_d3d11.c 2015-03-21 22:21:30.123045735 +0100 -@@ -46,6 +46,9 @@ - #endif /* __WINRT__ */ - - -+#define SDL_DEBUG_STRINGIFY_ARG(str) #str -+#define SDL_DEBUG(str) SDL_DEBUG_STRINGIFY_ARG(__FUNCTION__) str -+ - #define SAFE_RELEASE(X) if ((X)) { IUnknown_Release(SDL_static_cast(IUnknown*, X)); X = NULL; } - - -@@ -910,7 +925,7 @@ - blendDesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; - result = ID3D11Device_CreateBlendState(data->d3dDevice, &blendDesc, blendStateOutput); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBlendState", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateBlendState"), result); - return result; - } - -@@ -992,14 +1007,14 @@ - - result = CreateDXGIFactoryFunc(&IID_IDXGIFactory2, &data->dxgiFactory); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", CreateDXGIFactory", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", CreateDXGIFactory"), result); - goto done; - } - - /* FIXME: Should we use the default adapter? */ - result = IDXGIFactory2_EnumAdapters(data->dxgiFactory, 0, &data->dxgiAdapter); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", D3D11CreateDevice"), result); - goto done; - } - -@@ -1028,25 +1043,25 @@ - &d3dContext /* Returns the device immediate context. */ - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", D3D11CreateDevice"), result); - goto done; - } - - result = ID3D11Device_QueryInterface(d3dDevice, &IID_ID3D11Device1, &data->d3dDevice); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to ID3D11Device1", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device to ID3D11Device1"), result); - goto done; - } - - result = ID3D11DeviceContext_QueryInterface(d3dContext, &IID_ID3D11DeviceContext1, &data->d3dContext); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext to ID3D11DeviceContext1", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext to ID3D11DeviceContext1"), result); - goto done; - } - - result = ID3D11Device_QueryInterface(d3dDevice, &IID_IDXGIDevice1, &dxgiDevice); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to IDXGIDevice1", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device to IDXGIDevice1"), result); - goto done; - } - -@@ -1055,7 +1070,7 @@ - */ - result = IDXGIDevice1_SetMaximumFrameLatency(dxgiDevice, 1); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIDevice1::SetMaximumFrameLatency", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIDevice1::SetMaximumFrameLatency"), result); - goto done; - } - -@@ -1084,7 +1099,7 @@ - break; - - default: -- SDL_SetError(__FUNCTION__ ", Unexpected feature level: %d", data->featureLevel); -+ SDL_SetError("%s, Unexpected feature level: %d", __FUNCTION__, data->featureLevel); - result = E_FAIL; - goto done; - } -@@ -1097,7 +1112,7 @@ - &data->vertexShader - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateVertexShader", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateVertexShader"), result); - goto done; - } - -@@ -1110,7 +1125,7 @@ - &data->inputLayout - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateInputLayout", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateInputLayout"), result); - goto done; - } - -@@ -1122,7 +1137,7 @@ - &data->colorPixelShader - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['color' shader]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreatePixelShader ['color' shader]"), result); - goto done; - } - -@@ -1133,7 +1148,7 @@ - &data->texturePixelShader - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['textures' shader]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreatePixelShader ['textures' shader]"), result); - goto done; - } - -@@ -1144,7 +1159,7 @@ - &data->yuvPixelShader - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['yuv' shader]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreatePixelShader ['yuv' shader]"), result); - goto done; - } - -@@ -1159,7 +1174,7 @@ - &data->vertexShaderConstants - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex shader constants]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateBuffer [vertex shader constants]"), result); - goto done; - } - -@@ -1179,7 +1194,7 @@ - &data->nearestPixelSampler - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [nearest-pixel filter]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateSamplerState [nearest-pixel filter]"), result); - goto done; - } - -@@ -1189,7 +1204,7 @@ - &data->linearSampler - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [linear filter]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateSamplerState [linear filter]"), result); - goto done; - } - -@@ -1207,14 +1222,14 @@ - rasterDesc.SlopeScaledDepthBias = 0.0f; - result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->mainRasterizer); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [main rasterizer]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateRasterizerState [main rasterizer]"), result); - goto done; - } - - rasterDesc.ScissorEnable = TRUE; - result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->clippedRasterizer); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [clipped rasterizer]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateRasterizerState [clipped rasterizer]"), result); - goto done; - } - -@@ -1374,7 +1389,7 @@ - &data->swapChain - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForCoreWindow", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIFactory2::CreateSwapChainForCoreWindow"), result); - goto done; - } - } else if (usingXAML) { -@@ -1384,18 +1399,18 @@ - NULL, - &data->swapChain); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForComposition", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIFactory2::CreateSwapChainForComposition"), result); - goto done; - } - - #if WINAPI_FAMILY == WINAPI_FAMILY_APP - result = ISwapChainBackgroundPanelNative_SetSwapChain(WINRT_GlobalSwapChainBackgroundPanelNative, (IDXGISwapChain *) data->swapChain); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ISwapChainBackgroundPanelNative::SetSwapChain", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ISwapChainBackgroundPanelNative::SetSwapChain"), result); - goto done; - } - #else -- SDL_SetError(__FUNCTION__ ", XAML support is not yet available for Windows Phone"); -+ SDL_SetError(SDL_DEBUG(", XAML support is not yet available for Windows Phone")); - result = E_FAIL; - goto done; - #endif -@@ -1414,7 +1429,7 @@ - &data->swapChain - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForHwnd", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIFactory2::CreateSwapChainForHwnd"), result); - goto done; - } - #else -@@ -1464,7 +1479,7 @@ - 0 - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::ResizeBuffers", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain::ResizeBuffers"), result); - goto done; - } - #endif -@@ -1485,7 +1500,7 @@ - if (data->swapEffect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL) { - result = IDXGISwapChain1_SetRotation(data->swapChain, data->rotation); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::SetRotation", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain1::SetRotation"), result); - goto done; - } - } -@@ -1497,7 +1512,7 @@ - &backBuffer - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::GetBuffer [back-buffer]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain::GetBuffer [back-buffer]"), result); - goto done; - } - -@@ -1508,7 +1523,7 @@ - &data->mainRenderTargetView - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device::CreateRenderTargetView", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device::CreateRenderTargetView"), result); - goto done; - } - -@@ -1628,7 +1643,7 @@ - ); - if (FAILED(result)) { - D3D11_DestroyTexture(renderer, texture); -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D"), result); - return -1; - } - -@@ -1646,7 +1661,7 @@ - ); - if (FAILED(result)) { - D3D11_DestroyTexture(renderer, texture); -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D"), result); - return -1; - } - -@@ -1657,7 +1672,7 @@ - ); - if (FAILED(result)) { - D3D11_DestroyTexture(renderer, texture); -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D"), result); - return -1; - } - } -@@ -1673,7 +1688,7 @@ - ); - if (FAILED(result)) { - D3D11_DestroyTexture(renderer, texture); -- WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG("ID3D11Device1::CreateShaderResourceView"), result); - return -1; - } - -@@ -1685,7 +1700,7 @@ - ); - if (FAILED(result)) { - D3D11_DestroyTexture(renderer, texture); -- WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG("ID3D11Device1::CreateShaderResourceView"), result); - return -1; - } - result = ID3D11Device_CreateShaderResourceView(rendererData->d3dDevice, -@@ -1695,7 +1710,7 @@ - ); - if (FAILED(result)) { - D3D11_DestroyTexture(renderer, texture); -- WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG("ID3D11Device1::CreateShaderResourceView"), result); - return -1; - } - } -@@ -1712,7 +1727,7 @@ - &textureData->mainTextureRenderTargetView); - if (FAILED(result)) { - D3D11_DestroyTexture(renderer, texture); -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRenderTargetView", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateRenderTargetView"), result); - return -1; - } - } -@@ -1768,7 +1783,7 @@ - NULL, - &stagingTexture); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D [create staging texture]"), result); - return -1; - } - -@@ -1781,7 +1796,7 @@ - &textureMemory - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [map staging texture]"), result); - SAFE_RELEASE(stagingTexture); - return -1; - } -@@ -1943,7 +1958,7 @@ - NULL, - &textureData->stagingTexture); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D [create staging texture]"), result); - return -1; - } - -@@ -1956,7 +1971,7 @@ - &textureMemory - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [map staging texture]"), result); - SAFE_RELEASE(textureData->stagingTexture); - return -1; - } -@@ -2238,7 +2253,7 @@ - &mappedResource - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [vertex buffer]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [vertex buffer]"), result); - return -1; - } - SDL_memcpy(mappedResource.pData, vertexData, dataSizeInBytes); -@@ -2262,7 +2277,7 @@ - &rendererData->vertexBuffer - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex buffer]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateBuffer [vertex buffer]"), result); - return -1; - } - -@@ -2732,7 +2747,7 @@ - &backBuffer - ); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::GetBuffer [get back buffer]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain1::GetBuffer [get back buffer]"), result); - goto done; - } - -@@ -2749,7 +2764,7 @@ - NULL, - &stagingTexture); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D [create staging texture]"), result); - goto done; - } - -@@ -2781,7 +2796,7 @@ - 0, - &textureMemory); - if (FAILED(result)) { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [map staging texture]"), result); - goto done; - } - -@@ -2800,7 +2815,7 @@ - * 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), "%s, Convert Pixels failed: %s", __FUNCTION__, SDL_GetError()); - SDL_SetError(errorMessage); - goto done; - } -@@ -2869,7 +2884,7 @@ - /* We probably went through a fullscreen <-> windowed transition */ - D3D11_CreateWindowSizeDependentResources(renderer); - } else { -- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::Present", result); -+ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain::Present"), result); - } - } - } diff --git a/SDL2-prevent-duplicate-d3d11-declarations.patch b/SDL2-prevent-duplicate-d3d11-declarations.patch deleted file mode 100644 index e63737f..0000000 --- a/SDL2-prevent-duplicate-d3d11-declarations.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- src/render/direct3d11/SDL_render_d3d11.c.orig 2015-03-21 20:17:57.816864185 +0100 -+++ src/render/direct3d11/SDL_render_d3d11.c 2015-03-21 22:16:38.285858676 +0100 -@@ -132,12 +132,24 @@ - - - /* Defined here so we don't have to include uuid.lib */ -+#ifndef __IDXGIFactory2_INTERFACE_DEFINED__ - static const GUID IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } }; -+#endif -+#ifndef __IDXGIDevice1_INTERFACE_DEFINED__ - static const GUID IID_IDXGIDevice1 = { 0x77db970f, 0x6276, 0x48ba, { 0xba, 0x28, 0x07, 0x01, 0x43, 0xb4, 0x39, 0x2c } }; -+#endif -+#ifndef __ID3D11Texture2D_INTERFACE_DEFINED__ - static const GUID IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0xb4, 0x48, 0x95, 0x35, 0xd3, 0x4f, 0x9c } }; -+#endif -+#ifndef __ID3D11Device1_INTERFACE_DEFINED__ - static const GUID IID_ID3D11Device1 = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } }; -+#endif -+#ifndef __ID3D11DeviceContext1_INTERFACE_DEFINED__ - static const GUID IID_ID3D11DeviceContext1 = { 0xbb2c6faa, 0xb5fb, 0x4082, { 0x8e, 0x6b, 0x38, 0x8b, 0x8c, 0xfa, 0x90, 0xe1 } }; -+#endif -+#ifndef __ID3D11Debug_INTERFACE_DEFINED__ - static const GUID IID_ID3D11Debug = { 0x79cf2233, 0x7536, 0x4948, { 0x9d, 0x36, 0x1e, 0x46, 0x92, 0xdc, 0x57, 0x60 } }; -+#endif - - /* Direct3D 11.x shaders - diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index d78bb4b..5f71121 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.3 -Release: 8%{?dist} +Version: 2.0.5 +Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -28,13 +28,6 @@ BuildRequires: mingw64-gcc BuildRequires: nasm %endif -# Don't try to re-implement D3D11 pieces which are already part of mingw-w64 -Patch0: SDL2-prevent-duplicate-d3d11-declarations.patch - -# Workaround a gcc compatibility issue -Patch1: SDL2-fix-gcc-compatibility.patch - - %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed to provide fast access to the graphics frame buffer and audio @@ -85,8 +78,6 @@ device. %prep %setup -q -n SDL2-%{version} -%patch0 -p0 -b .d3d11 -%patch1 -p0 -b .gcc dos2unix COPYING.txt README.txt @@ -113,6 +104,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw32_bindir}/sdl2-config %{mingw32_libdir}/libSDL2.dll.a %{mingw32_libdir}/libSDL2main.a +%{mingw32_libdir}/cmake/SDL2/ %{mingw32_libdir}/pkgconfig/sdl2.pc %{mingw32_datadir}/aclocal/sdl2.m4 %{mingw32_includedir}/SDL2 @@ -128,6 +120,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw64_bindir}/sdl2-config %{mingw64_libdir}/libSDL2.dll.a %{mingw64_libdir}/libSDL2main.a +%{mingw64_libdir}/cmake/SDL2/ %{mingw64_libdir}/pkgconfig/sdl2.pc %{mingw64_datadir}/aclocal/sdl2.m4 %{mingw64_includedir}/SDL2 @@ -138,6 +131,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Mon Oct 24 2016 Kalev Lember - 2.0.5-1 +- Update to 2.0.5 + * Thu Feb 04 2016 Fedora Release Engineering - 2.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index a6923be..2f3514f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe6c61d2e9df9ef570e7e80c6e822537 SDL2-2.0.3.tar.gz +d4055424d556b4a908aa76fad63abd3c SDL2-2.0.5.tar.gz From 98eddc219a6c8699adcedf716bfb967b0ce006fb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 24 Oct 2016 12:55:58 +0200 Subject: [PATCH 10/43] Don't set group tags They are unused in Fedora. --- mingw-SDL2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 5f71121..d2e39f6 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -6,7 +6,6 @@ Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ -Group: Development/Libraries URL: http://www.libsdl.org/ Source0: http://www.libsdl.org/release/SDL2-%{version}.tar.gz @@ -133,6 +132,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog * Mon Oct 24 2016 Kalev Lember - 2.0.5-1 - Update to 2.0.5 +- Don't set group tags * Thu Feb 04 2016 Fedora Release Engineering - 2.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 1efc6d0875e4b037d690b606755de6577e8dcc1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 20:59:01 +0000 Subject: [PATCH 11/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index d2e39f6..e2978d4 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Oct 24 2016 Kalev Lember - 2.0.5-1 - Update to 2.0.5 - Don't set group tags From e1cae688c5bac9aadf0952201ca15227c1502068 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 21:27:40 +0000 Subject: [PATCH 12/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index e2978d4..2c57f55 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From d4ce4a58b83427ab76d6198c3dde7fccf7b7b973 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 01:54:46 +0000 Subject: [PATCH 13/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 2c57f55..279248a 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 2.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 0cedff7422b05b9f9a9b2a69c2906f5d6c8dd87f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 10:16:13 +0000 Subject: [PATCH 14/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 279248a..d7cfe0f 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 2.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 6748a58f27ecc767e41a3de968ae37db146cad6a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 27 Sep 2018 23:03:31 +0300 Subject: [PATCH 15/43] Update to 2.0.8 --- .gitignore | 1 + mingw-SDL2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 62239de..3cfe517 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /SDL2-2.0.3.tar.gz /SDL2-2.0.5.tar.gz +/SDL2-2.0.8.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index d7cfe0f..d780dee 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.5 -Release: 5%{?dist} +Version: 2.0.8 +Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Thu Sep 27 2018 Kalev Lember - 2.0.8-1 +- Update to 2.0.8 + * Fri Jul 13 2018 Fedora Release Engineering - 2.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 2f3514f..152189e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4055424d556b4a908aa76fad63abd3c SDL2-2.0.5.tar.gz +SHA512 (SDL2-2.0.8.tar.gz) = 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 From b37127c569a405ab1861e779cca1ccf6f2bdcb9b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 2 Nov 2018 14:19:14 +0100 Subject: [PATCH 16/43] Update to 2.0.9 --- .gitignore | 1 + mingw-SDL2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3cfe517..78e43fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /SDL2-2.0.3.tar.gz /SDL2-2.0.5.tar.gz /SDL2-2.0.8.tar.gz +/SDL2-2.0.9.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index d780dee..d1d5e6d 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,7 +1,7 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.8 +Version: 2.0.9 Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Fri Nov 02 2018 Kalev Lember - 2.0.9-1 +- Update to 2.0.9 + * Thu Sep 27 2018 Kalev Lember - 2.0.8-1 - Update to 2.0.8 diff --git a/sources b/sources index 152189e..d7ea0c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.8.tar.gz) = 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 +SHA512 (SDL2-2.0.9.tar.gz) = a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10 From 80dc0dc6114a3638ad0d385594097b06085bc1d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 10:21:58 +0000 Subject: [PATCH 17/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index d1d5e6d..ca8e418 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.0.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Nov 02 2018 Kalev Lember - 2.0.9-1 - Update to 2.0.9 From ea89eab8cc3c716a5c7909bcb0d8fc8439137b62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 16:34:08 +0000 Subject: [PATCH 18/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index ca8e418..ab3d1c9 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.0.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 2.0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 809c3956c1111b190b6e55974de912f2e70ca730 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 8 Oct 2019 18:24:20 +0200 Subject: [PATCH 19/43] Rebuild (Changes/Mingw32GccDwarf2) --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index ab3d1c9..90cba85 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Tue Oct 08 2019 Sandro Mani - 2.0.9-4 +- Rebuild (Changes/Mingw32GccDwarf2) + * Thu Jul 25 2019 Fedora Release Engineering - 2.0.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1de6a27c0e95e1ed71f47a129e2fc1e3fdf7b01a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 14 Nov 2019 13:17:09 +0100 Subject: [PATCH 20/43] Update to 2.0.10 --- .gitignore | 1 + mingw-SDL2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 78e43fc..b0644d9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /SDL2-2.0.5.tar.gz /SDL2-2.0.8.tar.gz /SDL2-2.0.9.tar.gz +/SDL2-2.0.10.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 90cba85..4b1de96 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.9 -Release: 4%{?dist} +Version: 2.0.10 +Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Thu Nov 14 2019 Sandro Mani - 2.0.10-1 +- Update to 2.0.10 + * Tue Oct 08 2019 Sandro Mani - 2.0.9-4 - Rebuild (Changes/Mingw32GccDwarf2) diff --git a/sources b/sources index d7ea0c3..aa0ea9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.9.tar.gz) = a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10 +SHA512 (SDL2-2.0.10.tar.gz) = f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 From 4734f64a99e9cd6d0b174c327d6253f85e3827e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 12:46:30 +0000 Subject: [PATCH 21/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 4b1de96..492c56b 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Nov 14 2019 Sandro Mani - 2.0.10-1 - Update to 2.0.10 From 0f9338eb3d0c0fcd35c7c380617715cde41d5a8f Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 11 Mar 2020 06:38:09 +0000 Subject: [PATCH 22/43] Update to 2.0.12 --- .gitignore | 1 + mingw-SDL2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b0644d9..f75bd0f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /SDL2-2.0.8.tar.gz /SDL2-2.0.9.tar.gz /SDL2-2.0.10.tar.gz +/SDL2-2.0.12.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 492c56b..b0a4968 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.10 -Release: 2%{?dist} +Version: 2.0.12 +Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Wed Mar 11 2020 Pete Walter - 2.0.12-1 +- Update to 2.0.12 + * Wed Jan 29 2020 Fedora Release Engineering - 2.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index aa0ea9a..2003a7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.10.tar.gz) = f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 +SHA512 (SDL2-2.0.12.tar.gz) = 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 From 1bad86bb39b0a42d04d17c8e47f9451503f50686 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 07:25:42 +0000 Subject: [PATCH 23/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index b0a4968..3c92fda 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Mar 11 2020 Pete Walter - 2.0.12-1 - Update to 2.0.12 From 0782ed6288a8728374bcca7c12d7e018ccf00011 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 13 Nov 2020 00:12:10 +0100 Subject: [PATCH 24/43] Switch to %mingw_make_{build,install} --- mingw-SDL2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 3c92fda..0328564 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -82,7 +82,7 @@ dos2unix COPYING.txt README.txt %build %mingw_configure -%mingw_make %{?_smp_mflags} +%mingw_make_build %install From 1d33bfaac94495ed268873432627549d5e7c45d3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 13 Nov 2020 01:03:03 +0100 Subject: [PATCH 25/43] More spec cleanups --- mingw-SDL2.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 0328564..ddefcaf 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -72,12 +72,12 @@ designed to provide fast access to the graphics frame buffer and audio device. -%?mingw_debug_package +%{?mingw_debug_package} %prep -%setup -q -n SDL2-%{version} -dos2unix COPYING.txt README.txt +%autosetup -p1 -n SDL2-%{version} +dos2unix COPYING.txt %build @@ -86,19 +86,19 @@ dos2unix COPYING.txt README.txt %install -%mingw_make DESTDIR=$RPM_BUILD_ROOT install +%mingw_make_install # Remove test library. -rm $RPM_BUILD_ROOT%{mingw32_libdir}/libSDL2_test.a -rm $RPM_BUILD_ROOT%{mingw64_libdir}/libSDL2_test.a +rm %{buildroot}%{mingw32_libdir}/libSDL2_test.a +rm %{buildroot}%{mingw64_libdir}/libSDL2_test.a # Drop all .la files -find $RPM_BUILD_ROOT -name "*.la" -delete +find %{buildroot} -name "*.la" -delete # Win32 %files -n mingw32-SDL2 -%doc README.txt COPYING.txt +%license COPYING.txt %{mingw32_bindir}/SDL2.dll %{mingw32_bindir}/sdl2-config %{mingw32_libdir}/libSDL2.dll.a @@ -114,7 +114,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete # Win64 %files -n mingw64-SDL2 -%doc README.txt COPYING.txt +%license COPYING.txt %{mingw64_bindir}/SDL2.dll %{mingw64_bindir}/sdl2-config %{mingw64_libdir}/libSDL2.dll.a From 89d4af432a9f7b6b47442abea08143a170253bcb Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 13 Jan 2021 04:26:26 +0000 Subject: [PATCH 26/43] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- mingw-SDL2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index ddefcaf..d0ed3fa 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -11,6 +11,7 @@ Source0: http://www.libsdl.org/release/SDL2-%{version}.tar.gz BuildArch: noarch +BuildRequires: make BuildRequires: dos2unix BuildRequires: mingw32-filesystem >= 95 From 4868ab1396f09933ea285fd431ab1d91134abe45 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 24 Jan 2021 22:48:25 +0100 Subject: [PATCH 27/43] Update to 2.0.14 --- .gitignore | 1 + mingw-SDL2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f75bd0f..f9ab2e7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /SDL2-2.0.9.tar.gz /SDL2-2.0.10.tar.gz /SDL2-2.0.12.tar.gz +/SDL2-2.0.14.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index d0ed3fa..023fa05 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.12 -Release: 2%{?dist} +Version: 2.0.14 +Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -131,6 +131,9 @@ find %{buildroot} -name "*.la" -delete %changelog +* Sun Jan 24 2021 Sandro Mani - 2.0.14-1 +- Update to 2.0.14 + * Tue Jul 28 2020 Fedora Release Engineering - 2.0.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 2003a7d..de25c7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.12.tar.gz) = 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 +SHA512 (SDL2-2.0.14.tar.gz) = ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee From 87d3661e750a010a5678326a857d0dd5967801db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 19:47:55 +0000 Subject: [PATCH 28/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 023fa05..4613cd4 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -131,6 +131,9 @@ find %{buildroot} -name "*.la" -delete %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Jan 24 2021 Sandro Mani - 2.0.14-1 - Update to 2.0.14 From 37046cec7366413baa458e12ce7f1c1dad32c7f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 14:17:58 +0000 Subject: [PATCH 29/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 4613cd4..d3ce708 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -131,6 +131,9 @@ find %{buildroot} -name "*.la" -delete %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.0.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.0.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 050cae9b65f1bd25b55c117ecdbab47bf1195107 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 11 Aug 2021 08:32:57 +0200 Subject: [PATCH 30/43] Update to 2.0.16 --- .gitignore | 1 + mingw-SDL2.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f9ab2e7..ed32c89 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /SDL2-2.0.10.tar.gz /SDL2-2.0.12.tar.gz /SDL2-2.0.14.tar.gz +/SDL2-2.0.16.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index d3ce708..ce8ff52 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.14 -Release: 3%{?dist} +Version: 2.0.16 +Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -11,7 +11,7 @@ Source0: http://www.libsdl.org/release/SDL2-%{version}.tar.gz BuildArch: noarch -BuildRequires: make +BuildRequires: make BuildRequires: dos2unix BuildRequires: mingw32-filesystem >= 95 @@ -78,7 +78,6 @@ device. %prep %autosetup -p1 -n SDL2-%{version} -dos2unix COPYING.txt %build @@ -99,7 +98,7 @@ find %{buildroot} -name "*.la" -delete # Win32 %files -n mingw32-SDL2 -%license COPYING.txt +%license LICENSE.txt %{mingw32_bindir}/SDL2.dll %{mingw32_bindir}/sdl2-config %{mingw32_libdir}/libSDL2.dll.a @@ -115,7 +114,7 @@ find %{buildroot} -name "*.la" -delete # Win64 %files -n mingw64-SDL2 -%license COPYING.txt +%license LICENSE.txt %{mingw64_bindir}/SDL2.dll %{mingw64_bindir}/sdl2-config %{mingw64_libdir}/libSDL2.dll.a @@ -131,6 +130,9 @@ find %{buildroot} -name "*.la" -delete %changelog +* Wed Aug 11 2021 Sandro Mani - 2.0.16-1 +- Update to 2.0.16 + * Thu Jul 22 2021 Fedora Release Engineering - 2.0.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index de25c7c..4755235 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.14.tar.gz) = ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee +SHA512 (SDL2-2.0.16.tar.gz) = ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f From ade3cbb6d36462540240c206f88124067cff6f6c Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 1 Dec 2021 08:39:31 -0500 Subject: [PATCH 31/43] Update to 2.0.18 - Switch to building with CMake --- .gitignore | 1 + mingw-SDL2.spec | 22 +++++++++------------- sources | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index ed32c89..31eec89 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /SDL2-2.0.12.tar.gz /SDL2-2.0.14.tar.gz /SDL2-2.0.16.tar.gz +/SDL2-2.0.18.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index ce8ff52..3778ec6 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,7 +1,7 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.16 +Version: 2.0.18 Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library @@ -11,18 +11,17 @@ Source0: http://www.libsdl.org/release/SDL2-%{version}.tar.gz BuildArch: noarch +BuildRequires: cmake BuildRequires: make BuildRequires: dos2unix BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc +BuildRequires: mingw32-gcc-c++ BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw64-gcc - -# Not required at the moment, but SDL does contain plenty of C++ code, -# I just haven't worked out how to enable it. -#BuildRequires: mingw32-gcc-c++ +BuildRequires: mingw64-gcc-c++ %ifarch %{ix86} BuildRequires: nasm @@ -81,20 +80,13 @@ device. %build -%mingw_configure +%mingw_cmake -DSDL_STATIC=ON -DSDL_STATIC_PIC=ON %mingw_make_build %install %mingw_make_install -# Remove test library. -rm %{buildroot}%{mingw32_libdir}/libSDL2_test.a -rm %{buildroot}%{mingw64_libdir}/libSDL2_test.a - -# Drop all .la files -find %{buildroot} -name "*.la" -delete - # Win32 %files -n mingw32-SDL2 @@ -130,6 +122,10 @@ find %{buildroot} -name "*.la" -delete %changelog +* Wed Dec 01 2021 Neal Gompa - 2.0.18-1 +- Update to 2.0.18 +- Switch to building with CMake + * Wed Aug 11 2021 Sandro Mani - 2.0.16-1 - Update to 2.0.16 diff --git a/sources b/sources index 4755235..898ab5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.16.tar.gz) = ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f +SHA512 (SDL2-2.0.18.tar.gz) = 8688b855ce15d574fb0726dd2a44109bb7b34d81c652c51025a32bf7eb7015ceb685834cf9fc3f97a2f5f5a3203f548ce6845420fafae7e5dc6bb9d11ce1740d From b6a06a1cc738611ebe7ac6b4374d605d60482627 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 18 Jan 2022 10:29:09 +0100 Subject: [PATCH 32/43] Update to 2.0.20 --- .gitignore | 1 + mingw-SDL2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 31eec89..c7e4fd9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /SDL2-2.0.14.tar.gz /SDL2-2.0.16.tar.gz /SDL2-2.0.18.tar.gz +/SDL2-2.0.20.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 3778ec6..f4c15b5 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,7 +1,7 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.18 +Version: 2.0.20 Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library @@ -122,6 +122,9 @@ device. %changelog +* Tue Jan 18 2022 Sandro Mani - 2.0.20-1 +- Update to 2.0.20 + * Wed Dec 01 2021 Neal Gompa - 2.0.18-1 - Update to 2.0.18 - Switch to building with CMake diff --git a/sources b/sources index 898ab5a..0d522da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.18.tar.gz) = 8688b855ce15d574fb0726dd2a44109bb7b34d81c652c51025a32bf7eb7015ceb685834cf9fc3f97a2f5f5a3203f548ce6845420fafae7e5dc6bb9d11ce1740d +SHA512 (SDL2-2.0.20.tar.gz) = 4889949eaa674948bdb0a01bb2a842a0943b15b08ff27ec0079b0fd4f79d071ffb32488a5a51c12ad7c74ed5fe73b608cdf6336a44c95dae8a0fb3f47d0f01de From 3088381d6ce53141cbc1a2ab541dc64128cc98e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 19:15:43 +0000 Subject: [PATCH 33/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index f4c15b5..e065485 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -122,6 +122,9 @@ device. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.0.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 18 2022 Sandro Mani - 2.0.20-1 - Update to 2.0.20 From 2703e862f4d081f09a95fda3439faed309145ef8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 2 Mar 2022 12:45:23 +0100 Subject: [PATCH 34/43] Add mingw-SDL2_lmingw32.patch --- mingw-SDL2.spec | 10 +++++++++- mingw-SDL2_lmingw32.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 mingw-SDL2_lmingw32.patch diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index e065485..34ec2cb 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,12 +2,17 @@ Name: mingw-SDL2 Version: 2.0.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ URL: http://www.libsdl.org/ Source0: http://www.libsdl.org/release/SDL2-%{version}.tar.gz +# Fix -lmingw32 order in in SDL_LIBS +# The link order must be -lmingw32 -lSDL2main -lSDL2, otherwise +# undefined reference to `WinMain@16' +# appers in consumers +Patch0: mingw-SDL2_lmingw32.patch BuildArch: noarch @@ -122,6 +127,9 @@ device. %changelog +* Wed Mar 02 2022 Sandro Mani - 2.0.22-3 +- Add mingw-SDL2_lmingw32.patch + * Thu Jan 20 2022 Fedora Release Engineering - 2.0.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/mingw-SDL2_lmingw32.patch b/mingw-SDL2_lmingw32.patch new file mode 100644 index 0000000..8f82d45 --- /dev/null +++ b/mingw-SDL2_lmingw32.patch @@ -0,0 +1,12 @@ +diff -rupN SDL2-2.0.20/CMakeLists.txt SDL2-2.0.20-new/CMakeLists.txt +--- SDL2-2.0.20/CMakeLists.txt 2022-01-08 22:13:56.000000000 +0100 ++++ SDL2-2.0.20-new/CMakeLists.txt 2022-03-02 12:41:51.634494670 +0100 +@@ -1787,7 +1787,7 @@ elseif(WINDOWS) + list(APPEND EXTRA_LIBS mingw32) + list(APPEND EXTRA_LDFLAGS "-mwindows") + set(SDL_CFLAGS "${SDL_CFLAGS} -Dmain=SDL_main") +- list(APPEND SDL_LIBS "-lmingw32" "-lSDL2main" "-mwindows") ++ list(APPEND SDL_LIBS "-lSDL2main" "-lmingw32" "-mwindows") + endif() + + elseif(APPLE) From 2395947bff180d09f8bf9ba342581997646947e1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 25 Mar 2022 14:46:58 +0100 Subject: [PATCH 35/43] Rebuild with mingw-gcc-12 --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 34ec2cb..6744a71 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -127,6 +127,9 @@ device. %changelog +* Fri Mar 25 2022 Sandro Mani - 2.0.20-4 +- Rebuild with mingw-gcc-12 + * Wed Mar 02 2022 Sandro Mani - 2.0.22-3 - Add mingw-SDL2_lmingw32.patch From d22cadf06405bb532fd1cf5694a9fbe65699d24b Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 30 Apr 2022 02:20:19 -0400 Subject: [PATCH 36/43] Update to 2.0.22 --- .gitignore | 1 + mingw-SDL2.spec | 7 +++++-- mingw-SDL2_lmingw32.patch | 27 ++++++++++++++++++--------- sources | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index c7e4fd9..825c4d3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /SDL2-2.0.16.tar.gz /SDL2-2.0.18.tar.gz /SDL2-2.0.20.tar.gz +/SDL2-2.0.22.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 6744a71..7043f15 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.20 -Release: 4%{?dist} +Version: 2.0.22 +Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -127,6 +127,9 @@ device. %changelog +* Sat Apr 30 2022 Neal Gompa - 2.0.22-1 +- Update to 2.0.22 + * Fri Mar 25 2022 Sandro Mani - 2.0.20-4 - Rebuild with mingw-gcc-12 diff --git a/mingw-SDL2_lmingw32.patch b/mingw-SDL2_lmingw32.patch index 8f82d45..b2b6e23 100644 --- a/mingw-SDL2_lmingw32.patch +++ b/mingw-SDL2_lmingw32.patch @@ -1,12 +1,21 @@ -diff -rupN SDL2-2.0.20/CMakeLists.txt SDL2-2.0.20-new/CMakeLists.txt ---- SDL2-2.0.20/CMakeLists.txt 2022-01-08 22:13:56.000000000 +0100 -+++ SDL2-2.0.20-new/CMakeLists.txt 2022-03-02 12:41:51.634494670 +0100 -@@ -1787,7 +1787,7 @@ elseif(WINDOWS) - list(APPEND EXTRA_LIBS mingw32) - list(APPEND EXTRA_LDFLAGS "-mwindows") - set(SDL_CFLAGS "${SDL_CFLAGS} -Dmain=SDL_main") -- list(APPEND SDL_LIBS "-lmingw32" "-lSDL2main" "-mwindows") -+ list(APPEND SDL_LIBS "-lSDL2main" "-lmingw32" "-mwindows") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 644715a..23b7e13 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1813,13 +1813,13 @@ elseif(WINDOWS) + file(GLOB VERSION_SOURCES ${SDL2_SOURCE_DIR}/src/main/windows/*.rc) + file(GLOB SDLMAIN_SOURCES ${SDL2_SOURCE_DIR}/src/main/windows/*.c) + if(MINGW OR CYGWIN) +- list(APPEND EXTRA_LIBS mingw32) +- list(APPEND EXTRA_LDFLAGS "-mwindows") +- list(APPEND SDL_LIBS "-lmingw32" "-mwindows") + if(NOT SDL2_DISABLE_SDL2MAIN) + set(SDL_CFLAGS "${SDL_CFLAGS} -Dmain=SDL_main") + list(APPEND SDL_LIBS "-lSDL2main") + endif(NOT SDL2_DISABLE_SDL2MAIN) ++ list(APPEND EXTRA_LIBS mingw32) ++ list(APPEND EXTRA_LDFLAGS "-mwindows") ++ list(APPEND SDL_LIBS "-lmingw32" "-mwindows") endif() elseif(APPLE) diff --git a/sources b/sources index 0d522da..05a5fe0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.20.tar.gz) = 4889949eaa674948bdb0a01bb2a842a0943b15b08ff27ec0079b0fd4f79d071ffb32488a5a51c12ad7c74ed5fe73b608cdf6336a44c95dae8a0fb3f47d0f01de +SHA512 (SDL2-2.0.22.tar.gz) = ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a From bae17ad797ba3cef540db77bde0ebebe2033c11d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 23 Jun 2022 18:16:15 +0200 Subject: [PATCH 37/43] Fix packaging static cmake config --- mingw-SDL2.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 7043f15..0a05785 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -101,6 +101,7 @@ device. %{mingw32_libdir}/libSDL2.dll.a %{mingw32_libdir}/libSDL2main.a %{mingw32_libdir}/cmake/SDL2/ +%exclude %{mingw32_libdir}/cmake/SDL2/*static* %{mingw32_libdir}/pkgconfig/sdl2.pc %{mingw32_datadir}/aclocal/sdl2.m4 %{mingw32_includedir}/SDL2 @@ -108,6 +109,7 @@ device. # Win32 (static) %files -n mingw32-SDL2-static %{mingw32_libdir}/libSDL2.a +%{mingw32_libdir}/cmake/SDL2/*static* # Win64 %files -n mingw64-SDL2 @@ -117,6 +119,7 @@ device. %{mingw64_libdir}/libSDL2.dll.a %{mingw64_libdir}/libSDL2main.a %{mingw64_libdir}/cmake/SDL2/ +%exclude %{mingw64_libdir}/cmake/SDL2/*static* %{mingw64_libdir}/pkgconfig/sdl2.pc %{mingw64_datadir}/aclocal/sdl2.m4 %{mingw64_includedir}/SDL2 @@ -124,9 +127,13 @@ device. # Win64 (static) %files -n mingw64-SDL2-static %{mingw64_libdir}/libSDL2.a +%{mingw64_libdir}/cmake/SDL2/*static* %changelog +* Thu Jun 23 2022 Sandro Mani - 2.0.22-2 +- Fix packaging static cmake config + * Sat Apr 30 2022 Neal Gompa - 2.0.22-1 - Update to 2.0.22 From e4e599c6e42489e1bbe04b3b6c828fbb43fe821c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 21:07:49 +0000 Subject: [PATCH 38/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 0a05785..ef9b274 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.0.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -131,6 +131,9 @@ device. %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.0.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jun 23 2022 Sandro Mani - 2.0.22-2 - Fix packaging static cmake config From 66366a2b4985a376aaccb186b54b3786dba196de Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 19 Aug 2022 17:02:07 -0400 Subject: [PATCH 39/43] Update to 2.24.0 --- .gitignore | 1 + mingw-SDL2.spec | 17 ++++++++++------- mingw-SDL2_lmingw32.patch | 21 --------------------- sources | 2 +- 4 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 mingw-SDL2_lmingw32.patch diff --git a/.gitignore b/.gitignore index 825c4d3..78c117f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /SDL2-2.0.18.tar.gz /SDL2-2.0.20.tar.gz /SDL2-2.0.22.tar.gz +/SDL2-2.24.0.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index ef9b274..f0257f3 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,18 +1,13 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.22 -Release: 3%{?dist} +Version: 2.24.0 +Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ URL: http://www.libsdl.org/ Source0: http://www.libsdl.org/release/SDL2-%{version}.tar.gz -# Fix -lmingw32 order in in SDL_LIBS -# The link order must be -lmingw32 -lSDL2main -lSDL2, otherwise -# undefined reference to `WinMain@16' -# appers in consumers -Patch0: mingw-SDL2_lmingw32.patch BuildArch: noarch @@ -92,6 +87,9 @@ device. %install %mingw_make_install +rm -rf %{buildroot}%{mingw32_datadir}/licenses +rm -rf %{buildroot}%{mingw64_datadir}/licenses + # Win32 %files -n mingw32-SDL2 @@ -100,6 +98,7 @@ device. %{mingw32_bindir}/sdl2-config %{mingw32_libdir}/libSDL2.dll.a %{mingw32_libdir}/libSDL2main.a +%{mingw32_libdir}/libSDL2_test.a %{mingw32_libdir}/cmake/SDL2/ %exclude %{mingw32_libdir}/cmake/SDL2/*static* %{mingw32_libdir}/pkgconfig/sdl2.pc @@ -118,6 +117,7 @@ device. %{mingw64_bindir}/sdl2-config %{mingw64_libdir}/libSDL2.dll.a %{mingw64_libdir}/libSDL2main.a +%{mingw64_libdir}/libSDL2_test.a %{mingw64_libdir}/cmake/SDL2/ %exclude %{mingw64_libdir}/cmake/SDL2/*static* %{mingw64_libdir}/pkgconfig/sdl2.pc @@ -131,6 +131,9 @@ device. %changelog +* Fri Aug 19 2022 Neal Gompa - 2.24.0-1 +- Update to 2.24.0 + * Thu Jul 21 2022 Fedora Release Engineering - 2.0.22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/mingw-SDL2_lmingw32.patch b/mingw-SDL2_lmingw32.patch deleted file mode 100644 index b2b6e23..0000000 --- a/mingw-SDL2_lmingw32.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 644715a..23b7e13 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1813,13 +1813,13 @@ elseif(WINDOWS) - file(GLOB VERSION_SOURCES ${SDL2_SOURCE_DIR}/src/main/windows/*.rc) - file(GLOB SDLMAIN_SOURCES ${SDL2_SOURCE_DIR}/src/main/windows/*.c) - if(MINGW OR CYGWIN) -- list(APPEND EXTRA_LIBS mingw32) -- list(APPEND EXTRA_LDFLAGS "-mwindows") -- list(APPEND SDL_LIBS "-lmingw32" "-mwindows") - if(NOT SDL2_DISABLE_SDL2MAIN) - set(SDL_CFLAGS "${SDL_CFLAGS} -Dmain=SDL_main") - list(APPEND SDL_LIBS "-lSDL2main") - endif(NOT SDL2_DISABLE_SDL2MAIN) -+ list(APPEND EXTRA_LIBS mingw32) -+ list(APPEND EXTRA_LDFLAGS "-mwindows") -+ list(APPEND SDL_LIBS "-lmingw32" "-mwindows") - endif() - - elseif(APPLE) diff --git a/sources b/sources index 05a5fe0..78a6256 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.22.tar.gz) = ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a +SHA512 (SDL2-2.24.0.tar.gz) = 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212 From 60f4b953e2d64ac3fa261a34a9dacca52fb1c445 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 21 Nov 2022 22:52:21 -0500 Subject: [PATCH 40/43] Update to 2.26.0 --- .gitignore | 1 + mingw-SDL2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 78c117f..1fb8c35 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /SDL2-2.0.20.tar.gz /SDL2-2.0.22.tar.gz /SDL2-2.24.0.tar.gz +/SDL2-2.26.0.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index f0257f3..ed7051c 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,7 +1,7 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.24.0 +Version: 2.26.0 Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library @@ -131,6 +131,9 @@ rm -rf %{buildroot}%{mingw64_datadir}/licenses %changelog +* Tue Nov 22 2022 Neal Gompa - 2.26.0-1 +- Update to 2.26.0 + * Fri Aug 19 2022 Neal Gompa - 2.24.0-1 - Update to 2.24.0 diff --git a/sources b/sources index 78a6256..aefe3de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.24.0.tar.gz) = 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212 +SHA512 (SDL2-2.26.0.tar.gz) = b4379140399e2248b28c4fe36ba6bb142cd047014c3cfc6fd2c0fee7110ad28af6553f24ca4ccf4996165940de127aafe8d744b09bea9d5684ce8244697996bf From 1fbaab685033e755abf847d239dee6c35ed1a541 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 19:32:24 +0000 Subject: [PATCH 41/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mingw-SDL2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index ed7051c..9bd1f25 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -2,7 +2,7 @@ Name: mingw-SDL2 Version: 2.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -131,6 +131,9 @@ rm -rf %{buildroot}%{mingw64_datadir}/licenses %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.26.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Nov 22 2022 Neal Gompa - 2.26.0-1 - Update to 2.26.0 From 381d73b5e74eaa8e4ed598842d24ce093f9dee74 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 22 Jan 2023 10:15:20 +0100 Subject: [PATCH 42/43] Update to 2.26.2 --- .gitignore | 1 + mingw-SDL2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1fb8c35..df54390 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /SDL2-2.0.22.tar.gz /SDL2-2.24.0.tar.gz /SDL2-2.26.0.tar.gz +/SDL2-2.26.2.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 9bd1f25..dd86f74 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.26.0 -Release: 2%{?dist} +Version: 2.26.2 +Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -131,6 +131,9 @@ rm -rf %{buildroot}%{mingw64_datadir}/licenses %changelog +* Sun Jan 22 2023 Sandro Mani - 2.26.2-1 +- Update to 2.26.2 + * Thu Jan 19 2023 Fedora Release Engineering - 2.26.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index aefe3de..582c942 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.26.0.tar.gz) = b4379140399e2248b28c4fe36ba6bb142cd047014c3cfc6fd2c0fee7110ad28af6553f24ca4ccf4996165940de127aafe8d744b09bea9d5684ce8244697996bf +SHA512 (SDL2-2.26.2.tar.gz) = 5af6f40790560651a7c6c1f7dae3b97d55c5ab372f02dc6024cb7ad3c996a6fac8a7aba1d510ad994cc5d4ba91efd03010d8678104ed44f55ef948011bc66d28 From 8ef5e5067a14158e6a67fc879f6adf1ef1fe5f6f Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:24:48 +0300 Subject: [PATCH 43/43] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 582c942..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (SDL2-2.26.2.tar.gz) = 5af6f40790560651a7c6c1f7dae3b97d55c5ab372f02dc6024cb7ad3c996a6fac8a7aba1d510ad994cc5d4ba91efd03010d8678104ed44f55ef948011bc66d28