From a7969adfe985233867c401a8cceec4bd34bcf9b8 Mon Sep 17 00:00:00 2001 From: srcejon Date: Tue, 4 Jun 2024 08:11:34 +0100 Subject: [PATCH 1/3] CUDAvkFFTEngine: Add required include. --- sdrbase/dsp/cudavkfftengine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sdrbase/dsp/cudavkfftengine.cpp b/sdrbase/dsp/cudavkfftengine.cpp index 94f01b0d2..4a7eeaba7 100644 --- a/sdrbase/dsp/cudavkfftengine.cpp +++ b/sdrbase/dsp/cudavkfftengine.cpp @@ -18,6 +18,7 @@ #include #include "dsp/cudavkfftengine.h" +#include "util/profiler.h" CUDAvkFFTEngine::CUDAvkFFTEngine() { From f5a1ef47b5eecea9a3b66635e2ae1c47eca9dce5 Mon Sep 17 00:00:00 2001 From: srcejon Date: Tue, 4 Jun 2024 08:58:06 +0100 Subject: [PATCH 2/3] Github mac CI: Try ffmpeg@5 --- .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 aa042aca4..e553632a8 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -121,7 +121,7 @@ jobs: rm -f /usr/local/bin/2to3 brew install opencv - name: Install brew packages - run: brew install nasm boost hidapi libusb fftw faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt subversion + run: brew install nasm boost hidapi libusb fftw ffmpeg@5 faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt subversion - name: Configure SDRangel run: | mkdir build && cd build From f49a0ec796716a6c2746a03babe77e3ef3710f3f Mon Sep 17 00:00:00 2001 From: srcejon Date: Tue, 4 Jun 2024 11:28:56 +0100 Subject: [PATCH 3/3] Set CMAKE_PREFIX_PATH to include ffmpeg@5. --- .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 e553632a8..7659a35a8 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -125,7 +125,7 @@ jobs: - 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_CHANNELRX_DEMODDATV=OFF -DENABLE_CHANNELTX_MODDATV=OFF -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_CHANNELRX_DEMODDATV=OFF -DENABLE_CHANNELTX_MODDATV=OFF -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DCMAKE_PREFIX_PATH="/usr/local/opt/ffmpeg@5/" - name: Get filename id: get_filename run: echo "filename=$(grep CPACK_PACKAGE_FILE_NAME build/CMakeCache.txt | cut -d "=" -f2)" >> $GITHUB_OUTPUT