audio/mpd: update to 0.22.6.

See https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22.6/NEWS
Add BDEP on py3-sphinx to build the manpages, which arent shipped
anymore in the source tarball.
ok bket@
This commit is contained in:
landry 2021-02-20 14:43:01 +00:00
parent b98f46b047
commit 4c37806e33
4 changed files with 28 additions and 30 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.132 2020/07/08 13:02:24 bket Exp $
# $OpenBSD: Makefile,v 1.133 2021/02/20 14:43:01 landry Exp $
BROKEN-hppa = no atomic ops
COMMENT = Music Player Daemon
VER = 0.21.25
VER = 0.22.6
DISTNAME = mpd-${VER}
EXTRACT_SUFX = .tar.xz
CATEGORIES = audio
@ -11,7 +11,7 @@ HOMEPAGE = https://www.musicpd.org/
# GPLv2+
PERMIT_PACKAGE = Yes
WANTLIB = FLAC audiofile avcodec avformat avutil \
WANTLIB = FLAC audiofile avcodec avfilter avformat avutil \
bz2 c cdio cdio_cdda cdio_paranoia curl \
expat faad icui18n icuuc \
id3tag iso9660 m mikmod mp3lame mpcdec \
@ -24,6 +24,7 @@ MASTER_SITES = https://www.musicpd.org/download/mpd/${VER:R}/
COMPILER = base-clang ports-gcc
BUILD_DEPENDS = devel/boost
BUILD_DEPENDS += textproc/py-sphinx,python3
LIB_DEPENDS = audio/faad>=2.6.1p0 \
audio/flac \
@ -145,9 +146,6 @@ CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include -D_BSD_SOURCE"
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 ${PREFIX}/man/man1/mpd.1
${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 ${PREFIX}/man/man5/mpd.conf.5
# avoid dependency on gtk3,-guic
@rm -Rf ${PREFIX}/share/icons/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpd

View File

@ -1,2 +1,2 @@
SHA256 (mpd-0.21.25.tar.xz) = IKCtAb8yey2+tq6OGvlSyw3oPS1j+rD6S3GDp0dlwgE=
SIZE (mpd-0.21.25.tar.xz) = 683768
SHA256 (mpd-0.22.6.tar.xz) = K+FJpIlcPLYTR3+M8Rk1k+PYodOKdf+n0y2oyDFqTV4=
SIZE (mpd-0.22.6.tar.xz) = 730524

View File

@ -1,14 +1,14 @@
$OpenBSD: patch-doc_meson_build,v 1.1 2019/08/06 17:28:12 landry Exp $
$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
@@ -11,7 +11,7 @@ sphinx_output = custom_target(
'conf.py',
],
command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
- build_by_default: true,
+ build_by_default: false,
install: true,
install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
)
@@ -18,7 +18,7 @@ if get_option('html_manual')
'conf.py',
],
command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
- build_by_default: true,
+ build_by_default: false,
install: true,
install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
)

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-doc_mpdconf_example,v 1.19 2019/08/06 17:28:12 landry Exp $
$OpenBSD: patch-doc_mpdconf_example,v 1.20 2021/02/20 14:43:01 landry Exp $
Index: doc/mpdconf.example
--- doc/mpdconf.example.orig
+++ doc/mpdconf.example
@ -7,25 +7,25 @@ Index: doc/mpdconf.example
# file:// protocol) or streaming files over an accepted protocol.
#
-#music_directory "~/music"
+music_directory "/please-configure-your-music_directory"
+music_directory "/please-configure-your-music_directory"
#
# This setting sets the MPD internal playlist directory. The purpose of this
# directory is storage for playlists created by MPD. The server will use
# 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/spool/mpd/playlists"
+playlist_directory "/var/spool/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
# 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/spool/mpd/mpd.db"
#
++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 @@
@ -33,22 +33,22 @@ Index: doc/mpdconf.example
# setting defaults to logging to syslog.
#
-#log_file "~/.mpd/log"
+log_file "/var/log/mpd/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.
#
-#pid_file "~/.mpd/pid"
+pid_file "/var/spool/mpd/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
# 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/spool/mpd/mpdstate"
+state_file "/var/spool/mpd/mpdstate"
#
# The location of the sticker database. This is a database which
# manages dynamic information attached to songs.
@ -78,7 +78,7 @@ Index: doc/mpdconf.example
# This setting is the TCP port that is desired for the daemon to get assigned
# to.
#
@@ -303,11 +306,11 @@ input {
@@ -327,11 +330,11 @@ input {
#
# An example of an sndio output.
#