diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-09-19 00:39:52 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2021-09-25 02:09:27 -0700 |
| commit | efc9679b6cf99bd77abcf4bb369e29d6b74f4c6a (patch) | |
| tree | ad544d986d692e88d253e76e51f12273a7ec0984 /multimedia | |
| parent | 3d7fbe9c4f863b5374a7b5cdb39a5ffe95a7f00f (diff) | |
gerbera: update to 1.9.1
Remove upstream backport.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gerbera/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/gerbera/patches/010-Os-unique_ptr.patch | 42 |
2 files changed, 2 insertions, 44 deletions
diff --git a/multimedia/gerbera/Makefile b/multimedia/gerbera/Makefile index 8d1b281cd..cb1ad2340 100644 --- a/multimedia/gerbera/Makefile +++ b/multimedia/gerbera/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gerbera -PKG_VERSION:=1.9.0 +PKG_VERSION:=1.9.1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=7d3af525a6c37e10869961b2fedc2cfb54d8acf30256a2d5a10394c6a97ed25b +PKG_HASH:=5d323c6cb4150e3454b8c6e0012f41648441799ba44cb59436b124b54d3fc82b PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0-or-later diff --git a/multimedia/gerbera/patches/010-Os-unique_ptr.patch b/multimedia/gerbera/patches/010-Os-unique_ptr.patch deleted file mode 100644 index 91b724786..000000000 --- a/multimedia/gerbera/patches/010-Os-unique_ptr.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7071316114b7d196808d943ce654b355927e73e1 Mon Sep 17 00:00:00 2001 -From: Karlchen <k_straussberger@netzland.net> -Date: Mon, 23 Aug 2021 09:04:36 +0200 -Subject: [PATCH] Fix linkage error in on aarch64 with g++-10 - -fixes #1674 ---- - src/content/content_manager.cc | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/src/content/content_manager.cc -+++ b/src/content/content_manager.cc -@@ -622,17 +622,17 @@ void ContentManager::_rescanDirectory(co - - std::error_code ec; - auto rootDir = fs::directory_entry(location, ec); -- fs::directory_iterator dIter; -+ std::unique_ptr<fs::directory_iterator> dIter; - - if (!ec && rootDir.exists(ec) && rootDir.is_directory(ec)) { -- dIter = fs::directory_iterator(location, ec); -+ dIter = std::make_unique<fs::directory_iterator>(location, ec); - if (ec) { - log_error("_rescanDirectory: Failed to iterate {}, {}", location.c_str(), ec.message()); - } - } else { - log_error("Could not open {}: {}", location.c_str(), ec.message()); - } -- if (ec) { -+ if (ec || !dIter) { - if (adir->persistent()) { - removeObject(adir, containerID, false); - if (location == adir->getLocation()) { -@@ -673,7 +673,7 @@ void ContentManager::_rescanDirectory(co - adir->setCurrentLMT(location, std::chrono::seconds::zero()); - - std::shared_ptr<CdsObject> firstObject; -- for (auto&& dirEnt : dIter) { -+ for (auto&& dirEnt : *dIter) { - auto&& newPath = dirEnt.path(); - auto&& name = newPath.filename().string(); - if (name[0] == '.' && !asSetting.hidden) { |