diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-11-04 13:47:26 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-11-06 08:48:27 -0800 |
commit | 8ea39c479c1061c45c61084da67e90c9639c5215 (patch) | |
tree | 951f40a6673f0e1323a41e1405aa48f1c8c9b32d /meta-multimedia | |
parent | 560ca7fdcfb714973256e8538ee9b94e7b6b3ba8 (diff) | |
download | meta-openembedded-contrib-8ea39c479c1061c45c61084da67e90c9639c5215.tar.gz |
gerbera: upgrade 1.11.0 -> 1.12.1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r-- | meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch | 37 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb (renamed from meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb) | 3 |
2 files changed, 1 insertions, 39 deletions
diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch deleted file mode 100644 index bb8e438304..0000000000 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch +++ /dev/null @@ -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 - diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb index 2a6d328711..89cc51e0ea 100644 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb @@ -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" |