mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

vulkan-samples: Drop using u8string_view

Browse Source 
Its deprecated in upstream fmt as well. Moreover it helps compile with
latest compiler

(From OE-Core rev: 01ef766ada47cd845643c632160e1808fa237d1c)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2023-01-17 15:18:52 -08:00
committed by Richard Purdie
parent 7aadc3e227
commit 351243a0ca
2 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch Normal file
View File

@@ -0,0 +1,59 @@
From 93987b1ce7d6f91387202495aac61026070597df Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 15 Jan 2023 21:37:52 -0800
Subject: [PATCH] Deprecate u8string_view
Use basic_string_view instead
Upstream-Status: Backport [https://github.com/fmtlib/fmt/commit/dea7fde8b7d649923dd41b0766bdf076033c62a2]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/spdlog/fmt/bundled/core.h | 3 ++-
include/spdlog/fmt/bundled/format.h | 15 ++-------------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/include/spdlog/fmt/bundled/core.h b/include/spdlog/fmt/bundled/core.h
index 50b79351..e8b029ef 100644
--- a/include/spdlog/fmt/bundled/core.h
+++ b/include/spdlog/fmt/bundled/core.h
@@ -1484,7 +1484,8 @@ FMT_API void vprint(wstring_view format_str, wformat_args args);
/**
\rst
- Prints formatted data to ``stdout``.
+ Formats ``args`` according to specifications in ``format_str`` and writes the
+ output to ``stdout``.
**Example**::
diff --git a/include/spdlog/fmt/bundled/format.h b/include/spdlog/fmt/bundled/format.h
index 1bb24a52..39426361 100644
--- a/include/spdlog/fmt/bundled/format.h
+++ b/include/spdlog/fmt/bundled/format.h
@@ -407,21 +407,10 @@ void basic_buffer<T>::append(const U *begin, const U *end) {
enum char8_t: unsigned char {};
#endif
-// A UTF-8 string view.
-class u8string_view : public basic_string_view<char8_t> {
- public:
- typedef char8_t char_type;
-
- u8string_view(const char *s):
- basic_string_view<char8_t>(reinterpret_cast<const char8_t*>(s)) {}
- u8string_view(const char *s, size_t count) FMT_NOEXCEPT:
- basic_string_view<char8_t>(reinterpret_cast<const char8_t*>(s), count) {}
-};
-
#if FMT_USE_USER_DEFINED_LITERALS
inline namespace literals {
-inline u8string_view operator"" _u(const char *s, std::size_t n) {
- return {s, n};
+inline basic_string_view<char8_t> operator"" _u(const char* s, std::size_t n) {
+ return {reinterpret_cast<const char8_t*>(s), n};
}
}
#endif
--
2.39.0

1
meta/recipes-graphics/vulkan/vulkan-samples_git.bb
View File

@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https;lfs=0 \
file://debugfix.patch \
file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch;patchdir=third_party/spdlog \
file://0001-Deprecate-u8string_view.patch;patchdir=third_party/spdlog \
"
UPSTREAM_CHECK_COMMITS = "1"