From 6ea4216c76814c8c94b19c38b9776b1f299c4ec1 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Fri, 2 Oct 2020 01:02:30 -0700 Subject: [PATCH] mpd: update to 0.22. Signed-off-by: Joseph Benden --- common/shlibs | 1 + srcpkgs/mpd/files/mpd/run | 3 ++- ..._check-both-html_manual-and-manpages.patch | 20 +++++++++++++++ srcpkgs/mpd/template | 25 +++++++++---------- 4 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 srcpkgs/mpd/patches/001-doc_meson-build_check-both-html_manual-and-manpages.patch diff --git a/common/shlibs b/common/shlibs index 1ee97241fe5..9754a0cbf9d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3992,3 +3992,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1 libtdjson.so.1.6.0 libtd-1.6.0_1 libJudy.so.1 judy-1.0.5_1 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2 +liburing.so.1 liburing-0.7_1 diff --git a/srcpkgs/mpd/files/mpd/run b/srcpkgs/mpd/files/mpd/run index bde3c869b60..bb7832c9e23 100755 --- a/srcpkgs/mpd/files/mpd/run +++ b/srcpkgs/mpd/files/mpd/run @@ -1,3 +1,4 @@ #!/bin/sh +[ -r conf ] && . ./conf install -d -m 0755 -o mpd -g mpd /run/mpd -exec mpd --no-daemon +exec mpd --no-daemon ${OPTS:-} diff --git a/srcpkgs/mpd/patches/001-doc_meson-build_check-both-html_manual-and-manpages.patch b/srcpkgs/mpd/patches/001-doc_meson-build_check-both-html_manual-and-manpages.patch new file mode 100644 index 00000000000..97a4e74b2a7 --- /dev/null +++ b/srcpkgs/mpd/patches/001-doc_meson-build_check-both-html_manual-and-manpages.patch @@ -0,0 +1,20 @@ +From 4ca2c3318147f6521029e5f6b5f65a5f13fa92a5 Mon Sep 17 00:00:00 2001 +From: Max Kellermann +Date: Wed, 30 Sep 2020 12:10:24 +0200 +Subject: [PATCH] doc/meson.build: check both html_manual and manpages + +Closes https://github.com/MusicPlayerDaemon/MPD/issues/960 +--- + doc/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/meson.build b/doc/meson.build +index 02ffc7f9e..a67686483 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -1,4 +1,4 @@ +-if not get_option('html_manual') ++if not get_option('html_manual') and not get_option('manpages') + subdir_done() + endif + diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index 12fec41677f..66c3a37edc0 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,6 +1,6 @@ # Template file for 'mpd' pkgname=mpd -version=0.21.26 +version=0.22 revision=1 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true @@ -8,20 +8,22 @@ configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled -Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled -Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled - -Dshine=disabled -Ddocumentation=true -Daudiofile=enabled -Dtremor=disabled - -Dsolaris_output=disabled + -Dshine=disabled -Ddocumentation=enabled -Daudiofile=enabled -Dtremor=disabled + -Dsolaris_output=disabled -Dhtml_manual=false -Dmanpages=true -Djack=$(vopt_if jack enabled disabled) -Dlame=$(vopt_if lame enabled disabled) -Dao=$(vopt_if libao enabled disabled) -Dmpcdec=$(vopt_if mpcdec enabled disabled) -Dsndio=$(vopt_if sndio enabled disabled) -Dpulse=$(vopt_if pulseaudio enabled disabled) -Dwavpack=$(vopt_if wavpack enabled disabled) -Dcdio_paranoia=$(vopt_if cdio enabled disabled) - -Dopenal=$(vopt_if openal enabled disabled) -Dshout=$(vopt_if shoutcast enabled disabled)" + -Dopenal=$(vopt_if openal enabled disabled) -Dshout=$(vopt_if shoutcast enabled disabled) + -Dio_uring=$(vopt_if io_uring enabled disabled)" conf_files="/etc/mpd.conf" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config python3-Sphinx" makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel libcurl-devel libid3tag-devel libmad-devel libmikmod-devel libmms-devel libmodplug-devel libmpdclient-devel libnfs-devel libsamplerate-devel libsoup-devel libupnp1.8-devel mpg123-devel opus-devel yajl-devel zziplib-devel libsoxr-devel audiofile-devel twolame-devel + $(vopt_if io_uring 'liburing-devel') $(vopt_if cdio 'libcdio-paranoia-devel') $(vopt_if shoutcast 'libshout-devel') $(vopt_if jack 'jack-devel') $(vopt_if lame 'lame-devel') $(vopt_if libao 'libao-devel') $(vopt_if mpcdec 'libmpcdec-devel') @@ -34,9 +36,10 @@ maintainer="Daniel Eyßer " license="GPL-2.0-or-later" homepage="https://www.musicpd.org/" changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS" -distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=f9e68221c7a6829ec02f281eb313b2f24182020f5eb65ab22b337e6169ea4eea +distfiles="https://www.musicpd.org/download/mpd/${version}/mpd-${version}.tar.xz" +checksum=7de742d925d01bf52685cc6cbb31fdeb671e4992a448720897ef706e57e39076 LDFLAGS+=" -Wl,-z,stack-size=1048576" +patch_args="-Np1" system_accounts="mpd" mpd_homedir="/var/lib/mpd" @@ -47,20 +50,16 @@ make_dirs=" /var/lib/mpd/playlists 0755 mpd mpd" # Package build options -build_options="jack lame mpcdec pulseaudio libao wavpack sndio cdio openal shoutcast" +build_options="jack lame mpcdec pulseaudio libao wavpack sndio cdio openal shoutcast io_uring" desc_option_cdio="Enable libcdio_paranoia input plugin" desc_option_openal="Enable OpenAL output plugin" +desc_option_io_uring="Enable support for using liburing" build_options_default="jack pulseaudio libao sndio cdio shoutcast" if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -Dtest=true" fi -pre_configure() { - # We only want manpages - sed -n -e '1p' -i doc/meson.build -} - post_install() { vconf doc/mpdconf.example mpd.conf vsconf doc/mpdconf.example