diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-against-fmt-10.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-against-fmt-10.patch deleted file mode 100644 index 2da98cfcf..000000000 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-against-fmt-10.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 2c08724e8a7e3a0ee8cdd91246a714a17f2ba5c1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 17 May 2023 17:31:56 -0700 -Subject: [PATCH] Fix build against fmt 10+ - -Fixes -git/src/config/setup/config_setup_vector.cc:191:9: required from here -| /home/hains/openpli-dm920-python3/build/tmp/work/cortexa15hf-neon-vfpv4-oe-linux-gnueabi/gerbera/1.11.0-r0/ -recipe-sysroot/usr/include/fmt/core.h:1691:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt -| 1691 | formattable, -| | ^~~~~~~~~~~ - -Source: https://github.com/Hains/openpli-dm920-python3/commit/688ae121bd3928925a8656bd4aaf3857d8e8a8ed - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/config/setup/config_setup_array.cc | 6 +++--- - src/config/setup/config_setup_autoscan.cc | 2 +- - src/config/setup/config_setup_client.cc | 2 +- - src/config/setup/config_setup_dictionary.cc | 6 +++--- - src/config/setup/config_setup_dynamic.cc | 2 +- - src/config/setup/config_setup_transcoding.cc | 2 +- - src/config/setup/config_setup_tweak.cc | 2 +- - src/config/setup/config_setup_vector.cc | 4 ++-- - 8 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/config/setup/config_setup_array.cc b/src/config/setup/config_setup_array.cc -index 8f3cf1db..efc9b501 100644 ---- a/src/config/setup/config_setup_array.cc -+++ b/src/config/setup/config_setup_array.cc -@@ -136,11 +136,11 @@ std::vector ConfigArraySetup::getXmlContent(const pugi::xml_node& o - std::vector result; - if (initArray) { - if (!initArray(optValue, result, ConfigDefinition::mapConfigOption(nodeOption))) { -- throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue); -+ throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue.value()); - } - } else { - if (!createOptionFromNode(optValue, result)) { -- throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue); -+ throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue.value()); - } - } - if (result.empty()) { -@@ -149,7 +149,7 @@ std::vector ConfigArraySetup::getXmlContent(const pugi::xml_node& o - result = defaultEntries; - } - if (notEmpty && result.empty()) { -- throw_std_runtime_error("Invalid array {} empty '{}'", xpath, optValue); -+ throw_std_runtime_error("Invalid array {} empty '{}'", xpath, optValue.value()); - } - return result; - } -diff --git a/src/config/setup/config_setup_autoscan.cc b/src/config/setup/config_setup_autoscan.cc -index e882ca3e..d773419b 100644 ---- a/src/config/setup/config_setup_autoscan.cc -+++ b/src/config/setup/config_setup_autoscan.cc -@@ -203,7 +203,7 @@ std::shared_ptr ConfigAutoscanSetup::newOption(const pugi::xml_nod - { - auto result = std::vector(); - if (!createOptionFromNode(optValue, result)) { -- throw_std_runtime_error("Init {} autoscan failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} autoscan failed '{}'", xpath, optValue.value()); - } - optionValue = std::make_shared(result); - return optionValue; -diff --git a/src/config/setup/config_setup_client.cc b/src/config/setup/config_setup_client.cc -index 30bb98cb..56be9c53 100644 ---- a/src/config/setup/config_setup_client.cc -+++ b/src/config/setup/config_setup_client.cc -@@ -163,7 +163,7 @@ std::shared_ptr ConfigClientSetup::newOption(const pugi::xml_node& - auto result = std::make_shared(); - - if (!createOptionFromNode(isEnabled ? optValue : pugi::xml_node(nullptr), result)) { -- throw_std_runtime_error("Init {} client config failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} client config failed '{}'", xpath, optValue.value()); - } - optionValue = std::make_shared(result); - return optionValue; -diff --git a/src/config/setup/config_setup_dictionary.cc b/src/config/setup/config_setup_dictionary.cc -index eb91c694..ea2aaa05 100644 ---- a/src/config/setup/config_setup_dictionary.cc -+++ b/src/config/setup/config_setup_dictionary.cc -@@ -162,11 +162,11 @@ std::map ConfigDictionarySetup::getXmlContent(const pu - std::map result; - if (initDict) { - if (!initDict(optValue, result)) { -- throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue.value()); - } - } else { - if (!createOptionFromNode(optValue, result) && required) { -- throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue.value()); - } - } - if (result.empty()) { -@@ -175,7 +175,7 @@ std::map ConfigDictionarySetup::getXmlContent(const pu - result = defaultEntries; - } - if (notEmpty && result.empty()) { -- throw_std_runtime_error("Invalid dictionary {} empty '{}'", xpath, optValue); -+ throw_std_runtime_error("Invalid dictionary {} empty '{}'", xpath, optValue.value()); - } - return result; - } -diff --git a/src/config/setup/config_setup_dynamic.cc b/src/config/setup/config_setup_dynamic.cc -index 6a43b820..93030b85 100644 ---- a/src/config/setup/config_setup_dynamic.cc -+++ b/src/config/setup/config_setup_dynamic.cc -@@ -179,7 +179,7 @@ std::shared_ptr ConfigDynamicContentSetup::newOption(const pugi::x - auto result = std::make_shared(); - - if (!createOptionFromNode(optValue, result)) { -- throw_std_runtime_error("Init {} DynamicContentList failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} DynamicContentList failed '{}'", xpath, optValue.value()); - } - optionValue = std::make_shared(result); - return optionValue; -diff --git a/src/config/setup/config_setup_transcoding.cc b/src/config/setup/config_setup_transcoding.cc -index 4827f109..c353ce1f 100644 ---- a/src/config/setup/config_setup_transcoding.cc -+++ b/src/config/setup/config_setup_transcoding.cc -@@ -492,7 +492,7 @@ std::shared_ptr ConfigTranscodingSetup::newOption(const pugi::xml_ - auto result = std::make_shared(); - - if (!createOptionFromNode(isEnabled ? optValue : pugi::xml_node(nullptr), result)) { -- throw_std_runtime_error("Init {} transcoding failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} transcoding failed '{}'", xpath, optValue.value()); - } - optionValue = std::make_shared(result); - return optionValue; -diff --git a/src/config/setup/config_setup_tweak.cc b/src/config/setup/config_setup_tweak.cc -index d7692c09..72c2beb2 100644 ---- a/src/config/setup/config_setup_tweak.cc -+++ b/src/config/setup/config_setup_tweak.cc -@@ -242,7 +242,7 @@ std::shared_ptr ConfigDirectorySetup::newOption(const pugi::xml_no - auto result = std::make_shared(); - - if (!createOptionFromNode(optValue, result)) { -- throw_std_runtime_error("Init {} DirectoryConfigList failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} DirectoryConfigList failed '{}'", xpath, optValue.value()); - } - optionValue = std::make_shared(result); - return optionValue; -diff --git a/src/config/setup/config_setup_vector.cc b/src/config/setup/config_setup_vector.cc -index c8ff853d..91f99ca4 100644 ---- a/src/config/setup/config_setup_vector.cc -+++ b/src/config/setup/config_setup_vector.cc -@@ -180,7 +180,7 @@ std::vector>> ConfigVectorSetup: - { - std::vector>> result; - if (!createOptionFromNode(optValue, result) && required) { -- throw_std_runtime_error("Init {} vector failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} vector failed '{}'", xpath, optValue.value()); - } - if (result.empty()) { - log_debug("{} assigning {} default values", xpath, defaultEntries.size()); -@@ -188,7 +188,7 @@ std::vector>> ConfigVectorSetup: - result = defaultEntries; - } - if (notEmpty && result.empty()) { -- throw_std_runtime_error("Invalid vector {} empty '{}'", xpath, optValue); -+ throw_std_runtime_error("Invalid vector {} empty '{}'", xpath, optValue.value()); - } - return result; - } diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb deleted file mode 100644 index 89cc51e0e..000000000 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -Description = "Gerbera - An UPnP media server" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" - -SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master \ - file://0001-Fix-build-against-fmt-10.patch \ - " - -SRCREV = "559e1d1a92f5977ce8cff7393aa85330dbf2d1d6" - -S = "${WORKDIR}/git" - -DEPENDS = "expat fmt spdlog pugixml libebml libmatroska zlib curl libupnp e2fsprogs sqlite3 libnsl2" - -SYSTEMD_SERVICE:${PN} = "gerbera.service" - -inherit cmake pkgconfig systemd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd" -PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib" -EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_INCLUDE_DIRS=${STAGING_INCDIR} -DLIBUUID_LIBRARIES=-luuid" - -do_install:append() { - install -d ${D}/root/.config/ -} - -FILES:${PN} += "/root/.config/" - -SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.0.0.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.0.0.bb new file mode 100644 index 000000000..de4de3a07 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.0.0.bb @@ -0,0 +1,36 @@ +Description = "Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" + +SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master" +SRCREV = "2f26e656b16fb86132f27d1f8d47c6055041430d" + +S = "${WORKDIR}/git" + +DEPENDS = "pugixml sqlite3 zlib fmt spdlog util-linux-libuuid libupnp libnsl2" + +SYSTEMD_SERVICE:${PN} = "gerbera.service" + +inherit cmake pkgconfig systemd + +EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} curl taglib inotify exif matroska" +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd" +PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib" +PACKAGECONFIG[curl] = "-DWITH_CURL=TRUE,-DWITH_CURL=FALSE,curl" +PACKAGECONFIG[inotify] = "-DWITH_INOTIFY=TRUE,-DWITH_INOTIFY=FALSE,inotify-tools" +PACKAGECONFIG[avcodec] = "-DWITH_AVCODEC=TRUE,-DWITH_AVCODEC=FALSE,ffmpeg" +PACKAGECONFIG[wavpack] = "-DWITH_WAVPACK=TRUE,-DWITH_WAVPACK=FALSE,wavpack" +PACKAGECONFIG[exif] = "-DWITH_EXIF=TRUE,-DWITH_EXIF=FALSE,libexif" +PACKAGECONFIG[exiv2] = "-DWITH_EXIV2=TRUE,-DWITH_EXIV2=FALSE,exiv2" +PACKAGECONFIG[matroska] = "-DWITH_MATROSKA=TRUE,-DWITH_MATROSKA=FALSE,libebml libmatroska" + +do_install:append() { + install -d ${D}/root/.config/ +} + +FILES:${PN} += "/root/.config/" + +SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}"