From e96246bee894368fe0647efd304ffddbd85449f4 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 10:51:38 +0100
Subject: [PATCH 01/29] Add Mac build action

---
 .github/workflows/sdrangel.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index d77248f37..1170a3239 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -11,6 +11,27 @@ on:
   pull_request:
 
 jobs:
+  build_mac:
+    runs-on: macos-11
+    steps:
+      - uses: actions/checkout@v3      
+      - uses: ilammy/setup-nasm@v1
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3          
+        with:
+          dir: '${{ github.workspace }}/qt/'
+          version: '5.15.2'
+          host: 'mac'
+          target: 'desktop'
+          arch: 'clang_64'
+          setup-python: false
+          modules: 'qtcharts qtwebengine'
+      - name: build sdrangel on Mac
+        run: |
+          mkdir build && cd build
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DCMAKE_PREFIX_PATH="$QT_ROOT_DIR"
+          make package -j4
+     
   build:
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}

From 83cbac81e8275dac7226eafa672c2623555e789a Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 10:54:24 +0100
Subject: [PATCH 02/29] Build on mac_ci branch for testing

---
 .github/workflows/sdrangel.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 1170a3239..cfdfbec8b 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - master
+      - mac_ci
     tags:
       - 'v*'
   pull_request:

From 578bb464390f605e9f34c302dafda322ca000358 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 11:41:43 +0100
Subject: [PATCH 03/29] Use brew for some dependencies

---
 .github/workflows/sdrangel.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index cfdfbec8b..e76b6a718 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -16,7 +16,6 @@ jobs:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v3      
-      - uses: ilammy/setup-nasm@v1
       - name: Install Qt
         uses: jurplel/install-qt-action@v3          
         with:
@@ -27,6 +26,10 @@ jobs:
           arch: 'clang_64'
           setup-python: false
           modules: 'qtcharts qtwebengine'
+      - name: Update brew
+          run: brew update
+      - name: Install brew packages
+          run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
       - name: build sdrangel on Mac
         run: |
           mkdir build && cd build

From 1a7ea1291538889fc5afb64d044166c221f3008f Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 11:43:23 +0100
Subject: [PATCH 04/29] Fix indent

---
 .github/workflows/sdrangel.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index e76b6a718..cb4d6c9af 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -27,9 +27,9 @@ jobs:
           setup-python: false
           modules: 'qtcharts qtwebengine'
       - name: Update brew
-          run: brew update
+        run: brew update
       - name: Install brew packages
-          run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
+        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
       - name: build sdrangel on Mac
         run: |
           mkdir build && cd build

From 5ec8bde168f49e29efacc8015049da00e857146f Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 12:17:26 +0100
Subject: [PATCH 05/29] Try using prebuilt libraries

---
 .github/workflows/sdrangel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index cb4d6c9af..3e1bde2f4 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -33,7 +33,7 @@ jobs:
       - name: build sdrangel on Mac
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DCMAKE_PREFIX_PATH="$QT_ROOT_DIR"
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DCMAKE_PREFIX_PATH="$QT_ROOT_DIR"
           make package -j4
      
   build:

From 2e26ef468b882cfb48162bda13fb148c923b80ed Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 13:43:40 +0100
Subject: [PATCH 06/29] Add FFmpeg, so we don't try to build it

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7fda37af..893ff53e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -753,6 +753,7 @@ if (NOT ENABLE_EXTERNAL_LIBRARIES OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "AUTO")
     find_package(AptDec)
     find_package(LibDAB)
     find_package(HIDAPI)
+    find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE)
 
     # Devices
     if(ENABLE_AIRSPY)

From e40b98b381344fedda83c8fd5666a93fa9669676 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 15:09:15 +0100
Subject: [PATCH 07/29] Don't build UHD it ENABLE_EXTERNAL_LIBRARIES=AUTO

---
 external/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index e26f48922..0b595e6d7 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -1478,7 +1478,7 @@ if (WIN32 OR APPLE)
         endif ()
     endif (ENABLE_BLADERF)
 
