[corrade][magnum][magnum-plugins] Updated to upstream, enabled more features in [magnum]

Removed plugin location defines. Fixed tools search path in FindCorrade, FindMagnum cmake modules.

10 files changed, 88 insertions, 49 deletions

diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL
index 748d0c61a..d8fb3681a 100644
--- a/ports/corrade/CONTROL
+++ b/ports/corrade/CONTROL
@@ -1,3 +1,3 @@
 Source: corrade
-Version: jun2017-1
+Version: jun2017-2
 Description: C++11/C++14 multiplatform utility library http://mosra.cz/blog/corrade.php
diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake
index 113d24dc7..3ae3710f6 100644
--- a/ports/corrade/portfile.cmake
+++ b/ports/corrade/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/corrade
-    REF b87c50db3543367b6eb20dc72246c6687449b029
-    SHA512 882ccba210c6db7dc8a70e425e1cc119dd1c1a880b8b7d36b2c9478a2105294294680495e7bafb8c0bc7f667bd247dbd008e8ff133a8ea26b13df781a8896297
+    REF c182fe636894a998f241212d0205d0c126b7926f
+    SHA512 e62486368eab9c5f90ef9f4af91500f465d9e3baa6e5f6e9f2a49844d09676faefcb965a9d5b27a54eda19436af6b23dcda19504be6cd0dcd52dfad2ad4bfa21
     HEAD_REF master
 )
 
diff --git a/ports/magnum-plugins/001-fix-include.patch b/ports/magnum-plugins/001-fix-include.patch
deleted file mode 100644
index c6aa9c755..000000000
--- a/ports/magnum-plugins/001-fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/MagnumPlugins/OpenGexImporter/OpenDdl/OpenDdl.cpp b/src/MagnumPlugins/OpenGexImporter/OpenDdl/OpenDdl.cpp
-index c94ee98..843d1ec 100644
---- a/src/MagnumPlugins/OpenGexImporter/OpenDdl/OpenDdl.cpp
-+++ b/src/MagnumPlugins/OpenGexImporter/OpenDdl/OpenDdl.cpp
-@@ -25,6 +25,7 @@
- 
- #include <algorithm>
- #include <tuple>
-+#include <memory>
- #include <Corrade/Utility/Debug.h>
- 
- #include "MagnumPlugins/OpenGexImporter/OpenDdl/Document.h"
diff --git a/ports/magnum-plugins/001-tools-path.patch b/ports/magnum-plugins/001-tools-path.patch
new file mode 100644
index 000000000..18a351c2e
--- /dev/null
+++ b/ports/magnum-plugins/001-tools-path.patch
@@ -0,0 +1,26 @@
+diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake
+index e63bc03..052006f 100644
+--- a/modules/FindCorrade.cmake
++++ b/modules/FindCorrade.cmake
+@@ -397,7 +397,7 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
+         if(_component MATCHES ${_CORRADE_EXECUTABLE_COMPONENTS})
+             add_executable(Corrade::${_component} IMPORTED)
+ 
+-            find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component})
++            find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component} PATH_SUFFIXES corrade)
+             mark_as_advanced(CORRADE_${_COMPONENT}_EXECUTABLE)
+ 
+             if(CORRADE_${_COMPONENT}_EXECUTABLE)
+diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
+index 8df555d..12f7aa4 100644
+--- a/modules/FindMagnum.cmake
++++ b/modules/FindMagnum.cmake
+@@ -493,7 +493,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
+         if(_component MATCHES ${_MAGNUM_EXECUTABLE_COMPONENTS})
+             add_executable(Magnum::${_component} IMPORTED)
+ 
+-            find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component})
++            find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component} PATH_SUFFIXES magnum)
+             mark_as_advanced(MAGNUM_${_COMPONENT}_EXECUTABLE)
+ 
+             if(MAGNUM_${_COMPONENT}_EXECUTABLE)
diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
index 087383c4a..9d684689a 100644
--- a/ports/magnum-plugins/CONTROL
+++ b/ports/magnum-plugins/CONTROL
@@ -1,4 +1,4 @@
 Source: magnum-plugins
