From: jbenden <jbenden@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mpd: update to 0.22.
Date: Sun, 04 Oct 2020 22:39:18 +0200 [thread overview]
Message-ID: <20201004203918.xxyxTXiznbj0kBk9IYuGu5jlbCyYxYfy9OWLQ3jYwdg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25271@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 458 bytes --]
There is an updated pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages mpd-0.22
https://github.com/void-linux/void-packages/pull/25271
mpd: update to 0.22.
mpd update to 0.22; and addition to `common/shlibs` for `liburing`.
Tested locally and seems OK.
Signed-off-by: Joseph Benden <joe@benden.us>
A patch file from https://github.com/void-linux/void-packages/pull/25271.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mpd-0.22-25271.patch --]
[-- Type: text/x-diff, Size: 6188 bytes --]
From 5889a7b03523a401b1f33fab347be674e4b96b45 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Fri, 2 Oct 2020 01:02:30 -0700
Subject: [PATCH] mpd: update to 0.22.
Signed-off-by: Joseph Benden <joe@benden.us>
---
common/shlibs | 1 +
srcpkgs/mpd/INSTALL | 2 +-
srcpkgs/mpd/files/mpd/run | 3 ++-
..._check-both-html_manual-and-manpages.patch | 20 +++++++++++++++
srcpkgs/mpd/template | 25 +++++++++----------
5 files changed, 36 insertions(+), 15 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/INSTALL b/srcpkgs/mpd/INSTALL
index 64ae2d78211..9b6b817e4b5 100644
--- a/srcpkgs/mpd/INSTALL
+++ b/srcpkgs/mpd/INSTALL
@@ -1,5 +1,5 @@
case "$ACTION" in
post)
- setcap 'cap_sys_nice=eip' usr/bin/mpd
+ setcap 'cap_sys_nice,cap_ipc_lock=eip' usr/bin/mpd
;;
esac
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 <max@musicpd.org>
+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 <daniel.eysser@gmail.com>"
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
next prev parent reply other threads:[~2020-10-04 20:39 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-02 8:09 [PR PATCH] " jbenden
2020-10-02 12:36 ` ericonr
2020-10-02 12:37 ` ericonr
2020-10-02 12:50 ` sgn
2020-10-02 12:51 ` sgn
2020-10-02 17:09 ` ericonr
2020-10-02 19:26 ` daniel-eys
2020-10-02 19:33 ` jbenden
2020-10-02 19:39 ` daniel-eys
2020-10-02 19:57 ` [PR PATCH] [Updated] " jbenden
2020-10-02 20:01 ` jbenden
2020-10-03 1:47 ` sgn
2020-10-03 23:29 ` [PR PATCH] [Updated] " jbenden
2020-10-04 20:39 ` jbenden [this message]
2020-10-06 22:40 ` jbenden
2020-10-13 12:15 ` kartikynwa
2020-10-13 12:18 ` kartikynwa
2020-10-19 13:46 ` SolitudeSF
2020-10-19 18:22 ` [PR PATCH] [Updated] " jbenden
2020-10-22 9:31 ` kartikynwa
2020-10-22 17:05 ` [PR PATCH] [Updated] mpd: update to 0.22.1 jbenden
2020-10-24 15:01 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201004203918.xxyxTXiznbj0kBk9IYuGu5jlbCyYxYfy9OWLQ3jYwdg@z \
--to=jbenden@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).