From b639f6af28b5c0c4b2dcc1523fe7f856adfc2b9b Mon Sep 17 00:00:00 2001
From: lwvmobile <lwvmobile@gmail.com>
Date: Tue, 21 Mar 2023 22:42:09 -0400
Subject: [PATCH] Fix Cmake Warnings;

---
 CMakeLists.txt                                       | 10 ++++++++--
 cmake/{FindPULSEAUDIO.cmake => FindPulseAudio.cmake} |  0
 src/dsd_main.c                                       |  2 +-
 src/dsd_ncurses.c                                    |  6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)
 rename cmake/{FindPULSEAUDIO.cmake => FindPulseAudio.cmake} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76d733f..8921ad6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,11 @@
+set(CMAKE_LEGACY_CYGWIN_WIN32 0) #annoying warning in cygwin
 project(dsd-fme-aero)
-cmake_minimum_required(VERSION 2.8.11)
+#Ubuntu 18.04 uses 3.10.2 currently -- almost EOL
+#Ubuntu 20.04 uses 3.16.3
+#Ubuntu 22.04 uses 3.22.1
+#Arch currently on 3.25.3
+#Cygwin currently using 3.23.2 (or newer)
+cmake_minimum_required(VERSION 3.10.2)
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 #Set curses to ncurses, and wide true for ascii
@@ -14,7 +20,7 @@ find_package(MBE REQUIRED)
 find_package(ITPP REQUIRED)
 find_package(RTLSDR)
 find_package(Curses REQUIRED) 
-find_package(PULSEAUDIO REQUIRED)
+find_package(PulseAudio REQUIRED)
 
 include_directories(SYSTEM ${LIBSNDFILE_INCLUDE_DIR} ${MBE_INCLUDE_DIR} ${ITPP_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIRS} ${CURSES_INCLUDE_DIR})
 set(LIBS ${MBE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${ITPP_LIBRARY} ${PULSEAUDIO_SIMPLE_LIBRARY} ${CURSES_LIBRARY})
diff --git a/cmake/FindPULSEAUDIO.cmake b/cmake/FindPulseAudio.cmake
similarity index 100%
rename from cmake/FindPULSEAUDIO.cmake
rename to cmake/FindPulseAudio.cmake
diff --git a/src/dsd_main.c b/src/dsd_main.c
index e277180..7d2d4b6 100644
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
@@ -52,7 +52,7 @@ char * FM_banner[9] = {
   " ██║  ██║ ╚═══██╗██║  ██║    ██╔══╝  ██║╚██╔╝██║██╔══╝  ",
   " ██████╔╝██████╔╝██████╔╝    ██║     ██║ ╚═╝ ██║███████╗",
   " ╚═════╝ ╚═════╝ ╚═════╝     ╚═╝     ╚═╝     ╚═╝╚══════╝",
-  " 'Aero' Edition v2.0.0-65-g1737c1f  Windows 32-bit RC5a "
+  " 'Aero' Edition v2.0.0-68-g85eea59  Windows 32-bit RC5b "
 };
 
 int comp (const void *a, const void *b)
diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index 2beff47..0da3105 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -2061,7 +2061,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
   if (opts->ncurses_compact == 1)
   {
     printw ("------------------------------------------------------------------------------\n");
-    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.0-65-g1737c1f RC5a");
+    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.0-68-g85eea59 RC5b");
   }
   if (opts->ncurses_compact == 0)
   {
@@ -2072,8 +2072,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
       if (i == 1) printw (" ESC to Menu");
       if (i == 2) printw (" 'q' to Quit ");
       if (i == 4) printw (" MBElib %s", versionstr);
-      if (i == 5) printw (" %s ", "Aero RC5a"); //printw (" %s \n", GIT_TAG);
-      if (i == 6) printw (" %s \n", "v2.0.0-65-g1737c1f"); //printw (" %s \n", GIT_TAG);
+      if (i == 5) printw (" %s ", "Aero RC5b"); //printw (" %s \n", GIT_TAG);
+      if (i == 6) printw (" %s \n", "v2.0.0-68-g85eea59"); //printw (" %s \n", GIT_TAG);
       else printw ("\n");
     }
     attroff(COLOR_PAIR(6)); //6