-    if (ENABLE_USRP AND Boost_FOUND AND NOT WIN32)
+    if (ENABLE_USRP AND Boost_FOUND AND NOT WIN32 AND ((NOT UHD_FOUND) OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "ON"))
         ExternalProject_Add(uhd
                 GIT_REPOSITORY https://github.com/EttusResearch/uhd.git
                 GIT_TAG v4.2.0.0
@@ -1504,7 +1504,7 @@ if (WIN32 OR APPLE)
             set(UHD_LIBRARIES "${install_dir}/lib/libuhd${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
             set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${install_dir}/lib")
         endif ()
-    endif (ENABLE_USRP AND Boost_FOUND AND NOT WIN32)
+    endif (ENABLE_USRP AND Boost_FOUND AND NOT WIN32 AND ((NOT UHD_FOUND) OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "ON"))
 
 endif (WIN32 OR APPLE)
 

From 7873595ad9a5023397be7ab1b9615a3c1c40597e Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 15:54:53 +0100
Subject: [PATCH 08/29] Fix syntax error

---
 external/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 0b595e6d7..e9b3b28cb 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -1478,7 +1478,7 @@ if (WIN32 OR APPLE)
         endif ()
     endif (ENABLE_BLADERF)
 
-    if (ENABLE_USRP AND Boost_FOUND AND NOT WIN32 AND ((NOT UHD_FOUND) OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "ON"))
+    if (ENABLE_USRP AND Boost_FOUND AND NOT WIN32 AND ((NOT UHD_FOUND) OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "ON")))
         ExternalProject_Add(uhd
                 GIT_REPOSITORY https://github.com/EttusResearch/uhd.git
                 GIT_TAG v4.2.0.0
@@ -1504,7 +1504,7 @@ if (WIN32 OR APPLE)
             set(UHD_LIBRARIES "${install_dir}/lib/libuhd${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
             set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${install_dir}/lib")
         endif ()
-    endif (ENABLE_USRP AND Boost_FOUND AND NOT WIN32 AND ((NOT UHD_FOUND) OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "ON"))
+    endif (ENABLE_USRP AND Boost_FOUND AND NOT WIN32 AND ((NOT UHD_FOUND) OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "ON")))
 
 endif (WIN32 OR APPLE)
 

From cd49cca0563b25bad80d2f82f01b2a16219c7712 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 17:07:55 +0100
Subject: [PATCH 09/29] Remove Qt6

---
 .github/workflows/sdrangel.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 3e1bde2f4..a7ea54d3a 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -30,6 +30,8 @@ jobs:
         run: brew update
       - name: Install brew packages
         run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
+      - name: Unstall brew's Qt6, so we use 5.15 installed above
+        run: brew uninstall qt
       - name: build sdrangel on Mac
         run: |
           mkdir build && cd build

From f290cb79972fd2b8d27c948615d62def22330cf2 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 17:29:45 +0100
Subject: [PATCH 10/29] Try Qt5_ROOT instead

---
 .github/workflows/sdrangel.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index a7ea54d3a..7537618b3 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -30,12 +30,10 @@ jobs:
         run: brew update
       - name: Install brew packages
         run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
-      - name: Unstall brew's Qt6, so we use 5.15 installed above
-        run: brew uninstall qt
       - name: build sdrangel on Mac
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DCMAKE_PREFIX_PATH="$QT_ROOT_DIR"
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DQt5_ROOT=$QT_ROOT_DIR
           make package -j4
      
   build:

From ac00b647f0256e0ae00f1f0fc9b96bcb927f970e Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 19:10:31 +0100
Subject: [PATCH 11/29] Try brew's Qt5

---
 .github/workflows/sdrangel.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 7537618b3..c58052d64 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -16,24 +16,14 @@ jobs:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v3      
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3          
-        with:
-          dir: '${{ github.workspace }}/qt/'
-          version: '5.15.2'
-          host: 'mac'
-          target: 'desktop'
-          arch: 'clang_64'
-          setup-python: false
-          modules: 'qtcharts qtwebengine'
       - name: Update brew
         run: brew update
       - name: Install brew packages
-        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
+        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr qt@5
       - name: build sdrangel on Mac
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DQt5_ROOT=$QT_ROOT_DIR
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5)"
           make package -j4
      
   build:

From 7e410ac8f00c7795d5bdf3e50d305b2f8ba8a3f1 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 20:39:29 +0100
Subject: [PATCH 12/29] Try Qt6 build

---
 .github/workflows/sdrangel.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index c58052d64..812c7e045 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -19,11 +19,11 @@ jobs:
       - name: Update brew
         run: brew update
       - name: Install brew packages
-        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr qt@5
+        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
       - name: build sdrangel on Mac
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5)"
+          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE"
           make package -j4
      
   build:

