Merge 51665d49b2 into 2a9c679c02

Merge pull request #2087 from agatti/vulkan-fix
Fix building with recent Vulkan SDKs.
2024-04-26 10:44:20 -05:00 · 2024-04-26 17:16:38 +02:00 · 2024-04-26 00:35:16 +02:00 · 2024-04-25 00:23:12 +02:00 · 2024-04-23 20:23:07 +02:00 · 2024-04-22 23:05:04 +02:00
9 changed files with 25 additions and 11 deletions
--- 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 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 svn
      - name: Configure SDRangel
        run: |
          mkdir build && cd build
--- a/plugins/feature/map/mapbeacondialog.cpp
+++ b/plugins/feature/map/mapbeacondialog.cpp
@ -31,6 +31,7 @@ MapBeaconDialog::MapBeaconDialog(MapGUI *gui, QWidget* parent) :
    ui(new Ui::MapBeaconDialog)
 {
    ui->setupUi(this);
+    setAttribute(Qt::WA_QuitOnClose, false);
    connect(&m_dlm, &HttpDownloadManager::downloadComplete, this, &MapBeaconDialog::downloadFinished);
 }

--- a/plugins/feature/map/mapgui.cpp
+++ b/plugins/feature/map/mapgui.cpp
@ -2507,17 +2507,20 @@ void MapGUI::on_displaySettings_clicked()
 void MapGUI::on_beacons_clicked()
 {
    m_beaconDialog.show();
+    m_beaconDialog.raise();
 }

 void MapGUI::on_ibpBeacons_clicked()
 {
    m_ibpBeaconDialog.show();
+    m_ibpBeaconDialog.raise();
 }

 void MapGUI::on_radiotime_clicked()
 {
    m_radioTimeDialog.updateTable();
    m_radioTimeDialog.show();
+    m_radioTimeDialog.raise();
 }

 QString MapGUI::getDataDir()
--- a/plugins/feature/map/mapibpbeacondialog.cpp
+++ b/plugins/feature/map/mapibpbeacondialog.cpp
@ -30,9 +30,9 @@ MapIBPBeaconDialog::MapIBPBeaconDialog(MapGUI *gui, QWidget* parent) :
    ui(new Ui::MapIBPBeaconDialog)
 {
    ui->setupUi(this);
+    setAttribute(Qt::WA_QuitOnClose, false);
    connect(&m_timer, &QTimer::timeout, this, &MapIBPBeaconDialog::updateTime);
    m_timer.setInterval(1000);
-    m_timer.start();
    ui->beacons->setRowCount(IBPBeacon::m_frequencies.size());
    for (int row = 0; row < IBPBeacon::m_frequencies.size(); row++)
    {
@ -44,7 +44,6 @@ MapIBPBeaconDialog::MapIBPBeaconDialog(MapGUI *gui, QWidget* parent) :
        ui->beacons->setItem(row, IBP_BEACON_COL_DISTANCE, new QTableWidgetItem(""));
    }
    resizeTable();
-    updateTable(QTime::currentTime());
 }

 MapIBPBeaconDialog::~MapIBPBeaconDialog()
@ -126,3 +125,17 @@ void MapIBPBeaconDialog::updateTime()
        updateTable(t);
    }
 }
+
+void MapIBPBeaconDialog::showEvent(QShowEvent *event)
+{
+    (void) event;
+    updateTable(QTime::currentTime());
+    updateTime();
+    m_timer.start();
+}
+
+void MapIBPBeaconDialog::hideEvent(QHideEvent *event)
+{
+    (void) event;
+    m_timer.stop();
+}
--- a/plugins/feature/map/mapibpbeacondialog.h
+++ b/plugins/feature/map/mapibpbeacondialog.h
@ -43,6 +43,8 @@ private slots:
    void accept();
    void on_beacons_cellDoubleClicked(int row, int column);
    void updateTime();
+    void showEvent(QShowEvent *event);
+    void hideEvent(QHideEvent *event);

 private:
    MapGUI *m_gui;
--- a/plugins/feature/map/mapradiotimedialog.cpp
+++ b/plugins/feature/map/mapradiotimedialog.cpp
@ -29,6 +29,7 @@ MapRadioTimeDialog::MapRadioTimeDialog(MapGUI *gui, QWidget* parent) :
    ui(new Ui::MapRadioTimeDialog)
 {
    ui->setupUi(this);
+    setAttribute(Qt::WA_QuitOnClose, false);
    // Don't call updateTable until m_gui->getAzEl() will return valid location
 }

