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/portfile.cmake | |
| 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/portfile.cmake')
| -rw-r--r-- | ports/magnum-plugins/portfile.cmake | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index 96c87e77e..cf458cf1f 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -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 @@ -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) |