Skip to content

Commit 8b8eda3

Browse files
AlexandreRoumaAlexandreRouma
committed
add hydrasdr support to all platforms EXCEPT Windows and remote debian buster CI
1 parent 4558e73 commit 8b8eda3

File tree

11 files changed

+124
-28
lines changed

11 files changed

+124
-28
lines changed

‎.github/workflows/build_all.yml‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ jobs:
136136
- name: Install more recent librtlsdr
137137
run: git clone https://github.com/osmocom/rtl-sdr && cd rtl-sdr && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 LIBRARY_PATH=$(pkg-config --libs-only-L libusb-1.0 | sed 's/\-L//') && sudo make install && cd ../../
138138

139+
- name: Install libhydrasdr
140+
run: git clone https://github.com/hydrasdr/rfone_host && cd rfone_host && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../
141+
139142
- name: Prepare CMake
140143
working-directory: ${{runner.workspace}}/build
141144
run: cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 $GITHUB_WORKSPACE -DOPT_BUILD_PLUTOSDR_SOURCE=ON -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_AUDIO_SINK=OFF -DOPT_BUILD_PORTAUDIO_SINK=ON -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON -DOPT_BUILD_M17_DECODER=ON -DOPT_BUILD_PERSEUS_SOURCE=ON -DOPT_BUILD_AUDIO_SOURCE=OFF -DOPT_BUILD_RFNM_SOURCE=ON -DOPT_BUILD_FOBOSSDR_SOURCE=ON -DUSE_BUNDLE_DEFAULTS=ON -DCMAKE_BUILD_TYPE=Release
@@ -193,6 +196,9 @@ jobs:
193196
- name: Install more recent librtlsdr
194197
run: git clone https://github.com/osmocom/rtl-sdr && cd rtl-sdr && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 LIBRARY_PATH=$(pkg-config --libs-only-L libusb-1.0 | sed 's/\-L//') && sudo make install && cd ../../
195198

199+
- name: Install libhydrasdr
200+
run: git clone https://github.com/hydrasdr/rfone_host && cd rfone_host && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../
201+
196202
- name: Prepare CMake
197203
working-directory: ${{runner.workspace}}/build
198204
run: cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 $GITHUB_WORKSPACE -DOPT_BUILD_PLUTOSDR_SOURCE=ON -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_AUDIO_SINK=OFF -DOPT_BUILD_PORTAUDIO_SINK=ON -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON -DOPT_BUILD_M17_DECODER=OFF -DOPT_BUILD_PERSEUS_SOURCE=OFF -DOPT_BUILD_AUDIO_SOURCE=OFF -DOPT_BUILD_RFNM_SOURCE=ON -DOPT_BUILD_FOBOSSDR_SOURCE=ON -DUSE_BUNDLE_DEFAULTS=ON -DCMAKE_BUILD_TYPE=Release
@@ -211,14 +217,14 @@ jobs:
211217
name: sdrpp_macos_arm
212218
path: ${{runner.workspace}}/sdrpp_macos_arm.zip
213219

214-
build_debian_buster_amd64:
220+
build_debian_bullseye_amd64:
215221
runs-on: ubuntu-latest
216222

217223
steps:
218224
- uses: actions/checkout@v4
219-
225+
220226
- name: Create Docker Image
221-
run: cd $GITHUB_WORKSPACE/docker_builds/debian_buster && docker build . --tag sdrpp_build
227+
run: cd $GITHUB_WORKSPACE/docker_builds/debian_bullseye && docker build . --tag sdrpp_build
222228

223229
- name: Run Container
224230
run: docker run --name build -v $GITHUB_WORKSPACE:/root/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
@@ -230,17 +236,17 @@ jobs:
230236
- name: Save Deb Archive
231237
uses: actions/upload-artifact@v4
232238
with:
233-
name: sdrpp_debian_buster_amd64
239+
name: sdrpp_debian_bullseye_amd64
234240
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
235241

236-
build_debian_buster_aarch64:
242+
build_debian_bullseye_aarch64:
237243
runs-on: ubuntu-24.04-arm
238244

