From 73b1f9ae4e431a462e84bfb034b59d330d61b01a Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sat, 20 Jun 2020 21:54:10 +0300
Subject: [PATCH] cava: update patches

---
 packages/cava/Makefile.am.patch | 10 +++++-----
 packages/cava/config.c.patch    | 25 ++++++++++++-------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/cava/Makefile.am.patch b/packages/cava/Makefile.am.patch
index a6249821b..4c2173ac9 100644
--- a/packages/cava/Makefile.am.patch
+++ b/packages/cava/Makefile.am.patch
@@ -1,10 +1,10 @@
-diff -uNr cava-0.6.1/Makefile.am cava-0.6.1.mod/Makefile.am
---- cava-0.6.1/Makefile.am	2018-05-03 19:07:33.000000000 +0300
-+++ cava-0.6.1.mod/Makefile.am	2019-08-16 13:48:27.945938729 +0300
+diff -uNr cava-0.7.0/Makefile.am cava-0.7.0.mod/Makefile.am
+--- cava-0.7.0/Makefile.am	2020-05-26 23:29:47.000000000 +0300
++++ cava-0.7.0.mod/Makefile.am	2020-06-20 21:53:06.667611313 +0300
 @@ -11,7 +11,7 @@
  bin_PROGRAMS = cava
- cava_SOURCES = cava.c
- cava_LDADD = -liniparser
+ cava_SOURCES = cava.c config.c input/common.c input/fifo.c input/shmem.c \
+                output/terminal_noncurses.c output/raw.c
 -cava_LDFLAGS = -L/usr/local/lib -Wl,-rpath /usr/local/lib
 +cava_LDFLAGS =
  cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
diff --git a/packages/cava/config.c.patch b/packages/cava/config.c.patch
index 00b247216..551956b67 100644
--- a/packages/cava/config.c.patch
+++ b/packages/cava/config.c.patch
@@ -1,13 +1,12 @@
-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;
+diff -uNr cava-0.7.0/config.c cava-0.7.0.mod/config.c
+--- cava-0.7.0/config.c	2020-05-26 23:29:47.000000000 +0300
++++ cava-0.7.0.mod/config.c	2020-06-20 21:52:36.395409147 +0300
+@@ -488,7 +488,7 @@
+         break;
+ #endif
+     case INPUT_FIFO:
+-        p->audio_source = strdup(iniparser_getstring(ini, "input:source", "/tmp/mpd.fifo"));
++        p->audio_source = strdup(iniparser_getstring(ini, "input:source", "@TERMUX_PREFIX@/tmp/mpd.fifo"));
+         p->fifoSample = iniparser_getint(ini, "input:sample_rate", 44100);
+         p->fifoSampleBits = iniparser_getint(ini, "input:sample_bits", 16);
+         break;