From 5eeea9ff895198a0222edae46b9cebce815b6003 Mon Sep 17 00:00:00 2001
From: Oliver Schmidhauser <oli@glow.li>
Date: Mon, 28 Aug 2017 15:19:58 +0200
Subject: [PATCH] Update Cava to 0.6.0

This also fixes a problem of it segfaulting when "r" is pressed (should
reload the config)
---
 packages/cava/build.sh       |  4 ++--
 packages/cava/cava.c.patch   | 13 -------------
 packages/cava/config.c.patch | 13 +++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 packages/cava/cava.c.patch
 create mode 100644 packages/cava/config.c.patch

diff --git a/packages/cava/build.sh b/packages/cava/build.sh
index 747d6518c..cb1c09fa9 100644
--- a/packages/cava/build.sh
+++ b/packages/cava/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/karlstav/cava
 TERMUX_PKG_DESCRIPTION="Console-based Audio Visualizer. Works with MPD."
-TERMUX_PKG_VERSION=0.5.0
+TERMUX_PKG_VERSION=0.6.0
 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
 TERMUX_PKG_SRCURL=https://github.com/karlstav/cava/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=c2fdc489addd96058a2b98c6bd2d925c88db1b7651c67d274f21aabbd7ff0ad8
+TERMUX_PKG_SHA256=42d51c6c283cd2b0f5125954ea8c61a12385703d1953ef9c40103402c7a744dc
 TERMUX_PKG_FOLDERNAME=cava-$TERMUX_PKG_VERSION
 TERMUX_PKG_DEPENDS="ncurses,fftw"
 TERMUX_PKG_BUILD_DEPENDS="libtool"
diff --git a/packages/cava/cava.c.patch b/packages/cava/cava.c.patch
deleted file mode 100644
index 68400a8e1..000000000
--- a/packages/cava/cava.c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cava.c b/cava.c
-index de8f98a..e88154e 100644
---- a/cava.c
-+++ b/cava.c
-@@ -268,7 +268,7 @@ FILE *fp;
- 	}
- 	if (strcmp(inputMethod, "fifo") == 0) {
- 		im = 2;
--		audio.source = (char *)iniparser_getstring(ini, "input:source", "/tmp/mpd.fifo");
-+		audio.source = (char *)iniparser_getstring(ini, "input:source", "@TERMUX_PREFIX@/tmp/mpd.fifo");
- 	}
- 	if (strcmp(inputMethod, "pulse") == 0) {
- 		im = 3;
diff --git a/packages/cava/config.c.patch b/packages/cava/config.c.patch
new file mode 100644
index 000000000..00b247216
--- /dev/null
+++ b/packages/cava/config.c.patch
@@ -0,0 +1,13 @@
+diff --git a/config.c b/config.c
+index 1da11cd..2e9ddd8 100644
+--- a/config.c
++++ b/config.c
+@@ -396,7 +396,7 @@ if (strcmp(inputMethod, "alsa") == 0) {
+ }
+ if (strcmp(inputMethod, "fifo") == 0) {
+ 	p->im = 2;
+-	p->audio_source = (char *)iniparser_getstring(ini, "input:source", "/tmp/mpd.fifo");
++	p->audio_source = (char *)iniparser_getstring(ini, "input:source", "@TERMUX_PREFIX@/tmp/mpd.fifo");
+ }
+ if (strcmp(inputMethod, "pulse") == 0) {
+ 	p->im = 3;