--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@ -606,8 +606,6 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
    find_library(VULKAN_SPIRV_TOOLS_LIB SPIRV-Tools HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
    find_library(VULKAN_SPIRV_TOOLS_OPT_LIB SPIRV-Tools-opt HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
    find_library(VULKAN_SPIRV_TOOLS_SHARED_LIB SPIRV-Tools-shared HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
-    find_library(VULKAN_HLSL_LIB HLSL HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
-    find_library(VULKAN_OGLCOMPILER_LIB OGLCompiler HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
    find_library(VULKAN_OSDEPENDENT_LIB OSDependent HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
    find_library(VULKAN_GLSLANG_LIB glslang HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
    find_library(VULKAN_GLSLANG_RES_LIB glslang-default-resource-limits HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
@ -624,8 +622,6 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
    find_library(VULKAN_SPIRV_TOOLSD_LIB SPIRV-Tools${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
    find_library(VULKAN_SPIRV_TOOLS_OPTD_LIB SPIRV-Tools-opt${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
    find_library(VULKAN_SPIRV_TOOLS_SHAREDD_LIB SPIRV-Tools-shared${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
-    find_library(VULKAN_HLSLD_LIB HLSL${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
-    find_library(VULKAN_OGLCOMPILERD_LIB OGLCompiler${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
    find_library(VULKAN_OSDEPENDENTD_LIB OSDependent${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
    find_library(VULKAN_GLSLANGD_LIB glslang${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
    find_library(VULKAN_GLSLANG_RESD_LIB glslang-default-resource-limits${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
@ -638,8 +634,6 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
        optimized ${VULKAN_SPIRV_TOOLS_LIB}
        optimized ${VULKAN_SPIRV_TOOLS_OPT_LIB}
        optimized ${VULKAN_SPIRV_TOOLS_SHARED_LIB}
-        optimized ${VULKAN_HLSL_LIB}
-        optimized ${VULKAN_OGLCOMPILER_LIB}
        optimized ${VULKAN_OSDEPENDENT_LIB}
        optimized ${VULKAN_GLSLANG_LIB}
        optimized ${VULKAN_GLSLANG_RES_LIB}
@ -651,8 +645,6 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
        debug ${VULKAN_SPIRV_TOOLSD_LIB}
        debug ${VULKAN_SPIRV_TOOLS_OPTD_LIB}
        debug ${VULKAN_SPIRV_TOOLS_SHAREDD_LIB}
-        debug ${VULKAN_HLSLD_LIB}
-        debug ${VULKAN_OGLCOMPILERD_LIB}
        debug ${VULKAN_OSDEPENDENTD_LIB}
        debug ${VULKAN_GLSLANGD_LIB}
        debug ${VULKAN_GLSLANG_RESD_LIB}
--- a/sdrbase/dsp/vkfftengine.cpp
+++ b/sdrbase/dsp/vkfftengine.cpp
@ -16,6 +16,7 @@
 ///////////////////////////////////////////////////////////////////////////////////

 #include <QDebug>
+#include <QElapsedTimer>

 #include "dsp/vkfftengine.h"

--- a/sdrbase/dsp/vulkanvkfftengine.cpp
+++ b/sdrbase/dsp/vulkanvkfftengine.cpp
@ -20,6 +20,7 @@
 #include "glslang_c_interface.h"

 #include "dsp/vulkanvkfftengine.h"
+#include "util/profiler.h"

 class GLSInitialiser {
 public:
Author	SHA1	Message	Date
dforsi	516c690c0b	Merge `51665d49b2` into `2a9c679c02`	2024-04-26 10:44:20 -05:00
Edouard Griffiths	2a9c679c02	Merge pull request #2087 from agatti/vulkan-fix Fix building with recent Vulkan SDKs.	2024-04-26 17:16:38 +02:00
Alessandro Gatti	fa5dc41503	vkFFT: Fix building with recent Vulkan SDKs. Signed-off-by: Alessandro Gatti <a.gatti@frob.it>	2024-04-26 00:35:16 +02:00
Edouard Griffiths	5e321e3ead	Merge pull request #2068 from dforsi/feature/map-feature Feature/map feature	2024-04-25 00:23:12 +02:00
Daniele Forsi	991ccddb66	Close any open dialog when sdrangel quits	2024-04-23 20:23:07 +02:00
Daniele Forsi	b4ec43e4aa	Raise the Beacon, IBP Beacons an Radio Time dialogs Make the dialogs visible again if they are open but are hidden behind the main window or another application's window.	2024-04-22 23:05:04 +02:00
Daniele Forsi	f4b2dfc0a9	Revert "Prevent the dialogs to be hidden behind the main window" This reverts commit `f72574d1ad`.	2024-04-22 22:42:00 +02:00
Daniele Forsi	f72574d1ad	Prevent the dialogs to be hidden behind the main window This also menas that when the main window is closed, the dialogs get closed automatically, and not only when the map window is closed.	2024-04-22 22:39:19 +02:00
Daniele Forsi	230c461204	Update the IPB beacons table only when the dialog is visible	2024-04-22 22:39:19 +02:00
Daniele Forsi	51665d49b2	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-21 11:25:42 +02:00