From 138122bddcc297d729e6898c34bf01abd519eeaa Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 21:00:34 +0100
Subject: [PATCH 13/29] Fix syntax

---
 .github/workflows/sdrangel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 812c7e045..5bc934d71 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -23,7 +23,7 @@ jobs:
       - name: build sdrangel on Mac
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE"
+          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
           make package -j4
      
   build:

From 6e514435acbfdb4dc036eefb41878deb1a96e00e Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 21:08:10 +0100
Subject: [PATCH 14/29] Try Qt6

---
 .github/workflows/sdrangel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 5bc934d71..643f0c97f 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -23,7 +23,7 @@ jobs:
       - name: build sdrangel on Mac
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
+          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
           make package -j4
      
   build:

From dc40fac02107c95b7d3cf411d60d12f86e56cc2a Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 21:31:25 +0100
Subject: [PATCH 15/29] Fix for Qt6

---
 sdrbase/util/psk31.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdrbase/util/psk31.cpp b/sdrbase/util/psk31.cpp
index 731410711..24efe6c47 100644
--- a/sdrbase/util/psk31.cpp
+++ b/sdrbase/util/psk31.cpp
@@ -302,7 +302,7 @@ void PSK31Encoder::addCode(unsigned& bits, unsigned int& bitCount, const QString
     unsigned int codeLen = code.size();
 
     for (unsigned int i = 0; i < codeLen; i++) {
-        codeBits |= (code[i] == "1" ? 1 : 0) << i;
+        codeBits |= (code[i] == '1' ? 1 : 0) << i;
     }
 
     addStartBits(bits, bitCount);

From 9fadf291a1834ded16cab466fa39e80cbcc8c20b Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 23 Sep 2023 22:14:01 +0100
Subject: [PATCH 16/29] QGLFormat is removed from Qt6

---
 app/main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/main.cpp b/app/main.cpp
index 62d45943c..9c8b0a7ad 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -24,7 +24,9 @@
 #include <QSysInfo>
 #include <QSettings>
 #ifdef __APPLE__
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 #include <QGLFormat>
+#endif
 #include <QSurfaceFormat>
 #endif
 #ifdef ANDROID
@@ -212,10 +214,12 @@ int main(int argc, char* argv[])
     // will not work. Because of this, we have two versions of the shaders:
     // OpenGL 2 versions for compatiblity with older drivers and OpenGL 3.3
     // versions for newer drivers
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     QGLFormat fmt;
     fmt.setVersion(3, 3);
     fmt.setProfile(QGLFormat::CoreProfile);
     QGLFormat::setDefaultFormat(fmt);
+#endif
     QSurfaceFormat sfc;
     sfc.setVersion(3, 3);
     sfc.setProfile(QSurfaceFormat::CoreProfile);

From 8c9eb22bfd0a1d72ce470fe4b3d419be0aa951be Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 08:34:04 +0100
Subject: [PATCH 17/29] Upload Mac artifact

---
 .github/workflows/sdrangel.yml | 50 ++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 643f0c97f..eeefbc743 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -12,20 +12,6 @@ on:
   pull_request:
 
 jobs:
-  build_mac:
-    runs-on: macos-11
-    steps:
-      - uses: actions/checkout@v3      
-      - name: Update brew
-        run: brew update
-      - name: Install brew packages
-        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
-      - name: build sdrangel on Mac
-        run: |
-          mkdir build && cd build
-          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
-          make package -j4
-     
   build:
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
@@ -110,3 +96,39 @@ jobs:
         uses: softprops/action-gh-release@v0.1.13
         with:
           files: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
+
+  build_mac:
+    runs-on: macos-11
+    steps:
+      - uses: actions/checkout@v3
+      - name: Update brew
+        run: brew update
+      - name: Install brew packages
+        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
+      - name: Build sdrangel on Mac
+        run: |
+          mkdir build && cd build
+          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
+          make package -j4
+      - id: get_version2
+        uses: battila7/get-version-action@v2
+      - name: Get version
+        id: get_version
+        run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
+        # Requires git fetch --tags upstream to have been run!
+      - name: Set output
+        id: get_version3
+        run: echo "version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+      - name: Diplay version
+        run: |
+          echo ${{ steps.get_version.outputs.version }}
+          echo ${{ steps.get_version2.outputs.version }}
+          echo ${{ steps.get_version3.outputs.version }}
+      - name: Get OS version
+        id: get_os_version
+        run: echo "version=$(sw_vers -productVersion)" >> $env:GITHUB_OUTPUT
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: sdrangel-${{ steps.get_version3.outputs.version }}_${{ steps.get_os_version.outputs.version }}_x86_64.dmg
+          path: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version3.outputs.version }}_${{ steps.get_os_version.outputs.version }}_x86_64.dmg

