[magnum,-plugins,-integration,-extras] Update to v2018.04

Signed-off-by: Squareys <squareys@googlemail.com>
This commit is contained in:
Squareys 2018-05-02 12:21:02 +02:00
parent 3338ab613c
commit eee5939689
8 changed files with 49 additions and 63 deletions

View File

@ -1,9 +1,9 @@
Source: magnum-extras
Version: 2018.02-2
Build-Depends: magnum
Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
Default-Features:
Feature: ui
Description: Ui library
Build-Depends: corrade[interconnect], magnum[text]
Source: magnum-extras
Version: 2018.04-1
Build-Depends: magnum
Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
Default-Features:
Feature: ui
Description: Ui library
Build-Depends: corrade[interconnect], magnum[text]

View File

@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum-extras
REF v2018.02
SHA512 62c0832d19a36e0f89ffcd958356130c81f577b1091a9232d43307868caf51a1fd186c4aa196bd456d3c37cb887c9802d80eb0b332893bafa812298dbc39d7b7
REF v2018.04
SHA512 2c933d0cad6f0b6580a84dba22bfdadf120a302246cab404a99749e0ba7bb0d799ee606ca43cc1c39f85ae37a00dcc7374b9fd05eb2bb07945c9371a9c8a8492
HEAD_REF master
)

View File

@ -1,5 +1,5 @@
Source: magnum-integration
Version: 2018.02-1
Version: 2018.04-1
Build-Depends: magnum
Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
Default-Features:

View File

@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum-integration
REF v2018.02
SHA512 b2db442d5e29c117ee30ee2c37f5087c3d360158a52eb6bc19e5c1a0388a0ec1338c53e3fdad618bb6f4aba5d88fe10d20bb1539e5f21a309b8f06f2e195279c
REF v2018.04
SHA512 ef22309dea452de8cf63d62f4b99f3e7b5b12b3580455e8fc1d53eabd921e24ec3824ce238a2b74cf0b6fd137e238b67c6b4653e750072b1105c6571e352d9fe
HEAD_REF master
)

View File

@ -1,28 +1,15 @@
Source: magnum-plugins
Version: 2018.02-2
Version: 2018.04-1
Build-Depends: magnum
Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
Default-Features: anyimageimporter, anysceneimporter, anyimageconverter, ddsimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stbimageconverter, stbimageimporter
Feature: anyimageimporter
Description: AnyImageImporter plugin
Build-Depends: magnum[trade]
Feature: anyaudioimporter
Description: AnyAudioImporter plugin
Build-Depends: magnum[audio]
Feature: anyimageconverter
Description: AnyImageConverter plugin
Build-Depends: magnum[trade]
Feature: anysceneimporter
Description: AnySceneImporter plugin
Build-Depends: magnum[trade]
Default-Features: ddsimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stbimageconverter, stbimageimporter
Feature: assimpimporter
Description: AssimpImporter plugin
Build-Depends: assimp, magnum-plugins[anyimageimporter], magnum[anyimageimporter], magnum[trade]
Build-Depends: assimp, magnum[anyimageimporter], magnum[trade]
Feature: openddl
Description: OpenDdl library
Feature: ddsimporter
Description: DdsImporter plugin
@ -58,7 +45,7 @@ Build-Depends: magnum[trade]
Feature: opengeximporter
Description: OpenGexImporter plugin
Build-Depends: magnum-plugins[anyimageimporter], magnum[anyimageimporter], magnum[trade]
Build-Depends: magnum[anyimageimporter], magnum[trade], magnum-plugins[openddl]
Feature: pngimageconverter
Description: PngImageConverter plugin
@ -89,5 +76,5 @@ Description: StbVorbisAudioImporter plugin
Build-Depends: magnum[audio]
Feature: tinygltfimporter
Description: (Upcoming) TinyGltfImporter plugin
Build-Depends: magnum-plugins[anyimageimporter], magnum[anyimageimporter], magnum-plugins[stbimageimporter], magnum[trade]
Description: TinyGltfImporter plugin
Build-Depends: magnum[anyimageimporter], magnum-plugins[stbimageimporter], magnum[trade]

View File

