From 55846bb4dfc521909115a3880ae30fb5f02f64cd Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 13 Jun 2023 01:44:41 +0200 Subject: [PATCH] [vulkan-memory-allocator] add cstdio import for gcc13 (#31920) * [vulkan-memory-allocator] add cstdio import for gcc13 * version --- ports/vulkan-memory-allocator/gcc13.patch | 15 +++++++++++++++ ports/vulkan-memory-allocator/portfile.cmake | 2 ++ ports/vulkan-memory-allocator/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vulkan-memory-allocator.json | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/vulkan-memory-allocator/gcc13.patch diff --git a/ports/vulkan-memory-allocator/gcc13.patch b/ports/vulkan-memory-allocator/gcc13.patch new file mode 100644 index 0000000000..e76153fcd4 --- /dev/null +++ b/ports/vulkan-memory-allocator/gcc13.patch @@ -0,0 +1,15 @@ +diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h +index 60f5720..31164bc 100644 +--- a/include/vk_mem_alloc.h ++++ b/include/vk_mem_alloc.h +@@ -2578,6 +2578,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( + #include // For std::popcount + #endif + ++#if VMA_STATS_STRING_ENABLED ++ #include // For snprintf ++#endif ++ + /******************************************************************************* + CONFIGURATION SECTION + diff --git a/ports/vulkan-memory-allocator/portfile.cmake b/ports/vulkan-memory-allocator/portfile.cmake index c64df48a79..84377d7d66 100644 --- a/ports/vulkan-memory-allocator/portfile.cmake +++ b/ports/vulkan-memory-allocator/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF a6bfc237255a6bac1513f7c1ebde6d8aed6b5191 #v3.0.1 SHA512 14361ff201fd660c22b60de54c648ff20a2e2a7f65105f66853a9a4dbffbeca2ae42098dcb1528bb4e524639b92fa4ff27ebd3940c42ccfaf7c99c08bdd0d8ce HEAD_REF master + PATCHES + gcc13.patch # https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/29d492b60c84ca784ea0943efc7d2e6e0f3bdaac ) file(COPY "${SOURCE_PATH}/include/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") diff --git a/ports/vulkan-memory-allocator/vcpkg.json b/ports/vulkan-memory-allocator/vcpkg.json index ec3a725743..f0353db815 100644 --- a/ports/vulkan-memory-allocator/vcpkg.json +++ b/ports/vulkan-memory-allocator/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vulkan-memory-allocator", "version": "3.0.1", - "port-version": 1, + "port-version": 2, "description": "Easy to integrate Vulkan memory allocation library from GPUOpen", "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 8c7d939077..7aebd2686b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8510,7 +8510,7 @@ }, "vulkan-memory-allocator": { "baseline": "3.0.1", - "port-version": 1 + "port-version": 2 }, "vulkan-memory-allocator-hpp": { "baseline": "3.0.1", diff --git a/versions/v-/vulkan-memory-allocator.json b/versions/v-/vulkan-memory-allocator.json index 0c9d5deed3..d8d04a0d56 100644 --- a/versions/v-/vulkan-memory-allocator.json +++ b/versions/v-/vulkan-memory-allocator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0295d831ef2217a424c4739767ecde90e5bc7554", + "version": "3.0.1", + "port-version": 2 + }, { "git-tree": "49c724c78cf76e8858c92ce7b1acdc52fd9bf62b", "version": "3.0.1",