epienbro pushed to mingw-SDL2 (master). "Fix FTBFS against latest mingw-w64"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Mar 29 17:25:19 UTC 2015


>From f888e80eda443e798b7cd787d5780d7a5925d8fd Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun, 29 Mar 2015 19:25:12 +0200
Subject: Fix FTBFS against latest mingw-w64


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 <epienbro at fedoraproject.org> - 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 <rel-eng at lists.fedoraproject.org> - 2.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mingw-SDL2.git/commit/?h=master&id=f888e80eda443e798b7cd787d5780d7a5925d8fd


More information about the scm-commits mailing list