diff --git a/packages/cava/Makefile.am.patch b/packages/cava/Makefile.am.patch index bb71ba7f9..f3c32865a 100644 --- a/packages/cava/Makefile.am.patch +++ b/packages/cava/Makefile.am.patch @@ -1,8 +1,6 @@ -diff --git a/Makefile.am b/Makefile.am -index 8419207..1bd48e4 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -15,12 +15,11 @@ cava_LDFLAGS = -L/usr/local/lib -Wl,-rpath /usr/local/lib +@@ -8,13 +8,13 @@ cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \ -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE_EXTENDED \ -DFONTDIR=\"@FONT_DIR@\" @@ -11,8 +9,10 @@ index 8419207..1bd48e4 100644 if OSX cava_CFLAGS += -DNORT + cava_LDADD = else -- cava_LDFLAGS += -lrt +- cava_LDADD = -lrt ++ cava_LDADD = cava_font_dir = @FONT_DIR@ cava_font__DATA = cava.psf endif diff --git a/packages/cava/build.sh b/packages/cava/build.sh index 70cfae436..26fe01f58 100644 --- a/packages/cava/build.sh +++ b/packages/cava/build.sh @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://github.com/karlstav/cava TERMUX_PKG_DESCRIPTION="Console-based Audio Visualizer. Works with MPD and Pulseaudio" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" -TERMUX_PKG_VERSION=0.7.4 +TERMUX_PKG_VERSION=0.7.5 TERMUX_PKG_SRCURL=https://github.com/karlstav/cava/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=fefd3cc04d41b03ca416630cafadbfda6c75e2ca0869da1f03963dcb13e1ecb7 +TERMUX_PKG_SHA256=863578e7d091735fd9c673239058515300faa79ff76304849a93c37ae3bd93cf TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="ncurses,fftw,pulseaudio" +TERMUX_PKG_DEPENDS="fftw, libiniparser, ncurses, pulseaudio" TERMUX_PKG_BUILD_DEPENDS="libtool" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/cava/configure.ac.patch b/packages/cava/configure.ac.patch index bd8423041..56bfdaecb 100644 --- a/packages/cava/configure.ac.patch +++ b/packages/cava/configure.ac.patch @@ -1,8 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index 47094de..caa62bd 100644 --- a/configure.ac +++ b/configure.ac -@@ -63,9 +63,9 @@ dnl ###################### +@@ -63,9 +63,9 @@ AC_CHECK_HEADERS([pthread.h], AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", @@ -14,3 +12,12 @@ index 47094de..caa62bd 100644 ) dnl ###################### +@@ -260,7 +260,7 @@ + AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no) + if [[ $have_iniparser = "yes" ]] ; then + LIBS="$LIBS -liniparser" +- CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser" ++ CPPFLAGS="$CPPFLAGS -I@TERMUX_PREFIX@/include/iniparser" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[dictionary* ini; + const char *keys[3];