diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-03-02 12:53:33 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-03-03 11:08:29 -0800 |
| commit | 70cfed4768ba3dfb5d6b2db35fa3175ade6785f9 (patch) | |
| tree | 3c198123b42cd9c45a7851ae7f2c5b224ce63e2e | |
| parent | de2140c8931851250a77e5770dfddc24e66f9fa4 (diff) | |
| download | meta-openembedded-contrib-70cfed4768ba3dfb5d6b2db35fa3175ade6785f9.tar.gz | |
gerbera: Update to 1.7.0
Fix build with gcc11
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@gmail.com>
| -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.7.0.bb (renamed from meta-multimedia/recipes-multimedia/gerbera/gerbera_1.6.0.bb) | 5 |
2 files changed, 35 insertions, 2 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 new file mode 100644 index 0000000000..f3197f937b --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch @@ -0,0 +1,32 @@ +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.6.0.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb index 7f26741832..d4242aa062 100644 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.6.0.bb +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb @@ -4,9 +4,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https \ -" + file://0001-include-optional-header.patch \ + " -SRCREV = "b219e22f09e346dd048f614a01ca2cbc55edd940" +SRCREV = "7bc33b98994411e1748d3b3fa9a8424c49e236d6" S = "${WORKDIR}/git" |