239245
steps:
240246
- uses: actions/checkout@v4
241-
247+
242248
- name: Create Docker Image
243-
run: cd $GITHUB_WORKSPACE/docker_builds/debian_buster && docker build . --tag sdrpp_build
249+
run: cd $GITHUB_WORKSPACE/docker_builds/debian_bullseye && docker build . --tag sdrpp_build
244250

245251
- name: Run Container
246252
run: docker run --name build -v $GITHUB_WORKSPACE:/root/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
@@ -252,17 +258,17 @@ jobs:
252258
- name: Save Deb Archive
253259
uses: actions/upload-artifact@v4
254260
with:
255-
name: sdrpp_debian_buster_aarch64
261+
name: sdrpp_debian_bullseye_aarch64
256262
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
257263

258-
build_debian_bullseye_amd64:
264+
build_debian_bookworm_amd64:
259265
runs-on: ubuntu-latest
260266

261267
steps:
262268
- uses: actions/checkout@v4
263269

264270
- name: Create Docker Image
265-
run: cd $GITHUB_WORKSPACE/docker_builds/debian_bullseye && docker build . --tag sdrpp_build
271+
run: cd $GITHUB_WORKSPACE/docker_builds/debian_bookworm && docker build . --tag sdrpp_build
266272

267273
- name: Run Container
268274
run: docker run --name build -v $GITHUB_WORKSPACE:/root/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
@@ -274,17 +280,17 @@ jobs:
274280
- name: Save Deb Archive
275281
uses: actions/upload-artifact@v4
276282
with:
277-
name: sdrpp_debian_bullseye_amd64
283+
name: sdrpp_debian_bookworm_amd64
278284
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
279285

280-
build_debian_bullseye_aarch64:
286+
build_debian_bookworm_aarch64:
281287
runs-on: ubuntu-24.04-arm
282288

283289
steps:
284290
- uses: actions/checkout@v4
285291

286292
- name: Create Docker Image
287-
run: cd $GITHUB_WORKSPACE/docker_builds/debian_bullseye && docker build . --tag sdrpp_build
293+
run: cd $GITHUB_WORKSPACE/docker_builds/debian_bookworm && docker build . --tag sdrpp_build
288294

289295
- name: Run Container
290296
run: docker run --name build -v $GITHUB_WORKSPACE:/root/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
@@ -296,17 +302,17 @@ jobs:
296302
- name: Save Deb Archive
297303
uses: actions/upload-artifact@v4
298304
with:
299-
name: sdrpp_debian_bullseye_aarch64
305+
name: sdrpp_debian_bookworm_aarch64
300306
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
301307

302-
build_debian_bookworm_amd64:
308+
build_debian_trixie_amd64:
303309
runs-on: ubuntu-latest
304310

305311
steps:
306312
- uses: actions/checkout@v4
307313

308314
- name: Create Docker Image
309-
run: cd $GITHUB_WORKSPACE/docker_builds/debian_bookworm && docker build . --tag sdrpp_build
315+
run: cd $GITHUB_WORKSPACE/docker_builds/debian_trixie && docker build . --tag sdrpp_build
310316

311317
- name: Run Container
312318
run: docker run --name build -v $GITHUB_WORKSPACE:/root/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
@@ -318,17 +324,17 @@ jobs:
318324
- name: Save Deb Archive
319325
uses: actions/upload-artifact@v4
320326
with:
321-
name: sdrpp_debian_bookworm_amd64
327+
name: sdrpp_debian_trixie_amd64
322328
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
323329

324-
build_debian_bookworm_aarch64:
330+
build_debian_trixie_aarch64:
325331
runs-on: ubuntu-24.04-arm
326332

327333
steps:
328334
- uses: actions/checkout@v4
329335

330336
- name: Create Docker Image
331-
run: cd $GITHUB_WORKSPACE/docker_builds/debian_bookworm && docker build . --tag sdrpp_build
337+
run: cd $GITHUB_WORKSPACE/docker_builds/debian_trixie && docker build . --tag sdrpp_build
332338

