Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Add gr-soapy support to Gqrx #1378

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ jobs:
gr-osmosdr \
liborc-0.4-dev \
appstream \
desktop-file-utils
desktop-file-utils \
libsoapysdr-dev \
soapysdr-module-rtlsdr
- name: Install Qt5
if: matrix.image == 'ubuntu:20.04'
run: |
Expand Down Expand Up @@ -77,7 +79,7 @@ jobs:
# for https://github.com/actions/runner-images/issues/9272
sudo chown -R runner:admin /usr/local/
brew update
brew install airspy boost gnuradio hackrf libbladerf librtlsdr pybind11 six uhd qt@6 || true
brew install airspy boost gnuradio hackrf libbladerf librtlsdr pybind11 six uhd qt@6 soapysdr soapyrtlsdr || true

cd /tmp
git clone https://gitea.osmocom.org/sdr/gr-osmosdr.git
Expand Down Expand Up @@ -121,6 +123,8 @@ jobs:
volk:p
libsndfile:p
fftw:p
soapysdr:p
soapyrtlsdr:p
- name: Clone and build GNU Radio
working-directory: ${{ runner.temp }}
run: |
Expand All @@ -137,7 +141,8 @@ jobs:
-DENABLE_GR_DIGITAL=ON \
-DENABLE_GR_FFT=ON \
-DENABLE_GR_FILTER=ON \
-DENABLE_GR_NETWORK=ON
-DENABLE_GR_NETWORK=ON \
-DENABLE_GR_SOAPY=ON
cmake --build build
cmake --install build
- name: Clone and build gr-osmosdr
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ else()
endif()

include(FindPkgConfig)
find_package(Gnuradio-osmosdr REQUIRED)

set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG AUDIO BLOCKS DIGITAL FILTER FFT PMT)
find_package(Gnuradio REQUIRED COMPONENTS analog audio blocks digital filter fft network)

set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG AUDIO BLOCKS DIGITAL FILTER FFT PMT SOAPY)
find_package(Gnuradio REQUIRED COMPONENTS analog audio blocks digital filter fft network soapy)
if(NOT Gnuradio_FOUND)
message(FATAL_ERROR "GnuRadio Runtime required to compile gqrx")
endif()
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ if(NOT Gnuradio_VERSION VERSION_LESS "3.10")
gnuradio::gnuradio-filter
gnuradio::gnuradio-network
gnuradio::gnuradio-audio
gnuradio::gnuradio-soapy
Volk::volk
)
else()
Expand Down
Loading
Loading