Merge 954748f452 into 34871bfa0f

Temporarily disable building DATV plugins for MacOS CI
This is a temporary workaround to make CI succeed until the plugins code is modified to be compatible with a newer version of ffmpeg.
2024-04-26 23:09:03 +02:00 · 2024-04-26 23:04:12 +02:00 · 2024-04-26 22:57:41 +02:00 · 2024-04-26 19:10:56 +02:00 · 2024-04-26 08:34:50 +02:00
2 changed files with 3 additions and 3 deletions
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@ -121,11 +121,11 @@ jobs:
          rm -f /usr/local/bin/2to3
          brew install opencv
      - name: Install brew packages
-        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt
+        run: brew install nasm boost hidapi libusb fftw faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt
      - 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
+          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
      - name: Get filename
        id: get_filename
        run: echo "filename=$(grep CPACK_PACKAGE_FILE_NAME build/CMakeCache.txt | cut -d "=" -f2)" >> $GITHUB_OUTPUT
--- a/plugins/samplesource/sdrplayv3/sdrplayv3plugin.cpp
+++ b/plugins/samplesource/sdrplayv3/sdrplayv3plugin.cpp
@ -96,7 +96,7 @@ void SDRPlayV3Plugin::enumOriginDevices(QStringList& listedHwIds, OriginDevices&
    sdrplay_api_LockDeviceApi();

    sdrplay_api_ErrT err;
-    sdrplay_api_DeviceT devs[6];
+    sdrplay_api_DeviceT devs[SDRPLAY_MAX_DEVICES];
    unsigned int count;
    if ((err = sdrplay_api_GetDevices(devs, &count, sizeof(devs) / sizeof(sdrplay_api_DeviceT))) == sdrplay_api_Success)
    {
Author	SHA1	Message	Date
dforsi	93bec05fed	Merge `954748f452` into `34871bfa0f`	2024-04-26 23:09:03 +02:00
Daniele Forsi	954748f452	Temporarily disable building DATV plugins for MacOS CI This is a temporary workaround to make CI succeed until the plugins code is modified to be compatible with a newer version of ffmpeg.	2024-04-26 23:04:12 +02:00
Daniele Forsi	6f107cd915	Fix CI for Mac OS Build ffmpeg as external project to work around missing includes: /Users/runner/work/sdrangel/sdrangel/plugins/channelrx/demoddatv/datvideorender.cpp:282:46: error: no member named 'channels' in 'AVCodecContext' (and similar)	2024-04-26 22:57:41 +02:00
Edouard Griffiths	34871bfa0f	Merge pull request #2088 from rudis/sdrplay sdrplayv3: use SDRPLAY_MAX_DEVICES in enumOriginDevices()	2024-04-26 19:10:56 +02:00
Simon Ruderich	f5b43fec2d	sdrplayv3: use SDRPLAY_MAX_DEVICES in enumOriginDevices() This makes it consistent with openDevice() which already uses this constant provided by the API.	2024-04-26 08:34:50 +02:00