gerbera: Upgrade to 1.9.2

Drop upstreamed patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-01-24 10:25:45 -08:00
parent 37c7803b06
commit 39d43ab3b9
2 changed files with 1 additions and 34 deletions

View File

@ -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

View File

@ -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"