[magnum-plugins] Fix file conflict with stb (microsoft#12458)

hellozee · Sep 11, 2020 · 1a7ec7b · 1a7ec7b
1 parent 2fe39cd
commit 1a7ec7b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/ports/magnum-plugins/002-fix-stb-conflict.patch b/ports/magnum-plugins/002-fix-stb-conflict.patch
@@ -0,0 +1,13 @@
+diff --git a/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp b/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp
+index c24a968..1a38162 100644
+--- a/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp
++++ b/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp
+@@ -45,7 +45,7 @@
+ #endif
+
+ /* Not defining malloc/free, because there's no equivalent for realloc in C++ */
+-#include "stb_image.h"
++#include "external/stb/stb_image.h"
+
+ namespace Magnum { namespace Trade {
+
diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
@@ -1,5 +1,6 @@
 Source: magnum-plugins
 Version: 2020.06
+Port-Version: 1
 Build-Depends: magnum[core]
 Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/

diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
  HEAD_REF master
  PATCHES
  001-tools-path.patch
+ 002-fix-stb-conflict.patch
 )
 
 if("basisimporter" IN_LIST FEATURES OR "basisimageconverter" IN_LIST FEATURES)