cava: update to 0.7.4 (#6829)

This commit is contained in:
glow 2021-05-24 18:04:41 +02:00 committed by GitHub
parent 557cadb0c3
commit ce4bd9d866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 26 deletions

View File

@ -1,15 +1,14 @@
--- ./Makefile.am.orig 2020-07-20 21:01:59.145108114 +0200
+++ ./Makefile.am 2020-07-20 21:09:12.312923976 +0200
@@ -11,7 +11,7 @@
bin_PROGRAMS = cava
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 =
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
cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
-D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE_EXTENDED
cava_CFLAGS = -std=c99 -Wall -Werror -Wextra -Wno-unused-result -Wno-unknown-warning-option -Wno-maybe-uninitialized
@@ -19,7 +19,6 @@
-D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE_EXTENDED \
-DFONTDIR=\"@FONT_DIR@\"
-cava_CFLAGS = -std=c99 -Wall -Werror -Wextra -Wno-unused-result -Wno-unknown-warning-option -Wno-maybe-uninitialized -Wno-vla-parameter
+cava_CFLAGS = -std=c99 -Wall -Werror -Wextra -Wno-unused-result -Wno-unknown-warning-option -Wno-maybe-uninitialized -Wno-vla-parameter -Wno-unused-variable
if OSX
cava_CFLAGS += -DNORT
else

View File

@ -2,10 +2,9 @@ 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.3
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=0.7.4
TERMUX_PKG_SRCURL=https://github.com/karlstav/cava/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=6363347ef4c74770767d9aa2fb5d65ad4c2aedf1d23bdaac50fc8e8e4e3c707e
TERMUX_PKG_SHA256=fefd3cc04d41b03ca416630cafadbfda6c75e2ca0869da1f03963dcb13e1ecb7
TERMUX_PKG_DEPENDS="ncurses,fftw,pulseaudio"
TERMUX_PKG_BUILD_DEPENDS="libtool"
TERMUX_PKG_BUILD_IN_SRC=true

View File

@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac
index 6e3c291..c9d706e 100644
index 47094de..caa62bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,9 +31,9 @@ dnl ######################
@@ -63,9 +63,9 @@ dnl ######################
AC_CHECK_HEADERS([pthread.h],
AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread",
@ -13,13 +13,4 @@ index 6e3c291..c9d706e 100644
+ AC_MSG_NOTICE([no pthread.h header header file found])
)
@@ -152,7 +152,7 @@ AS_IF([test "x$enable_legacy_iniparser" = "xyes"], [
dnl ############################
dnl Set font directory
dnl ############################
-DEFAULT_FONT_DIR="/usr/share/consolefonts"
+DEFAULT_FONT_DIR="@TERMUX_PREFIX@/share/consolefonts"
AC_ARG_VAR(FONT_DIR, [Directory where the font will be installed.])
if test -z "$FONT_DIR" ; then
FONT_DIR="$DEFAULT_FONT_DIR"
dnl ######################