-Version: jun2017-2
+Version: jun2017-3
 Build-Depends: stb, magnum
 Description: Plugins for C++11/C++14 and OpenGL graphics engine http://mosra.cz/blog/magnum.php
diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake
index dde435ee4..0fe8f83a1 100644
--- a/ports/magnum-plugins/portfile.cmake
+++ b/ports/magnum-plugins/portfile.cmake
@@ -2,14 +2,15 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/magnum-plugins
-    REF 645b50647d5164c5ec8f5bc83ba2578f6cfe7d80
-    SHA512 73c7fb7e9a5a9e2a4ee7314b5d41d98ada9cf1a50c1cd833c2ae19c5bdab66862f3696f142e987f9d2b551142e94f96a2d8ccad37625682c8391400091dcf879
+    REF 34a3bc34335ca05097e735db19fe1fae81dbfbb5
+    SHA512 918c3eeae246d1ac67e3595c50ff599872a0c1498e9a8a0386ad656f3d9d2209b048b53c25f198660e15201147795578c5c931b00116da46fd77d8e91c0826cb
     HEAD_REF master
 )
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-fix-include.patch
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/001-tools-path.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
diff --git a/ports/magnum/002-magnum-defs.patch b/ports/magnum/002-magnum-defs.patch
deleted file mode 100644
index de7d1cb10..000000000
--- a/ports/magnum/002-magnum-defs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/Magnum/configure.h.cmake b/src/Magnum/configure.h.cmake
-index 6a752d4..cd1277b 100644
---- a/src/Magnum/configure.h.cmake
-+++ b/src/Magnum/configure.h.cmake
-@@ -35,4 +35,23 @@
- #cmakedefine MAGNUM_TARGET_WEBGL
- #cmakedefine MAGNUM_TARGET_HEADLESS
- 
-+// Plugin directories
-+#ifdef _DEBUG
-+#define MAGNUM_PLUGINS_DIR "${MAGNUM_PLUGINS_DEBUG_DIR}"
-+#define MAGNUM_PLUGINS_FONT_DIR "${MAGNUM_PLUGINS_FONT_DEBUG_DIR}"
-+#define MAGNUM_PLUGINS_FONTCONVERTER_DIR "${MAGNUM_PLUGINS_FONTCONVERTER_DEBUG_DIR}"
-+#define MAGNUM_PLUGINS_IMAGECONVERTER_DIR "${MAGNUM_PLUGINS_IMAGECONVERTER_DEBUG_DIR}"
-+#define MAGNUM_PLUGINS_IMPORTER_DIR "${MAGNUM_PLUGINS_IMPORTER_DEBUG_DIR}"
-+#define MAGNUM_PLUGINS_AUDIOIMPORTER_DIR "${MAGNUM_PLUGINS_AUDIOIMPORTER_DEBUG_DIR}"
-+#else
-+#define MAGNUM_PLUGINS_DIR "${MAGNUM_PLUGINS_RELEASE_DIR}"
-+#define MAGNUM_PLUGINS_FONT_DIR "${MAGNUM_PLUGINS_FONT_RELEASE_DIR}"
-+#define MAGNUM_PLUGINS_FONTCONVERTER_DIR "${MAGNUM_PLUGINS_FONTCONVERTER_RELEASE_DIR}"
-+#define MAGNUM_PLUGINS_IMAGECONVERTER_DIR "${MAGNUM_PLUGINS_IMAGECONVERTER_RELEASE_DIR}"
-+#define MAGNUM_PLUGINS_IMPORTER_DIR "${MAGNUM_PLUGINS_IMPORTER_RELEASE_DIR}"
-+#define MAGNUM_PLUGINS_AUDIOIMPORTER_DIR "${MAGNUM_PLUGINS_AUDIOIMPORTER_RELEASE_DIR}"
-+#endif
-+
- #endif
diff --git a/ports/magnum/002-tools-path.patch b/ports/magnum/002-tools-path.patch
new file mode 100644
index 000000000..18a351c2e
--- /dev/null
+++ b/ports/magnum/002-tools-path.patch
@@ -0,0 +1,26 @@
+diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake
+index e63bc03..052006f 100644
+--- a/modules/FindCorrade.cmake
++++ b/modules/FindCorrade.cmake
+@@ -397,7 +397,7 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
+         if(_component MATCHES ${_CORRADE_EXECUTABLE_COMPONENTS})
+             add_executable(Corrade::${_component} IMPORTED)
+ 
+-            find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component})
++            find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component} PATH_SUFFIXES corrade)
+             mark_as_advanced(CORRADE_${_COMPONENT}_EXECUTABLE)
+ 
+             if(CORRADE_${_COMPONENT}_EXECUTABLE)
+diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
+index 8df555d..12f7aa4 100644
+--- a/modules/FindMagnum.cmake
++++ b/modules/FindMagnum.cmake
+@@ -493,7 +493,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
+         if(_component MATCHES ${_MAGNUM_EXECUTABLE_COMPONENTS})
+             add_executable(Magnum::${_component} IMPORTED)
+ 
+-            find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component})
++            find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component} PATH_SUFFIXES magnum)
+             mark_as_advanced(MAGNUM_${_COMPONENT}_EXECUTABLE)
+ 
+             if(MAGNUM_${_COMPONENT}_EXECUTABLE)
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index 9160e2287..9245e4380 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,4 +1,4 @@
 Source: magnum
