diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-01-24 10:25:45 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-01-25 09:13:09 -0800 |
| commit | 39d43ab3b96aab25fb82af55a0ea9bef2cecdbc3 (patch) | |
| tree | 41f4385cf1ea97e25fcde1ccbbbb8a92e114e568 /meta-multimedia | |
| parent | 37c7803b064a7075b4ab1a18cf3ef9798c66c33e (diff) | |
| download | meta-openembedded-contrib-39d43ab3b96aab25fb82af55a0ea9bef2cecdbc3.tar.gz | |
gerbera: Upgrade to 1.9.2
Drop upstreamed patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch | 32 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb (renamed from meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb) | 3 |
2 files changed, 1 insertions, 34 deletions
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 <raj.khem@gmail.com> -Date: Tue, 2 Mar 2021 12:57:37 -0800 -Subject: [PATCH] include <optional> 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<std::vector<std::byte>> readBinaryFile(const fs::path& path); -| | ^~~~~~~~ - -Upstream-Status: Submitted [https://github.com/gerbera/gerbera/pull/1273] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - 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 <sstream> - #include <string> - #include <unordered_set> -+#include <optional> - #include <vector> - 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.9.2.bb index ec5548ab6c..94657ba534 100644 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb @@ -4,10 +4,9 @@ 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" +SRCREV = "3b93d362ec33f738868a4e896a2c9ee8e9d7a92a" S = "${WORKDIR}/git" |