[corrade,magnum,-plugins,-extras,-integration] Update to latest and support feature packages (#2687)

[corrade,magnum,-plugins,-extras,-integration] Update to latest and support feature packages

2 files changed, 115 insertions, 22 deletions

diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
index 5c76b45ae..12a444e2d 100644
--- a/ports/magnum-plugins/CONTROL
+++ b/ports/magnum-plugins/CONTROL
@@ -1,4 +1,81 @@
 Source: magnum-plugins
-Version: jan2018-1
-Build-Depends: stb, magnum
-Description: Plugins for C++11/C++14 and OpenGL graphics engine http://mosra.cz/blog/magnum.php
+Version: 2018.02-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
+
+Feature: anyaudioimporter
+Description: AnyAudioImporter plugin
+
+Feature: anyimageconverter
+Description: AnyImageConverter plugin
+
+Feature: anysceneimporter
+Description: AnySceneImporter plugin
+
+Feature: assimpimporter
+Description: AssimpImporter plugin
+Build-Depends: assimp, magnum-plugins[anyimageimporter]
+
+Feature: ddsimporter
+Description: DdsImporter plugin
+
+Feature: devilimageimporter
+Description: DevIlImageImporter plugin
+Build-Depends: devil
+
+Feature: drflacaudioimporter
+Description: DrFlacAudioImporter plugin
+Build-Depends: magnum[audio]
+
+Feature: drwavaudioimporter
+Description: DrWavAudioImporter plugin
+Build-Depends: magnum[audio]
+
+Feature: freetypefont
+Description: FreeTypeFont plugin
+Build-Depends: freetype, magnum[text]
+
+Feature: harfbuzzfont
+Description: HarfBuzzFont plugin
+Build-Depends: harfbuzz, magnum-plugins[freetypefont]
+
+Feature: jpegimporter
+Description: JpegImporter plugin
+Build-Depends: libjpeg-turbo
+
+Feature: miniexrimageconverter
+Description: MiniExrImageConverter plugin
+
+Feature: opengeximporter
+Description: OpenGexImporter plugin
+Build-Depends: magnum-plugins[anyimageimporter]
+
+Feature: pngimageconverter
+Description: PngImageConverter plugin
+Build-Depends: libpng
+
+Feature: pngimporter
+Description: PngImporter plugin
+Build-Depends: libpng
+
+Feature: stanfordimporter
+Description: StanfordImporter plugin
+
+Feature: stbimageconverter
+Description: StbImageConverter plugin
+
+Feature: stbimageimporter
+Description: StbImageImporter plugin
+
+Feature: stbtruetypefont
+Description: StbTrueTypeFont plugin
+Build-Depends: magnum[text]
+
+Feature: stbvorbisaudioimporter
+Description: StbVorbisAudioImporter plugin
+Build-Depends: magnum[audio]
+
diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake
index b2b574b06..86e5622d5 100644
--- a/ports/magnum-plugins/portfile.cmake
+++ b/ports/magnum-plugins/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/magnum-plugins
-    REF f0ddc63385e30c3bae362789855a95de7c46f8a7 
-    SHA512 d0afda7be75efd2dec731e9435732220a76e735ef58d860f7119f206b1d5828af6e70aca3517b0f930c83440930ed62cb03e6c123e37771b72c50ddb44676945
+    REF v2018.02
+    SHA512 650d3ec26b3c72aa98ffa242b072e382445de49d4849042faf5dac800d5e4cce223cac3fa1cc079fcb230632730af1d90ac7d347d152a1f31d224732499e96b4
     HEAD_REF master
 )
 
@@ -15,38 +15,51 @@ vcpkg_apply_patches(
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(BUILD_STATIC 1)
-    set(BUILD_PLUGINS_STATIC 1)
 else()
     set(BUILD_STATIC 0)
-    set(BUILD_PLUGINS_STATIC 0)
 endif()
 
+# Handle features
+set(_COMPONENT_FLAGS "")
+foreach(_feature IN LISTS ALL_FEATURES)
+    # Uppercase the feature name and replace "-" with "_"
+    string(TOUPPER "${_feature}" _FEATURE)
+    string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
+
+    # Turn "-DWITH_*=" ON or OFF depending on whether the feature
+    # is in the list.
+    if(_feature IN_LIST FEATURES)
+        list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON")
+    else()
+        list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF")
+    endif()
+endforeach()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
     OPTIONS
-        -DWITH_STBIMAGECONVERTER=ON
-        -DWITH_STBIMAGEIMPORTER=ON
-        -DWITH_STBTRUETYPEFONT=ON
-        -DWITH_STBTRUETYPEFONT=ON
-        -DWITH_MINIEXRIMAGECONVERTER=ON
-        -DWITH_OPENGEXIMPORTER=ON
-        -DWITH_OPENGEXIMPORTER=ON
-        -DWITH_STANFORDIMPORTER=ON
-        -DWITH_DRWAVAUDIOIMPORTER=ON
-        -DWITH_ANYAUDIOIMPORTER=ON
-        -DWITH_ANYIMAGECONVERTER=ON
-        -DWITH_ANYSCENEIMPORTER=ON
+        ${_COMPONENT_FLAGS}
         -DBUILD_STATIC=${BUILD_STATIC}
-        -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}
         -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
         -DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum
 )
 
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+# Debug includes and share are the same as release
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Clean up empty directories
+if(NOT FEATURES)
+    file(REMOVE_RECURSE
+        ${CURRENT_PACKAGES_DIR}/bin
+        ${CURRENT_PACKAGES_DIR}/lib
+        ${CURRENT_PACKAGES_DIR}/debug)
+    set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
@@ -66,6 +79,9 @@ else()
    # hint vcpkg
    set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
    set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/MagnumPlugins)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d)
 endif()
 
 # Handle copyright