diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch deleted file mode 100644 index c4419209a5..0000000000 --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 -From: kyak -Date: Wed, 12 Jan 2022 19:41:37 +0300 -Subject: [PATCH] Fix for fmt > 8.0 - -[Retrieved from: -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] -Signed-off-by: Fabrice Fontaine ---- - src/util/logger.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/util/logger.h b/src/util/logger.h -index 58696e52f..ba64afa79 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -32,7 +32,9 @@ - #ifndef __LOGGER_H__ - #define __LOGGER_H__ - -+#include - #include -+#include - - #define log_debug SPDLOG_DEBUG - #define log_info SPDLOG_INFO -@@ -40,4 +42,17 @@ - #define log_error SPDLOG_ERROR - #define log_js SPDLOG_INFO - -+#if FMT_VERSION >= 80100 -+template -+struct fmt::formatter, char>> -+ : formatter> { -+ template -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ { -+ return fmt::formatter>::format( -+ static_cast>(value), ctx); -+ } -+}; -+#endif -+ - #endif // __LOGGER_H__ diff --git a/package/gerbera/config.xml b/package/gerbera/config.xml index 30d70e21f7..e6261f25d0 100644 --- a/package/gerbera/config.xml +++ b/package/gerbera/config.xml @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ Gerbera - uuid:ac20d9b6-5c82-48e6-80de-436965fbe1d7 + uuid:7b156a2a-d79e-4763-983b-ae1d13fe0ff4 /var/lib/gerbera /usr/share/gerbera/web - 1800 + 180 gerbera.db + + + upnp:class derivedfrom "object.item" and last_updated > "@last7" + + + upnp:class derivedfrom "object.item" and last_modified > "@last7" + + * @@ -45,12 +53,15 @@ - - - + + + + + + @@ -98,14 +109,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -133,3 +172,4 @@ + diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 5dcd364c33..89ac9ad55a 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ab49f661ac..6acdfb86ac 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.9.2 +GERBERA_VERSION = 1.10.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md