diff options
Diffstat (limited to 'dev-util/vulkan-utility-libraries')
3 files changed, 56 insertions, 2 deletions
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..dffad6c7f418 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 @@ -6,7 +6,7 @@ EAPI=8 MY_PN=Vulkan-Utility-Libraries PYTHON_COMPAT=( python3_{11..14} ) PYTHON_REQ_USE="xml(+)" -inherit cmake-multilib python-any-r1 +inherit cmake-multilib dot-a python-any-r1 if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" @@ -33,9 +33,23 @@ DEPEND="~dev-util/vulkan-headers-${PV} )" BDEPEND="${PYTHON_DEPS}" +PATCHES=( + "${FILESDIR}"/${PN}-1.4.313.0-magic_enum-0.9.7.patch +) + +src_configure() { + lto-guarantee-fat + multilib-minimal_src_configure +} + multilib_src_configure() { local mycmakeargs=( -DBUILD_TESTS=$(usex test ON OFF) ) cmake_src_configure } + +multilib_src_install_all() { + einstalldocs + strip-lto-bytecode +} 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..a2d1fe03e8a5 100644 --- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild +++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 MY_PN=Vulkan-Utility-Libraries PYTHON_COMPAT=( python3_{11..14} ) PYTHON_REQ_USE="xml(+)" -inherit cmake-multilib python-any-r1 +inherit cmake-multilib dot-a python-any-r1 if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" @@ -33,9 +33,23 @@ DEPEND="~dev-util/vulkan-headers-${PV} )" BDEPEND="${PYTHON_DEPS}" +PATCHES=( + "${FILESDIR}"/${PN}-1.4.313.0-magic_enum-0.9.7.patch +) + +src_configure() { + lto-guarantee-fat + multilib-minimal_src_configure +} + multilib_src_configure() { local mycmakeargs=( -DBUILD_TESTS=$(usex test ON OFF) ) cmake_src_configure } + +multilib_src_install_all() { + einstalldocs + strip-lto-bytecode +} |