From patchwork Sun Oct 12 11:51:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 9184 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4ckzNP1NDQz3wkk for ; Sun, 12 Oct 2025 11:51:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [IPv6:2001:678:b28::201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail02.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ckzNN6RCgz3qx for ; Sun, 12 Oct 2025 11:51:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ckzNN5jCYz2y7D for ; Sun, 12 Oct 2025 11:51:48 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ckzNL1ps4z2xSM for ; Sun, 12 Oct 2025 11:51:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (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 mail01.ipfire.org (Postfix) with ESMTPSA id 4ckzNJ6DBZz2S; Sun, 12 Oct 2025 11:51:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1760269905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/dUnfpbCAAFn9ITm1q8hoKouIaetlx7V1edAsFTzIIY=; b=oAuDpMNbsR1kq7EgUVXfpclfMGtUN/PZqbwaLDWdC5/AyEI+V+urB1+nE/3N0TvUeDjByn dKexCOjbN2BfanCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1760269905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/dUnfpbCAAFn9ITm1q8hoKouIaetlx7V1edAsFTzIIY=; b=C8T4v5GdFnwIvw7HR8ptb7SyECrJ8UCmzLpASIzezeXdvaUDHV5nZlWyMOMGxpq96u8/7R YIcCHsYjcICx6SBmCkc1SVgcYFCHAZPYtkz1YXoFjEsM1FMXvH3jIx7kFR6/oC+apl7++M /o9q4ZbXO0VOdhyKWQNCLIkfpqJi8lIMywmI9TRvl3dNRrECdogjrGrZyKBk3yzpYv3lr+ BCi9cLcbu3cWmwIOJAnn8osRbGKaXNl9k1F7LzP315UR+wWvEPkT+cKHo9G1P/fKgcBopO DK+qGBq7ZIowNu8zPPwCplJwqowO9f/conSVDMvbNM8hG8VZLgHImyDcZP1g/A== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] mympd: Update to version 22.1.1 Date: Sun, 12 Oct 2025 13:51:42 +0200 Message-ID: <20251012115142.3398558-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - Update from version 22.0.4 to 22.1.1 - Addition of cmake option to not create the systemd startup files - Removal of patch to make mympd work with coreutils-9.8 as this latest update already includes the change in it. - Changelog 22.1.1 - Upd: Logging improvements - Fix: Now playing indicator in Queue View - Fix: Detection of ca cert store #1469 - Fix: Ending newline detection in build script #1470 22.1.0 This is the first release that supports a system-wide installed libmpdclient library. If the library was not found or is too old, the build process falls back to the embedded libmpdclient. - Feat: Support string normalization option (MPD 0.25) - Feat: Support shared libmpdclient (v2.24.0) #874 - Upd: Rework album implementation to work with upstream libmpdclient - Upd: Mongoose 7.19 - Upd: Bootstrap 5.3.8 Signed-off-by: Adolf Belka --- config/rootfiles/packages/mympd | 3 -- lfs/mympd | 8 ++--- ....4_Simplify_ending_newline_detection.patch | 32 ------------------- 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 src/patches/mympd-22.0.4_Simplify_ending_newline_detection.patch diff --git a/config/rootfiles/packages/mympd b/config/rootfiles/packages/mympd index 215a55bb2..7d1f9263e 100644 --- a/config/rootfiles/packages/mympd +++ b/config/rootfiles/packages/mympd @@ -2,9 +2,6 @@ etc/rc.d/init.d/mympd usr/bin/mympd usr/bin/mympd-config usr/bin/mympd-script -#usr/lib/systemd/system/mympd.service -#usr/lib/systemd/user -#usr/lib/systemd/user/mympd.service var/ipfire/backup/addons/includes/mympd var/lib/mympd #var/lib/mympd/config diff --git a/lfs/mympd b/lfs/mympd index a0167ffa8..17ab9be3a 100644 --- a/lfs/mympd +++ b/lfs/mympd @@ -26,7 +26,7 @@ include Config SUMMARY = Webfrontend for Music Player Daemon -VER = 22.0.4 +VER = 22.1.1 THISAPP = myMPD-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mympd -PAK_VER = 15 +PAK_VER = 16 DEPS = mpd libmpdclient @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d59eba43d083adb2bc58bf31ec03bea1105143d681e409c92e60303b9ede75285aec04d0f70a6dcc52ca62f3eb27a8287840d3fcc3ff9489a4dc9d53e61e9a89 +$(DL_FILE)_BLAKE2 = a64c9691e552c63fcdaf7cbca71a33d812293477f5676ffeb63fb1b7d230d69f3c4f6efdd188afa2a596543644bb3920d12e00f59fd3f5ebce1f04a6a4d01dda install : $(TARGET) @@ -81,7 +81,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mympd-22.0.4_Simplify_ending_newline_detection.patch # Do not try to re-define _FORTIFY_SOURCE cd $(DIR_APP) && sed -e "/D_FORTIFY_SOURCE/d" -i CMakeLists.txt @@ -92,6 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -D MYMPD_DOC=OFF \ -D MYMPD_ENABLE_SYSTEMD=OFF \ -D MYMPD_MANPAGES=OFF \ + -D MYMPD_STARTUP_SCRIPT=OFF \ -D CMAKE_BUILD_TYPE=Release .. cd $(DIR_APP)/build && make $(MAKETUNING) cd $(DIR_APP)/build && make install diff --git a/src/patches/mympd-22.0.4_Simplify_ending_newline_detection.patch b/src/patches/mympd-22.0.4_Simplify_ending_newline_detection.patch deleted file mode 100644 index f8a5a3cf6..000000000 --- a/src/patches/mympd-22.0.4_Simplify_ending_newline_detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c6eeec3614bd6e91f3313f37a723a2b37467ec6a Mon Sep 17 00:00:00 2001 -From: jcorporation -Date: Fri, 10 Oct 2025 15:45:06 +0200 -Subject: [PATCH] Fix: Simplify ending newline detection #1470 - ---- - build.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build.sh b/build.sh -index 366e3e619..1f20fcdb0 100755 ---- a/build.sh -+++ b/build.sh -@@ -217,7 +217,7 @@ createassets() { - [ "$F" = "js/long-press-event.js" ] && continue - [ "$F" = "js/version.js" ] && continue - JSSRCFILES="$JSSRCFILES htdocs/$F" -- if tail -1 "htdocs/$F" | perl -npe 'exit 1 if m/\n/; exit 0' -+ if [ -n "$(tail -c 1 "htdocs/$F")" ] - then - echo_error "$F don't end with newline character" - exit 1 -@@ -241,7 +241,7 @@ createassets() { - JSFILES="$JSFILES $MYMPD_BUILDDIR/htdocs/js/*.min.js" - for F in $JSFILES - do -- if tail -1 "$F" | perl -npe 'exit 1 if m/\n/; exit 0' -+ if [ -n "$(tail -c 1 "$F")" ] - then - echo_error "$F don't end with newline character" - exit 1 -