From ddbac0e50348ad3883719b4e11e8f413f6377965 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 10:04:54 +0100
Subject: [PATCH 18/29] Try to fix version number

---
 .github/workflows/sdrangel.yml | 43 +++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index eeefbc743..899f6591e 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -101,6 +101,28 @@ jobs:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+        # Need with clause so git describe --tags works?
+      - name: Get version
+        id: get_version
+        run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
+        # Requires git fetch --tags upstream to have been run!
+      - name: Get version 3
+        id: get_version3
+        run: echo "version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+        # This just gives branch name
+      - name: Get OS version
+        id: get_os_version
+        run: |
+          sw_vers -productVersion
+          echo "os_version=$(sw_vers -productVersion)" >> $env:GITHUB_OUTPUT
+      - name: Diplay version
+        run: |
+          echo ${{ steps.get_version.outputs.version }}
+          echo ${{ steps.get_version3.outputs.version }}
+          echo ${{ steps.get_os_version.outputs.version }}
       - name: Update brew
         run: brew update
       - name: Install brew packages
@@ -110,25 +132,8 @@ jobs:
           mkdir build && cd build
           cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
           make package -j4
-      - id: get_version2
-        uses: battila7/get-version-action@v2
-      - name: Get version
-        id: get_version
-        run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
-        # Requires git fetch --tags upstream to have been run!
-      - name: Set output
-        id: get_version3
-        run: echo "version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-      - name: Diplay version
-        run: |
-          echo ${{ steps.get_version.outputs.version }}
-          echo ${{ steps.get_version2.outputs.version }}
-          echo ${{ steps.get_version3.outputs.version }}
-      - name: Get OS version
-        id: get_os_version
-        run: echo "version=$(sw_vers -productVersion)" >> $env:GITHUB_OUTPUT
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: sdrangel-${{ steps.get_version3.outputs.version }}_${{ steps.get_os_version.outputs.version }}_x86_64.dmg
-          path: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version3.outputs.version }}_${{ steps.get_os_version.outputs.version }}_x86_64.dmg
+          name: sdrangel-${{ steps.get_version.outputs.version }}_${{ steps.get_os_version.outputs.os_version }}_x86_64.dmg
+          path: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}_${{ steps.get_os_version.outputs.os_version }}_x86_64.dmg

From c875b307ca5c5f044d9468474c152992db1eda7c Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 10:17:53 +0100
Subject: [PATCH 19/29] Try to fix version number

---
 .github/workflows/sdrangel.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 899f6591e..33b6aabdd 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -107,7 +107,7 @@ jobs:
         # Need with clause so git describe --tags works?
       - name: Get version
         id: get_version
