From c6a1f188a8c2e02744f0a8978bd9c1ec2ba6e2dc Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Sat, 22 Jun 2019 12:35:37 +0200 Subject: [PATCH 1/7] removes symlink to desktop file --- flatpak/sdrangel.desktop | 1 - 1 file changed, 1 deletion(-) delete mode 120000 flatpak/sdrangel.desktop diff --git a/flatpak/sdrangel.desktop b/flatpak/sdrangel.desktop deleted file mode 120000 index 226f8f691..000000000 --- a/flatpak/sdrangel.desktop +++ /dev/null @@ -1 +0,0 @@ -../desktop/sdrangel.desktop \ No newline at end of file From 684cc02bb00ea32d7ded738c79ed2e21ac1c6100 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Sat, 22 Jun 2019 12:53:35 +0200 Subject: [PATCH 2/7] wip --- flatpak/org.sdrangel.SDRangel.json | 298 ++++++++++++++++++++++++++++- 1 file changed, 295 insertions(+), 3 deletions(-) diff --git a/flatpak/org.sdrangel.SDRangel.json b/flatpak/org.sdrangel.SDRangel.json index 1fdf7e82c..61b6921b1 100644 --- a/flatpak/org.sdrangel.SDRangel.json +++ b/flatpak/org.sdrangel.SDRangel.json @@ -17,8 +17,6 @@ "modules": [ { "name": "libusb", - "config-opts": [""], - "make-args": [""], "sources": [ { "type": "git", @@ -27,9 +25,165 @@ ] }, { - "name": "limesuite", + "name": "cm256cc", "buildsystem": "cmake-ninja", "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/f4exb/cm256cc.git", + "commit": "f21e8bc" + } + ] + }, + { + "name": "mbelib", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/szechyjs/mbelib.git", + "commit": "e2d84c1" + } + ] + }, + { + "name": "serialdv", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/f4exb/serialDV.git", + "commit": "abd65a0" + } + ] + }, + { + "name": "dsdcc", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev", + "-DUSE_MBELIB=ON" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/f4exb/dsdcc.git", + "commit": "a0f4694" + } + ] + }, + { + "name": "codec2", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/drowe67/codec2.git", + "commit": "76a20416d715ee06f8b36a9953506876689a3bd2" + } + ] + }, + { + "name": "sdrplay", + "sources": [ + { + "type": "archive", + "url": "https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-2.13.1.run", + "sha256": "e2320b9eafffa3cb5d49e956207af2521ccf098aacc1fd9abecc8fb96b364522" + } + ] + }, + { + "name": "airspy", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/airspy/host.git", + "commit": "5c86e53" + } + ] + }, + { + "name": "rtlsdr", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev", + "-DDETACH_KERNEL_DRIVER=ON" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/librtlsdr/librtlsdr.git", + "commit": "c7d970a" + } + ] + }, + { + "name": "plutosdr", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev", + "-DINSTALL_UDEV_RULE=OFF" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/analogdevicesinc/libiio.git", + "commit": "5bdc242" + } + ] + }, + { + "name": "bladerf", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev", + "-DINSTALL_UDEV_RULE=OFF" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/Nuand/bladeRF.git", + "commit": "32058c4" + } + ] + }, + { + "name": "hackrf", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev", + "-DINSTALL_UDEV_RULE=OFF" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/mossmann/hackrf.git", + "commit": "9bbbbbf" + } + ] + }, + { + "name": "limesdr", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev", "-DENABLE_QUICKTEST=OFF", "-DENABLE_GUI=OFF", "-DENABLE_SOAPY_LMS7=OFF", @@ -46,10 +200,148 @@ } ] }, + { + "name": "perseus", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/f4exb/libperseus-sdr.git", + "commit": "afefa23" + } + ] + }, + { + "name": "xtrx", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev", + "-DENABLE_SOAPY=NO" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/xtrx-sdr/images.git", + "commit": "053ec82" + } + ] + }, + { + "name": "uhd", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev", + "-DENABLE_PYTHON_API=OFF", + "-DINSTALL_UDEV_RULES=OFF" + ], + "sources": [ + { + "type": "git", + "url": "git://github.com/EttusResearch/uhd.git", + "commit": "e0e61" + } + ] + }, + { + "name": "libmirisdr", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "git://github.com/f4exb/libmirisdr-4.git", + "commit": "e0e61" + } + ] + }, + { + "name": "soapy", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "git://github.com/pothosware/SoapySDR.git", + "commit": "5838bc9" + } + ] + }, + { + "name": "soapy_remote", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "git://github.com/pothosware/SoapyRemote.git", + "commit": "4f5d717" + } + ] + }, + { + "name": "soapy_sdrplay", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "git://github.com/pothosware/SoapySDRPlay.git", + "commit": "12c3db6" + } + ] + }, + { + "name": "soapy_limesdr", + "// TODO": "Basis is contained in build modules limesdr and soapy_remote", + "// buildsystem": "cmake-ninja", + "// config-opts": [ + "-Wno-dev" + ] + }, + { + "name": "soapy_uhd", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/pothosware/SoapyUHD.git", + "commit": "5838bc9" + } + ] + }, + { + "name": "soapy_redpitaya", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-Wno-dev" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/pothosware/SoapyRedPitaya.git", + "commit": "3d576f83b3bde52104b2a88150516ca8c9a78c7a" + } + ] + }, { "name": "sdrangel", "buildsystem": "cmake-ninja", "config-opts": [ + "-Wno-dev", "-DDEBUG_OUTPUT=ON", "-DBUILD_TYPE=RELEASE", "-DRX_SAMPLE_24BIT=ON" From d150bc50b32ea0b376d3eccddf65463b6ecd8e06 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Sat, 22 Jun 2019 16:20:00 +0200 Subject: [PATCH 3/7] uses the right git version hashes in flatpak manifest --- flatpak/org.sdrangel.SDRangel.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/flatpak/org.sdrangel.SDRangel.json b/flatpak/org.sdrangel.SDRangel.json index 61b6921b1..1f2bc5320 100644 --- a/flatpak/org.sdrangel.SDRangel.json +++ b/flatpak/org.sdrangel.SDRangel.json @@ -241,7 +241,7 @@ { "type": "git", "url": "git://github.com/EttusResearch/uhd.git", - "commit": "e0e61" + "commit": "e0e61a5" } ] }, @@ -254,8 +254,7 @@ "sources": [ { "type": "git", - "url": "git://github.com/f4exb/libmirisdr-4.git", - "commit": "e0e61" + "url": "git://github.com/f4exb/libmirisdr-4.git" } ] }, @@ -319,7 +318,7 @@ { "type": "git", "url": "https://github.com/pothosware/SoapyUHD.git", - "commit": "5838bc9" + "commit": "2900fff" } ] }, From 31267f0317c2c5f998bb8a8512a8337d0439f033 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Mon, 24 Jun 2019 14:50:41 +0200 Subject: [PATCH 4/7] removes libusb module dependency from flatpak manifest --- flatpak/org.sdrangel.SDRangel.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/flatpak/org.sdrangel.SDRangel.json b/flatpak/org.sdrangel.SDRangel.json index 1f2bc5320..45197bd1d 100644 --- a/flatpak/org.sdrangel.SDRangel.json +++ b/flatpak/org.sdrangel.SDRangel.json @@ -15,15 +15,6 @@ "--socket=wayland" ], "modules": [ - { - "name": "libusb", - "sources": [ - { - "type": "git", - "url": "https://github.com/libusb/libusb.git" - } - ] - }, { "name": "cm256cc", "buildsystem": "cmake-ninja", From 21de517cb1ed15aae86884adcce46b65132d445d Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Thu, 4 Jul 2019 01:49:17 +0200 Subject: [PATCH 5/7] explicitly ignore flatpak builder directories --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0d7edf863..2bd855474 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ presets/* LOCAL/* sdrangelove.supp .cproject +.flatpak-builder/ .project .pydevproject .vscode/ From d4388111b06fa3aac9c6f0a1fb9a3fe42d293c22 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Thu, 4 Jul 2019 01:53:35 +0200 Subject: [PATCH 6/7] update xtrx images git hash Build failed due to a submodule that was removed. Flatpak 1.4.1 cannot sort this out correctly. --- flatpak/org.sdrangel.SDRangel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/org.sdrangel.SDRangel.json b/flatpak/org.sdrangel.SDRangel.json index 45197bd1d..106156563 100644 --- a/flatpak/org.sdrangel.SDRangel.json +++ b/flatpak/org.sdrangel.SDRangel.json @@ -216,7 +216,7 @@ { "type": "git", "url": "https://github.com/xtrx-sdr/images.git", - "commit": "053ec82" + "commit": "9586a6e" } ] }, From bdc0fdd2e900e8f1cc354b139f69efee7e9fc1fb Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Thu, 4 Jul 2019 01:55:47 +0200 Subject: [PATCH 7/7] builds sdrangel from the local sources --- flatpak/org.sdrangel.SDRangel.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flatpak/org.sdrangel.SDRangel.json b/flatpak/org.sdrangel.SDRangel.json index 106156563..a858158b9 100644 --- a/flatpak/org.sdrangel.SDRangel.json +++ b/flatpak/org.sdrangel.SDRangel.json @@ -338,9 +338,8 @@ ], "sources": [ { - "type": "git", - "url": "https://github.com/f4exb/sdrangel.git", - "tag": "v4.5.6" + "type": "dir", + "path": ".." } ] }