From patchwork Sun Mar 20 18:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 1607507 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="key not found in DNS" header.d=embedded.rocks header.i=@embedded.rocks header.a=rsa-sha256 header.s=default header.b=pSkOe4H/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KM6Ll4dWrz9s3q for ; Mon, 21 Mar 2022 05:52:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id EFB5360BF2; Sun, 20 Mar 2022 18:52:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vk7ynBz7dSlG; Sun, 20 Mar 2022 18:52:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 7C01A60BE9; Sun, 20 Mar 2022 18:52:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E92991BF4D8 for ; Sun, 20 Mar 2022 18:52:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D1A2F60BE9 for ; Sun, 20 Mar 2022 18:52:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wBca-y3Q34h3 for ; Sun, 20 Mar 2022 18:52:22 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by smtp3.osuosl.org (Postfix) with ESMTPS id 3EA7260BE5 for ; Sun, 20 Mar 2022 18:52:22 +0000 (UTC) Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 78007240103 for ; Sun, 20 Mar 2022 19:52:19 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4KM6LV5fkZz9rxF for ; Sun, 20 Mar 2022 19:52:18 +0100 (CET) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1647802337; x=1648407138; bh=UHsbPurl/SD/fxMdTjkRR99bSVHbsnXDRAMgJVFngR4=; b=pSkOe4H/sRIQ RSoYxXVaof+hFQNdhWkyrikFutTAMqhT2yFzZrjbHnZZDW5bFvbVlbWDUmtluSB2 IFG0dvcZNnmD5W/oZiZuYlImbYcTTBpiok7E09o6+zu3q1+Iswh218bLo5yMQo/l nTjS44H8KmqmL6LHhlE1ef4GK3nNJXGgeaL7q/37DncJmatcX9NQQ1l4bWkea3wP m7wu3Zim1WAYg3eQEq99rwJa/3fx79UAy7WyP8NgSS+nDrVmNHZ08TSrcdZR21fa HvhUZIJem8XoqiC+t76X0bZS7r/SvH/Yw8BzhU/7u/O9TCbmBhMFXEU8khAoTB4G cvMx9FmlfA== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id tgOvP_CiN629; Sun, 20 Mar 2022 19:52:17 +0100 (CET) Received: from nzxt.fritz.box (port-62-8-191-53.dynamic.as20676.net [62.8.191.53]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Sun, 20 Mar 2022 19:52:16 +0100 (CET) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Sun, 20 Mar 2022 18:51:44 +0000 Message-Id: <20220320185144.10894-1-joerg.krause@embedded.rocks> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/gerbera: bump to version 1.10.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?J=C3=B6rg_Krause?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Drop patch wich is included in the new version. Also recreate config.xml by building and running Gerbera using: ``` ~/buildroot/output/target/usr/bin/gerbera --create-config > package/gerbera/config.xml ``` Note, that Gerbera sets the `` parameter to the runtime user's home by default when generating the script. This is not appropriate when running Gerbera on an embedded Linux system as we usually do not have multiple users or even users at all. Therefore, we set the home directory to /var/lib/gerbera`. Signed-off-by: Jörg Krause --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------- package/gerbera/config.xml | 58 ++++++++++++++++++---- package/gerbera/gerbera.hash | 2 +- package/gerbera/gerbera.mk | 2 +- 4 files changed, 51 insertions(+), 55 deletions(-) delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch 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