From patchwork Fri Apr 9 19:10:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4134 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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FH74p1z48z3yBV for ; Fri, 9 Apr 2021 19:10:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FH74n1V5yz4jK; Fri, 9 Apr 2021 19:10:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FH74n0Sw5z2yRM; Fri, 9 Apr 2021 19:10:33 +0000 (UTC) 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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FH74l4JQQz2xKk for ; Fri, 9 Apr 2021 19:10:31 +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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FH74l0R7XztW; Fri, 9 Apr 2021 19:10:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1617995431; 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=oWVRIwalb5w3bP7J/EHUfTIhniPdBMflG7Lvauz87xo=; b=wzdSOvGPncfaDmuDqTiMAvi8eFPMPwFGzDB2jLajxcyCUYX6bNA6if5kmVgaNJgV901DQw QWA87jr/1Add8LDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1617995431; 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=oWVRIwalb5w3bP7J/EHUfTIhniPdBMflG7Lvauz87xo=; b=DIdnpj/5yDyJxo1h08aU/wA5YbPxyE2zCRZLWn/Cy5BnQng7PV2l120zSVyQBDaEhr6eKj ChjOhsA1baayBs6fvuCaUmWOZLu523JhuuwhbS5YGsQbkDNe9u+YSMXOC0hmetP7fIGJen +j3KrLn7bVnNAGVq1dmF1kIfkMIZsFrX1TjfZ8yoSHylKARzDNmyqXhxi6z80slJp1WBMy w/iwm2EdN/qiAPwZ6l38DI2SED2GNvzL9i5iAoR98bzVtTODLDgub1V6so4Mve/0KmhWvj J/gTVhLpiwXkWlwiSgtQT9ncQwTtTewAMvLODeNh34dRjch3F+aug6l0zJ2/YQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/3] mpd: Update to 0.22.6 Date: Fri, 9 Apr 2021 21:10:20 +0200 Message-Id: <20210409191022.2911348-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from 0.19.19 to 0.22.6 - Update rootfile - Required update of libupnp - Autotools no longer available Build changed to meson Meson build required addition of pkgconfig file for libid3tag - Changelog is too large to include here. Full details can be found in the NEWS file in the source tarball Signed-off-by: Adolf Belka --- config/rootfiles/packages/mpd | 12 +++-------- lfs/mpd | 39 ++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/config/rootfiles/packages/mpd b/config/rootfiles/packages/mpd index c49d33498..85501238b 100644 --- a/config/rootfiles/packages/mpd +++ b/config/rootfiles/packages/mpd @@ -1,16 +1,10 @@ etc/rc.d/init.d/mpd usr/bin/mpd -var/log/mpd.error.log -var/log/mpd.log #usr/share/doc/mpd #usr/share/doc/mpd/AUTHORS #usr/share/doc/mpd/COPYING #usr/share/doc/mpd/NEWS -#usr/share/doc/mpd/COMMANDS -#usr/share/doc/mpd/README #usr/share/doc/mpd/README.md -#usr/share/doc/mpd/TODO -#usr/share/doc/mpd/UPGRADING -#usr/share/doc/mpd/mpdconf.example -#usr/share/man/man1/mpd.1 -#usr/share/man/man5/mpd.conf.5 +#usr/share/icons/hicolor/scalable/apps/mpd.svg +var/log/mpd.error.log +var/log/mpd.log diff --git a/lfs/mpd b/lfs/mpd index f7abccf2c..3112575ad 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -24,7 +24,7 @@ include Config -VER = 0.19.19 +VER = 0.22.6 THISAPP = mpd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 20 +PAK_VER = 21 DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6e4fca9a9c26dad08b61bac9a91802db +$(DL_FILE)_MD5 = 774a6250870730f3d55eb1445ab751dd install : $(TARGET) @@ -78,22 +78,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --disable-ipv6 \ - --sysconfdir=/etc \ - --disable-sqlite \ - --disable-smbclient \ - --enable-id3 \ - --enable-vorbis \ - --enable-expat \ - --enable-ffmpeg \ - --enable-flac \ - --enable-lame-encoder \ - --enable-upnp \ - --disable-icu - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && meson --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + -D ipv6=disabled \ + -D sqlite=disabled \ + -D smbclient=disabled \ + -D id3tag=enabled \ + -D vorbis=enabled \ + -D expat=enabled \ + -D ffmpeg=enabled \ + -D flac=enabled \ + -D lame=enabled \ + -D upnp=enabled \ + -D icu=disabled \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ + cd $(DIR_APP) && ninja -C builddir/ install #install initscripts $(call INSTALL_INITSCRIPT,mpd)