From 7f5b4562c6b698623e8fb84844d682dade7abeb4 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: May 07 2016 13:32:16 +0000 Subject: Fix FTBFS against GCC 6 --- diff --git a/angle-gcc6-fix.patch b/angle-gcc6-fix.patch new file mode 100644 index 0000000..18687c2 --- /dev/null +++ b/angle-gcc6-fix.patch @@ -0,0 +1,11 @@ +--- angle/src/libGLESv2/renderer/d3d/d3d11/Blit11.cpp.orig 2016-05-07 15:18:26.645401675 +0200 ++++ angle/src/libGLESv2/renderer/d3d/d3d11/Blit11.cpp 2016-05-07 15:19:36.471158313 +0200 +@@ -57,6 +57,8 @@ + #include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h" + #include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h" + ++#include ++ + namespace rx + { + diff --git a/mingw-angleproject.spec b/mingw-angleproject.spec index 0f117f2..83f7035 100644 --- a/mingw-angleproject.spec +++ b/mingw-angleproject.spec @@ -7,7 +7,7 @@ Summary: Almost Native Graphics Layer Engine Name: mingw-angleproject Version: 0 -Release: 0.14.git.%{snapshot_rev_short}.%{snapshot_stamp}%{?dist} +Release: 0.15.git.%{snapshot_rev_short}.%{snapshot_stamp}%{?dist} License: BSD Group: System Environment/Libraries URL: http://code.google.com/p/angleproject/ @@ -84,6 +84,9 @@ Patch108: angleproject-export-shader-symbols.patch # Use GCC constructors instead of DllMain to avoid conflicts when using the static library Patch109: angleproject-use-constructors-instead-of-DllMain.patch +# Fix compilation against GCC 6 +Patch110: angle-gcc6-fix.patch + %description ANGLE is a conformant implementation of the OpenGL ES 2.0 specification that @@ -209,6 +212,7 @@ cp %{SOURCE2} src/libEGL/ %patch107 -p1 %patch108 -p1 %patch109 -p1 +%patch110 -p1 # Executing .bat scripts on Linux is a no-go so make this a no-op echo "" > src/copy_compiler_dll.bat @@ -341,6 +345,9 @@ cp -Rv include/* $RPM_BUILD_ROOT%{mingw64_includedir} %changelog +* Sat May 07 2016 Erik van Pienbroek - 0-0.15.git.30d6c2.20141113 +- Fix FTBFS against GCC 6 + * Thu Feb 04 2016 Fedora Release Engineering - 0-0.14.git.30d6c2.20141113 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild