From 39d43ab3b96aab25fb82af55a0ea9bef2cecdbc3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 24 Jan 2022 10:25:45 -0800 Subject: gerbera: Upgrade to 1.9.2 Drop upstreamed patch Signed-off-by: Khem Raj --- .../gerbera/0001-include-optional-header.patch | 32 ---------------------- .../recipes-multimedia/gerbera/gerbera_1.7.0.bb | 31 --------------------- .../recipes-multimedia/gerbera/gerbera_1.9.2.bb | 30 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 63 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch delete mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb create mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch deleted file mode 100644 index f3197f937b..0000000000 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5719ed8ce9ba60beb9c1670b49296b1c66430dc2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 2 Mar 2021 12:57:37 -0800 -Subject: [PATCH] include header - -Fixes build with gcc11 -/src/util/tools.h:165:6: error: 'optional' in na -mespace 'std' does not name a template type -| 165 | std::optional> readBinaryFile(const fs::path& path); -| | ^~~~~~~~ - -Upstream-Status: Submitted [https://github.com/gerbera/gerbera/pull/1273] -Signed-off-by: Khem Raj ---- - src/util/tools.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/util/tools.h b/src/util/tools.h -index 3a4064e9..e5142966 100644 ---- a/src/util/tools.h -+++ b/src/util/tools.h -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - namespace fs = std::filesystem; - --- -2.30.1 - diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb deleted file mode 100644 index ec5548ab6c..0000000000 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -Description = "Gerbera - An UPnP media server" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" - -SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https;branch=master \ - file://0001-include-optional-header.patch \ - " - -SRCREV = "7bc33b98994411e1748d3b3fa9a8424c49e236d6" - -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.9.2.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb new file mode 100644 index 0000000000..94657ba534 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb @@ -0,0 +1,30 @@ +Description = "Gerbera - An UPnP media server" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" + +SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https;branch=master \ + " + +SRCREV = "3b93d362ec33f738868a4e896a2c9ee8e9d7a92a" + +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