early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp b/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp
index c24a968..1a38162 100644
--- a/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp
+++ b/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp
@@ -45,7 +45,7 @@
#endif
/* Not defining malloc/free, because there's no equivalent for realloc in C++ */
-#include "stb_image.h"
+#include "external/stb/stb_image.h"
namespace Magnum { namespace Trade {

View File

@@ -0,0 +1,134 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum-plugins
REF v2020.06
SHA512 3c11c2928bfc9d04c1ad64f72b6ffac6cf80a1ef3aacc5d0486b9ad955cf4f6ea6d5dcb3846dc5d73f64ec522a015eafb997f62c79ad7ff91169702341f23af0
HEAD_REF master
PATCHES
002-fix-stb-conflict.patch
)
if("basisimporter" IN_LIST FEATURES OR "basisimageconverter" IN_LIST FEATURES)
# Bundle Basis Universal. The repo has big unrequired files in its
# history, so we're downloading just a snapshot instead of a git clone.
if(VCPKG_USE_HEAD_VERSION)
# v1_15_update2
set(_BASIS_VERSION "v1_15_update2")
set(_BASIS_SHA512 "a898a057b57ac64f6c0bf5fce0b599e23421ccdd015ea7bb668bce8b9292ef55b098f3d05854a2fb5363959932b75cd0a842664ae7d4f71f3537dc11301c1b32")
else()
# A commit that's before the UASTC support (which is not implemented yet)
vcpkg_download_distfile(
_BASIS_UNIVERSAL_PATCHES
URLS "https://github.com/BinomialLLC/basis_universal/commit/e9c55faac7745ebf38d08cd3b4f71aaf542f8191.diff"
FILENAME "e9c55faac7745ebf38d08cd3b4f71aaf542f8191.patch"
SHA512 e5dda11de2ba8cfd39728e69c74a7656bb522e509786fe5673c94b26be9bd4bee897510096479ee6323f5276d34cba1c44c60804a515c0b35ff7b6ac9d625b88
)
set(_BASIS_VERSION "8565af680d1bd2ad56ab227ca7d96c56dfbe93ed")
set(_BASIS_SHA512 "65062ab3ba675c46760f56475a7528189ed4097fb9bab8316e25d9e23ffec2a9560eb9a6897468baf2a6ab2bd698b5907283e96deaeaef178085a47f9d371bb2")
endif()
vcpkg_download_distfile(
_BASIS_UNIVERSAL_ARCHIVE
URLS "https://github.com/BinomialLLC/basis_universal/archive/${_BASIS_VERSION}.tar.gz"
FILENAME "basis-universal-${_BASIS_VERSION}.tar.gz"
SHA512 ${_BASIS_SHA512}
)
vcpkg_extract_source_archive(
_BASIS_UNIVERSAL_SOURCE
ARCHIVE ${_BASIS_UNIVERSAL_ARCHIVE}
WORKING_DIRECTORY "${SOURCE_PATH}/src/external"
PATCHES
${_BASIS_UNIVERSAL_PATCHES})
# Remove potentially cached directory which would cause renaming to fail
file(REMOVE_RECURSE "${SOURCE_PATH}/src/external/basis-universal")
# Rename the output folder so that magnum auto-detects it
file(RENAME ${_BASIS_UNIVERSAL_SOURCE} "${SOURCE_PATH}/src/external/basis-universal")
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(BUILD_PLUGINS_STATIC 1)
else()
set(BUILD_PLUGINS_STATIC 0)
endif()
# Head only features
set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES})
if(NOT VCPKG_USE_HEAD_VERSION)
list(REMOVE_ITEM ALL_SUPPORTED_FEATURES cgltfimporter glslangshaderconverter
ktximageconverter ktximporter openexrimageconverter openexrimporter
spirvtoolsshaderconverter stbdxtimageconverter)
message(WARNING "Features cgltfimporter, glslangshaderconverter, ktximageconverter, ktximporter, openexrimageconverter, openexrimporter, spirvtoolsshaderconverter and stbdxtimageconverter are not available when building non-head version.")
endif()
set(_COMPONENTS "")
# Generate cmake parameters from feature names
foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES)
# Uppercase the feature name and replace "-" with "_"
string(TOUPPER "${_feature}" _FEATURE)
string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
# Final feature is empty, ignore it
if(_feature)
list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE})
endif()
endforeach()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
${FEATURE_OPTIONS}
-DBUILD_STATIC=${BUILD_PLUGINS_STATIC}
-DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}
-DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
-DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum
)
vcpkg_cmake_install()
# Debug includes and share are the same as release
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share)
# Clean up empty directories, if not building anything.
# FEATURES may only contain "core", but that does not build anything.
if(NOT FEATURES OR FEATURES STREQUAL "core")
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/bin
${CURRENT_PACKAGES_DIR}/lib
${CURRENT_PACKAGES_DIR}/debug)
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
# move plugin libs to conventional place
file(GLOB_RECURSE LIB_TO_MOVE ${CURRENT_PACKAGES_DIR}/lib/magnum/*)
file(COPY ${LIB_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
file(GLOB_RECURSE LIB_TO_MOVE_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*)
file(COPY ${LIB_TO_MOVE_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum)
else()
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
# On windows, plugins are "Modules" that cannot be linked as shared
# libraries, but are meant to be loaded at runtime.
# While this is handled adequately through the CMake project, the auto-magic
# linking with visual studio might try to link the import libs anyway.
#
# We delete the import libraries here to avoid the auto-magic linking
# for plugins which are loaded at runtime.
if(WIN32)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d)
endif()
endif()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
RENAME copyright)
vcpkg_copy_pdbs()

View File

@@ -0,0 +1,494 @@
{
"name": "magnum-plugins",
"version-string": "2020.06",
"port-version": 8,
"description": "Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization",
"homepage": "https://magnum.graphics/",
"dependencies": [
{
"name": "magnum",
"default-features": false
},
{
"name": "vcpkg-cmake",
"host": true
}
],
"default-features": [
"cgltfimporter",
"ddsimporter",
"icoimporter",
"ktximageconverter",
"ktximporter",
"miniexrimageconverter",
"opengeximporter",
"stanfordimporter",
"stanfordsceneconverter",
"stbimageconverter",
"stbimageimporter",
"stlimporter"
],
"features": {
"assimpimporter": {
"description": "AssimpImporter plugin",
"dependencies": [
"assimp",
{
"name": "magnum",
"default-features": false,
"features": [
"anyimageimporter"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"basisimageconverter": {
"description": "BasisImageConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
},
"zstd"
]
},
"basisimporter": {
"description": "BasisImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
},
"zstd"
]
},
"cgltfimporter": {
"description": "CgltfImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"anyimageimporter"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"ddsimporter": {
"description": "DdsImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"devilimageimporter": {
"description": "DevIlImageImporter plugin",
"dependencies": [
"devil",
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"drflacaudioimporter": {
"description": "DrFlacAudioImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"audio"
]
}
]
},
"drmp3audioimporter": {
"description": "DrMp3AudioImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"audio"
]
}
]
},
"drwavaudioimporter": {
"description": "DrWavAudioImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"audio"
]
}
]
},
"freetypefont": {
"description": "FreeTypeFont plugin",
"dependencies": [
"freetype",
{
"name": "magnum",
"default-features": false,
"features": [
"text"
]
}
]
},
"glslangshaderconverter": {
"description": "GlslangShaderConverter plugin",
"dependencies": [
"glslang",
{
"name": "magnum",
"default-features": false,
"features": [
"shadertools"
]
}
]
},
"harfbuzzfont": {
"description": "HarfBuzzFont plugin",
"dependencies": [
"harfbuzz",
{
"name": "magnum-plugins",
"default-features": false,
"features": [
"freetypefont"
]
}
]
},
"icoimporter": {
"description": "IcoImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"jpegimageconverter": {
"description": "JpegImageConverter plugin",
"dependencies": [
"libjpeg-turbo",
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"jpegimporter": {
"description": "JpegImporter plugin",
"dependencies": [
"libjpeg-turbo",
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"ktximageconverter": {
"description": "KtxImageConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"ktximporter": {
"description": "KtxImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"meshoptimizersceneconverter": {
"description": "MeshOptimizerSceneConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
},
"meshoptimizer"
]
},
"miniexrimageconverter": {
"description": "MiniExrImageConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"openddl": {
"description": "OpenDdl library"
},
"openexrimageconverter": {
"description": "OpenExrImageConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
},
"openexr"
]
},
"openexrimporter": {
"description": "OpenExrImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
},
"openexr"
]
},
"opengeximporter": {
"description": "OpenGexImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"anyimageimporter"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
},
{
"name": "magnum-plugins",
"default-features": false,
"features": [
"openddl"
]
}
]
},
"pngimageconverter": {
"description": "PngImageConverter plugin",
"dependencies": [
"libpng",
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"pngimporter": {
"description": "PngImporter plugin",
"dependencies": [
"libpng",
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"spirvtoolsshaderconverter": {
"description": "SpirvToolsShaderConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"shadertools"
]
},
"spirv-tools"
]
},
"stanfordimporter": {
"description": "StanfordImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"stanfordsceneconverter": {
"description": "StanfordSceneConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"stbdxtimageconverter": {
"description": "StbDxtImageConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"stbimageconverter": {
"description": "StbImageConverter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"stbimageimporter": {
"description": "StbImageImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"stbtruetypefont": {
"description": "StbTrueTypeFont plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"text"
]
}
]
},
"stbvorbisaudioimporter": {
"description": "StbVorbisAudioImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"audio"
]
}
]
},
"stlimporter": {
"description": "StlImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
},
"tinygltfimporter": {
"description": "TinyGltfImporter plugin",
"dependencies": [
{
"name": "magnum",
"default-features": false,
"features": [
"anyimageimporter"
]
},
{
"name": "magnum",
"default-features": false,
"features": [
"trade"
]
}
]
}
}
}