Index: head/audio/cava/Makefile =================================================================== --- head/audio/cava/Makefile (revision 540362) +++ head/audio/cava/Makefile (revision 540363) @@ -1,69 +1,69 @@ # $FreeBSD$ PORTNAME= cava -DISTVERSION= 0.7.0 +DISTVERSION= 0.7.1 CATEGORIES= audio MAINTAINER= tobik@FreeBSD.org COMMENT= Console-based Audio Visualizer for MPD, PulseAudio, and sndio LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfftw3.so:math/fftw3 \ libiniparser.so:devel/iniparser USES= autoreconf libtool localbase ncurses USE_GITHUB= yes GH_ACCOUNT= karlstav GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-input-alsa CONFIGURE_ENV= ac_cv_lib_asound_snd_pcm_open=no \ FONT_DIR=${DATADIR} INSTALL_TARGET= install-strip PLIST_FILES= bin/cava PORTDOCS= README.md PORTEXAMPLES= config OPTIONS_DEFINE= DOCS EXAMPLES PORTAUDIO PULSEAUDIO SNDIO VT OPTIONS_DEFAULT= PULSEAUDIO SNDIO VT .if !exists(/usr/bin/vtfontcvt) OPTIONS_EXCLUDE= VT .endif VT_DESC= Build with vt(4) support (installs custom font) PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CONFIGURE_OFF= --disable-input-portaudio PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio \ libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_OFF= --disable-input-pulse SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_OFF= --disable-input-sndio VT_BUILD_DEPENDS= psf2bdf:x11-fonts/psftools VT_MAKE_ARGS_OFF= cava_font__DATA="" VT_PLIST_FILES= ${DATADIR}/cava.fnt pre-configure: @${ECHO_CMD} ${DISTVERSION} > ${WRKSRC}/version pre-build-VT-on: psf2bdf --fontname="-gnu-cava-medium-r-normal--16-160-75-75-c-80-iso10646-1" \ ${WRKSRC}/cava.psf > ${WRKSRC}/cava.bdf vtfontcvt ${WRKSRC}/cava.bdf ${WRKSRC}/cava.fnt post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/example_files/config ${STAGEDIR}${EXAMPLESDIR} .include Index: head/audio/cava/distinfo =================================================================== --- head/audio/cava/distinfo (revision 540362) +++ head/audio/cava/distinfo (revision 540363) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590792822 -SHA256 (karlstav-cava-0.7.0_GH0.tar.gz) = 1ced5b131b86f2aa86259c58c2d2dfd46201ab908395229191b5a8dec894b84c -SIZE (karlstav-cava-0.7.0_GH0.tar.gz) = 52865 +TIMESTAMP = 1593045121 +SHA256 (karlstav-cava-0.7.1_GH0.tar.gz) = 7dfb8f9c72722ded5b88bba967c72d024e9446fdabdf14938f4519262c901d06 +SIZE (karlstav-cava-0.7.1_GH0.tar.gz) = 53018 Index: head/audio/cava/files/patch-Makefile.am =================================================================== --- head/audio/cava/files/patch-Makefile.am (revision 540362) +++ head/audio/cava/files/patch-Makefile.am (revision 540363) @@ -1,35 +1,30 @@ - Remove some flags that gcc 4.2 (on tier 2 archs like powerpc) does not recognize - Do not install the Linux-only font ---- Makefile.am.orig 2020-05-26 20:29:47 UTC +--- Makefile.am.orig 2020-06-24 19:18:09 UTC +++ Makefile.am @@ -10,11 +10,11 @@ M_CPPFLAGS = -DSYSTEM_LIBINIPARSER=@SYSTEM_LIBINIPARSE 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 + output/raw.c 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 --cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-maybe-uninitialized -+ -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L -DFONT_DIR=\"@FONT_DIR@\" +- -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 ++ -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE_EXTENDED -DFONT_DIR=\"@FONT_DIR@\" +cava_CFLAGS = -std=c99 -Wall -Wextra if OSX cava_CFLAGS += -DNORT -@@ -39,11 +39,11 @@ if SNDIO - endif - - if NCURSES -- cava_SOURCES += output/terminal_bcircle.c output/terminal_ncurses.c -+ cava_SOURCES += output/terminal_ncurses.c +@@ -43,7 +43,7 @@ if NCURSES endif cava_font_dir = @FONT_DIR@ -cava_font__DATA = cava.psf +cava_font__DATA = cava.fnt if !SYSTEM_LIBINIPARSER cava_LDADD = -liniparser Index: head/audio/cava/files/patch-cava.c =================================================================== --- head/audio/cava/files/patch-cava.c (revision 540362) +++ head/audio/cava/files/patch-cava.c (revision 540363) @@ -1,62 +1,62 @@ ---- cava.c.orig 2020-05-26 20:29:47 UTC +--- cava.c.orig 2020-06-24 19:18:09 UTC +++ cava.c -@@ -32,13 +32,11 @@ +@@ -31,13 +31,11 @@ #include "util.h" #ifdef NCURSES -#include "output/terminal_bcircle.h" #include "output/terminal_ncurses.h" #include #endif #include "output/raw.h" -#include "output/terminal_noncurses.h" #include "input/alsa.h" #include "input/common.h" -@@ -91,8 +89,6 @@ void cleanup(void) { +@@ -90,8 +88,6 @@ void cleanup(void) { #else ; #endif - } else if (output_mode == OUTPUT_NONCURSES) { - cleanup_terminal_noncurses(); } } -@@ -338,8 +334,12 @@ as of 0.4.0 all options are specified in config file, +@@ -337,8 +333,12 @@ as of 0.4.0 all options are specified in config file, if (strncmp(ttyname(0), "/dev/ttys", 9) == 0) inAtty = 0; if (inAtty) { +#ifdef __FreeBSD__ + system("/usr/sbin/vidcontrol -f " FONT_DIR "/cava.fnt >/dev/null 2>&1"); +#else system("setfont cava.psf >/dev/null 2>&1"); system("setterm -blank 0"); +#endif } // We use unicode block characters to draw the bars and -@@ -547,12 +547,6 @@ as of 0.4.0 all options are specified in config file, +@@ -546,12 +546,6 @@ as of 0.4.0 all options are specified in config file, height = lines * 8; break; #endif - case OUTPUT_NONCURSES: - get_terminal_dim_noncurses(&width, &lines); -- init_terminal_noncurses(p.col, p.bgcol, width, lines, p.bar_width); +- init_terminal_noncurses(inAtty, p.col, p.bgcol, width, lines, p.bar_width); - height = (lines - 1) * 8; - break; - case OUTPUT_RAW: if (strcmp(p.raw_target, "/dev/stdout") != 0) { // checking if file exists -@@ -998,10 +992,6 @@ as of 0.4.0 all options are specified in config file, +@@ -997,10 +991,6 @@ as of 0.4.0 all options are specified in config file, p.gradient); break; #endif - case OUTPUT_NONCURSES: - rc = draw_terminal_noncurses(inAtty, lines, width, number_of_bars, p.bar_width, - p.bar_spacing, rest, bars, previous_frame); - break; case OUTPUT_RAW: rc = print_raw_out(number_of_bars, fp, p.is_bin, p.bit_format, p.ascii_range, p.bar_delim, p.frame_delim, bars);