From 95b026466130599b23b86ed8a0265d4f72e346a6 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 24 Aug 2019 22:42:12 +0200 Subject: [PATCH] mpd: use $PREFIX/var/run instead of $TMPDIR See https://github.com/termux/termux-packages/issues/4206 --- packages/mpd/build.sh | 2 +- packages/mpd/doc-mpdconf.example.patch | 4 ++-- packages/mpd/src-fs-io-FileOutputStream.hxx.patch | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 5c71605f9..342090a98 100644 --- a/packages/mpd/build.sh +++ b/packages/mpd/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.musicpd.org TERMUX_PKG_DESCRIPTION="Music player daemon" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.21.13 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=0c71ff34aa4def30cd931977cbfe3deb6ec815a726b8c5343f1b8e5707136ebf TERMUX_PKG_DEPENDS="libc++, libcurl, libid3tag, libopus, libpulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib" diff --git a/packages/mpd/doc-mpdconf.example.patch b/packages/mpd/doc-mpdconf.example.patch index 6a2960ffa..f336133b2 100644 --- a/packages/mpd/doc-mpdconf.example.patch +++ b/packages/mpd/doc-mpdconf.example.patch @@ -69,7 +69,7 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example # # And for Unix Socket -#bind_to_address "~/.mpd/socket" -+bind_to_address "@TERMUX_PREFIX@/tmp/mpd.socket" ++bind_to_address "@TERMUX_PREFIX@/var/run/mpd.socket" # # This setting is the TCP port that is desired for the daemon to get assigned -# to. @@ -191,7 +191,7 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example +audio_output { + type "fifo" + name "ncmpcpp visualizer" -+ path "~/../usr/tmp/mpd.fifo" ++ path "@TERMUX_PREFIX@/var/run/mpd.fifo" + format "44100:16:2" + enabled "no" +} diff --git a/packages/mpd/src-fs-io-FileOutputStream.hxx.patch b/packages/mpd/src-fs-io-FileOutputStream.hxx.patch index e3d5e5945..114d19555 100644 --- a/packages/mpd/src-fs-io-FileOutputStream.hxx.patch +++ b/packages/mpd/src-fs-io-FileOutputStream.hxx.patch @@ -1,7 +1,6 @@ -diff -u -r ../MPD-0.21.3/src/fs/io/FileOutputStream.hxx ./src/fs/io/FileOutputStream.hxx ---- ../MPD-0.21.3/src/fs/io/FileOutputStream.hxx 2018-11-16 12:27:58.000000000 +0000 -+++ ./src/fs/io/FileOutputStream.hxx 2018-12-31 01:08:58.577798371 +0000 -@@ -46,7 +46,7 @@ +--- ../FileOutputStream.hxx.orig 2019-08-24 20:56:41.969642005 +0200 ++++ ./src/fs/io/FileOutputStream.hxx 2019-08-12 21:47:53.854420002 +0200 +@@ -45,7 +45,7 @@ #include #endif