angleproject-git: Update to 2.1.r8455

rimrul · May 17, 2018 · 4a04381 · 4a04381
1 parent 59bc17a
commit 4a04381
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 385 deletions.
diff --git a/mingw-w64-angleproject-git/0000-build-fix.patch b/mingw-w64-angleproject-git/0000-build-fix.patch
@@ -31,21 +31,21 @@ index e096b1a..716aeb6 100644
 --- a/src/common/mathutil.h
 +++ b/src/common/mathutil.h
 @@ -16,6 +16,7 @@
- #include <algorithm>
  #include <string.h>
- #include <stdlib.h>
+ #include <algorithm>
+ #include <limits>
 +#include <intrin.h>
 
- namespace gl
- {
+ #include <anglebase/numerics/safe_math.h>
+
 diff --git a/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp b/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
 index ae42f36..0f1fed8 100644
 --- a/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
 +++ b/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
 @@ -16,6 +16,7 @@
+ #include "libANGLE/renderer/d3d/FramebufferD3D.h"
  #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
  #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
- #include "third_party/murmurhash/MurmurHash3.h"
 +#include <float.h>
 
  namespace rx

diff --git a/mingw-w64-angleproject-git/PKGBUILD b/mingw-w64-angleproject-git/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=angleproject
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=2.1.r6846
+pkgver=2.1.r8455
 pkgrel=1
 pkgdesc='ANGLE project built from git source (mingw-w64)'
 arch=('any')
@@ -17,15 +17,11 @@ options=('strip' 'staticlibs')
 source=("angleproject"::git+https://chromium.googlesource.com/angle/angle
         0000-build-fix.patch
         angleproject-include-import-library-and-use-def-file.patch
-        libEGL_mingw32.def
-        libGLESv2_mingw32.def
         0001-static-build-workaround.patch
         0002-redist.patch)
 sha256sums=('SKIP'
-            '462820ab00f0644c96f0d56925f89eca3a1fbf8bc2e033e13c41b971980b2a56'
-            '5652d020d68bd0a6c618306c553684ab65af9428c1f44d86490c60226987bb7d'
-            'fb04f30b904760d32c4c0b733d0a0b44359855db1fde9e7f5ca7d0b8b1be3e56'
-            'a6cf1600fc9dd3b295da3d2934ddcd9a62be8e440d90385cb4fd52907f05938a'
+            'e48b3553cb956fba0881f851efadf10f8353a876bd714dbd8f0e904e16aba1e9'
+            'c4a750d0a4f15148987d765df7c5a91d33ffe196210738394c3465f666575ae5'
             '42a9e7d4e4365ce119fe5b036a088f226e35b0f6bb51913f3635e01fb53ef1a6'
             'dc9ac8ffa9df3bab614cb14d2743804e26a84d5cb1a644b66788919917b9c3cd')
 pkgver() {
@@ -38,10 +34,6 @@ pkgver() {
 prepare() {
   cd "${srcdir}"/${_realname}
 
-  # provide 32-bit versions of *.def files
-  cp ../libEGL_mingw32.def src/libEGL/
-  cp ../libGLESv2_mingw32.def src/libGLESv2/
-
   ### Fedora team patches ###
   patch -p1 -i ${srcdir}/0000-build-fix.patch
 
@@ -72,9 +64,9 @@ build() {
   mkdir -p "${srcdir}"/${_realname}/build-${MINGW_CHOST}-static
 
 #Build shared libraries
-  gyp -D angle_enable_vulkan=0 -D use_ozone=0 -D OS=win -D MSVS_VERSION="" -D TARGET=${_target} --format make --generator-output="${srcdir}/${_realname}/build-${MINGW_CHOST}-shared" --depth . -I "${srcdir}/${_realname}/gyp/common.gypi" "${srcdir}/${_realname}/src/angle.gyp"
+  gyp -D is_debug=false -D angle_enable_vulkan=0 -D use_ozone=0 -D OS=win -D MSVS_VERSION="" -D TARGET=${_target} --format make --generator-output="${srcdir}/${_realname}/build-${MINGW_CHOST}-shared" --depth . -I "${srcdir}/${_realname}/gyp/common.gypi" "${srcdir}/${_realname}/src/angle.gyp"
 
-  gyp -D angle_enable_vulkan=0 -D use_ozone=0 -D OS=win -D MSVS_VERSION="" -D TARGET=${_target} --format make --generator-output="${srcdir}/${_realname}/build-${MINGW_CHOST}-static" --depth . -I "${srcdir}/${_realname}/gyp/common.gypi" "${srcdir}/${_realname}/src/angle.gyp" -D angle_gl_library_type=static_library
+  gyp -D is_debug=false -D angle_enable_vulkan=0 -D use_ozone=0 -D OS=win -D MSVS_VERSION="" -D TARGET=${_target} --format make --generator-output="${srcdir}/${_realname}/build-${MINGW_CHOST}-static" --depth . -I "${srcdir}/${_realname}/gyp/common.gypi" "${srcdir}/${_realname}/src/angle.gyp" -D angle_gl_library_type=static_library
 
   LINK=g++ make -C "${srcdir}/${_realname}/build-${MINGW_CHOST}-shared" -j$(($(nproc)+1)) V=1 CXXFLAGS="-O2 -g -pipe -Wall -std=c++14 -msse2 -DUNICODE -D_UNICODE"
 cd "${srcdir}"/${_realname}  
@@ -98,4 +90,4 @@ package() {
   install "${srcdir}"/${_realname}/build-${MINGW_CHOST}-static/out/Debug/obj.target/src/{libGLESv2.a,libEGL.a} "${pkgdir}/${MINGW_PREFIX}"/lib/
   ${MINGW_PREFIX}/bin/strip --strip-unneeded "${pkgdir}/${MINGW_PREFIX}"/lib/{libGLESv2.a,libEGL.a}
   cp -Rv include/* "${pkgdir}/${MINGW_PREFIX}"/include/
-}
+}
diff --git a/mingw-w64-angleproject-git/angleproject-include-import-library-and-use-def-file.patch b/mingw-w64-angleproject-git/angleproject-include-import-library-and-use-def-file.patch
@@ -5,7 +5,7 @@
                      'msvs_requires_importlibrary' : 'true',
                  }],
 +                ['TARGET=="win32"', {
-+                    'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL_mingw32.def' ],
++                    'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL.def' ],
 +                }],
 +                ['TARGET=="win64"', {
 +                    'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL.def' ],
@@ -33,10 +33,10 @@
                      'msvs_enable_winphone' : '1',
                  }],
 +                ['TARGET=="win32"', {
-+                    'ldflags': [ '-Wl,--out-implib,libGLESv2.dll.a ../src/libGLESv2/libGLESv2_mingw32.def' ],
++                    'ldflags': [ '-Wl,--out-implib,libGLESv2.dll.a ../src/libGLESv2/libGLESv2_autogen.def' ],
 +                }],
 +                ['TARGET=="win64"', {
-+                    'ldflags': [ '-Wl,--out-implib,libGLESv2.dll.a ../src/libGLESv2/libGLESv2.def' ],
++                    'ldflags': [ '-Wl,--out-implib,libGLESv2.dll.a ../src/libGLESv2/libGLESv2_autogen.def' ],
 +                }],
              ],
 +            'libraries': [

diff --git a/mingw-w64-angleproject-git/libEGL_mingw32.def b/mingw-w64-angleproject-git/libEGL_mingw32.def