Skip to content

[corrade,magnum,-integration,-extras,-plugins] Update Magnum to v2019.01 #5312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Codiferous merged 5 commits into from
Feb 11, 2019
Merged

[corrade,magnum,-integration,-extras,-plugins] Update Magnum to v2019.01 #5312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e06f434
[corrade] Update to v2019.01
Squareys Feb 6, 2019
11a6d7b
[magnum] Update to v2019.01, remove shapes and glutapplication features
Squareys Feb 6, 2019
db01cec
[magnum-(extras,plugins,integration)] Update to v2019.01, add imgui f…
Squareys Feb 6, 2019
3deb940
[magnum] Improve dependencies to corrade
Squareys Feb 6, 2019
c6bec45
[magnum-plugins] Add faad2audioimporter
Squareys Feb 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/corrade/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 3 additions & 2 deletions ports/corrade/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand All @@ -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}
)
Expand Down
4 changes: 2 additions & 2 deletions ports/magnum-extras/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:

Expand Down
4 changes: 2 additions & 2 deletions ports/magnum-extras/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
8 changes: 6 additions & 2 deletions ports/magnum-integration/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ports/magnum-integration/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
8 changes: 6 additions & 2 deletions ports/magnum-plugins/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ports/magnum-plugins/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
18 changes: 6 additions & 12 deletions ports/magnum/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -90,9 +86,6 @@ Feature: sdl2application
Description: Sdl2Application library
Build-Depends: sdl2

Feature: shapes
Description: Shapes library

Feature: scenegraph
Description: SceneGraph library

Expand All @@ -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
Expand All @@ -113,6 +106,7 @@ Build-Depends: magnum[trade]

Feature: trade
Description: Trade library
Build-Depends: corrade[pluginmanager]

Feature: wavaudioimporter
Description: WavAudioImporter plugin
Expand Down
4 changes: 2 additions & 2 deletions ports/magnum/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down