diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/magnum | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/magnum')
| -rw-r--r-- | ports/magnum/004-khrplatform-include.patch | 13 | ||||
| -rw-r--r-- | ports/magnum/CONTROL | 4 | ||||
| -rw-r--r-- | ports/magnum/portfile.cmake | 11 |
3 files changed, 5 insertions, 23 deletions
diff --git a/ports/magnum/004-khrplatform-include.patch b/ports/magnum/004-khrplatform-include.patch deleted file mode 100644 index 04d21e0ef..000000000 --- a/ports/magnum/004-khrplatform-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h b/src/MagnumExternal/OpenGL/GL/flextGL.h
-index 7d36f26e3..69cc8c82f 100644
---- a/src/MagnumExternal/OpenGL/GL/flextGL.h
-+++ b/src/MagnumExternal/OpenGL/GL/flextGL.h
-@@ -118,7 +118,7 @@ void flextGLInit(Magnum::GL::Context& context);
-
- /* Data types */
-
--#include <KHR/khrplatform.h>
-+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
- typedef unsigned int GLenum;
- typedef unsigned char GLboolean;
- typedef unsigned int GLbitfield;
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index cc0720af9..3e99db730 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,7 +1,7 @@ Source: magnum -Version: 2019.01-1 +Version: 2019.01-2 Build-Depends: corrade[utility] -Description: C++11/C++14 graphics middleware for games and data visualization +Description: C++11/C++14 graphics middleware for games and data visualization Homepage: https://magnum.graphics/ Default-Features: anyimageimporter, anyaudioimporter, anyimageconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, text, texturetools, trade, sdl2application diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index 29d8ea733..3d77bcd23 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -5,15 +5,10 @@ vcpkg_from_github( REF v2019.01 SHA512 1edce0a38af90bd456a827b073d30d470a13b47797d62ba22001643be7519722c6886498a63be5e2ee65b8649a7eb2c217bbe2cd36ab4f4523d91aaee573ffd5 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/001-sdl-includes.patch - ${CMAKE_CURRENT_LIST_DIR}/002-tools-path.patch - ${CMAKE_CURRENT_LIST_DIR}/003-glfw-find-module.patch - ${CMAKE_CURRENT_LIST_DIR}/004-khrplatform-include.patch + 001-sdl-includes.patch + 002-tools-path.patch + 003-glfw-find-module.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) |