-        run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
+        run: echo "version=$(git describe --tags | cut -c2-)" >> $GITHUB_OUTPUT
         # Requires git fetch --tags upstream to have been run!
       - name: Get version 3
         id: get_version3
@@ -117,7 +117,7 @@ jobs:
         id: get_os_version
         run: |
           sw_vers -productVersion
-          echo "os_version=$(sw_vers -productVersion)" >> $env:GITHUB_OUTPUT
+          echo "os_version=$(sw_vers -productVersion)" >> $GITHUB_OUTPUT
       - name: Diplay version
         run: |
           echo ${{ steps.get_version.outputs.version }}

From 56aba40d0781a4c40ee45e38bd887961ebb36f4e Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 10:21:17 +0100
Subject: [PATCH 20/29] Try to fix OS version number

---
 .github/workflows/sdrangel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 33b6aabdd..a50847450 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -122,7 +122,7 @@ jobs:
         run: |
           echo ${{ steps.get_version.outputs.version }}
           echo ${{ steps.get_version3.outputs.version }}
-          echo ${{ steps.get_os_version.outputs.version }}
+          echo ${{ steps.get_os_version.outputs.os_version }}
       - name: Update brew
         run: brew update
       - name: Install brew packages

From ad7c08d05c176f543adba2bd87daa10042cc9b77 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 10:26:41 +0100
Subject: [PATCH 21/29] Try to fix version number

---
 .github/workflows/sdrangel.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index a50847450..7d8aae819 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -104,11 +104,13 @@ jobs:
         with:
           submodules: true
           fetch-depth: 0
-        # Need with clause so git describe --tags works?
+        # Need with clause so git describe --tags works
       - name: Get version
         id: get_version
         run: echo "version=$(git describe --tags | cut -c2-)" >> $GITHUB_OUTPUT
-        # Requires git fetch --tags upstream to have been run!
+        # Requires git fetch --tags upstream to have been run on the branch!
+        #   git remote add upstream https://github.com/f4exb/sdrangel.git
+        #   git fetch --tags upstream
       - name: Get version 3
         id: get_version3
         run: echo "version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT

From 9a6ade37d9ea41ce7aeac50fbcbcf4451adfefb2 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 14:55:56 +0100
Subject: [PATCH 22/29] Cache version numbers, so they can be used in other
 scripts

---
 .github/workflows/sdrangel.yml | 9 +++++++--
 CMakeLists.txt                 | 2 +-
 cmake/cpack/CMakeLists.txt     | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 7d8aae819..cd9fd9d0f 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -43,7 +43,11 @@ jobs:
           echo github.workspace: ${{ github.workspace }}
       - name: Get version
         id: get_version
-        run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
+        run: echo "version=$(grep sdrangel_VERSION CMakeCache.txt  | cut -d "=" -f2)" >> $env:GITHUB_OUTPUT
+        #run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
+      - name: Diplay version
+        run:
+          echo ${{ steps.get_version.outputs.version }}
       - name: Install basic dependencies on Windows
         if: startsWith(matrix.config.os, 'windows')
         run: |
@@ -107,7 +111,8 @@ jobs:
         # Need with clause so git describe --tags works
       - name: Get version
         id: get_version
-        run: echo "version=$(git describe --tags | cut -c2-)" >> $GITHUB_OUTPUT
+        run: echo "version=$(grep CPACK_PACKAGE_FILE_NAME CMakeCache.txt  | cut -d "=" -f2)" >> $GITHUB_OUTPUT
+        #
         # Requires git fetch --tags upstream to have been run on the branch!
         #   git remote add upstream https://github.com/f4exb/sdrangel.git
         #   git fetch --tags upstream
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 893ff53e6..e6cf4cea8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,7 +173,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
     endif()
 endif()
 
