mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-16 15:25:53 +01:00
gerbera: Fix build with fmt 8.1+
The APIs have changes and we use external fmt library in spdlog which is used here Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
1746b37937
commit
5a69735514
|
|
@ -0,0 +1,46 @@
|
|||
From 22b3a91473d548456a0823f9f170db0d7db5a444 Mon Sep 17 00:00:00 2001
|
||||
From: kyak <bas@bmail.ru>
|
||||
Date: Wed, 12 Jan 2022 19:41:37 +0300
|
||||
Subject: [PATCH] Fix for fmt > 8.0
|
||||
|
||||
Upstream-Status: Backport [https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/util/logger.h | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/src/util/logger.h b/src/util/logger.h
|
||||
index 8a8f0b1f..0a512bff 100644
|
||||
--- a/src/util/logger.h
|
||||
+++ b/src/util/logger.h
|
||||
@@ -32,7 +32,9 @@
|
||||
#ifndef __LOGGER_H__
|
||||
#define __LOGGER_H__
|
||||
|
||||
+#include <fmt/format.h>
|
||||
#include <spdlog/spdlog.h>
|
||||
+#include <type_traits>
|
||||
|
||||
#define log_debug SPDLOG_DEBUG
|
||||
#define log_info SPDLOG_INFO
|
||||
@@ -40,4 +42,17 @@
|
||||
#define log_error SPDLOG_ERROR
|
||||
#define log_js SPDLOG_INFO
|
||||
|
||||
+#if FMT_VERSION >= 80100
|
||||
+template <typename T>
|
||||
+struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>>
|
||||
+ : formatter<std::underlying_type_t<T>> {
|
||||
+ template <typename FormatContext>
|
||||
+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out())
|
||||
+ {
|
||||
+ return fmt::formatter<std::underlying_type_t<T>>::format(
|
||||
+ static_cast<std::underlying_type_t<T>>(value), ctx);
|
||||
+ }
|
||||
+};
|
||||
+#endif
|
||||
+
|
||||
#endif // __LOGGER_H__
|
||||
--
|
||||
2.35.0
|
||||
|
||||
|
|
@ -4,6 +4,7 @@ LICENSE = "GPLv2"
|
|||
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8"
|
||||
|
||||
SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https;branch=master \
|
||||
file://0001-Fix-for-fmt-8.0.patch \
|
||||
"
|
||||
|
||||
SRCREV = "3b93d362ec33f738868a4e896a2c9ee8e9d7a92a"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user