[corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06

Signed-off-by: Squareys <[email protected]>

ports/corrade/CONTROL

@@ -1,5 +1,5 @@
 Source: corrade
-Version: 2019.10-1
+Version: 2020.06
 Description: C++11/C++14 multiplatform utility library
 Homepage: https://magnum.graphics/corrade/
 Default-Features: interconnect, pluginmanager, testsuite, utility

ports/corrade/portfile.cmake

@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/corrade
-    REF v2019.10
-    SHA512 5d161f78844b06e1a9979c7e244968a691012e7212e05df3ee3572f5df9aa69e86309f426a89f356f483f6de3871366a8e11b1701a578f865ea738cc8eee515b
+    REF v2020.06
+    SHA512 94cc8959b0ee43ecd8d13a25307e7829d53dc6601628d97c32288d1704e2c0835b755bffc06b2105e6aa5a612f119a60e83cb475860b51e6a35999215c100227
     HEAD_REF master
 )
 

ports/magnum-extras/CONTROL

@@ -1,5 +1,5 @@
 Source: magnum-extras
-Version: 2019.10
+Version: 2020.06
 Build-Depends: magnum[core]
 Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/

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 v2019.10
-    SHA512 75335a75f1662e6223d2be7bc2f3cdb12af0e13ed11f3551dbd68a9488ab2e37ba9cd7ee786cc13e545689ed213558b305bfaffbaf8fa7d3be61eb21eeeeba4a
+    REF v2020.06
+    SHA512 7419af84a6de72f666a9bd12a325c4b40f9e2a25fec3d0b22c348faab0a402b62fa782231b9b12180d84f4ab2508b02df25a97713948bdd2f21c9e8cb831fa25
     HEAD_REF master
 )
 

ports/magnum-integration/CONTROL

@@ -1,5 +1,5 @@
 Source: magnum-integration
-Version: 2019.10
+Version: 2020.06
 Build-Depends: magnum[core]
 Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/

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 v2019.10
-    SHA512 be8b21da07b9720ad19263d6ee0a234ff97ee4a1d5770e3ab33047bc54711689532945b099431c24f6ae863bb55a0883b3ba34a48d7d17768082b26651a9621e
+    REF v2020.06
+    SHA512 0b615acdb49ed55bd678a5fb019b1a8ccf522084f3114b2b8dd7e121c27d39ae2aab2879a2e2fa8b083163be711a86f64202fcf380413dec0c705fffd7d649c5
     HEAD_REF master
 )
 

ports/magnum-plugins/CONTROL

@@ -1,9 +1,9 @@
 Source: magnum-plugins
-Version: 2019.10-2
+Version: 2020.06
 Build-Depends: magnum[core]
 Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/
-Default-Features: ddsimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stbimageconverter, stbimageimporter
+Default-Features: ddsimporter, icoimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stanfordsceneconverter, stbimageconverter, stbimageimporter, stlimporter
 
 Feature: assimpimporter
 Description: AssimpImporter plugin
@@ -51,6 +51,10 @@ Feature: harfbuzzfont
 Description: HarfBuzzFont plugin
 Build-Depends: harfbuzz, magnum-plugins[freetypefont]
 
+Feature: icoimporter
+Description: IcoImporter plugin
+Build-Depends: magnum[trade]
+
 Feature: jpegimporter
 Description: JpegImporter plugin
 Build-Depends: libjpeg-turbo, magnum[trade]
@@ -83,6 +87,10 @@ Feature: stanfordimporter
 Description: StanfordImporter plugin
 Build-Depends: magnum[trade]
 
+Feature: stanfordsceneconverter
+Description: StanfordSceneConverter plugin
+Build-Depends: magnum[trade]
+
 Feature: stbimageconverter
 Description: StbImageConverter plugin
 Build-Depends: magnum[trade]
@@ -99,6 +107,10 @@ Feature: stbvorbisaudioimporter
 Description: StbVorbisAudioImporter plugin
 Build-Depends: magnum[audio]
 
+Feature: stlimporter
+Description: StlImporter plugin
+Build-Depends: magnum[trade]
+
 Feature: tinygltfimporter
 Description: TinyGltfImporter plugin
 Build-Depends: magnum[anyimageimporter], magnum-plugins[stbimageimporter], magnum[trade]

ports/magnum-plugins/portfile.cmake

