diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2019-11-25 19:31:55 +0100 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-11-25 10:31:55 -0800 |
| commit | a3ab4500a4fbe26bdd6b8a671e2a1dc44112f5eb (patch) | |
| tree | 7728dba538c7e052fc7bed994340f09af177d10a /ports/magnum-plugins/003-use-outdated-basisu.patch | |
| parent | 4603d007c2ed1e5119f929ee4e1a91edb3f63820 (diff) | |
| download | vcpkg-a3ab4500a4fbe26bdd6b8a671e2a1dc44112f5eb.tar.gz vcpkg-a3ab4500a4fbe26bdd6b8a671e2a1dc44112f5eb.zip | |
[magnum-plugins] Fix basisimporter/basisimageconverter features (#8939)
* [magnum-plugins] Patch FindBasisUniversal to find prebuilt basisu
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Patch BasisImporter to use slightly outdated basisu
jherico's fork which the vcpkg port is based on does not integrate
https://github.com/BinomialLLC/basis_universal/commit/54304fa01443280bbaa9854f16c9f1756b17b40b
yet, which renamed a parameter.
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Only apply FindBasisUniversal patch on release
The change is integrated upstream for --head builds already.
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Download large patch from GitHub history
Diffstat (limited to 'ports/magnum-plugins/003-use-outdated-basisu.patch')
| -rw-r--r-- | ports/magnum-plugins/003-use-outdated-basisu.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/ports/magnum-plugins/003-use-outdated-basisu.patch b/ports/magnum-plugins/003-use-outdated-basisu.patch new file mode 100644 index 000000000..61e7c52ac --- /dev/null +++ b/ports/magnum-plugins/003-use-outdated-basisu.patch @@ -0,0 +1,27 @@ +From 4d59a1eafc7a5828a0dedc92a713b3394d5f64fc Mon Sep 17 00:00:00 2001 +From: Squareys <squareys@googlemail.com> +Date: Wed, 6 Nov 2019 18:45:17 +0100 +Subject: [PATCH] fix vcpkg build + +--- + src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp b/src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp +index db3a39cb..d5c80b11 100644 +--- a/src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp ++++ b/src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp +@@ -106,7 +106,9 @@ Containers::Array<char> BasisImageConverter::doExportToData(const ImageView2D& i + + /* Hierarchical virtual selector codebook options */ + PARAM_CONFIG_FIX_NAME(global_sel_pal, bool, "global_selector_palette"); +- PARAM_CONFIG_FIX_NAME(auto_global_sel_pal, bool, "auto_global_selector_palette"); ++ /* vcpkg version is begind 54304fa01443280bbaa9854f16c9f1756b17b40b, which changes name ++ * to m_auto_global_sel_pal */ ++ params.m_no_auto_global_sel_pal = !configuration().value<bool>("auto_global_selector_palette"); + PARAM_CONFIG_FIX_NAME(no_hybrid_sel_cb, bool, "no_hybrid_selector_codebook"); + PARAM_CONFIG_FIX_NAME(global_pal_bits, int, "global_palette_bits"); + PARAM_CONFIG_FIX_NAME(global_mod_bits, int, "global_modifier_bits"); +-- +2.17.0.windows.1 + |