commit: c98c0fdfc61bd19436a022b940e65a088660071d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jun 21 05:20:48 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jun 21 06:01:09 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c98c0fdf
dev-util/vulkan-utility-libraries: adapt to >=dev-cpp/magic_enum-0.9.7 Just doing this in-stable given it's not like it built otherwise with older magic_enum because of the other location issues. Not that it matters much as it doesn't affect image but would normally care given new to-be-pushed magic_enum will be in ~arch. Bug: https://bugs.gentoo.org/933479 Signed-off-by: Sam James <sam <AT> gentoo.org> ...lity-libraries-1.4.313.0-magic_enum-0.9.7.patch | 26 ++++++++++++++++++++++ .../vulkan-utility-libraries-1.4.313.0.ebuild | 4 ++++ .../vulkan-utility-libraries-9999.ebuild | 4 ++++ 3 files changed, 34 insertions(+) diff --git a/dev-util/vulkan-utility-libraries/files/vulkan-utility-libraries-1.4.313.0-magic_enum-0.9.7.patch b/dev-util/vulkan-utility-libraries/files/vulkan-utility-libraries-1.4.313.0-magic_enum-0.9.7.patch new file mode 100644 index 000000000000..248376513821 --- /dev/null +++ b/dev-util/vulkan-utility-libraries/files/vulkan-utility-libraries-1.4.313.0-magic_enum-0.9.7.patch @@ -0,0 +1,26 @@ +Per https://github.com/Neargye/magic_enum/releases/tag/v0.9.7 +> [breaking changes] Need to use #include <magic_enum/magic_enum.hpp> instead of #include <magic_enum.hpp> +--- a/tests/test_formats.cpp ++++ b/tests/test_formats.cpp +@@ -8,8 +8,8 @@ + #include <gtest/gtest.h> + #define MAGIC_ENUM_RANGE_MIN 0 + #define MAGIC_ENUM_RANGE_MAX 512 +-#include <magic_enum.hpp> +-#include <magic_enum_flags.hpp> ++#include <magic_enum/magic_enum.hpp> ++#include <magic_enum/magic_enum_flags.hpp> + #include <vulkan/utility/vk_format_utils.h> + + #include <string_view> +--- a/tests/vk_enum_string_helper.cpp ++++ b/tests/vk_enum_string_helper.cpp +@@ -5,7 +5,7 @@ + // SPDX-License-Identifier: Apache-2.0 + #include <vulkan/vk_enum_string_helper.h> + +-#include <magic_enum.hpp> ++#include <magic_enum/magic_enum.hpp> + + #include <gtest/gtest.h> + diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.313.0.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.313.0.ebuild index a74cbadb0d5c..a794a0a3268e 100644 --- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.313.0.ebuild +++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.313.0.ebuild @@ -33,6 +33,10 @@ DEPEND="~dev-util/vulkan-headers-${PV} )" BDEPEND="${PYTHON_DEPS}" +PATCHES=( + "${FILESDIR}"/${PN}-1.4.313.0-magic_enum-0.9.7.patch +) + multilib_src_configure() { local mycmakeargs=( -DBUILD_TESTS=$(usex test ON OFF) diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild index afaede96fa4d..ab406b258820 100644 --- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild +++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild @@ -33,6 +33,10 @@ DEPEND="~dev-util/vulkan-headers-${PV} )" BDEPEND="${PYTHON_DEPS}" +PATCHES=( + "${FILESDIR}"/${PN}-1.4.313.0-magic_enum-0.9.7.patch +) + multilib_src_configure() { local mycmakeargs=( -DBUILD_TESTS=$(usex test ON OFF)
