From patchwork Sun Dec 8 08:15:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Ziegler X-Patchwork-Id: 2019705 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5dB24n4rz1yQw for ; Sun, 8 Dec 2024 19:16:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 27284607DC; Sun, 8 Dec 2024 08:16:22 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 9mbgLdgNljPy; Sun, 8 Dec 2024 08:16:20 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 22D38607C7 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 22D38607C7; Sun, 8 Dec 2024 08:16:20 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists1.osuosl.org (Postfix) with ESMTP id 4EBFD979 for ; Sun, 8 Dec 2024 08:16:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2634081167 for ; Sun, 8 Dec 2024 08:16:18 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id DJiz_jWi-UpZ for ; Sun, 8 Dec 2024 08:16:16 +0000 (UTC) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=176.9.89.163; helo=serv15.avernis.de; envelope-from=br015@umbiko.net; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 1B1A481164 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1B1A481164 Received: from serv15.avernis.de (serv15.avernis.de [176.9.89.163]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1B1A481164 for ; Sun, 8 Dec 2024 08:16:14 +0000 (UTC) Received: by serv15.avernis.de (Postfix) with ESMTPSA id 9390FBDE075B; Sun, 8 Dec 2024 09:16:10 +0100 (CET) From: Andreas Ziegler To: buildroot@buildroot.org Cc: Andreas Ziegler Date: Sun, 8 Dec 2024 09:15:38 +0100 Message-ID: <20241208081538.1245226-1-br015@umbiko.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 1.0.7 at serv15.avernis.de X-Virus-Status: Clean X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=umbiko.net; s=mail; t=1733645771; bh=HuzeBjQ3k9DnsHMoNPZl/DFxRh5fIcWAJO6csrhmWYI=; h=From:To:Cc:Subject:Date; b=CY1ADl3TCOd0BcmE03S7EMYMKY39114ST8n2w5oafX1WRKLbcLfyYxg31IF4bn+88 wOazeTQg1jrjwTCk+IBPTyTGtU8I+YDj9wSN7TMlxpO7/ZqOwuXr5B5iDQFXqddjxL ADwvRNg1WDuQ/Lcm1xmnRYOm+Gr/zGadCvfFi99Y= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=umbiko.net X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=umbiko.net header.i=@umbiko.net header.a=rsa-sha256 header.s=mail header.b=CY1ADl3T Subject: [Buildroot] [PATCH 1/1] package/mpd: update version to 0.23.16 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Version 0.23.16 change log: * database - fix integer overflows with 64-bit inode numbers * filter - ffmpeg: fix for filters producing no output * support libfmt 11 * support ICU 76 Adapt 0001-src-event-meson.build-add-atomic-dependency-for-spar.patch to silence check-package warnings Remove 0002-lib-fmt-support-build-with-libfmt-11.0.0.patch, changes were applied upstream $ utils/check-package package/mpd/* 916 lines processed 0 warnings generated $ echo "BR2_PACKAGE_MPD=y" > ~/output/mpd.config $ utils/test-pkg -c ~/output/mpd.config -d ~/output -p mpd bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK arm-aarch64 [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Andreas Ziegler --- ...build-add-atomic-dependency-for-spar.patch | 6 +- ...fmt-support-build-with-libfmt-11.0.0.patch | 93 ------------------- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 4 files changed, 6 insertions(+), 97 deletions(-) delete mode 100644 package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch diff --git a/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch b/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch index 390cf12583..28a82da30a 100644 --- a/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch +++ b/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch @@ -9,9 +9,11 @@ Linking with libatomic is needed on sparc otherwise build fails on: Fixes: - http://autobuild.buildroot.org/results/7a9fdb7e323892fb6ed85a2441054303e889c089 +Upstream: not sent (the same kind of patch for ncmpc was +refused: https://github.com/MusicPlayerDaemon/ncmpc/pull/45) Signed-off-by: Fabrice Fontaine -[Upstream status: not sent (the same kind of patch for ncmpc was -refused: https://github.com/MusicPlayerDaemon/ncmpc/pull/45)] +[Andreas: adapt upstream formatting] +Signed-off-by: Andreas Ziegler --- src/event/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch b/package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch deleted file mode 100644 index e0a361fee2..0000000000 --- a/package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Fri, 5 Jul 2024 14:27:45 +0000 -Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0 - -Upstream libfmt commit fmtlib/fmt@d707292 -now requires the format function to be const. - -Adjust the function prototype so it is const and can compile. - -Signed-off-by: Rudi Heitbaum - -Context: https://github.com/MusicPlayerDaemon/MPD/issues/2071 -Pull request: https://github.com/MusicPlayerDaemon/MPD/pull/2069 - -Fixes: http://autobuild.buildroot.net/results/73514ea76a5960f59b4c50e2074571b10e4682d4 -Fixes: http://autobuild.buildroot.net/results/a58ddbdfe35bd19021e65db0b8b8cc4c1c884d51 - -Rebase for mpd-0.23.15 - -Upstream: https://github.com/MusicPlayerDaemon/MPD/commit/3648475f871c33daa9e598c102a16e5a1a4d4dfc -Signed-off-by: Andreas Ziegler ---- - src/lib/ffmpeg/LibFmt.hxx | 2 +- - src/lib/fmt/AudioFormatFormatter.hxx | 4 ++-- - src/lib/fmt/ExceptionFormatter.hxx | 2 +- - src/lib/fmt/PathFormatter.hxx | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx -index aa068711f..dee83ed2d 100644 ---- a/src/lib/ffmpeg/LibFmt.hxx -+++ b/src/lib/ffmpeg/LibFmt.hxx -@@ -29,7 +29,7 @@ - struct fmt::formatter : formatter - { - template -- auto format(const AVSampleFormat format, FormatContext &ctx) { -+ auto format(const AVSampleFormat format, FormatContext &ctx) const { - const char *name = av_get_sample_fmt_name(format); - if (name == nullptr) - name = "?"; -diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx -index e0ffb6216..8da98efd4 100644 ---- a/src/lib/fmt/AudioFormatFormatter.hxx -+++ b/src/lib/fmt/AudioFormatFormatter.hxx -@@ -39,7 +39,7 @@ - struct fmt::formatter : formatter - { - template -- auto format(const SampleFormat format, FormatContext &ctx) { -+ auto format(const SampleFormat format, FormatContext &ctx) const { - return formatter::format(sample_format_to_string(format), - ctx); - } -@@ -49,7 +49,7 @@ - struct fmt::formatter : formatter - { - template -- auto format(const AudioFormat &af, FormatContext &ctx) { -+ auto format(const AudioFormat &af, FormatContext &ctx) const { - return formatter::format(ToString(af).c_str(), - ctx); - } -diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx -index 3f342df67..f08b3bb22 100644 ---- a/src/lib/fmt/ExceptionFormatter.hxx -+++ b/src/lib/fmt/ExceptionFormatter.hxx -@@ -38,7 +38,7 @@ - struct fmt::formatter : formatter - { - template -- auto format(std::exception_ptr e, FormatContext &ctx) { -+ auto format(std::exception_ptr e, FormatContext &ctx) const { - return formatter::format(GetFullMessage(e), ctx); - } - }; -diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx -index e5ae89dec..add06df81 100644 ---- a/src/lib/fmt/PathFormatter.hxx -+++ b/src/lib/fmt/PathFormatter.hxx -@@ -29,7 +29,7 @@ - struct fmt::formatter : formatter - { - template -- auto format(Path path, FormatContext &ctx) { -+ auto format(Path path, FormatContext &ctx) const { - return formatter::format(path.ToUTF8(), ctx); - } - }; --- -2.43.0 - diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index fe3d449cc5..c18a80a9d0 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a mpd-0.23.15.tar.xz +sha256 9668e36df80de485683c962d02845bf314d8a08e6141af7afeff76401e32b2c1 mpd-0.23.16.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index e320ad9dec..fd528aaa87 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).15 +MPD_VERSION = $(MPD_VERSION_MAJOR).16 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt