Skip to content

Commit

Permalink
[corrade/magnum/-extras/-integration/-plugins] Update to 2018.10 (#4556)
Browse files Browse the repository at this point in the history
Signed-off-by: Squareys <squareys@googlemail.com>
  • Loading branch information
Squareys authored and ras0219-msft committed Oct 25, 2018
1 parent 526b53b commit aba5a4a
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion ports/corrade/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: corrade
Version: 2018.04-1
Version: 2018.10-1
Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/
Default-Features: interconnect, pluginmanager, testsuite, utility

Expand Down
4 changes: 2 additions & 2 deletions ports/corrade/portfile.cmake
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.04
SHA512 be14f0cb76c904a37f962af16b331407ec6a1f7a31245c7221f41fcbce2749a1ad67057d451736814e357eaa59e015f16996bdba819f69a1dd0f3d5a3cad34a4
REF v2018.10
SHA512 594c15d9622fa0abdf893c15054f27bdcc40b5de1543d722b7173138ec5d299c45b7a85376ed617cdf9b4f52a05bf7a3d1ea1983e112b62690211116c255d201
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/magnum-extras/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: magnum-extras
Version: 2018.04-1
Version: 2018.10-1
Build-Depends: magnum
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
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.04
SHA512 2c933d0cad6f0b6580a84dba22bfdadf120a302246cab404a99749e0ba7bb0d799ee606ca43cc1c39f85ae37a00dcc7374b9fd05eb2bb07945c9371a9c8a8492
REF v2018.10
SHA512 2f1164e321ceff9ae526cb2bae961147f52f56b35ea837c29ba0153f418a269056f469415ca0393dfb8fa5d916e92130aaccc61105d18e3f242820d13478eb33
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/magnum-integration/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: magnum-integration
Version: 2018.04-1
Version: 2018.10-1
Build-Depends: magnum
Description: Integrations 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-integration/portfile.cmake
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.04
SHA512 ef22309dea452de8cf63d62f4b99f3e7b5b12b3580455e8fc1d53eabd921e24ec3824ce238a2b74cf0b6fd137e238b67c6b4653e750072b1105c6571e352d9fe
REF v2018.10
SHA512 2743eb7ee377350e85c1112f5c81850922748f50dc2d5409ccb05bec2b3246c91b8e149891a72a8319125a9843b408fd8254efaffaed2100a425e3e7ef426bbe
HEAD_REF master
)

Expand Down
6 changes: 5 additions & 1 deletion ports/magnum-plugins/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: magnum-plugins
Version: 2018.04-1
Version: 2018.10-1
Build-Depends: magnum
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 Down Expand Up @@ -39,6 +39,10 @@ Feature: jpegimporter
Description: JpegImporter plugin
Build-Depends: libjpeg-turbo, magnum[trade]

Feature: jpegimageconverter
Description: JpegImageConverter plugin
Build-Depends: libjpeg-turbo, magnum[trade]

Feature: miniexrimageconverter
Description: MiniExrImageConverter plugin
Build-Depends: magnum[trade]
Expand Down
4 changes: 2 additions & 2 deletions ports/magnum-plugins/portfile.cmake
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.04
SHA512 0b8ae1488e210d111826532299d1e29c5eba32c75f7c210caff088a9a57459b6354474c7a53fccd0c78553d67d79bf041d471b5822c59cb2c9612126cf3e49ef
REF v2018.10
SHA512 0ff79d2451957dd38f6bf9b1ee5b99f5ea9ac2cd993124f0bc4ae3e571d1a9f407876ecf59a34fd1bd86cda991e81e6632925b7a289e30b113b457bd1c7a0ae1
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/magnum/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: magnum
Version: 2018.04-1
Version: 2018.10-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
Expand Down
4 changes: 2 additions & 2 deletions ports/magnum/portfile.cmake
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.04
SHA512 6ad50e782c8cb10157cf969a571f8c0c0c91161de60ac25cf86eda09106f4de73168618a1a5fe0931c3fd293c718911e14d610bd4f86fe3e073620bd7619a9eb
REF v2018.10
SHA512 3c0998fc3600cb3799e89b4b97f6640e9b7ea9eb0ba937a2ccc0a9e5411f7dc466524a56a49ec04993530703e6688292af042a9aa6452af37f20d4449351cd96
HEAD_REF master
)

Expand Down
6 changes: 3 additions & 3 deletions ports/poco/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ vcpkg_from_github(
REPO pocoproject/poco
REF poco-1.9.0-release
SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
HEAD_REF master
HEAD_REF develop
PATCHES
config_h.patch
find_pcre.patch
Expand Down Expand Up @@ -51,11 +51,11 @@ else()
endif()

if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/bin
${CURRENT_PACKAGES_DIR}/debug/bin)
else()
file(REMOVE
file(REMOVE
${CURRENT_PACKAGES_DIR}/bin/cpspc.pdb
${CURRENT_PACKAGES_DIR}/bin/f2cpsp.pdb
${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.exe
Expand Down

0 comments on commit aba5a4a

Please sign in to comment.