From a8b48fb720e96c9d3a7a1809ee14ce371bc70de4 Mon Sep 17 00:00:00 2001 From: Aditya Alok Date: Mon, 18 Apr 2022 16:28:49 +0530 Subject: [PATCH] feat(mpd): enable auto-update, upgrade to 0.23.6 Signed-off-by: Aditya Alok --- packages/mpd/build.sh | 25 ++++++++++-------- packages/mpd/doc-mpdconf.example.patch | 26 +++++++++---------- ...atch => src-io-FileOutputStream.hxx.patch} | 2 +- 3 files changed, 28 insertions(+), 25 deletions(-) rename packages/mpd/{src-fs-io-FileOutputStream.hxx.patch => src-io-FileOutputStream.hxx.patch} (84%) diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 41d7f079f..25a7b7e00 100644 --- a/packages/mpd/build.sh +++ b/packages/mpd/build.sh @@ -2,24 +2,27 @@ TERMUX_PKG_HOMEPAGE=https://www.musicpd.org TERMUX_PKG_DESCRIPTION="Music player daemon" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.23.5 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=0.23.6 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=d57aec9100539dc6bdb8b06d40114e44d765481bee6bc900d6403e7b67dc8e92 -TERMUX_PKG_DEPENDS="ffmpeg, libbz2, libc++, libcurl, libexpat, libflac, libid3tag, libmp3lame, libmpdclient, libnfs, libogg, libopus, libsndfile, libsoxr, libsqlite, libvorbis, openal-soft, pulseaudio, zlib" +TERMUX_PKG_SHA256=38d537ff1ea38c727d299d7878f8622fba6d41453ea5e9821a61528b38c7ec7a +TERMUX_PKG_DEPENDS="ffmpeg, libbz2, libc++, libcurl, libexpat, libflac, libid3tag, libmp3lame, libmpdclient, libnfs, libogg, libopus, libsndfile, libsoxr, libsqlite, libvorbis, openal-soft, pulseaudio, zlib, libao, libmad, libiconv, libicu, zlib, dbus" TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dalsa=disabled --Dao=disabled -Depoll=false --Diconv=disabled --Dicu=disabled --Dmad=disabled --Dpcre=disabled -Dsndio=disabled +-Dzlib=enabled +-Dicu=enabled +-Diconv=enabled +-Dpcre=enabled +-Dexpat=enabled +-Ddbus=enabled +-Dipv6=enabled " TERMUX_PKG_CONFFILES="etc/mpd.conf" TERMUX_PKG_SERVICE_SCRIPT=("mpd" "if [ -f \"$TERMUX_ANDROID_HOME/.mpd/mpd.conf\" ]; then CONFIG=\"$TERMUX_ANDROID_HOME/.mpd/mpd.conf\"; else CONFIG=\"$TERMUX_PREFIX/etc/mpd.conf\"; fi\nexec mpd --stdout --no-daemon \$CONFIG 2>&1") +TERMUX_PKG_AUTO_UPDATE=true +TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" termux_step_pre_configure() { # Certain packages are not safe to build on device because their @@ -40,6 +43,6 @@ termux_step_post_make_install() { } termux_step_create_debscripts() { - echo "#!$TERMUX_PREFIX/bin/sh" > postinst - echo 'mkdir -p $HOME/.mpd/playlists' >> postinst + echo "#!$TERMUX_PREFIX/bin/sh" >postinst + echo 'mkdir -p $HOME/.mpd/playlists' >>postinst } diff --git a/packages/mpd/doc-mpdconf.example.patch b/packages/mpd/doc-mpdconf.example.patch index 39288d3dc..4866bfc9d 100644 --- a/packages/mpd/doc-mpdconf.example.patch +++ b/packages/mpd/doc-mpdconf.example.patch @@ -1,5 +1,5 @@ ---- ./doc/mpdconf.example.orig 2021-12-01 20:00:00.000000000 +0100 -+++ ./doc/mpdconf.example 2022-01-16 19:35:05.557761058 +0100 +--- a/doc/mpdconf.example 2022-03-14 17:55:47.000000000 +0000 ++++ b/doc/mpdconf.example 2022-04-19 04:52:49.436770322 +0000 @@ -10,14 +10,14 @@ # be disabled and audio files will only be accepted over ipc socket (using # file:// protocol) or streaming files over an accepted protocol. @@ -58,30 +58,30 @@ # ############################################################################### -@@ -80,17 +80,18 @@ - # should be paid if this is assigned to anything other than the default, any. +@@ -81,16 +81,19 @@ # This setting can deny access to control of the daemon. Not effective if - # systemd socket activiation is in use. --# -+# For local connections only + # systemd socket activation is in use. + # ++# For local connections only +#bind_to_address "localhost" ++# # For network #bind_to_address "any" # # And for Unix Socket -#bind_to_address "~/.mpd/socket" -+bind_to_address "@TERMUX_PREFIX@/var/run/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. -+# to. Normally this is 6600 but for termux this port needs to be above 8000. ++# to. Normally this is 6600 but for termux this port needs to be above 8000. # -#port "6600" +#port "8600" # # Suppress all messages below the given threshold. Use "verbose" for # troubleshooting. Available setting arguments are "notice", "info", "verbose", -@@ -135,12 +136,12 @@ +@@ -135,12 +138,12 @@ # If this setting is set to "yes", MPD will discover audio files by following # symbolic links outside of the configured music_directory. # @@ -96,7 +96,7 @@ # ############################################################################### -@@ -213,28 +214,6 @@ +@@ -213,28 +216,6 @@ # blocks. Setting this block is optional, though the server will only attempt # autodetection for one sound card. # @@ -125,7 +125,7 @@ # # An example of a shout output (for streaming to Icecast): # -@@ -265,7 +244,8 @@ +@@ -265,7 +246,8 @@ # type "recorder" # name "My recorder" # encoder "vorbis" # optional, vorbis or lame @@ -135,7 +135,7 @@ ## quality "5.0" # do not define if bitrate is defined # bitrate "128" # do not define if quality is defined # format "44100:16:1" -@@ -295,55 +275,31 @@ +@@ -295,55 +277,31 @@ ## media_role "media_role" #optional #} # diff --git a/packages/mpd/src-fs-io-FileOutputStream.hxx.patch b/packages/mpd/src-io-FileOutputStream.hxx.patch similarity index 84% rename from packages/mpd/src-fs-io-FileOutputStream.hxx.patch rename to packages/mpd/src-io-FileOutputStream.hxx.patch index 114d19555..18929a55c 100644 --- a/packages/mpd/src-fs-io-FileOutputStream.hxx.patch +++ b/packages/mpd/src-io-FileOutputStream.hxx.patch @@ -1,5 +1,5 @@ --- ../FileOutputStream.hxx.orig 2019-08-24 20:56:41.969642005 +0200 -+++ ./src/fs/io/FileOutputStream.hxx 2019-08-12 21:47:53.854420002 +0200 ++++ ./src/io/FileOutputStream.hxx 2019-08-12 21:47:53.854420002 +0200 @@ -45,7 +45,7 @@ #include #endif