-set(sdrangel_VERSION "${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}${sdrangel_VERSION_SUFFIX}")
+set(sdrangel_VERSION "${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}${sdrangel_VERSION_SUFFIX}" CACHE INTERNAL "")
 message(STATUS "${APPLICATION_NAME} Version: ${sdrangel_VERSION}")
 add_definitions("-DSDRANGEL_LIB_VERSION=\"${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}\"")
 add_definitions("-DSDRANGEL_VERSION=\"${sdrangel_VERSION}\"")
diff --git a/cmake/cpack/CMakeLists.txt b/cmake/cpack/CMakeLists.txt
index 318e20552..eceb09313 100644
--- a/cmake/cpack/CMakeLists.txt
+++ b/cmake/cpack/CMakeLists.txt
@@ -36,7 +36,7 @@ if(APPLE AND BUNDLE AND BUILD_GUI)
   set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
   set(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/Info.plist")
   set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
-  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}")
+  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
   set(CPACK_PRE_BUILD_SCRIPTS "${PROJECT_BINARY_DIR}/deploy_mac.cmake")
 
   # copy SoapySDR Modules

From 608609a980f82e6fad05f66f6a99a3aa51eb4fec Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 15:01:40 +0100
Subject: [PATCH 23/29] Fix syntax error

---
 .github/workflows/sdrangel.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index cd9fd9d0f..d20edb0f6 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -46,8 +46,7 @@ jobs:
         run: echo "version=$(grep sdrangel_VERSION CMakeCache.txt  | cut -d "=" -f2)" >> $env:GITHUB_OUTPUT
         #run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
       - name: Diplay version
-        run:
-          echo ${{ steps.get_version.outputs.version }}
+        run: echo ${{ steps.get_version.outputs.version }}
       - name: Install basic dependencies on Windows
         if: startsWith(matrix.config.os, 'windows')
         run: |

From d96878f994303cd61edcc75e835c69061cdafb68 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 15:14:31 +0100
Subject: [PATCH 24/29] Get version after configure

---
 .github/workflows/sdrangel.yml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index d20edb0f6..6b101a8ac 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -41,12 +41,6 @@ jobs:
           echo github.event_name: ${{ github.event_name }}
           echo github.ref: ${{ github.ref }}
           echo github.workspace: ${{ github.workspace }}
-      - name: Get version
-        id: get_version
-        run: echo "version=$(grep sdrangel_VERSION CMakeCache.txt  | cut -d "=" -f2)" >> $env:GITHUB_OUTPUT
-        #run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
-      - name: Diplay version
-        run: echo ${{ steps.get_version.outputs.version }}
       - name: Install basic dependencies on Windows
         if: startsWith(matrix.config.os, 'windows')
         run: |
@@ -89,6 +83,12 @@ jobs:
           mkdir build && cd build
           cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64;C:\Libraries\boost_1_73_0"
           cmake --build . --config Release --target package
+      - name: Get version
+        id: get_version
+        run: echo "version=$(grep sdrangel_VERSION build/CMakeCache.txt | cut -d "=" -f2)" >> $env:GITHUB_OUTPUT
+        #run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
+      - name: Diplay version
+        run: echo ${{ steps.get_version.outputs.version }}
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
@@ -108,9 +108,17 @@ jobs:
           submodules: true
           fetch-depth: 0
         # Need with clause so git describe --tags works
+      - name: Update brew
+        run: brew update
+      - name: Install brew packages
+        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
+      - name: Configure sdrangel
+        run: |
+          mkdir build && cd build
+          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
       - name: Get version
         id: get_version
-        run: echo "version=$(grep CPACK_PACKAGE_FILE_NAME CMakeCache.txt  | cut -d "=" -f2)" >> $GITHUB_OUTPUT
+        run: echo "version=$(grep CPACK_PACKAGE_FILE_NAME build/CMakeCache.txt  | cut -d "=" -f2)" >> $GITHUB_OUTPUT
         #
         # Requires git fetch --tags upstream to have been run on the branch!
         #   git remote add upstream https://github.com/f4exb/sdrangel.git
@@ -129,14 +137,9 @@ jobs:
           echo ${{ steps.get_version.outputs.version }}
           echo ${{ steps.get_version3.outputs.version }}
           echo ${{ steps.get_os_version.outputs.os_version }}