333339
- name: Run Container
334340
run: docker run --name build -v $GITHUB_WORKSPACE:/root/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
@@ -340,7 +346,7 @@ jobs:
340346
- name: Save Deb Archive
341347
uses: actions/upload-artifact@v4
342348
with:
343-
name: sdrpp_debian_bookworm_aarch64
349+
name: sdrpp_debian_trixie_aarch64
344350
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
345351

346352
build_debian_sid_amd64:
@@ -595,12 +601,12 @@ jobs:
595601
'build_windows',
596602
'build_macos_intel',
597603
'build_macos_arm',
598-
'build_debian_buster_amd64',
599-
'build_debian_buster_aarch64',
600604
'build_debian_bullseye_amd64',
601605
'build_debian_bullseye_aarch64',
602606
'build_debian_bookworm_amd64',
603607
'build_debian_bookworm_aarch64',
608+
'build_debian_trixie_amd64',
609+
'build_debian_trixie_aarch64',
604610
'build_debian_sid_amd64',
605611
'build_debian_sid_aarch64',
606612
'build_ubuntu_focal_amd64',
@@ -625,12 +631,12 @@ jobs:
625631
mv sdrpp_windows_x64/sdrpp_windows_x64.zip sdrpp_all/ &&
626632
mv sdrpp_macos_intel/sdrpp_macos_intel.zip sdrpp_all/ &&
627633
mv sdrpp_macos_arm/sdrpp_macos_arm.zip sdrpp_all/ &&
628-
mv sdrpp_debian_buster_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_buster_amd64.deb &&
629-
mv sdrpp_debian_buster_aarch64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_buster_aarch64.deb &&
630634
mv sdrpp_debian_bullseye_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_bullseye_amd64.deb &&
631635
mv sdrpp_debian_bullseye_aarch64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_bullseye_aarch64.deb &&
632636
mv sdrpp_debian_bookworm_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_bookworm_amd64.deb &&
633637
mv sdrpp_debian_bookworm_aarch64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_bookworm_aarch64.deb &&
638+
mv sdrpp_debian_trixie_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_trixie_amd64.deb &&
639+
mv sdrpp_debian_trixie_aarch64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_trixie_aarch64.deb &&
634640
mv sdrpp_debian_sid_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_amd64.deb &&
635641
mv sdrpp_debian_sid_aarch64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_aarch64.deb &&
636642
mv sdrpp_ubuntu_focal_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_focal_amd64.deb &&

‎docker_builds/debian_bookworm/do_build.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ make -j2
4646
make install
4747
cd ../../
4848

49+
# Install libhydrasdr
50+
git clone https://github.com/hydrasdr/rfone_host
51+
cd rfone_host
52+
mkdir build
53+
cd build
54+
cmake ..
55+
make -j2
56+
make install
57+
cd ../../
58+
4959
cd SDRPlusPlus
5060
mkdir build
5161
cd build

‎docker_builds/debian_bullseye/do_build.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ make -j2
4646
make install
4747
cd ../../
4848

49+
# Install libhydrasdr
50+
git clone https://github.com/hydrasdr/rfone_host
51+
cd rfone_host
52+
mkdir build
53+
cd build
54+
cmake ..
55+
make -j2
56+
make install
57+
cd ../../
58+
4959
cd SDRPlusPlus
5060
mkdir build
5161
cd build

‎docker_builds/debian_sid/do_build.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ make -j2
4646
make install
4747
cd ../../
4848

49+
# Install libhydrasdr
50+
git clone https://github.com/hydrasdr/rfone_host
51+
cd rfone_host
52+
mkdir build
53+
cd build
54+
cmake ..
55+
make -j2
56+
make install
57+
cd ../../
58+
4959
cd SDRPlusPlus
5060
mkdir build
5161
cd build

‎docker_builds/debian_buster/Dockerfile‎ renamed to ‎docker_builds/debian_trixie/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:buster
1+
FROM debian:trixie
22
ENV DEBIAN_FRONTEND=noninteractive
33
COPY do_build.sh /root
44
RUN chmod +x /root/do_build.sh

