From a085200bf7e2c823b804f7269192e925df4e5417 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 20 Jan 2022 16:31:26 +0900 Subject: [PATCH] ncmpcpp: Update to 0.9.2 --- packages/ncmpcpp/build.sh | 5 ++--- packages/ncmpcpp/config.patch | 14 ++++++-------- packages/ncmpcpp/ncmpcpp.cpp.patch | 13 ++++++------- packages/ncmpcpp/screens-visualizer.cpp.patch | 10 ++++++++++ packages/ncmpcpp/settings.cpp.patch | 15 ++++++++------- 5 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 packages/ncmpcpp/screens-visualizer.cpp.patch diff --git a/packages/ncmpcpp/build.sh b/packages/ncmpcpp/build.sh index c3cfea846..8f0d95daf 100644 --- a/packages/ncmpcpp/build.sh +++ b/packages/ncmpcpp/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://rybczak.net/ncmpcpp/ TERMUX_PKG_DESCRIPTION="NCurses Music Player Client (Plus Plus)" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.8.2 -TERMUX_PKG_REVISION=22 +TERMUX_PKG_VERSION=0.9.2 TERMUX_PKG_SRCURL=https://rybczak.net/ncmpcpp/stable/ncmpcpp-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=650ba3e8089624b7ad9e4cc19bc1ac6028edb7523cc111fa1686ea44c0921554 +TERMUX_PKG_SHA256=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b TERMUX_PKG_DEPENDS="fftw, boost, readline, libandroid-support, libc++, libcurl, libicu, libmpdclient, ncurses, zlib" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-visualizer --enable-outputs --enable-clock" diff --git a/packages/ncmpcpp/config.patch b/packages/ncmpcpp/config.patch index 800f3fab8..f278e7352 100644 --- a/packages/ncmpcpp/config.patch +++ b/packages/ncmpcpp/config.patch @@ -1,17 +1,15 @@ ---- ../cache/ncmpcpp-8134e6e23b2787322fa10e65e44d286da82eea91/doc/config 2017-04-23 02:24:57.000000000 +0000 -+++ ./doc/config 2017-05-13 23:29:50.055629354 +0000 -@@ -49,7 +49,13 @@ - ## } +--- a/doc/config ++++ b/doc/config +@@ -69,7 +69,11 @@ + ## visualizer. ## # --#visualizer_fifo_path = /tmp/mpd.fifo -+visualizer_fifo_path = "@TERMUX_PREFIX@/tmp/mpd.fifo" +-#visualizer_data_source = /tmp/mpd.fifo ++visualizer_data_source = "@TERMUX_PREFIX@/tmp/mpd.fifo" +visualizer_output_name = "my_fifo" -+visualizer_sync_interval = "30" +visualizer_in_stereo = "yes" +visualizer_type = "spectrum" +visualizer_look = "+|" -+ # ## ## Note: Below parameter is needed for ncmpcpp to determine which output diff --git a/packages/ncmpcpp/ncmpcpp.cpp.patch b/packages/ncmpcpp/ncmpcpp.cpp.patch index 6bc41f572..0f0dde3e4 100644 --- a/packages/ncmpcpp/ncmpcpp.cpp.patch +++ b/packages/ncmpcpp/ncmpcpp.cpp.patch @@ -1,12 +1,11 @@ ---- ../cache/ncmpcpp-8134e6e23b2787322fa10e65e44d286da82eea91/src/ncmpcpp.cpp 2017-04-23 02:24:57.000000000 +0000 -+++ ./src/ncmpcpp.cpp 2017-04-30 03:20:01.848812572 +0000 -@@ -108,8 +108,8 @@ +--- a/src/ncmpcpp.cpp ++++ b/src/ncmpcpp.cpp +@@ -108,7 +108,7 @@ cerr_buffer = std::cerr.rdbuf(); std::cerr.rdbuf(errorlog.rdbuf()); -- sigignore(SIGPIPE); -+ // sigignore(SIGPIPE); - signal(SIGWINCH, sighandler); +- signal(SIGPIPE, SIG_IGN); ++ //signal(SIGPIPE, SIG_IGN); + signal(SIGWINCH, sighandler); Mpd.setNoidleCallback(Status::update); - diff --git a/packages/ncmpcpp/screens-visualizer.cpp.patch b/packages/ncmpcpp/screens-visualizer.cpp.patch new file mode 100644 index 000000000..315654668 --- /dev/null +++ b/packages/ncmpcpp/screens-visualizer.cpp.patch @@ -0,0 +1,10 @@ +--- a/src/screens/visualizer.cpp ++++ b/src/screens/visualizer.cpp +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + + #include "global.h" diff --git a/packages/ncmpcpp/settings.cpp.patch b/packages/ncmpcpp/settings.cpp.patch index 79db501c7..89eff59ab 100644 --- a/packages/ncmpcpp/settings.cpp.patch +++ b/packages/ncmpcpp/settings.cpp.patch @@ -1,8 +1,8 @@ ---- ../cache/ncmpcpp-0.8/src/settings.cpp 2017-05-21 14:10:48.000000000 +0000 -+++ ./src/settings.cpp 2017-05-24 02:02:40.462100405 +0000 -@@ -265,17 +265,17 @@ +--- a/src/settings.cpp ++++ b/src/settings.cpp +@@ -237,18 +237,18 @@ // keep the same order of variables as in configuration file - p.add("ncmpcpp_directory", &ncmpcpp_directory, "~/.ncmpcpp/", adjust_directory); + p.add("ncmpcpp_directory", &ncmpcpp_directory, "~/.config/ncmpcpp/", adjust_directory); p.add("lyrics_directory", &lyrics_directory, "~/.lyrics/", adjust_directory); - p.add("mpd_host", nullptr, "localhost", [](std::string host) { + p.add("mpd_host", nullptr, "@TERMUX_PREFIX@/var/run/mpd.socket", [](std::string host) { @@ -16,8 +16,9 @@ + p.add("mpd_music_dir", &mpd_music_dir, "/sdcard/Music", adjust_directory); p.add("mpd_connection_timeout", &mpd_connection_timeout, "5"); p.add("mpd_crossfade_time", &crossfade_time, "5"); -- p.add("visualizer_fifo_path", &visualizer_fifo_path, "/tmp/mpd.fifo", adjust_path); -+ p.add("visualizer_fifo_path", &visualizer_fifo_path, "@TERMUX_PREFIX@/var/run/mpd.fifo", adjust_path); + p.add("random_exclude_pattern", &random_exclude_pattern, ""); +- p.add("visualizer_data_source", &visualizer_data_source, "/tmp/mpd.fifo", adjust_path); ++ p.add("visualizer_data_source", &visualizer_data_source, "@TERMUX_PREFIX@/var/run/mpd.fifo", adjust_path); p.add("visualizer_output_name", &visualizer_output_name, "Visualizer feed"); p.add("visualizer_in_stereo", &visualizer_in_stereo, "yes", yes_no); - p.add("visualizer_sync_interval", &visualizer_sync_interval, "30", + p.add("visualizer_type", &visualizer_type,