From 9b3bef68884983433093944a90b38ab0b48bcbb6 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sat, 11 Apr 2020 22:12:18 -0400 Subject: audio/mpd: Updated for version 0.21.22. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- audio/mpd/README | 19 ++++++------ audio/mpd/doinst.sh | 4 +-- audio/mpd/mpd.SlackBuild | 77 ++++++++++++++++++++++++++---------------------- audio/mpd/mpd.info | 6 ++-- audio/mpd/slack-desc | 2 +- 5 files changed, 56 insertions(+), 52 deletions(-) diff --git a/audio/mpd/README b/audio/mpd/README index 4ff9ef98d7..b28420017b 100644 --- a/audio/mpd/README +++ b/audio/mpd/README @@ -1,24 +1,23 @@ +mpd (Music Player Daemon) + Music Player Daemon (MPD) allows remote access for playing music (MP3, -Ogg Vorbis, FLAC, AAC, Mod, and wave files) and managing playlists. +Ogg Vorbis, FLAC, AAC, Mod, MIDI, and wave files) and managing playlists. MPD is designed for integrating a computer into a stereo system that provides control for music playback over a local network. It also makes a great desktop music player, especially if you are a console junkie, like frontend options, or restart X often. Some optional and important dependencies, detected automatically: -* ffmpeg: is recommended for support a wide audio files variety -* libshout: this enables the shoutcast streaming output +* ffmpeg: is recommended for support a wide variety of audio file types +* libshout: enables shoutcast streaming output * libmms: used for play mms:// and mmsh:// type network streams * id3lib: add support for edit ID3 tags -* avahi: add support for discover services on network +* avahi: add support for discovering services on network * yajl: add support for open soundcloud.com streams -Other optional dependencies: +Other optional dependencies, detected automatically: libmpdclient, musepack-tools, lame, faad2, fluidsynth, libsidplay2, -twolame, libnfs and jack. - -You can enable this optional feature: -ZZIPLIB=yes|no (default: no), enables open zip files, requires zziplib +twolame, libnfs, jack, zziplib. -NOTE: Be sure to edit the config file (/etc/mpd.conf or ~/mpd.conf) +NOTE: Be sure to edit the config file (/etc/mpd.conf or ~/mpd.conf) before running the daemon. diff --git a/audio/mpd/doinst.sh b/audio/mpd/doinst.sh index 62f245e304..0137e611aa 100644 --- a/audio/mpd/doinst.sh +++ b/audio/mpd/doinst.sh @@ -1,13 +1,11 @@ config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy rm $NEW fi - # Otherwise, we leave the .new copy for the admin to consider... } + config etc/mpd.conf.new diff --git a/audio/mpd/mpd.SlackBuild b/audio/mpd/mpd.SlackBuild index d24d93c3b3..9ccb34020f 100644 --- a/audio/mpd/mpd.SlackBuild +++ b/audio/mpd/mpd.SlackBuild @@ -23,8 +23,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20200411 bkw: not taking this over, but I'm upgrading it to the latest +# release as part of the migration to fluidsynth-2.x. + PRGNAM=mpd -VERSION=${VERSION:-0.20.18} +VERSION=${VERSION:-0.21.22} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,11 +60,11 @@ fi set -e -# zziplib support -if [ "${ZZIPLIB:-no}" != "no" ]; then - zziplib="enable" +# undocumented, but allow disabling pulseaudio +if [ "${PULSE:-yes}" = "yes" ]; then + PULSE="enabled" else - zziplib="disable" + PULSE="disabled" fi rm -rf $PKG @@ -71,40 +74,44 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -#adding LDFLAGS="-lnsl" for libwrap, part of tcp_wrappers package -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -lnsl" \ -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --enable-documentation \ - --enable-database \ - --enable-pulse \ - --enable-iso9660 \ - --${zziplib}-zzip \ - --enable-cdio-paranoia \ - --disable-dependency-tracking \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -lnsl" \ + meson .. \ + -Dsystemd=disabled \ + -Dpulse=$PULSE \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc + ${NINJA:-ninja} + DESTDIR=$PKG ninja install +cd .. + +strip $PKG/usr/bin/$PRGNAM + +# 20200411 bkw: meson doesn't support --docdir +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/* $PKG/usr/doc/$PRGNAM-$VERSION +rm -rf $PKG/usr/share/doc # Use sample config, without overwriting install -D -m 644 doc/mpdconf.example $PKG/etc/mpd.conf.new -find $PKG/usr/man -type f -exec gzip -9 {} \; +# 20200411 bkw: after the switch to meson, man pages aren't installed +# automatically for some reason. +for SECT in 1 5; do + mkdir -p $PKG/usr/man/man$SECT + cp doc/*.$SECT $PKG/usr/man/man$SECT + gzip -9 $PKG/usr/man/man$SECT/*.$SECT +done cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/audio/mpd/mpd.info b/audio/mpd/mpd.info index e1d297c8b9..129f6c469c 100644 --- a/audio/mpd/mpd.info +++ b/audio/mpd/mpd.info @@ -1,8 +1,8 @@ PRGNAM="mpd" -VERSION="0.20.18" +VERSION="0.21.22" HOMEPAGE="https://www.musicpd.org/" -DOWNLOAD="https://www.musicpd.org/download/mpd/0.20/mpd-0.20.18.tar.xz" -MD5SUM="8dc87ba95473fd738f2aff9bd69cc212" +DOWNLOAD="https://www.musicpd.org/download/mpd/0.21/mpd-0.21.22.tar.xz" +MD5SUM="bb2629c875aae28460cda5cf5257434b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/audio/mpd/slack-desc b/audio/mpd/slack-desc index 6035c0897f..630bf9d651 100644 --- a/audio/mpd/slack-desc +++ b/audio/mpd/slack-desc @@ -9,7 +9,7 @@ mpd: mpd (Music Player Daemon) mpd: mpd: MPD is designed for integrating a computer into a stereo system that -mpd: provides control for music playback over a local network. It is also +mpd: provides control for music playback over a local network. It is also mpd: a great music player using one of many available clients. mpd: mpd: Homepage: https://www.musicpd.org/ -- cgit v1.2.3