From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] SoapySDR: update to 0.8.1
Date: Sun, 09 Oct 2022 09:20:46 +0200 [thread overview]
Message-ID: <20221009072046.nEVqDLFxxB8Lq9gK62CpAAe9U22dwujYmoPiRS38JZk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39674@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/SoapySDR-0.8.1
https://github.com/void-linux/void-packages/pull/39674
SoapySDR: update to 0.8.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
A patch file from https://github.com/void-linux/void-packages/pull/39674.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/SoapySDR-0.8.1-39674.patch --]
[-- Type: text/x-diff, Size: 10523 bytes --]
From 4d291dad05a97a84db3ef80d0fb7ff7690af7f07 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 4ff73dace83f..ccbcea2ef465 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 9aabc2e156ab76556fa4264c705aa818804b62f0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 51d22ddf65f2e0d778648cdf200a9029bf460330 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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..6d9a71c42ab2 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
}
}
From 657768aad4bcf52e57120cb81477d156707d308c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 80f2f558090c180c3d953cc271d25aace90c8e42 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 b806dedcc149893c8e1e536156d3fe9db5dc4f48 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 59532f9345d91d358d1f3b8e224659de1e9bb539 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 45668fe6d009aade4a87f28f400df2392cc2eced Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 835a6023109ef7b1a06778f40582c3a6ca8c04b1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 e5e628265a5d89d73d6e64501dc5655953357458 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 af28cc26442ede53cc50e2aa0cc54f90066f90c3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 d047529cc05bed5073b6851833524cb10219083f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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)
next prev parent reply other threads:[~2022-10-09 7:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-03 14:39 [PR PATCH] update/SoapySDR 0.8.1 classabbyamp
2022-10-04 6:36 ` [PR PATCH] [Updated] SoapySDR: update to 0.8.1 classabbyamp
2022-10-04 19:39 ` classabbyamp
2022-10-09 7:20 ` classabbyamp [this message]
2022-10-09 16:01 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221009072046.nEVqDLFxxB8Lq9gK62CpAAe9U22dwujYmoPiRS38JZk@z \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).