[mingw-angleproject] Update to 20130517 snapshot (r2215)
Erik van Pienbroek
epienbro at fedoraproject.org
Fri May 17 16:57:52 UTC 2013
commit cfc0c711391a4c0d066c018c8675b512d6d51cb8
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri May 17 18:57:48 2013 +0200
Update to 20130517 snapshot (r2215)
.gitignore | 1 +
...namically-resolve-functions-of-dwmapi.dll.patch | 75 --------------------
angleproject-fix-case-sensitive-include.patch | 17 ++++-
mingw-angleproject.spec | 15 ++---
sources | 2 +-
5 files changed, 22 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 886010d..c9c74cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/angleproject-r1561.tar.bz2
+/angleproject-r2215.tar.bz2
diff --git a/angleproject-fix-case-sensitive-include.patch b/angleproject-fix-case-sensitive-include.patch
index 787e436..8fc6faf 100644
--- a/angleproject-fix-case-sensitive-include.patch
+++ b/angleproject-fix-case-sensitive-include.patch
@@ -2,12 +2,23 @@ Index: src/libEGL/Display.h
===================================================================
--- src/libEGL/Display.h (revision 1561)
+++ src/libEGL/Display.h (working copy)
-@@ -16,7 +16,7 @@
- #endif
- #include <windows.h>
+@@ -13,7 +13,7 @@
+
+ #include "common/system.h"
#include <d3d9.h>
-#include <D3Dcompiler.h>
+#include <d3dcompiler.h>
#include <set>
#include <vector>
+--- src/common/system.h.orig 2013-05-17 18:49:48.947324255 +0200
++++ src/common/system.h 2013-05-17 18:49:56.597454331 +0200
+@@ -15,7 +15,7 @@
+
+ #include <windows.h>
+ #include <d3d9.h>
+-#include <D3Dcompiler.h>
++#include <d3dcompiler.h>
+ #include <d3d9types.h>
+ #include <mmsystem.h>
+
diff --git a/mingw-angleproject.spec b/mingw-angleproject.spec
index 89f0388..5120d8b 100644
--- a/mingw-angleproject.spec
+++ b/mingw-angleproject.spec
@@ -1,12 +1,12 @@
%?mingw_package_header
-%global svn_revision 1561
-%global svn_stamp 20121214
+%global svn_revision 2215
+%global svn_stamp 20130517
Summary: Almost Native Graphics Layer Engine
Name: mingw-angleproject
Version: 0
-Release: 0.4.svn%{svn_revision}.%{svn_stamp}%{?dist}
+Release: 0.5.svn%{svn_revision}.%{svn_stamp}%{?dist}
License: BSD
Group: System Environment/Libraries
URL: http://code.google.com/p/angleproject/
@@ -29,11 +29,6 @@ BuildArch: noarch
# File names are case-sensitive on Linux
Patch0: angleproject-fix-case-sensitive-include.patch
-# Avoid having a hard dependency on dwmapi.dll as that library only
-# became available starting with Windows Vista.
-# Patch taken from the Qt project: https://bugreports.qt-project.org/browse/QTBUG-27741
-Patch1: 0001-Dynamically-resolve-functions-of-dwmapi.dll.patch
-
# Make sure an import library is created and the correct .def file is used during the build
Patch2: angleproject-include-import-library-and-use-def-file.patch
@@ -143,7 +138,6 @@ Static version of the mingw64-angleproject library.
%prep
%setup -q -n angleproject
%patch0 -p0
-%patch1 -p4
%patch2 -p0
%patch3 -p0
%patch4 -p4
@@ -254,6 +248,9 @@ cp -Rv include/* $RPM_BUILD_ROOT%{mingw64_includedir}
%changelog
+* Fri May 17 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.5.svn2215.20130517
+- Update to 20130517 snapshot (r2215)
+
* Thu Apr 4 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.4.svn1561.20121214
- Added another workaround due to the fact that the gyp
build system doesn't properly support cross-compilation
diff --git a/sources b/sources
index f582b07..87ed0de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fef71559522e810eb38863e5b7d55d20 angleproject-r1561.tar.bz2
+ed7c61ccf10d14b2dad3d466b799f991 angleproject-r2215.tar.bz2
More information about the scm-commits
mailing list