mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-09 07:51:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/gerbera: bump version to 3.2.0

Browse Source 
https://github.com/gerbera/gerbera/blob/v3.2.0/ReleaseNotes.md

Removed patch which is included in this release.

Added optional dependency to libpqxx which needs to be built with CMake.

Added optional dependency to new libzippp package.

Added cxxopts as new dependency:
72f7655e86

Updated config.xml following a note from the release notes:
"xmlns was renamed to xml-ns for compliance reasons"

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2026-03-15 14:16:19 +01:00
committed by Julien Olivain
parent 4f5f360350
commit 98d42291fc
5 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
package/gerbera/0001-fix_fmt_12.patch
View File

@@ -1,29 +0,0 @@
From f8e158bc72986e46b93d05358c29db0c10f2fe9f Mon Sep 17 00:00:00 2001
From: Karlchen <k_straussberger@netzland.net>
Date: Wed, 17 Sep 2025 21:18:49 +0200
Subject: [PATCH] Update to fmt 12.0.0
Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
Upstream: https://github.com/gerbera/gerbera/commit/f8e158bc72986e46b93d05358c29db0c10f2fe9f
[buildroot@heine.tech: removed all patch content not patching actual code]
---
src/web/config_load.cc | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/web/config_load.cc b/src/web/config_load.cc
index 8b296c43e0..4259ae3331 100644
--- a/src/web/config_load.cc
+++ b/src/web/config_load.cc
@@ -150,7 +150,11 @@ void Web::ConfigLoad::addNewValue(
template <typename T>
void Web::ConfigLoad::setValue(Json::Value& item, const T& value)
{
+#if FMT_VERSION >= 120000
+ static_assert(fmt::is_formattable<T, fmt::format_context>::value, "T must be formattable");
+#else
static_assert(fmt::has_formatter<T, fmt::format_context>::value, "T must be formattable");
+#endif
item[CONFIG_LOAD_VALUE] = fmt::to_string(value);
}

1
package/gerbera/Config.in
View File

@@ -8,6 +8,7 @@ config BR2_PACKAGE_GERBERA
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_STATIC_LIBS
depends on BR2_USE_WCHAR # fmt
select BR2_PACKAGE_CXXOPTS
select BR2_PACKAGE_FMT
select BR2_PACKAGE_ICU
select BR2_PACKAGE_JSONCPP

2
package/gerbera/config.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
<config version="2" xmlns="http://mediatomb.cc/config/2" xml-ns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
<!--
See https://gerbera.io or read the docs for more
information on creating and using config.xml configuration files.

2
package/gerbera/gerbera.hash
View File

@@ -1,3 +1,3 @@
# Locally computed:
sha256 6a7ed1c73bd86bdddd76bcb6c4bcd2e42788a20eb1f3165e0ea9f456abccd3ed gerbera-2.6.1.tar.gz
sha256 c55ec5cddc952e2563586ac76014be072c9dedb5094c6675889afa90b8df23e2 gerbera-3.2.0.tar.gz
sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md

17
package/gerbera/gerbera.mk
View File

@@ -4,11 +4,12 @@
#
################################################################################
GERBERA_VERSION = 2.6.1
GERBERA_VERSION = 3.2.0
GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION))
GERBERA_LICENSE = GPL-2.0
GERBERA_LICENSE_FILES = LICENSE.md
GERBERA_DEPENDENCIES = \
cxxopts \
fmt \
icu \
jsoncpp \
@@ -91,6 +92,13 @@ GERBERA_DEPENDENCIES += libupnp
GERBERA_CONF_OPTS += -DWITH_NPUPNP=OFF
endif
ifeq ($(BR2_PACKAGE_LIBPQXX),y)
GERBERA_DEPENDENCIES += libpqxx
GERBERA_CONF_OPTS += -DWITH_PGSQL=ON
else
GERBERA_CONF_OPTS += -DWITH_PGSQL=OFF
endif
ifeq ($(BR2_PACKAGE_MARIADB),y)
GERBERA_DEPENDENCIES += mariadb
GERBERA_CONF_OPTS += -DWITH_MYSQL=ON
@@ -112,6 +120,13 @@ else
GERBERA_CONF_OPTS += -DWITH_TAGLIB=OFF
endif
ifeq ($(BR2_PACKAGE_LIBZIPPP),y)
GERBERA_DEPENDENCIES += libzip libzippp
GERBERA_CONF_OPTS += -DWITH_ZIP=ON
else
GERBERA_CONF_OPTS += -DWITH_ZIP=OFF
endif
# gerbera does not provide a default configuration file, it can be
# created during run time through --create-config:
# http://docs.gerbera.io/en/latest/config-overview.html#generating-configuration