-Version: jun2017-3
+Version: jun2017-4
 Build-Depends: corrade, sdl2, openal-soft
 Description: C++11/C++14 and OpenGL graphics engine http://mosra.cz/blog/magnum.php
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index 3aed5a737..14d5e0846 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mosra/magnum
-    REF c8416ca4c3e9b68ba62acc9f73de235526cb3d6e
-    SHA512 d595be48ae44d944d5747880e0108bdc445b92fcc306f0169699e2b80500919647063ac88ef67491b2d8e92ae1f0612cd8768fc63d8cc4ffe4c625988b63504d
+    REF ed7eac0b42a598dff8984830e7f943dd6af07deb
+    SHA512 843e209b82b4f6f7c3f9612aec2641a28cb09361eefefe435bb7d2c06d0e4df65b6b9adf5893222cf31ddc3ccec967eb343da1da6180e9fbfef1b26234e145d5
     HEAD_REF master
 )
 
@@ -11,7 +11,7 @@ vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/001-sdl-includes.patch 
-        ${CMAKE_CURRENT_LIST_DIR}/002-magnum-defs.patch 
+        ${CMAKE_CURRENT_LIST_DIR}/002-tools-path.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -25,15 +25,39 @@ vcpkg_configure_cmake(
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
     OPTIONS
         -DWITH_SDL2APPLICATION=ON
+        -DWITH_WINDOWLESSWGLAPPLICATION=ON
+        -DWITH_WGLCONTEXT=ON
+        -DWITH_OPENGLTESTER=ON
         -DWITH_AUDIO=ON
         -DWITH_WAVAUDIOIMPORTER=ON
+        -DWITH_MAGNUMFONT=ON
+        -DWITH_MAGNUMFONTCONVERTER=ON
+        -DWITH_OBJIMPORTER=ON
+        -DWITH_TGAIMPORTER=ON
+        -DWITH_DISTANCEFIELDCONVERTER=ON
+        -DWITH_FONTCONVERTER=ON
+        -DWITH_TGAIMAGECONVERTER=ON
         -DBUILD_STATIC=${BUILD_STATIC}
         -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
         -DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum
+        --trace
 )
 
 vcpkg_install_cmake()
 
+# Drop a copy of tools
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/magnum-distancefieldconverter.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/magnum)
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/magnum-fontconverter.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/magnum)
+
+# Tools require dlls
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/magnum)
+
+file(GLOB_RECURSE TO_REMOVE 
+   ${CURRENT_PACKAGES_DIR}/bin/*.exe
+   ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+file(REMOVE ${TO_REMOVE})
+
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)