diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-07-20 19:47:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 19:47:16 -0700 |
| commit | c0d7b3970c9f62635379035955f43c27e5f5298e (patch) | |
| tree | b1122d58f2b16437d56a2de927ece25770ea2fbc | |
| parent | 44a5a4f4f215cd55188ef9ba8143b7ebece4025a (diff) | |
| download | vcpkg-c0d7b3970c9f62635379035955f43c27e5f5298e.tar.gz vcpkg-c0d7b3970c9f62635379035955f43c27e5f5298e.zip | |
[magnum-plugins] Fix file conflict with stb (#12458)
| -rw-r--r-- | ports/magnum-plugins/002-fix-stb-conflict.patch | 13 | ||||
| -rw-r--r-- | ports/magnum-plugins/CONTROL | 1 | ||||
| -rw-r--r-- | ports/magnum-plugins/portfile.cmake | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/ports/magnum-plugins/002-fix-stb-conflict.patch b/ports/magnum-plugins/002-fix-stb-conflict.patch new file mode 100644 index 000000000..13d535b32 --- /dev/null +++ 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 index 24e3e2fbb..dee9a32de 100644 --- 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 index 62e4da7bc..766d91cfc 100644 --- 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) |