mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
gerbera: upgrade 1.11.0 -> 1.12.1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,37 +0,0 @@
|
||||
From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001
|
||||
From: Felix Yan <felixonmars@archlinux.org>
|
||||
Date: Fri, 19 Aug 2022 15:22:10 +0300
|
||||
Subject: [PATCH] Fix build with fmt 9.0
|
||||
|
||||
Fixes #2681
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/database/sql_format.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/database/sql_format.h b/src/database/sql_format.h
|
||||
index 32dc00ef..e4e1909a 100644
|
||||
--- a/src/database/sql_format.h
|
||||
+++ b/src/database/sql_format.h
|
||||
@@ -42,7 +42,7 @@ struct SQLIdentifier {
|
||||
template <>
|
||||
struct fmt::formatter<SQLIdentifier> : formatter<std::string_view> {
|
||||
template <typename FormatContext>
|
||||
- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out())
|
||||
+ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out())
|
||||
{
|
||||
return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end);
|
||||
}
|
||||
@@ -61,7 +61,7 @@ struct ColumnUpdate {
|
||||
template <>
|
||||
struct fmt::formatter<ColumnUpdate> : formatter<std::string_view> {
|
||||
template <typename FormatContext>
|
||||
- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out())
|
||||
+ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out())
|
||||
{
|
||||
return format_to(ctx.out(), "{} = {}", a.column, a.value);
|
||||
}
|
||||
--
|
||||
2.38.0.rc1.362.ged0d419d3c-goog
|
||||
|
||||
+1
-2
@@ -4,11 +4,10 @@ LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8"
|
||||
|
||||
SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master \
|
||||
file://0001-Fix-build-with-fmt-9.0.patch \
|
||||
file://0001-Fix-build-against-fmt-10.patch \
|
||||
"
|
||||
|
||||
SRCREV = "d73d8c1346213d784753c02ea771970500e0df2a"
|
||||
SRCREV = "559e1d1a92f5977ce8cff7393aa85330dbf2d1d6"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user