‎docker_builds/debian_buster/do_build.sh‎ renamed to ‎docker_builds/debian_trixie/do_build.sh‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cd /root
44

55
# Install dependencies and tools
66
apt update
7-
apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk1-dev libzstd-dev libairspyhf-dev libairspy-dev \
7+
apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk-dev libzstd-dev libairspyhf-dev libairspy-dev \
88
libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget portaudio19-dev \
99
libcodec2-dev autoconf libtool xxd libspdlog-dev
1010

@@ -46,11 +46,21 @@ make -j2
4646
make install
4747
cd ../../
4848

49+
# Install libhydrasdr
50+
git clone https://github.com/hydrasdr/rfone_host
51+
cd rfone_host
52+
mkdir build
53+
cd build
54+
cmake ..
55+
make -j2
56+
make install
57+
cd ../../
58+
4959
cd SDRPlusPlus
5060
mkdir build
5161
cd build
52-
cmake .. -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_BLADERF_SOURCE=OFF -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON -DOPT_BUILD_M17_DECODER=ON -DOPT_BUILD_PERSEUS_SOURCE=ON -DOPT_BUILD_RFNM_SOURCE=ON -DOPT_BUILD_FOBOSSDR_SOURCE=ON
62+
cmake .. -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON -DOPT_BUILD_M17_DECODER=ON -DOPT_BUILD_PERSEUS_SOURCE=ON -DOPT_BUILD_RFNM_SOURCE=ON -DOPT_BUILD_FOBOSSDR_SOURCE=ON
5363
make VERBOSE=1 -j2
5464

5565
cd ..
56-
sh make_debian_package.sh ./build 'libfftw3-dev, libglfw3-dev, libvolk1-dev, librtaudio-dev, libzstd-dev'
66+
sh make_debian_package.sh ./build 'libfftw3-dev, libglfw3-dev, libvolk-dev, librtaudio-dev, libzstd-dev'

‎docker_builds/ubuntu_bionic/do_build.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,16 @@ echo 'Version: 0.7' >> /usr/share/pkgconfig/codec2.pc
8383
echo 'Libs: -L/usr/include/x86_64-linux-gnu/ -lcodec2' >> /usr/share/pkgconfig/codec2.pc
8484
echo 'Cflags: -I/usr/include/codec2' >> /usr/share/pkgconfig/codec2.pc
8585

86+
# Install libhydrasdr
87+
git clone https://github.com/hydrasdr/rfone_host
88+
cd rfone_host
89+
mkdir build
90+
cd build
91+
cmake ..
92+
make -j2
93+
make install
94+
cd ../../
95+
8696
# Build SDR++ Itself
8797
cd SDRPlusPlus
8898
mkdir build

‎docker_builds/ubuntu_focal/do_build.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ make -j2
4646
make install
4747
cd ../../
4848

49+
# Install libhydrasdr
50+
git clone https://github.com/hydrasdr/rfone_host
51+
cd rfone_host
52+
mkdir build
53+
cd build
54+
cmake ..
55+
make -j2
56+
make install
57+
cd ../../
58+
4959
cd SDRPlusPlus
5060
mkdir build
5161
cd build

‎docker_builds/ubuntu_jammy/do_build.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ make -j2
4646
make install
4747
cd ../../
4848

49+
# Install libhydrasdr
50+
git clone https://github.com/hydrasdr/rfone_host
51+
cd rfone_host
52+
mkdir build
53+
cd build
54+
cmake ..
55+
make -j2
56+
make install
57+
cd ../../
58+
4959
cd SDRPlusPlus
5060
mkdir build
5161
cd build

‎docker_builds/ubuntu_noble/do_build.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ make -j2
4646
make install
4747
cd ../../
4848

49+
# Install libhydrasdr
50+
git clone https://github.com/hydrasdr/rfone_host
51+
cd rfone_host
52+
mkdir build
53+
cd build
54+
cmake ..
55+
make -j2
56+
make install
57+
cd ../../
58+
4959
cd SDRPlusPlus
5060
mkdir build
5161
cd build

0 commit comments

Comments
 (0)