- 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	2021-05-18 18:13:38 UTC

+++ Makefile.am

@@ -22,7 +22,7 @@ if OSX

 else

     cava_LDFLAGS += -lrt

     cava_font_dir = @FONT_DIR@

-    cava_font__DATA = cava.psf

+    cava_font__DATA = cava.fnt

 endif

 if ALSA

@@ -52,5 +52,6 @@ if !SYSTEM_LIBINIPARSER

     cava_LDADD += -Liniparser/.libs

     cava_CPPFLAGS += -Iiniparser/src

 endif

+

--- cava.c.orig	2021-05-18 18:13:38 UTC

+++ cava.c

@@ -36,13 +36,11 @@

 #include "util.h"

 #ifdef NCURSES

-#include "output/terminal_bcircle.h"

 #include "output/terminal_ncurses.h"

 #include <curses.h>

 #endif

 #include "output/raw.h"

-#include "output/terminal_noncurses.h"

 #include "input/alsa.h"

 #include "input/common.h"

@@ -92,8 +90,6 @@ void cleanup(void) {

 #else

         ;

 #endif

-    } else if (output_mode == OUTPUT_NONCURSES) {

-        cleanup_terminal_noncurses();

     }

 }

@@ -260,10 +256,10 @@ as of 0.4.0 all options are specified in config file, 

             if (inAtty) {

                 // checking if cava psf font is installed in FONTDIR

                 FILE *font_file;

-                font_file = fopen(FONTDIR "/cava.psf", "r");

+                font_file = fopen(FONTDIR "/cava.fnt", "r");

                 if (font_file) {

                     fclose(font_file);

-                    system("setfont " FONTDIR "/cava.psf  >/dev/null 2>&1");

+		     system("/usr/sbin/vidcontrol -f " FONTDIR "/cava.fnt > /dev/null 2>&1");

                 } else {

                     // if not it might still be available, we dont know, must try

                     system("setfont cava.psf  >/dev/null 2>&1");

@@ -532,16 +528,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);

-

-                if (p.xaxis != NONE)

-                    lines--;

-

-                init_terminal_noncurses(inAtty, p.col, p.bgcol, width, lines, p.bar_width);

-                height = lines * 8;

-                break;

-

             case OUTPUT_RAW:

                 if (strcmp(p.raw_target, "/dev/stdout") != 0) {

                     int fptest;

@@ -787,11 +773,6 @@ as of 0.4.0 all options are specified in config file, 

             if (p.xaxis != NONE) {

                 x_axis_info = 1;

                 double center_frequency;

-                if (output_mode == OUTPUT_NONCURSES) {

-                    printf("\r\033[%dB", lines + 1);

-                    if (remainder)

-                        printf("\033[%dC", remainder);

-                }

                 for (int n = 0; n < number_of_bars; n++) {

                     if (p.stereo) {

                         if (n < number_of_bars / 2)

@@ -817,16 +798,6 @@ as of 0.4.0 all options are specified in config file, 

                             mvprintw(lines, n * (p.bar_width + p.bar_spacing) + remainder, "%.1f",

                                      freq_kilohz);

 #endif

-                    } else if (output_mode == OUTPUT_NONCURSES) {

-                        if (center_frequency < 1000)

-                            printf("%-4d", freq_floor);

-                        else if (center_frequency > 1000 && center_frequency < 10000)

-                            printf("%.2f", freq_kilohz);

-                        else

-                            printf("%.1f", freq_kilohz);

-

-                        if (n < number_of_bars - 1)

-                            printf("\033[%dC", p.bar_width + p.bar_spacing - 4);

                     }

                 }

                 printf("\r\033[%dA", lines + 1);

@@ -1142,11 +1113,6 @@ as of 0.4.0 all options are specified in config file, 

                                                p.gradient, x_axis_info);

                     break;

 #endif

-                case OUTPUT_NONCURSES:

-                    rc = draw_terminal_noncurses(inAtty, lines, width, number_of_bars, p.bar_width,

-                                                 p.bar_spacing, remainder, bars, previous_frame,

-                                                 x_axis_info);

-                    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);

Remove noncurses output method which only produces a garbled mess

on terminals.

--- config.c.orig	2021-08-02 22:27:47 UTC

+++ config.c

@@ -181,10 +181,6 @@ bool validate_config(struct config_params *p, struct e

         return false;

 #endif

     }

-    if (strcmp(outputMethod, "noncurses") == 0) {

-        p->output = OUTPUT_NONCURSES;

-        p->bgcol = 0;

-    }

     if (strcmp(outputMethod, "raw") == 0) { // raw:

         p->output = OUTPUT_RAW;

         p->bar_spacing = 0;

@@ -220,7 +216,7 @@ bool validate_config(struct config_params *p, struct e

 #ifndef NCURSES

         write_errorf(

             error,

-            "output method %s is not supported, supported methods are: 'noncurses' and 'raw'\n",

+            "output method %s is not supported, supported methods are: 'raw'\n",

             outputMethod);

         return false;

 #endif

@@ -228,7 +224,7 @@ bool validate_config(struct config_params *p, struct e

 #ifdef NCURSES

         write_errorf(error,

                      "output method %s is not supported, supported methods are: 'ncurses', "

-                     "'noncurses' and 'raw'\n",

+                     "and 'raw'\n",

                      outputMethod);

         return false;

 #endif

Neuter gratuitous OS check that is not used for anything at all.

--- configure.ac.orig	2020-05-26 20:29:47 UTC

+++ configure.ac

@@ -294,7 +294,7 @@ case "${host_os}" in

         build_mac=yes

         ;;

     *)

-        AC_MSG_ERROR(["OS $host_os is not supported"])

+        AC_MSG_NOTICE([I'm a teapot])

         ;;

 esac

--- example_files/config.orig	2020-10-29 12:41:35 UTC

+++ example_files/config

@@ -73,10 +73,7 @@

 [output]

-# Output method. Can be 'ncurses', 'noncurses' or 'raw'.

-# 'noncurses' uses a custom framebuffer technique and draws only changes

-# from frame to frame. 'ncurses' is default if supported

-#

+# Output method. Can be 'ncurses' or 'raw'.

 # 'raw' is an 8 or 16 bit (configurable via the 'bit_format' option) data

 # stream of the bar heights that can be used to send to other applications.

 # 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above.

Stop using uninitialized variable after lazy refactoring upstream

--- input/sndio.c.orig	2020-10-29 12:44:33 UTC

+++ input/sndio.c

@@ -14,7 +14,7 @@ void *input_sndio(void *data) {

     par.bits = 16;

     par.le = 1;

     par.rate = 44100;

-    par.rchan = 2;

+    par.rchan = audio->channels;

     par.appbufsz = sizeof(buf) / par.rchan;

     if ((hdl = sio_open(audio->source, SIO_REC, 0)) == NULL) {

@@ -33,7 +33,7 @@ void *input_sndio(void *data) {

         exit(EXIT_FAILURE);

     }

-    uint16_t frames = (sizeof(buf) / sizeof(buf[0])) / 2;

+    uint16_t frames = (sizeof(buf) / sizeof(buf[0])) / audio->channels;

     while (audio->terminate != 1) {

         if (sio_read(hdl, buf, sizeof(buf)) == 0) {

             fprintf(stderr, __FILE__ ": sio_read() failed: %s\n", strerror(errno));

--- output/terminal_ncurses.c.orig	2020-10-29 12:36:59 UTC

+++ output/terminal_ncurses.c

@@ -267,9 +267,13 @@ int draw_terminal_ncurses(int is_tty, int terminal_hei

 // general: cleanup

 void cleanup_terminal_ncurses(void) {

     echo();

+#ifdef __FreeBSD__

+    system("/usr/sbin/vidcontrol -f >/dev/null 2>&1");

+#else

     system("setfont  >/dev/null 2>&1");

     system("setfont /usr/share/consolefonts/Lat2-Fixed16.psf.gz  >/dev/null 2>&1");

     system("setterm -blank 10  >/dev/null 2>&1");

+#endif

     /*for(int i = 0; i < gradient_size; ++i) {

             if(the_color_redefinitions[i].color) {

                     init_color(the_color_redefinitions[i].color,

-