@@ -1,22 +1,11 @@
-set(_RELEASE_ONLY_PATCHES)
-if(NOT VCPKG_USE_HEAD_VERSION)
-    vcpkg_download_distfile(
-        _RELEASE_ONLY_PATCHES
-        URLS "https://github.com/mosra/magnum-plugins/commit/c2a05465fa43befbb628b424378e328fa42923b7.diff"
-        FILENAME "c2a05465fa43befbb628b424378e328fa42923b7.diff"
-        SHA512 e03953ff7319b3b8e3644b8e25c006a856dd6a85cec6e4c033f9b2059af7ae39ed84b76c11c93c41ea6a681d7f34dd5980806f49f760d1c26778047c90cc76df
-    )
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/magnum-plugins
-    REF v2019.10
-    SHA512 702c43b0d323dc5b903ffee3dd9aaecf2de3b6bb00e7b243880e433df12efe337e512aac75a6f38adce02eb94f3065770ff6a03b7241198f27b5c46de63e5750
+    REF v2020.06
+    SHA512 3c11c2928bfc9d04c1ad64f72b6ffac6cf80a1ef3aacc5d0486b9ad955cf4f6ea6d5dcb3846dc5d73f64ec522a015eafb997f62c79ad7ff91169702341f23af0
     HEAD_REF master
     PATCHES
         001-tools-path.patch
-        ${_RELEASE_ONLY_PATCHES}
 )
 
 if(basisimporter IN_LIST FEATURES OR basisimageconverter IN_LIST FEATURES)
@@ -27,14 +16,14 @@ if(basisimporter IN_LIST FEATURES OR basisimageconverter IN_LIST FEATURES)
         _BASIS_UNIVERSAL_PATCHES
         URLS "https://github.com/BinomialLLC/basis_universal/commit/e9c55faac7745ebf38d08cd3b4f71aaf542f8191.diff"
         FILENAME "e9c55faac7745ebf38d08cd3b4f71aaf542f8191.patch"