@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum-plugins
REF v2018.02
SHA512 650d3ec26b3c72aa98ffa242b072e382445de49d4849042faf5dac800d5e4cce223cac3fa1cc079fcb230632730af1d90ac7d347d152a1f31d224732499e96b4
REF v2018.04
SHA512 0b8ae1488e210d111826532299d1e29c5eba32c75f7c210caff088a9a57459b6354474c7a53fccd0c78553d67d79bf041d471b5822c59cb2c9612126cf3e49ef
HEAD_REF master
)
@ -53,8 +53,9 @@ file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share)
# Clean up empty directories
if(NOT FEATURES)
# Clean up empty directories, if not building anything.
# FEATURES may only contain "core", but that does not build anything.
if(NOT FEATURES OR FEATURES STREQUAL "core")
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/bin
${CURRENT_PACKAGES_DIR}/lib
@ -63,15 +64,15 @@ if(NOT FEATURES)
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
# move plugin libs to conventional place
file(GLOB_RECURSE LIB_TO_MOVE ${CURRENT_PACKAGES_DIR}/lib/magnum/*)
file(COPY ${LIB_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
file(GLOB_RECURSE LIB_TO_MOVE_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*)
file(COPY ${LIB_TO_MOVE_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
# move plugin libs to conventional place
file(GLOB_RECURSE LIB_TO_MOVE ${CURRENT_PACKAGES_DIR}/lib/magnum/*)
file(COPY ${LIB_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
file(GLOB_RECURSE LIB_TO_MOVE_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*)
file(COPY ${LIB_TO_MOVE_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum)
else()
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)

View File

@ -1,5 +1,5 @@
Source: magnum
Version: 2018.02-2
Version: 2018.04-1
Build-Depends: corrade[pluginmanager], 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, windowlesswglapplication
@ -9,19 +9,19 @@ Description: magnum-al-info utility
Build-Depends: magnum[audio]
Feature: anyimageimporter
Description: (Upcoming) AnyImageImporter plugin
Description: AnyImageImporter plugin
Build-Depends: magnum[trade]
Feature: anyaudioimporter
Description: (Upcoming) AnyAudioImporter plugin
Description: AnyAudioImporter plugin
Build-Depends: magnum[audio]
Feature: anyimageconverter
Description: (Upcoming) AnyImageConverter plugin
Description: AnyImageConverter plugin
Build-Depends: magnum[trade]
Feature: anysceneimporter
Description: (Upcoming) AnySceneImporter plugin
Description: AnySceneImporter plugin
Build-Depends: magnum[trade]
Feature: audio
@ -40,10 +40,10 @@ Description: magnum-fontconverter utility
Build-Depends: magnum[text], magnum[gl]
Feature: gl
Description: (Upcoming) GL library
Description: GL library
Feature: gl-info
Description: (Upcoming) gl-info utility
Description: gl-info utility
Build-Depends: magnum[gl]
Feature: glfwapplication
@ -58,9 +58,6 @@ Feature: imageconverter
Description: magnum-imageconverter utility
Build-Depends: magnum[trade]
Feature: magnuminfo
Description: magnum-info utility
Feature: magnumfont
Description: MagnumFont plugin
Build-Depends: magnum[text]
@ -101,10 +98,11 @@ Description: SceneGraph library
Feature: shaders
Description: Shaders library
Build-Depends: magnum[gl]
Feature: text
Description: Text library
Build-Depends: magnum[texturetools]
Build-Depends: magnum[texturetools], magnum[gl]
Feature: texturetools
Description: TextureTools library
@ -114,7 +112,7 @@ Description: TgaImporter plugin
Build-Depends: magnum[trade]
Feature: trade
Description: (Upcoming) Trade library
Description: Trade library
Feature: wavaudioimporter
Description: WavAudioImporter plugin

View File

@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum
REF v2018.02
SHA512 aeb0cab91ae0a7cca79c15ce98d9b2f8d46f5bc11bb90718e59188bf233154fb51668e0241112b65103f40e675736d74c86a2e5ccffcb698780ccedb1b3fb8bd
REF v2018.04
SHA512 6ad50e782c8cb10157cf969a571f8c0c0c91161de60ac25cf86eda09106f4de73168618a1a5fe0931c3fd293c718911e14d610bd4f86fe3e073620bd7619a9eb
HEAD_REF master
)