[magnum,magnum-plugins] Add vulkan and shaderconverter features (#15163)

* [magnum,magnum-plugins] Add vulkan and shaderconverter features

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Add warning for features unavailable in non-head version

Signed-off-by: Squareys <squareys@googlemail.com>

* update version record

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>

7 files changed, 63 insertions, 6 deletions

diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
index dee9a32de..f80c0f96f 100644
--- a/ports/magnum-plugins/CONTROL
+++ b/ports/magnum-plugins/CONTROL
@@ -1,6 +1,6 @@
 Source: magnum-plugins
 Version: 2020.06
-Port-Version: 1
+Port-Version: 2
 Build-Depends: magnum[core]
 Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/
@@ -48,6 +48,10 @@ Feature: freetypefont
 Description: FreeTypeFont plugin
 Build-Depends: freetype, magnum[text]
 
+Feature: glslangshaderconverter
+Description: GlslangShaderConverter plugin
+Build-Depends: glslang, magnum[shadertools]
+
 Feature: harfbuzzfont
 Description: HarfBuzzFont plugin
 Build-Depends: harfbuzz, magnum-plugins[freetypefont]
@@ -84,6 +88,10 @@ Feature: pngimporter
 Description: PngImporter plugin
 Build-Depends: libpng, magnum[trade]
 
+Feature: spirvtoolsshaderconverter
+Description: SpirvToolsShaderConverter plugin
+Build-Depends: spirv-tools, magnum[shadertools]
+
 Feature: stanfordimporter
 Description: StanfordImporter plugin
 Build-Depends: magnum[trade]
diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake
index 766d91cfc..07dca2902 100644
--- a/ports/magnum-plugins/portfile.cmake
+++ b/ports/magnum-plugins/portfile.cmake
@@ -44,9 +44,16 @@ else()
     set(BUILD_PLUGINS_STATIC 0)
 endif()
 
+# Head only features
+set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES})
+if(NOT VCPKG_USE_HEAD_VERSION)
+    list(REMOVE_ITEM ALL_SUPPORTED_FEATURES glslangshaderconverter spirvtoolsshaderconverter)
+    message(WARNING "Features glslangshaderconverter and spirvtoolsshaderconverter are not avaliable when building non-head version.")
+endif()
+
 set(_COMPONENTS "")
 # Generate cmake parameters from feature names
-foreach(_feature IN LISTS ALL_FEATURES)
+foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES)
     # Uppercase the feature name and replace "-" with "_"
     string(TOUPPER "${_feature}" _FEATURE)
     string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index e7fa5bd9a..5c9c8fa1c 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,10 +1,10 @@
 Source: magnum
 Version: 2020.06
-Port-Version: 2
+Port-Version: 3
 Build-Depends: corrade[utility]
 Description: C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/
-Default-Features: anyaudioimporter, anyimageimporter, anyimageconverter, anysceneconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, text, texturetools, trade, sdl2application
+Default-Features: anyaudioimporter, anyimageimporter, anyimageconverter, anysceneconverter, anysceneimporter, anyshaderconverter, debugtools, gl, meshtools, primitives, scenegraph, shaders, shadertools, text, texturetools, trade, sdl2application
 
 Feature: al-info
 Description: magnum-al-info utility
@@ -30,6 +30,10 @@ Feature: anysceneimporter
 Description: AnySceneImporter plugin
 Build-Depends: magnum[core,trade]
 
+Feature: anyshaderconverter
+Description: AnyShaderConverter plugin
+Build-Depends: magnum[core,shadertools]
+
 Feature: audio
 Description: Audio library
 Build-Depends: openal-soft
@@ -99,6 +103,10 @@ Feature: sceneconverter
 Description: magnum-sceneconverter utility
 Build-Depends: magnum[core,anysceneconverter]
 
+Feature: shaderconverter
+Description: magnum-shaderconverter utility
+Build-Depends: magnum[core,shadertools,anyshaderconverter]
+
 Feature: shaders
 Description: Shaders library
 Build-Depends: magnum[core,gl]
@@ -153,3 +161,15 @@ Build-Depends: magnum[core,gl]
 Feature: glxcontext
 Description: GlxContext library
 Build-Depends: magnum[core,gl]
+
+Feature: shadertools
+Description: ShaderTools library
+
+Feature: vk
+Description: Vk library
+Build-Depends: vulkan
+
+Feature: vk-info
+Description: vk-info utility
+Build-Depends: magnum[core,vk]
+
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index cb8b2473c..3aa777c9b 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -49,6 +49,13 @@ if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" MATCHES "(Emscripten|Linux)")
     list(REMOVE_ITEM ALL_SUPPORTED_FEATURES eglcontext windowlesseglapplication)
 endif()
 
+# Head only features
+if(NOT VCPKG_USE_HEAD_VERSION)
+    list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter
+        vk-info)
+    message(WARNING "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.")
+endif()
+
 set(_COMPONENTS "")
 # Generate cmake parameters from feature names
 foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES)
@@ -88,6 +95,11 @@ set(_TOOLS
     gl-info
     imageconverter
     sceneconverter)
+if(VCPKG_USE_HEAD_VERSION)
+list(APPEND _TOOLS
+    shaderconverter
+    vk-info)
+endif()
 foreach(_tool IN LISTS _TOOLS)
     if("${_tool}" IN_LIST FEATURES)
         list(APPEND _TOOL_EXEC_NAMES magnum-${_tool})
diff --git a/versions/baseline.json b/versions/baseline.json
index 31bebe2f7..988fd085c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3614,7 +3614,7 @@
     },
     "magnum": {
       "baseline": "2020.06",
-      "port-version": 2
+      "port-version": 3
     },
     "magnum-extras": {
       "baseline": "2020.06",
@@ -3626,7 +3626,7 @@
     },
     "magnum-plugins": {
       "baseline": "2020.06",
-      "port-version": 1
+      "port-version": 2
     },
     "mapbox-variant": {
       "baseline": "1.2.0",
diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json
index 743464560..0913d3788 100644
--- a/versions/m-/magnum-plugins.json
+++ b/versions/m-/magnum-plugins.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "b9b701869c5d4f5f4203702622d2bbfa58b6517f",
+      "version-string": "2020.06",
+      "port-version": 2
+    },
+    {
       "git-tree": "bc7aca74b45fcc3c73d3b0d051e63602c270f0b4",
       "version-string": "2020.06",
       "port-version": 1
diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json
index 59800ad4f..171c91661 100644
--- a/versions/m-/magnum.json
+++ b/versions/m-/magnum.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "84fd6db3cf53cfcb736bfb14b08b86940f5588e1",
+      "version-string": "2020.06",
+      "port-version": 3
+    },
+    {
       "git-tree": "e7a2404e1104325d881715e65459dd3c8a450489",
       "version-string": "2020.06",
       "port-version": 2