diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2019-02-11 22:49:12 +0100 |
|---|---|---|
| committer | Codiferous <44823842+Codiferous@users.noreply.github.com> | 2019-02-11 13:49:12 -0800 |
| commit | 6c6516621f487a4fb3fa2d9b9417a54c3013ee23 (patch) | |
| tree | 1b5258c0751948505ed21c9b92b1fb1dd60c8ea1 | |
| parent | e6b174ed58b42b6f7cb5c376612add552c04531f (diff) | |
| download | vcpkg-6c6516621f487a4fb3fa2d9b9417a54c3013ee23.tar.gz vcpkg-6c6516621f487a4fb3fa2d9b9417a54c3013ee23.zip | |
[corrade,magnum,-integration,-extras,-plugins] Update Magnum to v2019.01 (#5312)
* [corrade] Update to v2019.01
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum] Update to v2019.01, remove shapes and glutapplication features
These features were deprecated in earlier versions and now removed.
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-(extras,plugins,integration)] Update to v2019.01, add imgui feat.
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum] Improve dependencies to corrade
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Add faad2audioimporter
- faad2 is currently not in vcpkg, hence commented out
- The commented out empty line is required to have vcpkg parse the file
without issues
Signed-off-by: Squareys <squareys@googlemail.com>
| -rw-r--r-- | ports/corrade/CONTROL | 2 | ||||
| -rw-r--r-- | ports/corrade/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/magnum-extras/CONTROL | 4 | ||||
| -rw-r--r-- | ports/magnum-extras/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/magnum-integration/CONTROL | 8 | ||||
| -rw-r--r-- | ports/magnum-integration/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/magnum-plugins/CONTROL | 8 | ||||
| -rw-r--r-- | ports/magnum-plugins/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/magnum/CONTROL | 18 | ||||
| -rw-r--r-- | ports/magnum/portfile.cmake | 4 |
10 files changed, 32 insertions, 29 deletions
diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL index 8e7205158..db1dd82f9 100644 --- a/ports/corrade/CONTROL +++ b/ports/corrade/CONTROL @@ -1,5 +1,5 @@ Source: corrade -Version: 2018.10-2 +Version: 2019.01-1 Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/ Default-Features: interconnect, pluginmanager, testsuite, utility diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index c5b5780bd..c9e0321dd 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/corrade - REF v2018.10 - SHA512 594c15d9622fa0abdf893c15054f27bdcc40b5de1543d722b7173138ec5d299c45b7a85376ed617cdf9b4f52a05bf7a3d1ea1983e112b62690211116c255d201 + REF v2019.01 + SHA512 63468ee0a9362d92d61e2bc77fb8c3e455761894998393910f6bce4111b0ec74db8fe2a8658cec1292c5ceb26e57e005324b34f1ec343d4216abf3a955eaa97e HEAD_REF master PATCHES fixC2666.patch ) @@ -30,6 +30,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS + -DDUTILITY_USE_ANSI_COLORS=ON -DBUILD_STATIC=${BUILD_STATIC} ${_COMPONENT_FLAGS} ) diff --git a/ports/magnum-extras/CONTROL b/ports/magnum-extras/CONTROL index 2f782f048..9942c9463 100644 --- a/ports/magnum-extras/CONTROL +++ b/ports/magnum-extras/CONTROL @@ -1,6 +1,6 @@ Source: magnum-extras
-Version: 2018.10-1
-Build-Depends: magnum
+Version: 2019.01-1
+Build-Depends: magnum[core]
Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
Default-Features:
diff --git a/ports/magnum-extras/portfile.cmake b/ports/magnum-extras/portfile.cmake index 1a080b566..7941aeee9 100644 --- a/ports/magnum-extras/portfile.cmake +++ b/ports/magnum-extras/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-extras - REF v2018.10 - SHA512 2f1164e321ceff9ae526cb2bae961147f52f56b35ea837c29ba0153f418a269056f469415ca0393dfb8fa5d916e92130aaccc61105d18e3f242820d13478eb33 + REF v2019.01 + SHA512 b7116e53a6132c937ad1dc10d251d0b98884375a14e947c5ddfa046cd7a8e7e60eddf2802e1c945168fcb42d78fb13639fe65ea259c6a44f064e6065ee5ae3af HEAD_REF master ) diff --git a/ports/magnum-integration/CONTROL b/ports/magnum-integration/CONTROL index 6fdb5c5cd..da379258c 100644 --- a/ports/magnum-integration/CONTROL +++ b/ports/magnum-integration/CONTROL @@ -1,6 +1,6 @@ Source: magnum-integration -Version: 2018.10-1 -Build-Depends: magnum +Version: 2019.01-1 +Build-Depends: magnum[core] Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ Default-Features: @@ -11,6 +11,10 @@ Build-Depends: bullet3 Feature: glm Description: GlmIntegration library Build-Depends: glm + +Feature: imgui +Description: ImGuiIntegration library +Build-Depends: imgui #Feature: ovr #Description: OvrIntegration library #Build-Depends: ovrsdk diff --git a/ports/magnum-integration/portfile.cmake b/ports/magnum-integration/portfile.cmake index 1e1ba801a..60231be97 100644 --- a/ports/magnum-integration/portfile.cmake +++ b/ports/magnum-integration/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-integration - REF v2018.10 - SHA512 2743eb7ee377350e85c1112f5c81850922748f50dc2d5409ccb05bec2b3246c91b8e149891a72a8319125a9843b408fd8254efaffaed2100a425e3e7ef426bbe + REF v2019.01 + SHA512 4f892c30c3824aea5d51b9178ca5001b97eb89659b45ac6f5f2182ea2a3a8ff54d80e6b143679ea7f5a07c408afb480d11895c6e7afdc9003951f68e14000f9f HEAD_REF master ) diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL index 0aa1b075c..c109f7edf 100644 --- a/ports/magnum-plugins/CONTROL +++ b/ports/magnum-plugins/CONTROL @@ -1,6 +1,6 @@ Source: magnum-plugins -Version: 2018.10-1 -Build-Depends: magnum +Version: 2019.01-1 +Build-Depends: magnum[core] Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ Default-Features: ddsimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stbimageconverter, stbimageimporter @@ -26,6 +26,10 @@ Build-Depends: magnum[audio] Feature: drwavaudioimporter Description: DrWavAudioImporter plugin Build-Depends: magnum[audio] +# +#Feature: faad2audioimporter +#Description: Faad2AudioImporter plugin +#Build-Depends: magnum[audio], faad2 Feature: freetypefont Description: FreeTypeFont plugin diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index aa7f120fe..c013a0841 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-plugins - REF v2018.10 - SHA512 0ff79d2451957dd38f6bf9b1ee5b99f5ea9ac2cd993124f0bc4ae3e571d1a9f407876ecf59a34fd1bd86cda991e81e6632925b7a289e30b113b457bd1c7a0ae1 + REF v2019.01 + SHA512 482131372671ce0b86b6643f8c584f000db4324fe0f7e32bf9a31febded7b97ab7e947028fe21ce649554d2cff2bc11dfd94fad0006c465911c9f44b28c2d2a5 HEAD_REF master ) diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index 8cb02ccc2..29db869a3 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,8 +1,8 @@ Source: magnum -Version: 2018.10-1 -Build-Depends: corrade[pluginmanager], corrade[utility] +Version: 2019.01-1 +Build-Depends: corrade[utility] Description: C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ -Default-Features: anyimageimporter, anyaudioimporter, anyimageconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, shapes, text, texturetools, trade, sdl2application +Default-Features: anyimageimporter, anyaudioimporter, anyimageconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, text, texturetools, trade, sdl2application Feature: al-info Description: magnum-al-info utility @@ -14,7 +14,7 @@ Build-Depends: magnum[trade] Feature: anyaudioimporter Description: AnyAudioImporter plugin -Build-Depends: magnum[audio] +Build-Depends: magnum[audio], corrade[pluginmanager] Feature: anyimageconverter Description: AnyImageConverter plugin @@ -50,10 +50,6 @@ Feature: glfwapplication Description: GlfwApplication library Build-Depends: glfw3 -Feature: glutapplication -Description: GlutApplication library -Build-Depends: freeglut, magnum[gl] - Feature: imageconverter Description: magnum-imageconverter utility Build-Depends: magnum[trade] @@ -90,9 +86,6 @@ Feature: sdl2application Description: Sdl2Application library Build-Depends: sdl2 -Feature: shapes -Description: Shapes library - Feature: scenegraph Description: SceneGraph library @@ -102,7 +95,7 @@ Build-Depends: magnum[gl] Feature: text Description: Text library -Build-Depends: magnum[texturetools], magnum[gl] +Build-Depends: magnum[texturetools], magnum[gl], corrade[pluginmanager] Feature: texturetools Description: TextureTools library @@ -113,6 +106,7 @@ Build-Depends: magnum[trade] Feature: trade Description: Trade library +Build-Depends: corrade[pluginmanager] Feature: wavaudioimporter Description: WavAudioImporter plugin diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index e7f2833e7..9b8d3b424 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum - REF v2018.10 - SHA512 3c0998fc3600cb3799e89b4b97f6640e9b7ea9eb0ba937a2ccc0a9e5411f7dc466524a56a49ec04993530703e6688292af042a9aa6452af37f20d4449351cd96 + REF v2019.01 + SHA512 1edce0a38af90bd456a827b073d30d470a13b47797d62ba22001643be7519722c6886498a63be5e2ee65b8649a7eb2c217bbe2cd36ab4f4523d91aaee573ffd5 HEAD_REF master ) |
