aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Facioni <francisco@remyrobotics.com>2021-03-16 19:51:57 +0100
committerGitHub <noreply@github.com>2021-03-16 11:51:57 -0700
commit37df5123352fbb89411b4655e730767f35e30a30 (patch)
treef726e9ba111304cc911219fd4fbe33dfe65488ef
parentefeb03d2023255c2a3c3080b805dfb2fbee32fa4 (diff)
downloadvcpkg-37df5123352fbb89411b4655e730767f35e30a30.tar.gz
vcpkg-37df5123352fbb89411b4655e730767f35e30a30.zip
[magnum/magnum-plugins] fix all magnum dependencies being built (#16657)
-rw-r--r--ports/magnum-plugins/CONTROL60
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/m-/magnum-plugins.json5
3 files changed, 36 insertions, 31 deletions
diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
index 1826224b7..49a692393 100644
--- a/ports/magnum-plugins/CONTROL
+++ b/ports/magnum-plugins/CONTROL
@@ -1,6 +1,6 @@
Source: magnum-plugins
Version: 2020.06
-Port-Version: 3
+Port-Version: 4
Build-Depends: magnum[core]
Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization
Homepage: https://magnum.graphics/
@@ -8,118 +8,118 @@ Default-Features: ddsimporter, icoimporter, miniexrimageconverter, opengeximport
Feature: assimpimporter
Description: AssimpImporter plugin
-Build-Depends: assimp, magnum[anyimageimporter], magnum[trade]
+Build-Depends: assimp, magnum[core,anyimageimporter], magnum[core,trade]
Feature: openddl
Description: OpenDdl library
Feature: basisimageconverter
Description: BasisImageConverter plugin
-Build-Depends: magnum[trade]
+Build-Depends: magnum[core,trade]
Feature: basisimporter
Description: BasisImporter plugin
-Build-Depends: magnum[trade]
+Build-Depends: magnum[core,trade]
Feature: ddsimporter
Description: DdsImporter plugin
-Build-Depends: magnum[trade]
+Build-Depends: magnum[core,trade]
Feature: devilimageimporter
Description: DevIlImageImporter plugin
-Build-Depends: devil, magnum[trade]
+Build-Depends: devil, magnum[core,trade]
Feature: drflacaudioimporter
Description: DrFlacAudioImporter plugin
-Build-Depends: magnum[audio]
+Build-Depends: magnum[core,audio]
Feature: drmp3audioimporter
Description: DrMp3AudioImporter plugin
-Build-Depends: magnum[audio]
+Build-Depends: magnum[core,audio]
Feature: drwavaudioimporter
Description: DrWavAudioImporter plugin
-Build-Depends: magnum[audio]
+Build-Depends: magnum[core,audio]
#Feature: faad2audioimporter
#Description: Faad2AudioImporter plugin
-#Build-Depends: magnum[audio], faad2
+#Build-Depends: magnum[core,audio], faad2
Feature: freetypefont
Description: FreeTypeFont plugin
-Build-Depends: freetype, magnum[text]
+Build-Depends: freetype, magnum[core,text]
Feature: glslangshaderconverter
Description: GlslangShaderConverter plugin
-Build-Depends: glslang, magnum[shadertools]
+Build-Depends: glslang, magnum[core,shadertools]
Feature: harfbuzzfont
Description: HarfBuzzFont plugin
-Build-Depends: harfbuzz, magnum-plugins[freetypefont]
+Build-Depends: harfbuzz, magnum-plugins[core,freetypefont]
Feature: icoimporter
Description: IcoImporter plugin
-Build-Depends: magnum[trade]
+Build-Depends: magnum[core,trade]
Feature: jpegimporter
Description: JpegImporter plugin
-Build-Depends: libjpeg-turbo, magnum[trade]
+Build-Depends: libjpeg-turbo, magnum[core,trade]
Feature: jpegimageconverter
Description: JpegImageConverter plugin
-Build-Depends: libjpeg-turbo, magnum[trade]
+Build-Depends: libjpeg-turbo, magnum[core,trade]
Feature: meshoptimizersceneconverter
Description: MeshOptimizerSceneConverter plugin
-Build-Depends: magnum[trade], meshoptimizer
+Build-Depends: magnum[core,trade], meshoptimizer
Feature: miniexrimageconverter
Description: MiniExrImageConverter plugin
-Build-Depends: magnum[trade]
+Build-Depends: magnum[core,trade]
Feature: opengeximporter
Description: OpenGexImporter plugin
-Build-Depends: magnum[anyimageimporter], magnum[trade], magnum-plugins[openddl]
+Build-Depends: magnum[core,anyimageimporter], magnum[core,trade], magnum-plugins[core,openddl]
Feature: pngimageconverter
Description: PngImageConverter plugin
-Build-Depends: libpng, magnum[trade]
+Build-Depends: libpng, magnum[core,trade]
Feature: pngimporter
Description: PngImporter plugin
-Build-Depends: libpng, magnum[trade]
+Build-Depends: libpng, magnum[core,trade]
Feature: spirvtoolsshaderconverter
Description: SpirvToolsShaderConverter plugin
-Build-Depends: spirv-tools, magnum[shadertools]
+Build-Depends: spirv-tools, magnum[core,shadertools]
Feature: stanfordimporter
Description: StanfordImporter plugin
-Build-Depends: magnum[trade]
+Build-Depends: magnum[core,trade]
Feature: stanfordsceneconverter
Description: StanfordSceneConverter plugin
-Build-Depends: magnum[trade]
+Build-Depends: magnum[core,trade]
Feature: stbimageconverter
Description: StbImageConverter plugin
-Build-Depends: magnum[trade]
+Build-Depends: magnum[core,trade]
Feature: stbimageimporter
Description: StbImageImporter plugin
-Build-Depends: magnum[trade]
+Build-Depends: magnum[core,trade]
Feature: stbtruetypefont
Description: StbTrueTypeFont plugin
-Build-Depends: magnum[text]
+Build-Depends: magnum[core,text]
Feature: stbvorbisaudioimporter
Description: StbVorbisAudioImporter plugin
-Build-Depends: magnum[audio]
+Build-Depends: magnum[core,audio]
Feature: stlimporter
Description: StlImporter plugin
-Build-Depends: magnum[trade]
+Build-Depends: magnum[core,trade]
Feature: tinygltfimporter
Description: TinyGltfImporter plugin
-Build-Depends: magnum[anyimageimporter], magnum-plugins[stbimageimporter], magnum[trade]
+Build-Depends: magnum[core,anyimageimporter], magnum-plugins[core,stbimageimporter], magnum[core,trade]
diff --git a/versions/baseline.json b/versions/baseline.json
index c31882ac4..3878d3a91 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3714,7 +3714,7 @@
},
"magnum-plugins": {
"baseline": "2020.06",
- "port-version": 3
+ "port-version": 4
},
"mapbox-variant": {
"baseline": "1.2.0",
diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json
index 3ab660883..3a50a7ca9 100644
--- a/versions/m-/magnum-plugins.json
+++ b/versions/m-/magnum-plugins.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "05b4c54140907b0b46926c50e0b56bc80051b218",
+ "version-string": "2020.06",
+ "port-version": 4
+ },
+ {
"git-tree": "79988d3cd16038434cacef0e4423f3b2e64f0a1b",
"version-string": "2020.06",
"port-version": 3