Le Sat, Mar 05, 2022 at 11:12:50AM +0100, Landry Breuil a écrit :
> Hi,
>
> here's an update to 0.23.5, check
> https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.5/NEWS for
> the changelog, especially the 0.23.0 notes with added features. i've
> disabled pipewire and openmpt by default.
>
> there's support for snapcast output.
>
> totally untested yet, but sending it here for feedback.
new diff that actually applies on -current, currently testing here
backported on 7.0.
note that the database will be dropped/recreated upon first start, i had
this on stderr when starting the new version:
Mar 07 10:14 : exception: Tag list mismatch, discarding database file
and the playlist was emptied.
other than that it seems to work, but as there can be many mpd usecases
feedback is welcome.
Landry
? 0.21.8.log
? mpd-0.20.20
? mpd-0.21.1
? patch-src_Main_cxx
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/mpd/Makefile,v
retrieving revision 1.139
diff -u -r1.139 Makefile
--- Makefile 21 Nov 2021 08:10:41 -0000 1.139
+++ Makefile 7 Mar 2022 08:53:45 -0000
@@ -2,9 +2,8 @@
BROKEN-hppa = no atomic ops
COMMENT = Music Player Daemon
-VER = 0.22.11
+VER = 0.23.5
DISTNAME = mpd-${VER}
-REVISION = 1
EXTRACT_SUFX = .tar.xz
CATEGORIES = audio
HOMEPAGE = https://www.musicpd.org/
@@ -14,9 +13,9 @@
WANTLIB = FLAC audiofile avcodec avfilter avformat avutil \
bz2 c cdio cdio_cdda cdio_paranoia curl \
- expat faad icui18n icuuc \
+ expat faad fmt icui18n icuuc \
id3tag iso9660 m mikmod mp3lame mpcdec \
- mpdclient ogg opus pcre pthread samplerate \
+ mpdclient ogg opus pcre2-8 pthread samplerate \
shout sndfile sndio sqlite3 \
vorbis vorbisenc yajl z ${COMPILER_LIBCXX}
@@ -41,9 +40,10 @@
audio/musepack \
audio/opus \
databases/sqlite3 \
+ devel/fmt \
devel/libaudiofile \
devel/libyajl \
- devel/pcre \
+ devel/pcre2 \
graphics/ffmpeg \
net/curl \
net/libshout \
@@ -97,6 +97,7 @@
-Dmodplug=disabled \
-Dmpcdec=enabled \
-Dmpg123=disabled \
+ -Dopenmpt=disabled \
-Dopus=enabled \
-Dsidplay=disabled \
-Dsndfile=enabled \
@@ -126,6 +127,7 @@
-Doss=disabled \
-Dpipe=true \
-Dpulse=disabled \
+ -Dpipewire=disabled \
-Drecorder=true \
-Dshout=enabled \
-Dsndio=enabled \
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/mpd/distinfo,v
retrieving revision 1.59
diff -u -r1.59 distinfo
--- distinfo 13 Sep 2021 05:36:50 -0000 1.59
+++ distinfo 7 Mar 2022 08:53:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.22.11.tar.xz) = FD9/NKruboeIjz3TXUmq3mZWBSZRuWDKQrRsu1GMoKA=
-SIZE (mpd-0.22.11.tar.xz) = 737184
+SHA256 (mpd-0.23.5.tar.xz) = 8iwsJQk6BfRWb5zXIHz7zYQFr2ftKamJvPiQX4C3opk=
+SIZE (mpd-0.23.5.tar.xz) = 770700
Index: patches/patch-doc_meson_build
===================================================================
RCS file: /cvs/ports/audio/mpd/patches/patch-doc_meson_build,v
retrieving revision 1.2
diff -u -r1.2 patch-doc_meson_build
--- patches/patch-doc_meson_build 20 Feb 2021 14:43:01 -0000 1.2
+++ patches/patch-doc_meson_build 7 Mar 2022 08:53:45 -0000
@@ -1,9 +1,7 @@
-$OpenBSD: patch-doc_meson_build,v 1.2 2021/02/20 14:43:01 landry Exp $
-
Index: doc/meson.build
--- doc/meson.build.orig
+++ doc/meson.build
-@@ -18,7 +18,7 @@ if get_option('html_manual')
+@@ -19,7 +19,7 @@ if get_option('html_manual')
'conf.py',
],
command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
Index: patches/patch-doc_mpdconf_example
===================================================================
RCS file: /cvs/ports/audio/mpd/patches/patch-doc_mpdconf_example,v
retrieving revision 1.21
diff -u -r1.21 patch-doc_mpdconf_example
--- patches/patch-doc_mpdconf_example 8 Apr 2021 10:16:48 -0000 1.21
+++ patches/patch-doc_mpdconf_example 7 Mar 2022 08:53:45 -0000
@@ -1,4 +1,3 @@
-$OpenBSD: patch-doc_mpdconf_example,v 1.21 2021/04/08 10:16:48 solene Exp $
Index: doc/mpdconf.example
--- doc/mpdconf.example.orig
+++ doc/mpdconf.example
@@ -25,23 +24,25 @@
#
-#db_file "~/.mpd/database"
+db_file "/var/spool/mpd/mpd.db"
- #
+
# These settings are the locations for the daemon log files for the daemon.
- # These logs are great for troubleshooting, depending on your log_level
-@@ -34,25 +34,25 @@
- # The special value "syslog" makes MPD use the local syslog daemon. This
- # setting defaults to logging to syslog.
+ #
+@@ -35,7 +35,7 @@
+ # If you use systemd, do not configure a log_file. With systemd, MPD
+ # defaults to the systemd journal, which is fine.
#
-#log_file "~/.mpd/log"
+log_file "/var/log/mpd/mpd.log"
- #
+
# This setting sets the location of the file which stores the process ID
# for use of mpd --kill and some init scripts. This setting is disabled by
- # default and the pid file will not be stored.
+@@ -43,19 +43,19 @@
+ #
+ # If you use systemd, do not configure a pid_file.
#
-#pid_file "~/.mpd/pid"
+pid_file "/var/spool/mpd/mpd.pid"
- #
+
# This setting sets the location of the file which contains information about
# most variables to get MPD back into the same general shape it was in before
# it was brought down. This setting is disabled by default and the server
@@ -58,7 +59,7 @@
#
###############################################################################
-@@ -64,7 +64,7 @@
+@@ -67,7 +67,7 @@
# initialization. This setting is disabled by default and MPD is run as the
# current user.
#
@@ -67,7 +68,7 @@
#
# This setting specifies the group that MPD will run as. If not specified
# primary group of user specified with "user" setting will be used (if set).
-@@ -83,7 +83,10 @@
+@@ -86,7 +86,10 @@
#
# And for Unix Socket
#bind_to_address "~/.mpd/socket"
@@ -78,7 +79,7 @@
# This setting is the TCP port that is desired for the daemon to get assigned
# to.
#
-@@ -327,11 +330,11 @@ input {
+@@ -330,11 +333,11 @@ input {
#
# An example of an sndio output.
#
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/mpd/pkg/PLIST,v
retrieving revision 1.14
diff -u -r1.14 PLIST
--- pkg/PLIST 28 Apr 2020 17:16:21 -0000 1.14
+++ pkg/PLIST 7 Mar 2022 08:53:45 -0000
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.14 2020/04/28 17:16:21 jca Exp $
@pkgpath audio/mpd,tremor
@newgroup _mpd:560
@newuser _mpd:560:560:daemon:Music Player Daemon:/var/spool/mpd:/sbin/nologin
