From patchwork Mon Sep 2 21:43:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3359 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 5EDE03F033 for ; Mon, 2 Sep 2024 23:43:54 +0200 (CEST) Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-374bfc57e2asf1741885f8f.3 for ; Mon, 02 Sep 2024 14:43:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1725313434; cv=pass; d=google.com; s=arc-20240605; b=Z1g6Efy6hzrvtkMrlcXRz1l60LyY72Te9kNOwhTbzkFsqyncbOT4Oh1jdt59V37jhq DSQKTcd4CSIPBrGfq47prG1RhngU3bCsgQohRgX3wBJh0z50fcw5Al7RLsQf/twvL+Of IlaucZi6erXsH3npZ0ngHJK5bUBzt3JCx79i28x/LXAg7PNYoD/ctn6i9C0lvibUA9e2 8Bt9n85wRBEAqhzz6+F/CAh5NqsauSa0Lxj+Zc3vwPwe3P2YqMG895X083FXseTyhh4s YxSLW3CkkNXbhOK7kzfiLbIUzDRtm+Wf/fDWpAHMoszDLv5KTcAnjNrNDAfwglMH4T/G 1ghw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=1Ipg8C42Ec5KDOS35EROt5DlpwgPNv96Fjqn6RQoEL8=; fh=x4y1lFuPJZXUYn4hdQKdjV9BJ86ADHOC9sUPjtqQzsY=; b=FLk9LJkHtQj7VIUaxBSCHVg9VmnWBe4bK4np48c5Jdo5KYgpcTrJftMb/3Ms6Yn18o c10nFrH1h0YYurqs5A5ed2Bwm3QDTHMs6lCuf13cYVucRFgSn01RA1+Oy4FC4kKdbK0c jzRXA3j48SropkNuF4IVJfwcGceIhYXpMpYVKxcks3L0DLuD9OIZa8cOtioay3tG9El6 2r+O4O6qlrxss348o5wmxO51B/TAWXZDwvPHBkLCwqwEhmVwIFdlICHr0NAp1jyJz0Ax 41/L/q0ip0NfxlrIN7q9L+uPC9bE2gQ94ITcE2/4YfkciPPFvd/A92lIVoslijW4PC1H 86Wg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=YhL2fQcP; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1725313434; x=1725918234; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=1Ipg8C42Ec5KDOS35EROt5DlpwgPNv96Fjqn6RQoEL8=; b=QRGc3HaLN7/pz59KE5pllXr+jib1qRPhzr8eAXUHNDG26IfreWVktsBIcuLcbrC01Z MmIAL1nOy/i5Wn7sajkcy+zrK798s0zXftVQkSrolL/Y/w1uyNN6XB0Bkyd+34Baqrsc l4iZjrZrQTIyAr7YfEInmOlC1/IbHur04WTKk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725313434; x=1725918234; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1Ipg8C42Ec5KDOS35EROt5DlpwgPNv96Fjqn6RQoEL8=; b=cSKwN+X177xE75Mk4PZU8RcekteXcIeGc8x2b0/k32YffPV4FDPKIRLdwAmyhdDVgq PEA9bd6VQ9gZRDwRtoipUFetIbAaJiJi+Yj7x45rJZs4dYBMqJzsNtqtrOL747LUUxMs wPoZaRZ4SN7Qj0ezEshN2SysIdfDOdpfAL9xD1YMLU/TDlGb6ynCHnambRJpoX5+rmbP Hmg9TgjBxLkF6p6KgwMdMqW3Y84RIR3O7SmHzbeIAPH41RG1gArw99iVycA3WK2X9jTq 81q2LyykC4+g/kX5vCuq7ldgI752iSMylUHRFrufHr/DWt/Y0YCwSAAZsYebwZfCuYqX MZHQ== X-Forwarded-Encrypted: i=2; AJvYcCUnhMPLfN1ZLFo46sCe4LB7h9QJ1C0vYZaamPdsib031H4T4zIrc5eGYOcAXnHvu9g4zmAc5ulfx3P1lq4W@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YwIN/TQ/TcrlyhJyXRr/apsnLV+DhXQI8b3jiZGUhMZ6MBCrhC2 DJajcEvcG0ufUcIAfp5803pn0wLaFu82HnQllGmFq5r/8/rhDIGzTOYebND/oJCA2w== X-Google-Smtp-Source: AGHT+IHdY1BY7UToIp1EfsT3MqtefVxnq6alEVxE7Aeb5avpeTblT5OdZ7ZEMkLuYYcieSvYPXIbSg== X-Received: by 2002:a5d:62ca:0:b0:374:c318:2188 with SMTP id ffacd0b85a97d-374c94717d4mr3598591f8f.42.1725313433727; Mon, 02 Sep 2024 14:43:53 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6000:154f:b0:368:4489:3f45 with SMTP id ffacd0b85a97d-3749b42f021ls1951218f8f.2.-pod-prod-01-eu; Mon, 02 Sep 2024 14:43:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWK46RZKW4o4mJWl0CoxDbeG95bB4Jm3766lWQbpwXY7d4FoxWn+CUPe7anGMUMziCmRyHM9ArZ8NTDzaZY@amarulasolutions.com X-Received: by 2002:a05:600c:46c6:b0:426:4978:65f0 with SMTP id 5b1f17b1804b1-42c82f56727mr37064185e9.18.1725313432173; Mon, 02 Sep 2024 14:43:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725313432; cv=none; d=google.com; s=arc-20160816; b=v4lEYzW+joZAeGWIjWyaDPQApFxOC+r+pl4WJmzWXg6LT17XqZ3mx0pSZDtVmFmbxn xgnDGgGmlhRN9i+RujG3//dUIE2nVmqxi6V7UZNtkRnpl/Ji0dWuC6BQ8hBm2Bi85ree QFRpKrzj7RZL065DSxk12PI2wVHIvsl/NwhYgQAiMXWWIVK5Pw7s5m7FLMy4hTfSinHk dmluAjSiSwbgNGMpfTzhzT/r1d/z7FWCm47vKP70vkRlnu44+YFNjAx2alEAI6k/sbGE t76+vNnuOtDWPsXVvGqgv2lsXf01lmEovt710hEX5naJdNVR1cQYfep2G+CGL8uhDLNT Gq/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=ek/Bz+chJaik8cNNK4IIopjLAcXAu9ulxxRg/Cs+vps=; fh=iOkNj7gQNFdEhUXqRZBdAl5dTM3hIwcaxlZX5BHfZOA=; b=fd3KhqgoZKCBt8id+qNB+YDrr2Qd30ea29LzpJ/k3M4VRsPY5QHp9q78TG91jQEQw0 wZFnDeuF3qR6qMLUWbKw7rqisHoAW4mqZAzcMVyib6p/TJsGjARlSnRoWVn+49DRe1XF Bu6WoA2BClfUZcnf4EJSrjkxorzE6hFxFgsW+WidNAzROQ4xguZ1wqGZd6zpN6Drw1mi r8H15XaMWXlqQkf3xm4OcAFD9/NuzoKq+SJVFAixfyreaItz7tVo/prsC4ilmNihfctf TShHjLMt9BewkU5YZ3GC9k956xbJLqzdNyGMEdJKQ2R2tOz3VA+vMRvh9hGoYtYHe+5r RURg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=YhL2fQcP; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-42bb70b4a3bsor38601065e9.11.2024.09.02.14.43.52 for (Google Transport Security); Mon, 02 Sep 2024 14:43:52 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCXi9M/qJDCRUMlymMq7Y8MDD4Tv/Aq4VuLbSHWodNHyHMfCNbnqiOLGutbPLAJSUe29grPlQKKZZYa9LZZg@amarulasolutions.com X-Received: by 2002:a05:600c:4e8d:b0:426:61af:e1d3 with SMTP id 5b1f17b1804b1-42c82f6cb34mr30175825e9.31.1725313431327; Mon, 02 Sep 2024 14:43:51 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.42.28]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42bbdda3958sm116771605e9.26.2024.09.02.14.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 14:43:50 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Fabrice Fontaine , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/gerbera: fix build against fmt 11. Date: Mon, 2 Sep 2024 23:43:43 +0200 Message-ID: <20240902214343.249108-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=YhL2fQcP; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The commit adds a backported upstream patch to fix the following build failure: build/gerbera-1.12.1/src/cds/cds_objects.cc: In static member function 'static std::string CdsObject::mapFlags(int)': build/gerbera-1.12.1/src/cds/cds_objects.cc:174:35: error: 'join' is not a member of 'fmt' Upstreaming the patch was added in version 2.2.0. Fixes: - http://autobuild.buildroot.org/results/aaf054b0bb336d45203b0d869ec6f9e00528ec8e Signed-off-by: Dario Binacchi --- .../0002-Build-against-fmt-11.0.0.patch | 136 ++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 package/gerbera/0002-Build-against-fmt-11.0.0.patch diff --git a/package/gerbera/0002-Build-against-fmt-11.0.0.patch b/package/gerbera/0002-Build-against-fmt-11.0.0.patch new file mode 100644 index 000000000000..27dc05e5cb13 --- /dev/null +++ b/package/gerbera/0002-Build-against-fmt-11.0.0.patch @@ -0,0 +1,136 @@ +From bb9e80f4225d4ecb0d75d80c16b0ba3ddb12b1dc Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Mon, 2 Sep 2024 23:30:19 +0200 +Subject: [PATCH] Build against fmt 11.0.0 + +Signed-off-by: Dario Binacchi +Upstream: backport from upstream https://github.com/gerbera/gerbera/commit/f1f266efbb0a6adac160e428cd14c20f6ecd3e5d +--- + README.md | 2 +- + scripts/install-spdlog.sh | 4 +++- + scripts/versions.sh | 2 +- + src/database/sql_format.h | 3 +++ + src/util/logger.h | 5 ++++- + src/util/url_utils.cc | 7 ++++++- + test/scripting/mock/duk_helper.cc | 4 +++- + 7 files changed, 21 insertions(+), 6 deletions(-) + +diff --git a/README.md b/README.md +index a1992738f009..990a9af8855f 100644 +--- a/README.md ++++ b/README.md +@@ -53,7 +53,7 @@ sudo make install + | libiconv | | | | Required | Charset conversion | | + | sqlite3 | 3.7.0 | 3.35.5 | 3.36.0 | Required | Database storage | | + | zlib | | | | Required | Data compression | | +-| [fmtlib] | 7.1.3 | 7.1.3 | 9.1.0 | Required | Fast string formatting | | ++| [fmtlib] | 7.1.3 | 9.1.0 | 11.0.0 | Required | Fast string formatting | | + | [spdlog] | 1.8.1 | 1.8.5 | 1.11.0 | Required | Runtime logging | | + | [duktape] | 2.1.0 | 2.6.0 | 2.7.0 | Optional | Scripting Support | Enabled | + | mysql | | | | Optional | Alternate database storage | Disabled | +diff --git a/scripts/install-spdlog.sh b/scripts/install-spdlog.sh +index 8a758e35b579..5c1426e3d44f 100755 +--- a/scripts/install-spdlog.sh ++++ b/scripts/install-spdlog.sh +@@ -39,7 +39,9 @@ fi + mkdir build + cd build + +-cmake .. -DSPDLOG_FMT_EXTERNAL=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED} ++cmake .. -DSPDLOG_FMT_EXTERNAL=ON \ ++ -DBUILD_SHARED_LIBS=${BUILD_SHARED} \ ++ -DSPDLOG_BUILD_EXAMPLE=OFF + + if command -v nproc >/dev/null 2>&1; then + make "-j$(nproc)" +diff --git a/scripts/versions.sh b/scripts/versions.sh +index 19a0f80f79ac..8c1ffe7d590d 100644 +--- a/scripts/versions.sh ++++ b/scripts/versions.sh +@@ -36,7 +36,7 @@ else + EBML="1.4.4" + EXIV2="v0.27.5" + FFMPEGTHUMBNAILER="2.2.2" +- FMT="9.1.0" ++ FMT="11.0.0" + GOOGLETEST="1.12.1" + LASTFM="0.4.0" + MATROSKA="1.7.1" +diff --git a/src/database/sql_format.h b/src/database/sql_format.h +index 551122eb7cf7..d64edae69372 100644 +--- a/src/database/sql_format.h ++++ b/src/database/sql_format.h +@@ -26,6 +26,9 @@ + #define __SQL_FORMAT_H__ + + #include ++#if FMT_VERSION >= 100202 ++#include ++#endif + + struct SQLIdentifier { + constexpr SQLIdentifier(std::string_view name, char quote_begin, char quote_end) +diff --git a/src/util/logger.h b/src/util/logger.h +index a121ead31e95..d51e60430ed9 100644 +--- a/src/util/logger.h ++++ b/src/util/logger.h +@@ -36,6 +36,9 @@ + + #include + #include ++#if FMT_VERSION >= 100202 ++#include ++#endif + #include + #include + #include +@@ -135,7 +138,7 @@ template + struct fmt::formatter, char>> + : formatter> { + template +- auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) + { + return fmt::formatter>::format( + static_cast>(value), ctx); +diff --git a/src/util/url_utils.cc b/src/util/url_utils.cc +index b1c9fecef863..84f6f3be43d4 100644 +--- a/src/util/url_utils.cc ++++ b/src/util/url_utils.cc +@@ -23,11 +23,16 @@ Gerbera - https://gerbera.io/ + + #include "url_utils.h" // API + ++#include "exceptions.h" ++ ++ + #include ++#if FMT_VERSION >= 100202 ++#include ++#endif + #include + + #include "common.h" +-#include "exceptions.h" + + namespace URLUtils { + +diff --git a/test/scripting/mock/duk_helper.cc b/test/scripting/mock/duk_helper.cc +index 71bdc5d025f7..f1ab1cfef8a7 100644 +--- a/test/scripting/mock/duk_helper.cc ++++ b/test/scripting/mock/duk_helper.cc +@@ -24,8 +24,10 @@ + #include "duk_helper.h" + #include + #include +-#include + #include ++#if FMT_VERSION >= 100202 ++#include ++#endif + #include + + std::vector DukTestHelper::arrayToVector(duk_context* ctx, duk_idx_t idx) +-- +2.43.0 +