From e70bd4c0b29350595f08bda09a1fd723a038848a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:39:20 -0400 Subject: [PATCH 01/12] SoapySDR: update to 0.8.1 --- common/shlibs | 2 +- srcpkgs/SoapySDR/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 5d4b0a9899ad..95f160fc03ac 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3426,7 +3426,7 @@ libfifechan.so.0.1.5 fifechan-0.1.5_1 libfifechan_sdl.so.0.1.5 fifechan-0.1.5_1 libfifechan_opengl.so.0.1.5 fifechan-0.1.5_1 libpolyclipping.so.22 clipper-6.4.2_1 -libSoapySDR.so.0.7 SoapySDR-0.7.0_1 +libSoapySDR.so.0.8 SoapySDR-0.8.1_1 libeditorconfig.so.0 editorconfig-0.12.2_1 libcfitsio.so.9 cfitsio-3.480_1 libapparmor.so.1 libapparmor-2.12.0_1 diff --git a/srcpkgs/SoapySDR/template b/srcpkgs/SoapySDR/template index 3fb76a00990f..005ecf78a939 100644 --- a/srcpkgs/SoapySDR/template +++ b/srcpkgs/SoapySDR/template @@ -1,7 +1,7 @@ # Template file for 'SoapySDR' pkgname=SoapySDR -version=0.7.2 -revision=4 +version=0.8.1 +revision=1 wrksrc="${pkgname}-soapy-sdr-${version}" build_style=cmake configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3" @@ -14,7 +14,7 @@ license="BSL-1.0" homepage="https://github.com/pothosware/SoapySDR" changelog="https://raw.githubusercontent.com/pothosware/SoapySDR/master/Changelog.txt" distfiles="${homepage}/archive/soapy-sdr-${version}.tar.gz" -checksum=6eb4143fed115911884bdbbe6fe32dbd99b4ada210c9e126ac3c49c24414347a +checksum=a508083875ed75d1090c24f88abef9895ad65f0f1b54e96d74094478f0c400e6 SoapySDR-devel_package() { short_desc+=" - development files" From a4e6569d4c0d4fc55b5a86fac0bbd673e2e08ebb Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:25 -0400 Subject: [PATCH 02/12] CubicSDR: rebuild for SoapySDR-0.8.1 --- srcpkgs/CubicSDR/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template index 49b9b7b6ed46..e5e26088e7f3 100644 --- a/srcpkgs/CubicSDR/template +++ b/srcpkgs/CubicSDR/template @@ -1,7 +1,7 @@ # Template file for 'CubicSDR' pkgname=CubicSDR version=0.2.7 -revision=1 +revision=2 build_style=cmake build_helper="cmake-wxWidgets-gtk3" configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA) From f2244c5dda7cb1aafe756579f90e093657177694 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:28 -0400 Subject: [PATCH 03/12] LimeSuite: rebuild for SoapySDR-0.8.1 --- srcpkgs/LimeSuite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template index f7caba84c2fe..ba871e08dfa6 100644 --- a/srcpkgs/LimeSuite/template +++ b/srcpkgs/LimeSuite/template @@ -1,7 +1,7 @@ # Template file for 'LimeSuite' pkgname=LimeSuite version=22.09.0 -revision=1 +revision=2 build_style=cmake build_helper=cmake-wxWidgets-gtk3 configure_args=" @@ -83,6 +83,6 @@ LimeSuite-doc_package() { SoapyLMS7_package() { short_desc="SoapySDR module for LimeSDR/LMS7002M" pkg_install() { - vmove usr/lib/SoapySDR/modules0.7/libLMS7Support.so + vmove "usr/lib/SoapySDR/modules*/libLMS7Support.so" } } From daad033f71ae4def4b7150fe26753a1c86a46954 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:29 -0400 Subject: [PATCH 04/12] SoapyAirspy: rebuild for SoapySDR-0.8.1 --- srcpkgs/SoapyAirspy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SoapyAirspy/template b/srcpkgs/SoapyAirspy/template index 029a27443ae9..46f4ae10f73b 100644 --- a/srcpkgs/SoapyAirspy/template +++ b/srcpkgs/SoapyAirspy/template @@ -1,7 +1,7 @@ # Template file for 'SoapyAirspy' pkgname=SoapyAirspy version=0.1.2 -revision=1 +revision=2 wrksrc="${pkgname}-soapy-airspy-${version}" build_style=cmake hostmakedepends="pkg-config" From 290ebaf0f0e909736f6baf900fb98c44b68f0bf7 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:30 -0400 Subject: [PATCH 05/12] SoapyHackRF: rebuild for SoapySDR-0.8.1 --- srcpkgs/SoapyHackRF/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SoapyHackRF/template b/srcpkgs/SoapyHackRF/template index c67aef8218ab..67d8cea64c2a 100644 --- a/srcpkgs/SoapyHackRF/template +++ b/srcpkgs/SoapyHackRF/template @@ -1,7 +1,7 @@ # Template file for 'SoapyHackRF' pkgname=SoapyHackRF version=0.3.3 -revision=2 +revision=3 wrksrc="${pkgname}-soapy-hackrf-${version}" build_style=cmake hostmakedepends="pkg-config" From f494b74a02372d325d27ff248a109a5be18927ef Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:30 -0400 Subject: [PATCH 06/12] SoapyRTLSDR: rebuild for SoapySDR-0.8.1 --- srcpkgs/SoapyRTLSDR/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SoapyRTLSDR/template b/srcpkgs/SoapyRTLSDR/template index 4f7f699e93ee..ef62d125a169 100644 --- a/srcpkgs/SoapyRTLSDR/template +++ b/srcpkgs/SoapyRTLSDR/template @@ -1,7 +1,7 @@ # Template file for 'SoapyRTLSDR' pkgname=SoapyRTLSDR version=0.3.0 -revision=1 +revision=2 wrksrc="${pkgname}-soapy-rtlsdr-${version}" build_style=cmake hostmakedepends="pkg-config" From 3b44c8932bb767d81b3224572003a82a237fdbfe Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:31 -0400 Subject: [PATCH 07/12] SoapyUHD: rebuild for SoapySDR-0.8.1 --- srcpkgs/SoapyUHD/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SoapyUHD/template b/srcpkgs/SoapyUHD/template index 57e1fb436a2f..aded2ab1883f 100644 --- a/srcpkgs/SoapyUHD/template +++ b/srcpkgs/SoapyUHD/template @@ -1,7 +1,7 @@ # Template file for 'SoapyUHD' pkgname=SoapyUHD version=0.3.6 -revision=3 +revision=4 wrksrc="${pkgname}-soapy-uhd-${version}" build_style=cmake hostmakedepends="pkg-config" From d9a0a3309270d60177dbfeb3f69320cd860bf28f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:32 -0400 Subject: [PATCH 08/12] gnuradio: rebuild for SoapySDR-0.8.1 --- srcpkgs/gnuradio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 4b74134fa7c1..a3c5b9642386 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.10.3.0 -revision=3 +revision=4 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax From 87d4279b893fe8e99230fd802a2768eda2152763 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:32 -0400 Subject: [PATCH 09/12] gnuradio-osmosdr: rebuild for SoapySDR-0.8.1 --- srcpkgs/gnuradio-osmosdr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index 6c97b517e483..a62035e545d3 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr version=0.2.3git20210128 -revision=3 +revision=4 _githash=a100eb024c0210b95e4738b6efd836d48225bd03 wrksrc="gr-osmosdr-${_githash}" build_style=cmake From e5652c2f64f0a0d9d50323733737fe26bb8b4698 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:33 -0400 Subject: [PATCH 10/12] rtl_433: rebuild for SoapySDR-0.8.1 --- srcpkgs/rtl_433/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rtl_433/template b/srcpkgs/rtl_433/template index 54782dac8dd1..31059c60172e 100644 --- a/srcpkgs/rtl_433/template +++ b/srcpkgs/rtl_433/template @@ -1,7 +1,7 @@ # Template file for 'rtl_433' pkgname=rtl_433 version=21.12 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config libtool" makedepends="librtlsdr-devel SoapySDR-devel libusb-devel openssl-devel" From 20dd57355a06f77f2b3fbe433c6cdb3da705235d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:33 -0400 Subject: [PATCH 11/12] rx_tools: rebuild for SoapySDR-0.8.1 --- srcpkgs/rx_tools/patches/soapysdr_0.8.patch | 15 +++++++++++++++ srcpkgs/rx_tools/template | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/rx_tools/patches/soapysdr_0.8.patch diff --git a/srcpkgs/rx_tools/patches/soapysdr_0.8.patch b/srcpkgs/rx_tools/patches/soapysdr_0.8.patch new file mode 100644 index 000000000000..78ca0784404e --- /dev/null +++ b/srcpkgs/rx_tools/patches/soapysdr_0.8.patch @@ -0,0 +1,15 @@ +API change in SoapySDR-0.8.1. Upstream currently has 3 years of unreleased changes, +including a similar fix, but it was too convoluted to easily import directly. + +--- a/src/convenience/convenience.c ++++ b/src/convenience/convenience.c +@@ -488,7 +488,8 @@ + + show_device_info(dev); + +- if (SoapySDRDevice_setupStream(dev, streamOut, SOAPY_SDR_RX, format, NULL, 0, &stream_args) != 0) { ++ *streamOut = SoapySDRDevice_setupStream(dev, SOAPY_SDR_RX, format, NULL, 0, &stream_args); ++ if (*streamOut == NULL) { + fprintf(stderr, "SoapySDRDevice_setupStream failed\n"); + return -3; + } diff --git a/srcpkgs/rx_tools/template b/srcpkgs/rx_tools/template index d608eb8ae9fe..1147146456a8 100644 --- a/srcpkgs/rx_tools/template +++ b/srcpkgs/rx_tools/template @@ -1,7 +1,7 @@ # Template file for 'rx_tools' pkgname=rx_tools version=1.0.3 -revision=1 +revision=2 build_style=cmake makedepends="SoapySDR-devel" short_desc="Tools for receiving data from SDRs" From 0d9d5d854cae3638def5ee8dc39b4e7873adc7a3 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 1 Oct 2022 22:40:34 -0400 Subject: [PATCH 12/12] welle-io: rebuild for SoapySDR-0.8.1 --- srcpkgs/welle-io/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/welle-io/template b/srcpkgs/welle-io/template index a23f2c308293..17bac0b597c8 100644 --- a/srcpkgs/welle-io/template +++ b/srcpkgs/welle-io/template @@ -1,7 +1,7 @@ # Template file for 'welle-io' pkgname=welle-io version=2.1 -revision=2 +revision=3 wrksrc="welle.io-${version}" build_style=cmake configure_args="$(vopt_bool airspy AIRSPY) $(vopt_bool rtlsdr RTLSDR)