gerbera: update to 1.6.1

Removed upstream ffmpeg backport.

Updated npupnp patch with latest upstream version.

Enabled CURL since it's needed for libnpupnp anyway.

Fixed up GCC filesystem CMake variables to be more accurate.

Removed npupnp include hack since it was properly fixed now.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

multimedia/gerbera/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gerbera
-PKG_VERSION:=1.6.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.6.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=3a4956ec5fea1101e8daa32d9cfb985db908a49e2ac6137a1b2bf509e2684a6c
+PKG_HASH:=9bb119ee422c8e7a053c309256215a8899dfd6707f6b93496e6facea7978ac7c
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-or-later
@@ -45,13 +45,13 @@ define Package/gerbera/conffiles
 endef
 
 CMAKE_OPTIONS += \
-	-DCXX_FILESYSTEM_NO_LINK_NEEDED=$(if $(CONFIG_GCC_USE_VERSION_9),ON,OFF) \
-	-DCXX_FILESYSTEM_STDCPPFS_NEEDED=$(if $(CONFIG_GCC_USE_VERSION_8),OFF,ON) \
+	-DCXX_FILESYSTEM_NO_LINK_NEEDED=$(if $(CONFIG_GCC_USE_VERSION_8),OFF,ON) \
+	$(if $(CONFIG_GCC_USE_VERSION_8),-DCXX_FILESYSTEM_STDCPPFS_NEEDED=OFF) \
 	-DIconv_INCLUDE_DIR=$(ICONV_PREFIX)/include \
 	-DIconv_LIBRARY=$(ICONV_PREFIX)/lib/libiconv.a \
 	-DWITH_MAGIC=ON \
 	-DWITH_MYSQL=OFF \
-	-DWITH_CURL=OFF \
+	-DWITH_CURL=ON \
 	-DWITH_INOTIFY=ON \
 	-DWITH_JS=OFF \
 	-DWITH_TAGLIB=ON \
@@ -69,8 +69,7 @@ CMAKE_OPTIONS += \
 TARGET_CFLAGS += \
 	-ffunction-sections \
 	-fdata-sections \
-	-flto \
-	-I$(STAGING_DIR)/usr/include/npupnp/upnp
+	-flto
 
 TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
 

multimedia/gerbera/patches/010-ffmpeg.patch

@@ -1,31 +0,0 @@
-From 72f9db7bd75f03e9e7afeaaa0aa0ab7af9fe81a5 Mon Sep 17 00:00:00 2001
-From: Yuri Timenkov <yuri@timenkov.ru>
-Date: Sun, 26 Jul 2020 12:17:15 +0000
-Subject: [PATCH] Fixed build with ffmnpeg but without thumbnailer
-
-Fixes: #953
----
- src/metadata/ffmpeg_handler.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/metadata/ffmpeg_handler.cc b/src/metadata/ffmpeg_handler.cc
-index 4bba5655..e0ff84bb 100644
---- a/src/metadata/ffmpeg_handler.cc
-+++ b/src/metadata/ffmpeg_handler.cc
-@@ -265,6 +265,8 @@ void FfmpegHandler::fillMetadata(std::shared_ptr<CdsItem> item)
-     avformat_close_input(&pFormatCtx);
- }
- 
-+#ifdef HAVE_FFMPEGTHUMBNAILER
-+
- fs::path getThumbnailCacheBasePath(Config& config)
- {
-     if (auto configuredDir = config.getOption(CFG_SERVER_EXTOPTS_FFMPEGTHUMBNAILER_CACHE_DIR);
-@@ -284,7 +286,6 @@ fs::path getThumbnailCachePath(const fs::path& base, const fs::path& movie)
-     return path;
- }
- 
--#ifdef HAVE_FFMPEGTHUMBNAILER
- std::optional<std::vector<std::byte>> FfmpegHandler::readThumbnailCacheFile(const fs::path& movie_filename) const
- {
-     auto path = getThumbnailCachePath(getThumbnailCacheBasePath(*config), movie_filename);