diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index cdc18f0b20af..b3e38e2e7aa0 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,249 +1,249 @@ PORTNAME= musicpd -PORTVERSION= 0.23.12 +PORTVERSION= 0.23.13 CATEGORIES= audio MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} MAINTAINER= riggs@FreeBSD.org COMMENT= Remote-controllable music daemon WWW= https://www.musicpd.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libfmt.so:devel/libfmt \ libicudata.so:devel/icu USES= compiler:c++17-lang localbase:ldflags meson pkgconfig \ python:build tar:xz USE_RC_SUBR= ${PORTNAME} MESON_ARGS= --auto-features=disabled \ -Dbzip2=enabled \ -Dhttpd=true \ -Dicu=enabled \ -Doss=enabled \ -Dpipe=true \ -Dsyslog=enabled \ -Dzlib=enabled PORTDOCS= AUTHORS README.md NEWS SUB_FILES= pkg-message OPTIONS_SUB= yes OPTIONS_DEFINE= DOCS ID3TAG IPV6 ISO9660 MANPAGES SQLITE3 \ PROXYDB VORBISENC ZZIP OPTIONS_RADIO= RESAMPLER ZEROCONF OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER OPTIONS_RADIO_RESAMPLER= SAMPLERATE SOXR OPTIONS_MULTI= DOCUMENTATION FILE_FORMAT OPTIONS_MULTI_FILE_FORMAT= \ ADPLUG AUDIOFILE FAAD FFMPEG FLAC FLUIDSYNTH \ GME MAD MIKMOD MODPLUG MPG123 MUSEPACK \ OPUS SIDPLAY SNDFILE TWOLAME \ VORBIS WAVPACK WILDMIDI OPTIONS_GROUP= ACCESS PLAYBACK OPTIONS_GROUP_ACCESS= CDPARANOIA CURL LAME NFS PLAYLISTS QOBUZ \ SMB SOUNDCLOUD UPNP YAJL OPTIONS_GROUP_PLAYBACK= AO JACK OPENAL OPENMPT PIPEWIRE PULSEAUDIO \ SHOUTCAST SNDIO ADPLUG_DESC= AdPlug support FAAD_DESC= AAC/MP4 decoding via libfaad GME_DESC= GME support (video game music files) ISO9660_DESC= Direct support for ISO 9660 images PROXYDB_DESC= Proxy database support via libmpdclient LAME_DESC= Support for MP3 Icecast Streams OPENMPT_DESC= Support for OpenMPT playback PIPEWIRE_DESC= PipeWire support PLAYLISTS_DESC= Enable extra playlist support (wma, RSS) QOBUZ_DESC= Streaming service support: Qobuz SIDPLAY_DESC= Sidplay support (C64 mono and stereo files) SMB_DESC= SMB network support (currently strongly discouraged) SOUNDCLOUD_DESC=Streaming service support: SoundCloud TWOLAME_DESC= TwoLAME support (mp2) VORBISENC_DESC= Ogg Vorbis encoder WILDMIDI_DESC= WildMIDI support (MIDI files) YAJL_DESC= JSON support via libyajl ZZIP_DESC= Support for zzip archives OPTIONS_DEFAULT=CURL FFMPEG FLAC ID3TAG LAME MANPAGES OPUS \ PLAYLISTS PROXYDB SNDFILE VORBIS VORBISENC \ WAVPACK MANPAGES_MESON_ENABLED= documentation MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${PY_FLAVOR} # Decoder plugins ADPLUG_MESON_ENABLED= adplug ADPLUG_LIB_DEPENDS= libadplug.so:audio/libadplug AUDIOFILE_MESON_ENABLED=audiofile AUDIOFILE_LIB_DEPENDS= libaudiofile.so:audio/libaudiofile FAAD_MESON_ENABLED= faad FAAD_LIB_DEPENDS= libfaad.so:audio/faad FFMPEG_MESON_ENABLED= ffmpeg FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg FLAC_MESON_ENABLED= flac FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLUIDSYNTH_MESON_ENABLED= fluidsynth FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth GME_MESON_ENABLED= gme GME_LIB_DEPENDS= libgme.so:audio/libgme MAD_MESON_ENABLED= mad MAD_LIB_DEPENDS= libmad.so:audio/libmad MIKMOD_MESON_ENABLED= mikmod MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod MODPLUG_MESON_ENABLED= modplug MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MPG123_MESON_ENABLED= mpg123 MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 MUSEPACK_MESON_ENABLED= mpcdec MUSEPACK_LIB_DEPENDS= libmpcdec.so:audio/musepack NFS_MESON_ENABLED= nfs NFS_LIB_DEPENDS= libnfs.so:net/libnfs OPENMPT_MESON_ENABLED= openmpt OPENMPT_LIB_DEPENDS= libopenmpt.so:audio/libopenmpt OPUS_MESON_ENABLED= opus OPUS_LIB_DEPENDS= libopus.so:audio/opus \ libogg.so:audio/libogg PLAYLISTS_MESON_ENABLED=expat PLAYLISTS_LIB_DEPENDS= libexpat.so:textproc/expat2 SIDPLAY_MESON_ENABLED= sidplay SIDPLAY_LIB_DEPENDS= libsidplayfp.so:audio/libsidplayfp SIDPLAY_CXXFLAGS= -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR SNDFILE_MESON_ENABLED= sndfile SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile VORBIS_MESON_ENABLED= vorbis VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis WAVPACK_MESON_ENABLED= wavpack WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WILDMIDI_MESON_ENABLED= wildmidi WILDMIDI_LIB_DEPENDS= libWildMidi.so:audio/wildmidi # Encoder plugins VORBISENC_IMPLIES= VORBIS VORBISENC_MESON_ENABLED= vorbisenc VORBISENC_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis LAME_MESON_ENABLED= lame LAME_LIB_DEPENDS= libmp3lame.so:audio/lame TWOLAME_MESON_ENABLED= twolame TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame # Filter plugins SAMPLERATE_MESON_ENABLED= libsamplerate SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SOXR_MESON_ENABLED= soxr SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr # Output plugins AO_MESON_ENABLED= ao AO_LIB_DEPENDS= libao.so:audio/libao JACK_MESON_ENABLED= jack JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CXXFLAGS= -Wno-register OPENAL_MESON_ENABLED= openal OPENAL_USES= openal PIPEWIRE_MESON_ENABLED= pipewire PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PULSEAUDIO_MESON_ENABLED= pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio SHOUTCAST_MESON_ENABLED=shout SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout SHOUTCAST_IMPLIES= VORBIS SNDIO_MESON_ENABLED= sndio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio # Input plugins CDPARANOIA_MESON_ENABLED= cdio_paranoia CDPARANOIA_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia CURL_MESON_ENABLED= curl CURL_LIB_DEPENDS= libcurl.so:ftp/curl SMB_MESON_ENABLED= smbclient SMB_USES= samba:lib # Archive plugins ZZIP_MESON_ENABLED= zzip ZZIP_LIB_DEPENDS= libzzip.so:devel/zziplib ISO9660_MESON_ENABLED= iso9660 ISO9660_LIB_DEPENDS= libiso9660.so:sysutils/libcdio # Database plugins SQLITE3_MESON_ENABLED= sqlite SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PROXYDB_MESON_ENABLED= libmpdclient PROXYDB_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient # Tag plugins ID3TAG_MESON_ENABLED= id3tag ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag # Network support IPV6_MESON_ENABLED= ipv6 # Commercial service support QOBUZ_MESON_ENABLED= qobuz QOBUZ_LIB_DEPENDS= libgcrypt.so:security/libgcrypt QOBUZ_IMPLIES= CURL YAJL SOUNDCLOUD_MESON_ENABLED= soundcloud SOUNDCLOUD_IMPLIES= CURL YAJL # Misc library support AVAHI_MESON_ON= -Dzeroconf=avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app MDNSRESPONDER_MESON_ON= -Dzeroconf=bonjour MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder UPNP_MESON_ON= -Dupnp=npupnp UPNP_LIB_DEPENDS= libnpupnp.so:net/libnpupnp YAJL_MESON_ENABLED= yajl YAJL_LIB_DEPENDS= libyajl.so:devel/yajl MPDUSER?= mpd MPDGROUP?= mpd USERS= ${MPDUSER} GROUPS= ${MPDGROUP} post-patch: # Make musicpd run as ${MPDUSER} by default @${REINPLACE_CMD} -e 's|%%MPDUSER%%|${MPDUSER}|' \ ${WRKSRC}/doc/mpdconf.example # Fix man pages for executable names @${REINPLACE_CMD} \ -e 's#^``mpd#``${PORTNAME}#' \ -e 's#:: mpd#:: ${PORTNAME}#' \ -e 's#mpd(1)#${PORTNAME}(1)#' \ -e 's#mpd.conf(5)#${PORTNAME}.conf(5)#' \ ${WRKSRC}/doc/mpd.1.rst ${WRKSRC}/doc/mpd.conf.5.rst @${REINPLACE_CMD} \ -e "s#'mpd'#'${PORTNAME}'#" \ -e "s#'mpd.conf'#'${PORTNAME}.conf'#" \ -e "s#'mpd.conf doc#'${PORTNAME}.conf doc#" \ ${WRKSRC}/doc/conf.py do-install: ${INSTALL_PROGRAM} ${WRKSRC}/_build/mpd \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample do-install-MANPAGES-on: ${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.1 \ ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.conf.5 \ ${STAGEDIR}${PREFIX}/man/man5 .include diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index fabe02855abb..bfc65ffd163c 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674389526 -SHA256 (mpd-0.23.12.tar.xz) = b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 -SIZE (mpd-0.23.12.tar.xz) = 774708 +TIMESTAMP = 1684823682 +SHA256 (mpd-0.23.13.tar.xz) = a96b01e6fbbb7e8ab25eb7c15d5c811c62eb19b76d143a802f51674791f1d519 +SIZE (mpd-0.23.13.tar.xz) = 776668 diff --git a/audio/musicpd/files/patch-doc_mpdconf.example b/audio/musicpd/files/patch-doc_mpdconf.example index d3401207e2e1..48eb896465cd 100644 --- a/audio/musicpd/files/patch-doc_mpdconf.example +++ b/audio/musicpd/files/patch-doc_mpdconf.example @@ -1,108 +1,108 @@ ---- doc/mpdconf.example.orig 2021-11-11 09:16:36 UTC +--- doc/mpdconf.example.orig 2023-05-22 17:46:38 UTC +++ doc/mpdconf.example @@ -10,14 +10,14 @@ # be disabled and audio files will only be accepted over ipc socket (using # file:// protocol) or streaming files over an accepted protocol. # -#music_directory "~/music" +music_directory "/var/mpd/music" # # This setting sets the MPD internal playlist directory. The purpose of this # directory is storage for playlists created by MPD. The server will use # playlist files not created by the server but only if they are in the MPD # format. This setting defaults to playlist saving being disabled. # -#playlist_directory "~/.mpd/playlists" +playlist_directory "/var/mpd/.mpd/playlists" # # This setting sets the location of the MPD database. This file is used to # load the database at server start up and store the database while the @@ -25,7 +25,7 @@ # MPD to accept files over ipc socket (using file:// protocol) or streaming # files over an accepted protocol. # -#db_file "~/.mpd/database" +db_file "/var/mpd/.mpd/database" # These settings are the locations for the daemon log files for the daemon. # @@ -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/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 @@ -43,19 +43,19 @@ # # If you use systemd, do not configure a pid_file. # -#pid_file "~/.mpd/pid" +pid_file "/var/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 # state will be reset on server start up. # -#state_file "~/.mpd/state" +state_file "/var/mpd/.mpd/state" # # The location of the sticker database. This is a database which # manages dynamic information attached to songs. # -#sticker_file "~/.mpd/sticker.sql" +sticker_file "/var/mpd/.mpd/sticker.sql" # ############################################################################### @@ -67,7 +67,7 @@ # initialization. This setting is disabled by default and MPD is run as the # current user. # -#user "nobody" +user "%%MPDUSER%%" # # 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). @@ -85,7 +85,7 @@ #bind_to_address "any" # # And for Unix Socket -#bind_to_address "~/.mpd/socket" +#bind_to_address "/var/mpd/.mpd/socket" # # This setting is the TCP port that is desired for the daemon to get assigned # to. @@ -181,8 +181,8 @@ # #database { # plugin "simple" --# path "~/.local/share/mpd/db +-# path "~/.local/share/mpd/db" -# cache_directory "~/.local/share/mpd/cache" -+# path "/var/mpd/.local/share/mpd/db ++# path "/var/mpd/.local/share/mpd/db" +# cache_directory "/var/mpd/.local/share/mpd/cache" #} # - # An example of database config for a sattelite setup + # An example of database config for a satellite setup @@ -227,14 +227,14 @@ input { # # An example of an OSS output: # -#audio_output { -# type "oss" -# name "My OSS Device" +audio_output { + type "oss" + name "Default OSS Device" ## device "/dev/dsp" # optional ## mixer_type "hardware" # optional ## mixer_device "/dev/mixer" # optional ## mixer_control "PCM" # optional -#} +} # # An example of a shout output (for streaming to Icecast): #