diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-09-29 18:41:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-29 18:41:24 -0700 |
| commit | 2cf0a50129414e069d81e9d81b87a745348cdf82 (patch) | |
| tree | 70561d67f5546525cce7d2061c76cc5a3f8ad5b6 | |
| parent | b09ce119c59a045b3ba3a8948b011c86cf80d14f (diff) | |
| download | vcpkg-2cf0a50129414e069d81e9d81b87a745348cdf82.tar.gz vcpkg-2cf0a50129414e069d81e9d81b87a745348cdf82.zip | |
drop useless patch (#8395)
| -rw-r--r-- | ports/angle/002-fix-linux.patch | 28 | ||||
| -rw-r--r-- | ports/angle/CONTROL | 2 | ||||
| -rw-r--r-- | ports/angle/portfile.cmake | 1 |
3 files changed, 1 insertions, 30 deletions
diff --git a/ports/angle/002-fix-linux.patch b/ports/angle/002-fix-linux.patch deleted file mode 100644 index 283d49448..000000000 --- a/ports/angle/002-fix-linux.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/common/mathutil.h b/src/common/mathutil.h
-index bdf8c2a..d2aa5dd 100644
---- a/src/common/mathutil.h
-+++ b/src/common/mathutil.h
-@@ -21,6 +21,10 @@
- #include "common/debug.h"
- #include "common/platform.h"
-
-+#if defined(__GNUC__)
-+#include <x86intrin.h>
-+#endif
-+
- namespace angle
- {
- using base::CheckedNumeric;
-@@ -1260,6 +1264,12 @@ inline constexpr unsigned int UnsignedCeilDivide(unsigned int value, unsigned in
- # define ANGLE_ROTL64(x, y) _rotl64(x, y)
- # define ANGLE_ROTR16(x, y) _rotr16(x, y)
-
-+#elif defined(__GNUC__)
-+
-+# define ANGLE_ROTL(x, y) __rold(x, y)
-+# define ANGLE_ROTL64(x, y) __rolq(x, y)
-+# define ANGLE_ROTR16(x, y) __rolw(x, y)
-+
- #elif defined(__clang__) && __has_builtin(__builtin_rotateleft32) && \
- __has_builtin(__builtin_rotateleft64) && __has_builtin(__builtin_rotateright16)
-
diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL index 5922d9db4..e0b0a5f6d 100644 --- a/ports/angle/CONTROL +++ b/ports/angle/CONTROL @@ -1,5 +1,5 @@ Source: angle
-Version: 2019-07-19-1 +Version: 2019-07-19-2 Homepage: https://github.com/google/angle
Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index f492ca006..527874d72 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -23,7 +23,6 @@ vcpkg_from_github( SHA512 037ebe356371924088563180c4a37a31eaffa41ca21c42554391672c28e62fabc19d787516b88baa192b771e05c370c5a6cfec0863b70e08d65216f41d89923f PATCHES 001-fix-uwp.patch - 002-fix-linux.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) |