diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2020-03-28 04:37:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 20:37:33 -0700 |
| commit | edfce3b4558644d61fbef4c88ff4bd106b0809f8 (patch) | |
| tree | 9256e71392b4f2aa7f5c957b732bb9eb35d976fd /ports/magnum-plugins | |
| parent | 9efff1124a3ce8d648146a0b69c7cb38fb9ebe1e (diff) | |
| download | vcpkg-edfce3b4558644d61fbef4c88ff4bd106b0809f8.tar.gz vcpkg-edfce3b4558644d61fbef4c88ff4bd106b0809f8.zip | |
[magnum/magnum-plugins] Fix patches for --head builds (#10158)
* [magnum] Update patches for --head builds
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Remove obsolete patch
Since basisu port has been updated, we can now use it without patching
the magnum-plugins code for compatibility.
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade] Remove obsolete warning and flag
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum] Rename patches to reflect order of application
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade/magnum/magnum-plugins] Update port versions
Signed-off-by: Squareys <squareys@googlemail.com>
Diffstat (limited to 'ports/magnum-plugins')
| -rw-r--r-- | ports/magnum-plugins/003-use-outdated-basisu.patch | 27 | ||||
| -rw-r--r-- | ports/magnum-plugins/CONTROL | 2 | ||||
| -rw-r--r-- | ports/magnum-plugins/portfile.cmake | 1 |
3 files changed, 1 insertions, 29 deletions
diff --git a/ports/magnum-plugins/003-use-outdated-basisu.patch b/ports/magnum-plugins/003-use-outdated-basisu.patch deleted file mode 100644 index 61e7c52ac..000000000 --- a/ports/magnum-plugins/003-use-outdated-basisu.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL index 285c120fb..39d0d1016 100644 --- a/ports/magnum-plugins/CONTROL +++ b/ports/magnum-plugins/CONTROL @@ -1,5 +1,5 @@ Source: magnum-plugins -Version: 2019.10-1 +Version: 2019.10-2 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 cf458cf1f..1fc50e203 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -17,7 +17,6 @@ vcpkg_from_github( PATCHES 001-tools-path.patch ${_RELEASE_ONLY_PATCHES} - 003-use-outdated-basisu.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) |