Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[magnum-plugins] Fix basisimporter/basisimageconverter features #8939

Merged
merged 4 commits into from
Nov 25, 2019
Merged

[magnum-plugins] Fix basisimporter/basisimageconverter features #8939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9cbac8
[magnum-plugins] Patch FindBasisUniversal to find prebuilt basisu
Squareys Nov 6, 2019
23491fb
[magnum-plugins] Patch BasisImporter to use slightly outdated basisu
Squareys Nov 6, 2019
81d158b
[magnum-plugins] Only apply FindBasisUniversal patch on release
Squareys Nov 7, 2019
8a631de
[magnum-plugins] Download large patch from GitHub history
ras0219-msft Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions ports/magnum-plugins/003-use-outdated-basisu.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion ports/magnum-plugins/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: magnum-plugins
Version: 2019.10
Version: 2019.10-1
Build-Depends: magnum[core]
Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization
Homepage: https://magnum.graphics/
Expand Down
13 changes: 12 additions & 1 deletion ports/magnum-plugins/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
include(vcpkg_common_functions)
set(_RELEASE_ONLY_PATCHES)
if(NOT VCPKG_USE_HEAD_VERSION)
vcpkg_download_distfile(
_RELEASE_ONLY_PATCHES
URLS "https://github.com/mosra/magnum-plugins/commit/c2a05465fa43befbb628b424378e328fa42923b7.diff"
FILENAME "c2a05465fa43befbb628b424378e328fa42923b7.diff"
SHA512 e03953ff7319b3b8e3644b8e25c006a856dd6a85cec6e4c033f9b2059af7ae39ed84b76c11c93c41ea6a681d7f34dd5980806f49f760d1c26778047c90cc76df
)
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum-plugins
Expand All @@ -7,6 +16,8 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
001-tools-path.patch
${_RELEASE_ONLY_PATCHES}
003-use-outdated-basisu.patch
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
Expand Down