summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2016-02-27 22:13:52 +0100
committerMartchus2016-02-27 22:13:52 +0100
commit009c8bc1699c45402afe0d25f367c3ef412f1df6 (patch)
treeda19b100ae0a1d4f3dd8471fbb2b690a36aa0937
parent6db90508f39d56b6cf1ff0add5129f77048daba2 (diff)
downloadaur-009c8bc1699c45402afe0d25f367c3ef412f1df6.tar.gz
small adjustments
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD12
-rw-r--r--angleproject-include-import-library-and-use-def-file.patch14
3 files changed, 16 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9d4a3d39b46a..5c3938b7b95c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Feb 22 17:41:19 UTC 2016
+# Sat Feb 27 21:12:13 UTC 2016
pkgbase = mingw-w64-angleproject
- pkgdesc = Angle project (mingw-w64)
+ pkgdesc = ANGLE project (mingw-w64)
pkgver = 2.1.r5571.7a533f7
- pkgrel = 1
+ pkgrel = 2
url = https://chromium.googlesource.com/angle/angle/+/master/README.md
arch = any
license = BSD
@@ -18,9 +18,9 @@ pkgbase = mingw-w64-angleproject
source = angleproject::git+https://chromium.googlesource.com/angle/angle#commit=7a533f7
source = additional-mingw-header::git+https://github.com/Martchus/additional-mingw-header.git#commit=7a8f394
source = angleproject-include-import-library-and-use-def-file.patch
- md5sums = SKIP
- md5sums = SKIP
- md5sums = 966e40c3ffc2070ce413a7fda9b6aedc
+ sha256sums = SKIP
+ sha256sums = SKIP
+ sha256sums = 985a17541f2a4df6243cf817fd607f74619f995ff42f307ff95d6500f7f8fb64
pkgname = mingw-w64-angleproject
diff --git a/PKGBUILD b/PKGBUILD
index b1bd0775f21b..1c260888dabf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
pkgname=mingw-w64-angleproject
pkgver=2.1.r5571.7a533f7
-pkgrel=1
-pkgdesc='Angle project (mingw-w64)'
+pkgrel=2
+pkgdesc='ANGLE project (mingw-w64)'
arch=('any')
url='https://chromium.googlesource.com/angle/angle/+/master/README.md'
license=('BSD')
@@ -17,9 +17,9 @@ options=('!strip' '!buildflags' 'staticlibs')
source=('angleproject::git+https://chromium.googlesource.com/angle/angle#commit=7a533f7'
'additional-mingw-header::git+https://github.com/Martchus/additional-mingw-header.git#commit=7a8f394'
'angleproject-include-import-library-and-use-def-file.patch')
-md5sums=('SKIP'
- 'SKIP'
- '966e40c3ffc2070ce413a7fda9b6aedc')
+sha256sums=('SKIP'
+ 'SKIP'
+ '985a17541f2a4df6243cf817fd607f74619f995ff42f307ff95d6500f7f8fb64')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
#pkgver() {
@@ -37,7 +37,7 @@ prepare() {
cp sysinclude/{versionhelpers,VersionHelpers}.h
# remove .git directory to prevent: No rule to make target '../build-i686-w64-mingw32/.git/index', needed by 'out/Debug/obj/gen/angle/id/commit.h'.
- rm -r .git
+ rm -fr .git
# make sure an import library is created and the correct .def file is used during the build
patch -p1 -i "${srcdir}/angleproject-include-import-library-and-use-def-file.patch"
diff --git a/angleproject-include-import-library-and-use-def-file.patch b/angleproject-include-import-library-and-use-def-file.patch
index af852bd5f69b..e1c62d8bec2c 100644
--- a/angleproject-include-import-library-and-use-def-file.patch
+++ b/angleproject-include-import-library-and-use-def-file.patch
@@ -1,13 +1,10 @@
--- angleproject/src/libEGL.gypi.orig 2015-07-10 11:42:08.230786800 +0300
+++ angleproject/src/libEGL.gypi 2015-07-10 11:44:01.168491900 +0300
-@@ -48,7 +48,16 @@
+@@ -48,7 +48,13 @@
{
'msvs_enable_winphone' : '1',
}],
-+ ['TARGET=="win32"', {
-+ 'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL.def' ],
-+ }],
-+ ['TARGET=="win64"', {
++ ['TARGET=="win32" or TARGET=="win64"', {
+ 'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL.def' ],
+ }],
],
@@ -19,14 +16,11 @@
}
--- angleproject/src/libGLESv2.gypi.orig 2015-07-10 11:41:58.223787600 +0300
+++ angleproject/src/libGLESv2.gypi 2015-07-10 11:44:36.585949800 +0300
-@@ -826,7 +826,16 @@
+@@ -826,7 +826,13 @@
{
'msvs_enable_winphone' : '1',
}],
-+ ['TARGET=="win32"', {
-+ 'ldflags': [ '-Wl,--out-implib,libGLESv2.dll.a ../src/libGLESv2/libGLESv2.def' ],
-+ }],
-+ ['TARGET=="win64"', {
++ ['TARGET=="win32" or TARGET=="win64"', {
+ 'ldflags': [ '-Wl,--out-implib,libGLESv2.dll.a ../src/libGLESv2/libGLESv2.def' ],
+ }],
],