3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 14:58:00 +08:00
Code Issues Projects Releases Wiki Activity

[ashes] Updated port to 2022-04-03 (#23964)

Browse Source 
* [ashes] Updated port to 2022-04-03

* [ashes] Added license field.

* Nicole CR

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
This commit is contained in:
Sylvain Doremus 2022-04-06 23:04:12 +02:00 committed by GitHub
parent f387f27f13
commit ddb98dda38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ports/ashes/fix-cast.patch
View File

@ -1,39 +0,0 @@
diff --git a/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp b/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp
index fb9a195a..3a97e126 100644
--- a/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp
+++ b/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp
@@ -1688,7 +1688,7 @@ namespace ashes::d3d11
VkPeerMemoryFeatureFlags * pPeerMemoryFeatures )
{
reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" );
- *pPeerMemoryFeatures = VK_NULL_HANDLE;
+ *pPeerMemoryFeatures = static_cast<VkPeerMemoryFeatureFlags>(0);
}
void VKAPI_CALL vkCmdSetDeviceMask(
diff --git a/source/ashes/renderer/GlRenderer/ash_opengl.cpp b/source/ashes/renderer/GlRenderer/ash_opengl.cpp
index 45a17148..eec2419f 100644
--- a/source/ashes/renderer/GlRenderer/ash_opengl.cpp
+++ b/source/ashes/renderer/GlRenderer/ash_opengl.cpp
@@ -1700,7 +1700,7 @@ namespace ashes::gl
VkPeerMemoryFeatureFlags* pPeerMemoryFeatures )
{
reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" );
- *pPeerMemoryFeatures = VK_NULL_HANDLE;
+ *pPeerMemoryFeatures = static_cast<VkPeerMemoryFeatureFlags>(0);
}
void VKAPI_CALL vkCmdSetDeviceMask(
diff --git a/source/ashes/renderer/TestRenderer/ash_test.cpp b/source/ashes/renderer/TestRenderer/ash_test.cpp
index 741dd75c..b34647b8 100644
--- a/source/ashes/renderer/TestRenderer/ash_test.cpp
+++ b/source/ashes/renderer/TestRenderer/ash_test.cpp
@@ -1735,7 +1735,7 @@ namespace ashes::test
VkPeerMemoryFeatureFlags* pPeerMemoryFeatures )
{
reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" );
- *pPeerMemoryFeatures = VK_NULL_HANDLE;
+ *pPeerMemoryFeatures = static_cast<VkPeerMemoryFeatureFlags>(0);
}
void VKAPI_CALL vkCmdSetDeviceMask(

51
ports/ashes/portfile.cmake
View File

@ -1,27 +1,36 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DragonJoker/Ashes
REF 0f4e6d0ea308eb60ae32274acc9a4d345a4977ff
SHA512 0ce74780786d018e7a447c4e49d3cd83ad53b238a79fc484025e2034cd49a64253363cd592d2da367befa7cd5443b90eb1c5dae54b22756f7b4a0cdecb93c588
PATCHES
fix-cast.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DCMAKE_INSTALL_PREFIX=${CURRENT_INSTALLED_DIR}
-DPROJECTS_USE_PRECOMPILED_HEADERS=OFF
-DVCPKG_PACKAGE_BUILD=ON
-DASHES_BUILD_TEMPLATES=OFF
-DASHES_BUILD_TESTS=OFF
-DASHES_BUILD_INFO=OFF
-DASHES_BUILD_SAMPLES=OFF
OUT_SOURCE_PATH SOURCE_PATH
REPO DragonJoker/Ashes
REF f39ca2db24a9d7a2d586c85c78bb6eacd8d63b49
HEAD_REF master
SHA512 a45d443797ffe31305acca154640530c6ed767af9982d857b6e59841add3b0a373723f5f7b590512c1b0dd4064dfbae8aa8445fec59a3c3c2b8a3c002b180609
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ashes)
vcpkg_from_github(
OUT_SOURCE_PATH CMAKE_SOURCE_PATH
REPO DragonJoker/CMakeUtils
REF e2a9d422a02dab0e04f54b3e1bc515eba652a9d1
HEAD_REF master
SHA512 4ebd6141b9e5aa5283f31892da7108aa09fbd59292f0e98f2c9fe67577856f0af253184d41fdc16bb11094c4635401f181ea2e3abfa560adcf5c029f0d663b24
)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(REMOVE_RECURSE "${SOURCE_PATH}/CMake")
file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake")
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DCMAKE_INSTALL_PREFIX=${CURRENT_INSTALLED_DIR}
-DVCPKG_PACKAGE_BUILD=ON
-DASHES_BUILD_TEMPLATES=OFF
-DASHES_BUILD_TESTS=OFF
-DASHES_BUILD_INFO=OFF
-DASHES_BUILD_SAMPLES=OFF
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ashes)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

12
ports/ashes/vcpkg.json
View File

@ -1,13 +1,21 @@
{
"name": "ashes",
"version-date": "2021-06-18",
"port-version": 1,
"version-date": "2022-04-03",
"description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.",
"homepage": "https://github.com/DragonJoker/Ashes",
"license": "MIT",
"supports": "!osx & !linux & !ios & !android & !uwp & !x86 & !arm & !static",
"dependencies": [
"opengl",
"spirv-cross",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"vulkan-headers"
]
}

5
versions/a-/ashes.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "365d042da082df035fb7dba0a53e1a4ac306f469",
"version-date": "2022-04-03",
"port-version": 0
},
{
"git-tree": "68557018b215aba6325caf97248c62955fdef397",
"version-date": "2021-06-18",

4
versions/baseline.json
View File

@ -173,8 +173,8 @@
"port-version": 2
},
"ashes": {
"baseline": "2021-06-18",
"port-version": 1
"baseline": "2022-04-03",
"port-version": 0
},
"asio": {
"baseline": "1.22.1",