From ade3cbb6d36462540240c206f88124067cff6f6c Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Wed, 1 Dec 2021 08:39:31 -0500
Subject: [PATCH] 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 <ngompa@fedoraproject.org> - 2.0.18-1
+- Update to 2.0.18
+- Switch to building with CMake
+
 * Wed Aug 11 2021 Sandro Mani <manisandro@gmail.com> - 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