diff options
Diffstat (limited to 'ports/magnum')
| -rw-r--r-- | ports/magnum/003-glfw-find-module.patch | 13 | ||||
| -rw-r--r-- | ports/magnum/CONTROL | 32 | ||||
| -rw-r--r-- | ports/magnum/portfile.cmake | 13 |
3 files changed, 34 insertions, 24 deletions
diff --git a/ports/magnum/003-glfw-find-module.patch b/ports/magnum/003-glfw-find-module.patch deleted file mode 100644 index 8dd37d010..000000000 --- a/ports/magnum/003-glfw-find-module.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/modules/FindGLFW.cmake b/modules/FindGLFW.cmake -index 5e13798f7..d7cb12b03 100644 ---- a/modules/FindGLFW.cmake -+++ b/modules/FindGLFW.cmake -@@ -64,7 +64,7 @@ if(TARGET glfw) - endif() - - # In case no config file was found, try manually finding the library. --find_library(GLFW_LIBRARY NAMES glfw glfw3) -+find_library(GLFW_LIBRARY NAMES glfw glfw3 glfw3dll) - - # Include dir - find_path(GLFW_INCLUDE_DIR diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index 89bcff28e..0570cb4dc 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,7 +1,7 @@ Source: magnum -Version: 2019.01-1 +Version: 2019.10 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 @@ -117,6 +117,34 @@ Feature: windowlesswglapplication Description: WindowlessWglApplication library Build-Depends: magnum[gl] +Feature: eglcontext +Description: EglContext library +Build-Depends: magnum[gl] + +Feature: cglcontext +Description: CglContext library +Build-Depends: magnum[gl] + +Feature: glxcontext +Description: GlxContext library +Build-Depends: magnum[gl] + Feature: wglcontext Description: WglContext library Build-Depends: magnum[gl] + +Feature: windowlesseglapplication +Description: WindowlessEglApplication library +Build-Depends: magnum[gl] + +Feature: eglcontext +Description: EglContext library +Build-Depends: magnum[gl] + +Feature: windowlessglxapplication +Description: WindowlessGlxApplication library +Build-Depends: magnum[gl] + +Feature: glxcontext +Description: GlxContext library +Build-Depends: magnum[gl] diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index 9b8d3b424..113698702 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -2,17 +2,12 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum - REF v2019.01 - SHA512 1edce0a38af90bd456a827b073d30d470a13b47797d62ba22001643be7519722c6886498a63be5e2ee65b8649a7eb2c217bbe2cd36ab4f4523d91aaee573ffd5 + REF v2019.10 + SHA512 b1c991199fa9b09b780ea822de4b2251c70fcc95e7f28bb14a6184861d92fcd4c6e6fe43ad21acfbfd191cd46e79bf58b867240ad6f706b07cd1fbe145b8eaff 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 + 001-sdl-includes.patch + 002-tools-path.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) |
