From 8ea39c479c1061c45c61084da67e90c9639c5215 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 4 Nov 2023 13:47:26 -0700 Subject: gerbera: upgrade 1.11.0 -> 1.12.1 Signed-off-by: Khem Raj --- .../gerbera/0001-Fix-build-with-fmt-9.0.patch | 37 ---------------------- .../recipes-multimedia/gerbera/gerbera_1.11.0.bb | 32 ------------------- .../recipes-multimedia/gerbera/gerbera_1.12.1.bb | 31 ++++++++++++++++++ 3 files changed, 31 insertions(+), 69 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch delete mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb create mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb (limited to 'meta-multimedia') 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 -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 ---- - 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 : formatter { - template -- 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 : formatter { - template -- 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.11.0.bb deleted file mode 100644 index 2a6d328711..0000000000 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -Description = "Gerbera - An UPnP media server" - -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" - -S = "${WORKDIR}/git" - -DEPENDS = "expat fmt spdlog pugixml libebml libmatroska zlib curl libupnp e2fsprogs sqlite3 libnsl2" - -SYSTEMD_SERVICE:${PN} = "gerbera.service" - -inherit cmake pkgconfig systemd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd" -PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib" -EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_INCLUDE_DIRS=${STAGING_INCDIR} -DLIBUUID_LIBRARIES=-luuid" - -do_install:append() { - install -d ${D}/root/.config/ -} - -FILES:${PN} += "/root/.config/" - -SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb new file mode 100644 index 0000000000..89cc51e0ea --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb @@ -0,0 +1,31 @@ +Description = "Gerbera - An UPnP media server" + +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-against-fmt-10.patch \ + " + +SRCREV = "559e1d1a92f5977ce8cff7393aa85330dbf2d1d6" + +S = "${WORKDIR}/git" + +DEPENDS = "expat fmt spdlog pugixml libebml libmatroska zlib curl libupnp e2fsprogs sqlite3 libnsl2" + +SYSTEMD_SERVICE:${PN} = "gerbera.service" + +inherit cmake pkgconfig systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd" +PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib" +EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_INCLUDE_DIRS=${STAGING_INCDIR} -DLIBUUID_LIBRARIES=-luuid" + +do_install:append() { + install -d ${D}/root/.config/ +} + +FILES:${PN} += "/root/.config/" + +SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" -- cgit v1.2.3-54-g00ecf