* [PR PATCH] mpd: update to 0.22.
@ 2020-10-02 8:09 jbenden
2020-10-02 12:36 ` ericonr
` (20 more replies)
0 siblings, 21 replies; 22+ messages in thread
From: jbenden @ 2020-10-02 8:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 453 bytes --]
There is a new 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: 3324 bytes --]
From 057b20adba2befc0014fe2f5c9d3cd334eff6a5c 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/template | 17 ++++++-----------
2 files changed, 7 insertions(+), 11 deletions(-)
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/template b/srcpkgs/mpd/template
index 12fec41677f..ce6c6024607 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,8 +8,8 @@ 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)
@@ -21,7 +21,7 @@ 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
+ zziplib-devel libsoxr-devel audiofile-devel twolame-devel 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,8 +34,8 @@ 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"
system_accounts="mpd"
@@ -56,11 +56,6 @@ 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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
@ 2020-10-02 12:36 ` ericonr
2020-10-02 12:37 ` ericonr
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-10-02 12:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-702709912
Comment:
Not sure I love the idea of adding `liburing` to mpd. I couldn't even get it their testsuite to work well.
What advantages does it bring?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
2020-10-02 12:36 ` ericonr
@ 2020-10-02 12:37 ` ericonr
2020-10-02 12:50 ` sgn
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-10-02 12:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-702709912
Comment:
Not sure I love the idea of adding `liburing` to mpd. I couldn't even get their testsuite to work well.
What advantages does it bring?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 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
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-10-02 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-702715841
Comment:
Somehow I can play music with this version, some config was changed?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (2 preceding siblings ...)
2020-10-02 12:50 ` sgn
@ 2020-10-02 12:51 ` sgn
2020-10-02 17:09 ` ericonr
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-10-02 12:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-702715841
Comment:
Somehow I can play music with this version, some config was changed?
> mpd: ffmpeg: Unsupported libavcodec SampleFormat value: name
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (3 preceding siblings ...)
2020-10-02 12:51 ` sgn
@ 2020-10-02 17:09 ` ericonr
2020-10-02 19:26 ` daniel-eys
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-10-02 17:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-702709912
Comment:
Not sure I love the idea of adding `liburing` to mpd. I couldn't even get their testsuite to work well.
What advantages does it bring?
EDIT: That said, making it a build option is definitely fine.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (4 preceding siblings ...)
2020-10-02 17:09 ` ericonr
@ 2020-10-02 19:26 ` daniel-eys
2020-10-02 19:33 ` jbenden
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: daniel-eys @ 2020-10-02 19:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
New comment by daniel-eys on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-702916643
Comment:
The manpages are lost, see https://github.com/MusicPlayerDaemon/MPD/issues/960
Already fixed upstream, but not in a release yet.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (5 preceding siblings ...)
2020-10-02 19:26 ` daniel-eys
@ 2020-10-02 19:33 ` jbenden
2020-10-02 19:39 ` daniel-eys
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: jbenden @ 2020-10-02 19:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 415 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-702919539
Comment:
@daniel-eys I can patch it, would that work?
@ericonr I believe it is used to pass decoded audio from file reader threads, into the real-time thread sending data over to ALSA (etc). Also, MPD says it is required, not an optional dep (at least the meson output said this.)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (6 preceding siblings ...)
2020-10-02 19:33 ` jbenden
@ 2020-10-02 19:39 ` daniel-eys
2020-10-02 19:57 ` [PR PATCH] [Updated] " jbenden
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: daniel-eys @ 2020-10-02 19:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New comment by daniel-eys on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-702921954
Comment:
> @daniel-eys I can patch it, would that work?
Sure, we can just pick upstream's commit.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (7 preceding siblings ...)
2020-10-02 19:39 ` daniel-eys
@ 2020-10-02 19:57 ` jbenden
2020-10-02 20:01 ` jbenden
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: jbenden @ 2020-10-02 19:57 UTC (permalink / raw)
To: ml
[-- 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: 5468 bytes --]
From 5fe985af703e026f823a65547955bde56c79b5d5 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 +
..._check-both-html_manual-and-manpages.patch | 20 +++++++++++++++
srcpkgs/mpd/template | 25 +++++++++----------
3 files changed, 33 insertions(+), 13 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/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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (8 preceding siblings ...)
2020-10-02 19:57 ` [PR PATCH] [Updated] " jbenden
@ 2020-10-02 20:01 ` jbenden
2020-10-03 1:47 ` sgn
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: jbenden @ 2020-10-02 20:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 369 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-702932225
Comment:
I have added the patch, and sphinx dependency. The man pages are now present in the final package.
@ericonr Also, I turned the `io_uring` stuff into a build option (default off). I've tested building with and without; works.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (9 preceding siblings ...)
2020-10-02 20:01 ` jbenden
@ 2020-10-03 1:47 ` sgn
2020-10-03 23:29 ` [PR PATCH] [Updated] " jbenden
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-10-03 1:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-702715841
Comment:
Somehow I can NOT play music with this version, some config was changed?
> mpd: ffmpeg: Unsupported libavcodec SampleFormat value: name
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (10 preceding siblings ...)
2020-10-03 1:47 ` sgn
@ 2020-10-03 23:29 ` jbenden
2020-10-04 20:39 ` jbenden
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: jbenden @ 2020-10-03 23:29 UTC (permalink / raw)
To: ml
[-- 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: 5842 bytes --]
From 6ea4216c76814c8c94b19c38b9776b1f299c4ec1 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/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 <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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (11 preceding siblings ...)
2020-10-03 23:29 ` [PR PATCH] [Updated] " jbenden
@ 2020-10-04 20:39 ` jbenden
2020-10-06 22:40 ` jbenden
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: jbenden @ 2020-10-04 20:39 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (12 preceding siblings ...)
2020-10-04 20:39 ` jbenden
@ 2020-10-06 22:40 ` jbenden
2020-10-13 12:15 ` kartikynwa
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: jbenden @ 2020-10-06 22:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 342 bytes --]
New comment by jbenden on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-704590641
Comment:
I re-pushed a change to permit `io_uring` to work via capabilities added to the binary.
I've also added support for custom runit configuration of the `mpd` service, via a `conf` file, as is typical.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (13 preceding siblings ...)
2020-10-06 22:40 ` jbenden
@ 2020-10-13 12:15 ` kartikynwa
2020-10-13 12:18 ` kartikynwa
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kartikynwa @ 2020-10-13 12:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
New comment by kartikynwa on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-707698638
Comment:
When I tried making a template for this update, the files `meson.build` and `doc/meson.build` were getting mangled when `xbps-src` was extracting them from the sources. Anyone knows what's up with that?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (14 preceding siblings ...)
2020-10-13 12:15 ` kartikynwa
@ 2020-10-13 12:18 ` kartikynwa
2020-10-19 13:46 ` SolitudeSF
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kartikynwa @ 2020-10-13 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
New comment by kartikynwa on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-707698638
Comment:
When I tried making a template for this update, the files `meson.build` and `doc/meson.build` were getting mangled when `xbps-src` was extracting them from the sources. Anyone knows what's up with that?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (15 preceding siblings ...)
2020-10-13 12:18 ` kartikynwa
@ 2020-10-19 13:46 ` SolitudeSF
2020-10-19 18:22 ` [PR PATCH] [Updated] " jbenden
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: SolitudeSF @ 2020-10-19 13:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New comment by SolitudeSF on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-712167443
Comment:
0.22.1 is out
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (16 preceding siblings ...)
2020-10-19 13:46 ` SolitudeSF
@ 2020-10-19 18:22 ` jbenden
2020-10-22 9:31 ` kartikynwa
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: jbenden @ 2020-10-19 18:22 UTC (permalink / raw)
To: ml
[-- 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: 4818 bytes --]
From e73ca72747742e872c0409fcd6e55c01e805378f 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.1.
Signed-off-by: Joseph Benden <joe@benden.us>
---
common/shlibs | 1 +
srcpkgs/mpd/INSTALL | 2 +-
srcpkgs/mpd/files/mpd/run | 3 ++-
srcpkgs/mpd/template | 23 +++++++++++------------
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 35f08f5f099..9e668a18932 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,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/template b/srcpkgs/mpd/template
index 12fec41677f..8e3de99fec6 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.1
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')
@@ -35,8 +37,9 @@ 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
+checksum=408464093d09c73ceecafc201defcbaba2193cb30ad0aaf1241459a410fecaf3
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: mpd: update to 0.22.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (17 preceding siblings ...)
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
20 siblings, 0 replies; 22+ messages in thread
From: kartikynwa @ 2020-10-22 9:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New comment by kartikynwa on void-packages repository
https://github.com/void-linux/void-packages/pull/25271#issuecomment-714363866
Comment:
@jbenden thanks for this. I have built this and been using this on x86_64, both glibc and musl and it works flawlessly. edit the title of the PR maybe?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] mpd: update to 0.22.1.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (18 preceding siblings ...)
2020-10-22 9:31 ` kartikynwa
@ 2020-10-22 17:05 ` jbenden
2020-10-24 15:01 ` [PR PATCH] [Merged]: " leahneukirchen
20 siblings, 0 replies; 22+ messages in thread
From: jbenden @ 2020-10-22 17:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 460 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.1.
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: 4837 bytes --]
From bb8b5334db4b5b251005741620468337231978c1 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.1.
Signed-off-by: Joseph Benden <joe@benden.us>
---
common/shlibs | 1 +
srcpkgs/mpd/INSTALL | 2 +-
srcpkgs/mpd/files/mpd/run | 3 ++-
srcpkgs/mpd/template | 23 +++++++++++------------
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d21589f14a5..d252b19f5d8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3992,3 +3992,4 @@ libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
libSeExpr2Editor.so.3 seexpr-krita-3.4.4.0_1
libSeExpr2.so.3 seexpr-krita-3.4.4.0_1
+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/template b/srcpkgs/mpd/template
index 12fec41677f..8e3de99fec6 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.1
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')
@@ -35,8 +37,9 @@ 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
+checksum=408464093d09c73ceecafc201defcbaba2193cb30ad0aaf1241459a410fecaf3
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Merged]: mpd: update to 0.22.1.
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 jbenden
` (19 preceding siblings ...)
2020-10-22 17:05 ` [PR PATCH] [Updated] mpd: update to 0.22.1 jbenden
@ 2020-10-24 15:01 ` leahneukirchen
20 siblings, 0 replies; 22+ messages in thread
From: leahneukirchen @ 2020-10-24 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
There's a merged pull request on the void-packages repository
mpd: update to 0.22.1.
https://github.com/void-linux/void-packages/pull/25271
Description:
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>
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2020-10-24 15:01 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-02 8:09 [PR PATCH] mpd: update to 0.22 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
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
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).