-      - name: Update brew
-        run: brew update
-      - name: Install brew packages
-        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
       - name: Build sdrangel on Mac
         run: |
-          mkdir build && cd build
-          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
+          cd build
           make package -j4
       - name: Upload artifact
         uses: actions/upload-artifact@v3

From 6a75d36c4bca4477b861d402d62ed52b4a1eb938 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 17:13:41 +0100
Subject: [PATCH 25/29] Fix filename. Try 3 parallel jobs

---
 .github/workflows/sdrangel.yml | 37 +++++++++-------------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 6b101a8ac..1c3dc74a6 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -107,42 +107,23 @@ jobs:
         with:
           submodules: true
           fetch-depth: 0
-        # Need with clause so git describe --tags works
       - name: Update brew
         run: brew update
       - name: Install brew packages
         run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 opencv zlib airspy airspyhf hackrf rtl-sdr libbladerf uhd soapysdr
-      - name: Configure sdrangel
+      - name: Configure SDRangel
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON  -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
-      - name: Get version
-        id: get_version
-        run: echo "version=$(grep CPACK_PACKAGE_FILE_NAME build/CMakeCache.txt  | cut -d "=" -f2)" >> $GITHUB_OUTPUT
-        #
-        # Requires git fetch --tags upstream to have been run on the branch!
-        #   git remote add upstream https://github.com/f4exb/sdrangel.git
-        #   git fetch --tags upstream
-      - name: Get version 3
-        id: get_version3
-        run: echo "version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-        # This just gives branch name
-      - name: Get OS version
-        id: get_os_version
-        run: |
-          sw_vers -productVersion
-          echo "os_version=$(sw_vers -productVersion)" >> $GITHUB_OUTPUT
-      - name: Diplay version
-        run: |
-          echo ${{ steps.get_version.outputs.version }}
-          echo ${{ steps.get_version3.outputs.version }}
-          echo ${{ steps.get_os_version.outputs.os_version }}
-      - name: Build sdrangel on Mac
+          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
+      - name: Get filename
+        id: get_filename
+        run: echo "filename=$(grep CPACK_PACKAGE_FILE_NAME build/CMakeCache.txt | cut -d "=" -f2)" >> $GITHUB_OUTPUT
+      - name: Build SDRangel on Mac
         run: |
           cd build
-          make package -j4
+          make package -j3
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: sdrangel-${{ steps.get_version.outputs.version }}_${{ steps.get_os_version.outputs.os_version }}_x86_64.dmg
-          path: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}_${{ steps.get_os_version.outputs.os_version }}_x86_64.dmg
+          name: ${{ steps.get_filename.outputs.filename }}.dmg
+          path: ${{ github.workspace }}/build/${{ steps.get_filename.outputs.filename }}.dmg

From 12d592d2ed152299fa9aac165b28265c2355c1d5 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 20:06:47 +0100
Subject: [PATCH 26/29] Display exe size

---
 .github/workflows/sdrangel.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 1c3dc74a6..7872f3bc1 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -89,6 +89,8 @@ jobs:
         #run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
       - name: Diplay version
         run: echo ${{ steps.get_version.outputs.version }}
+      - name: Build size
+        run: ls -l ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
@@ -99,6 +101,8 @@ jobs:
         uses: softprops/action-gh-release@v0.1.13
         with:
           files: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
+      - name: Check space
+        run: Get-PSDrive
 
   build_mac:
     runs-on: macos-11

From b267efaa7a33eb0d2a841ce46a5a7c0bcd3329d0 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 20:10:33 +0100
Subject: [PATCH 27/29] Check space at more points

---
 .github/workflows/sdrangel.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index 7872f3bc1..b44281765 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -41,6 +41,8 @@ jobs:
           echo github.event_name: ${{ github.event_name }}
           echo github.ref: ${{ github.ref }}
           echo github.workspace: ${{ github.workspace }}
+      - name: Check space 1
+        run: Get-PSDrive
       - name: Install basic dependencies on Windows
         if: startsWith(matrix.config.os, 'windows')
         run: |