-        SHA512 e5dda11de2ba8cfd39728e69c74a7656bb522e509786fe5673c94b26be9bd4bee897510096479ee6323f5276d34cba1c44c60804a515c0b35ff7b6ac9d625b88
+    SHA512 3c11c2928bfc9d04c1ad64f72b6ffac6cf80a1ef3aacc5d0486b9ad955cf4f6ea6d5dcb3846dc5d73f64ec522a015eafb997f62c79ad7ff91169702341f23af0
     )
     set(_BASIS_VERSION "8565af680d1bd2ad56ab227ca7d96c56dfbe93ed")
     vcpkg_download_distfile(
         _BASIS_UNIVERSAL_ARCHIVE
         URLS "https://github.com/BinomialLLC/basis_universal/archive/${_BASIS_VERSION}.tar.gz"
         FILENAME "basis-universal-${_BASIS_VERSION}.tar.gz"
-        SHA512 65062ab3ba675c46760f56475a7528189ed4097fb9bab8316e25d9e23ffec2a9560eb9a6897468baf2a6ab2bd698b5907283e96deaeaef178085a47f9d371bb2
+    SHA512 3c11c2928bfc9d04c1ad64f72b6ffac6cf80a1ef3aacc5d0486b9ad955cf4f6ea6d5dcb3846dc5d73f64ec522a015eafb997f62c79ad7ff91169702341f23af0
     )
     vcpkg_extract_source_archive_ex(
         OUT_SOURCE_PATH _BASIS_UNIVERSAL_SOURCE
@@ -55,7 +44,7 @@ if(meshoptimizersceneconverter IN_LIST FEATURES)
         _MESHOPTIMIZER_ARCHIVE
         URLS "https://github.com/zeux/meshoptimizer/archive/97c52415c6d29f297a76482ddde22f739292446d.tar.gz"
         FILENAME "meshoptimizer.tar.gz"
-        SHA512 7e2934511d0f0346e552df61684aca27e8772f85f98f37942c75deb5886c5631e33a4a9e9b1318ffdfb36bce22b192d8015e354440657c08660538c98d31dd31
+    SHA512 3c11c2928bfc9d04c1ad64f72b6ffac6cf80a1ef3aacc5d0486b9ad955cf4f6ea6d5dcb3846dc5d73f64ec522a015eafb997f62c79ad7ff91169702341f23af0
     )
     vcpkg_extract_source_archive_ex(
         OUT_SOURCE_PATH _MESHOPTIMIZER_SOURCE

ports/magnum/002-sdl-includes.patch

@@ -1,36 +1,43 @@
 diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp
-index 46ade2d00..24d8eabe7 100644
+index 276c7ee55..90c52f3cb 100644
 --- a/src/Magnum/Platform/Sdl2Application.cpp
 +++ b/src/Magnum/Platform/Sdl2Application.cpp
-@@ -26,7 +26,7 @@
- #include "Sdl2Application.h"
-
- #include <cstring>
+@@ -34,7 +34,7 @@
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wpragma-pack"
+ #endif
 -#include <SDL.h>
 +#include <SDL2/SDL.h>
- #ifndef CORRADE_TARGET_EMSCRIPTEN
- #include <tuple>
- #else
+ #ifdef CORRADE_TARGET_CLANG_CL
+ #pragma clang diagnostic pop
+ #endif
 diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h
-index 1a50b1c72..45e88edf5 100644
+index b2426d513..176729fdb 100644
 --- a/src/Magnum/Platform/Sdl2Application.h
 +++ b/src/Magnum/Platform/Sdl2Application.h
-@@ -46,13 +46,13 @@
- #define SDL_MAIN_HANDLED
+@@ -57,11 +57,11 @@
+ #pragma clang diagnostic ignored "-Wpragma-pack"
  #endif
  /* SDL.h includes the world, adding 50k LOC. We don't want that either. */
 -#include <SDL_keycode.h>
 -#include <SDL_mouse.h>
+-#include <SDL_version.h> /* huh, why is this not pulled in implicitly?! */
 -#include <SDL_video.h>
 -#include <SDL_scancode.h>
 +#include <SDL2/SDL_keycode.h>
 +#include <SDL2/SDL_mouse.h>
++#include <SDL2/SDL_version.h> /* huh, why is this not pulled in implicitly?! */
 +#include <SDL2/SDL_video.h>
 +#include <SDL2/SDL_scancode.h>
-
+
+ #ifdef CORRADE_TARGET_IOS
+ /* Including SDL_main.h unconditionally would mean it'd override Corrade::Main
+@@ -74,7 +74,7 @@
+ #endif
+
  #ifdef CORRADE_TARGET_WINDOWS_RT
 -#include <SDL_main.h> /* For SDL_WinRTRunApp */
 +#include <SDL2/SDL_main.h> /* For SDL_WinRTRunApp */
  #include <wrl.h> /* For the WinMain entrypoint */
  #endif
-
+ #ifdef CORRADE_TARGET_CLANG_CL

ports/magnum/CONTROL

@@ -1,9 +1,9 @@
 Source: magnum
-Version: 2019.10-2
+Version: 2020.06
 Build-Depends: corrade[utility]
 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
+Default-Features: anyaudioimporter, anyimageimporter, anyimageconverter, anysceneconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, text, texturetools, trade, sdl2application
 
 Feature: al-info
 Description: magnum-al-info utility
@@ -21,6 +21,10 @@ Feature: anyimageconverter
 Description: AnyImageConverter plugin
 Build-Depends: magnum[trade]
 
+Feature: anysceneconverter
+Description: AnySceneConverter plugin
+Build-Depends: magnum[trade]
+
 Feature: anysceneimporter
 Description: AnySceneImporter plugin
 Build-Depends: magnum[trade]
@@ -90,6 +94,10 @@ Build-Depends: sdl2
 Feature: scenegraph
 Description: SceneGraph library
 
+Feature: sceneconverter
+Description: magnum-sceneconverter utility
+Build-Depends: magnum[anysceneconverter]
+
 Feature: shaders
 Description: Shaders library
 Build-Depends: magnum[gl]

ports/magnum/portfile.cmake

@@ -1,23 +1,12 @@
-# Patches that are independent of --head flag
-set(_PATCHES 001-tools-path.patch)
-
-# Patches that are only applied to --head builds
-if(VCPKG_USE_HEAD_VERSION)
-    list(APPEND _PATCHES 002-sdl-includes-head.patch)
-
-# Patches that are only applied to release builds
-else()
-    list(APPEND _PATCHES 002-sdl-includes.patch)
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/magnum
-    REF v2019.10
-    SHA512 b1c991199fa9b09b780ea822de4b2251c70fcc95e7f28bb14a6184861d92fcd4c6e6fe43ad21acfbfd191cd46e79bf58b867240ad6f706b07cd1fbe145b8eaff
+    REF v2020.06
+    SHA512 65b0c8a4520d1d282420c30ecd7c8525525d4dbb6e562e1e2e93d110f4eb686af43f098bf02460727fab1e1f9446dd00a99051e150c05ea40b1486a44fea1042
     HEAD_REF master
     PATCHES
-        ${_PATCHES}
+        001-tools-path.patch
+        002-sdl-includes.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -97,18 +86,19 @@ else()
     set(EXE_SUFFIX)
 endif()
 
-if(distancefieldconverter IN_LIST FEATURES)
-    file(COPY ${CURRENT_PACKAGES_DIR}/bin/magnum-distancefieldconverter${EXE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/magnum)
-endif()
-if(fontconverter IN_LIST FEATURES)
-    file(COPY ${CURRENT_PACKAGES_DIR}/bin/magnum-fontconverter${EXE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/magnum)
-endif()
-if(al-info IN_LIST FEATURES)
-    file(COPY ${CURRENT_PACKAGES_DIR}/bin/magnum-al-info${EXE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/magnum)
-endif()
-if(magnuminfo IN_LIST FEATURES)
-    file(COPY ${CURRENT_PACKAGES_DIR}/bin/magnum-info${EXE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/magnum)
-endif()
+# Copy tools into vcpkg's tools directory
+set(_TOOLS
+    al-info
+    distancefieldconverter
+    fontconverter
+    gl-info
+    imageconverter
+    sceneconverter)
+foreach(_tool IN LISTS TOOLS)
+    if("${_tool}" IN_LIST FEATURES)
+        file(COPY ${CURRENT_PACKAGES_DIR}/bin/magnum-${_tool}${EXE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/magnum)
+    endif()
+endforeach()
 
 # Tools require dlls
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/magnum)