@@ -75,6 +77,8 @@ jobs:
           arch: ${{matrix.config.QT_ARCH}}
           setup-python: false
           modules: 'qtcharts qtwebengine'
+      - name: Check space 2
+        run: Get-PSDrive
       - name: build sdrangel on Windows
         if: startsWith(matrix.config.os, 'windows')
         run: |
@@ -83,6 +87,8 @@ jobs:
           mkdir build && cd build
           cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64;C:\Libraries\boost_1_73_0"
           cmake --build . --config Release --target package
+      - name: Check space 3
+        run: Get-PSDrive
       - name: Get version
         id: get_version
         run: echo "version=$(grep sdrangel_VERSION build/CMakeCache.txt | cut -d "=" -f2)" >> $env:GITHUB_OUTPUT
@@ -101,7 +107,7 @@ jobs:
         uses: softprops/action-gh-release@v0.1.13
         with:
           files: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
-      - name: Check space
+      - name: Check space 3
         run: Get-PSDrive
 
   build_mac:

From a563e8f220d16b13045b71d371e3454637bb6d7f Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 20:26:22 +0100
Subject: [PATCH 28/29] Don't generate .zip file on windows

---
 cmake/cpack/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/cpack/CMakeLists.txt b/cmake/cpack/CMakeLists.txt
index eceb09313..e454d467a 100644
--- a/cmake/cpack/CMakeLists.txt
+++ b/cmake/cpack/CMakeLists.txt
@@ -331,7 +331,7 @@ elseif(WIN32 OR MINGW)
       endforeach()
     " COMPONENT Runtime)
 
-    list(APPEND CPACK_GENERATOR "ZIP;NSIS")
+    list(APPEND CPACK_GENERATOR "NSIS")
     set(CPACK_MONOLITHIC_INSTALL ON)
     set(CPACK_NSIS_HELP_LINK ${CPACK_PACKAGE_CONTACT})
     set(CPACK_NSIS_URL_INFO_ABOUT ${CPACK_PACKAGE_CONTACT})

From 3def09fd1f68fe62dcd00c4490749daa7548c95b Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 24 Sep 2023 21:42:08 +0100
Subject: [PATCH 29/29] Remove debug

---
 .github/workflows/sdrangel.yml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml
index b44281765..a26c2e792 100644
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@@ -41,8 +41,6 @@ jobs:
           echo github.event_name: ${{ github.event_name }}
           echo github.ref: ${{ github.ref }}
           echo github.workspace: ${{ github.workspace }}
-      - name: Check space 1
-        run: Get-PSDrive
       - name: Install basic dependencies on Windows
         if: startsWith(matrix.config.os, 'windows')
         run: |
@@ -77,8 +75,6 @@ jobs:
           arch: ${{matrix.config.QT_ARCH}}
           setup-python: false
           modules: 'qtcharts qtwebengine'
-      - name: Check space 2
-        run: Get-PSDrive
       - name: build sdrangel on Windows
         if: startsWith(matrix.config.os, 'windows')
         run: |
@@ -87,16 +83,11 @@ jobs:
           mkdir build && cd build
           cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64;C:\Libraries\boost_1_73_0"
           cmake --build . --config Release --target package
-      - name: Check space 3
+      - name: Check disk space
         run: Get-PSDrive
       - name: Get version
         id: get_version
         run: echo "version=$(grep sdrangel_VERSION build/CMakeCache.txt | cut -d "=" -f2)" >> $env:GITHUB_OUTPUT
-        #run: echo "version=$(git describe --tags | cut -c2-)" >> $env:GITHUB_OUTPUT
-      - name: Diplay version
-        run: echo ${{ steps.get_version.outputs.version }}
-      - name: Build size
-        run: ls -l ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
@@ -107,8 +98,6 @@ jobs:
         uses: softprops/action-gh-release@v0.1.13
         with:
           files: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
-      - name: Check space 3
-        run: Get-PSDrive
 
   build_mac:
     runs-on: macos-11