* [PR PATCH] gnuradio: update to 3.10.4.0
@ 2022-09-19 12:36 unspecd
2022-10-10 9:36 ` [PR PATCH] [Updated] " unspecd
` (20 more replies)
0 siblings, 21 replies; 22+ messages in thread
From: unspecd @ 2022-09-19 12:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1207 bytes --]
There is a new pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.4.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 6691 bytes --]
From 06baf2a0afd2d6d3a4b757b7c51df27f46e7daf9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/5] gnuradio: update to 3.10.4.0.
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 51ff1163b2c8..97903ab7fd9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3218,28 +3218,28 @@ liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.2.so.1 libpipewire0.2-0.2.7_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pmt.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-blocks.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-audio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fec.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fft.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-filter.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-analog.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-digital.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-dtv.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-channels.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-trellis.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-video-sdl.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-vocoder.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-wavelet.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-uhd.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-network.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-soapy.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-qtgui.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-zeromq.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-iio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pdu.so.3.10.4 gnuradio-3.10.4.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 4b74134fa7c1..7d747d9adcf0 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
+version=3.10.4.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd
python_version=3
if [ "$CROSS_BUILD" ]; then
From d5dc50917186886d13488b41c1b6864ea3b04d17 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:11 +1100
Subject: [PATCH 2/5] gnuradio-nrsc5: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index d3c7377168bc..422c501a8de3 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=2
+revision=3
wrksrc="gr-nrsc5-${version}"
build_style=cmake
make_cmd=make
From 8cb17adce76bd938f99e97ffd79f79572b6253ca Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:12 +1100
Subject: [PATCH 3/5] gnuradio-osmosdr: revbump for gnuradio 3.10.4
---
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 a79c832ba457..8a1c9d87035a 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 f1e806bb1214743611ac757b10de313af1b77956 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 4/5] gnuradio-rds: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 45e91fe3463a..55b657e3389e 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=3
+revision=4
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 28c3fc1c5b0d95821dfcd8698388e010e2746252 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 5/5] gqrx: revbump for gnuradio 3.10.4
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 280ffced8bb8..4ce2c2ec6154 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.4.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
@ 2022-10-10 9:36 ` unspecd
2022-10-10 11:40 ` unspecd
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-10-10 9:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.4.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 5931 bytes --]
From c1856f94a77774b73a76f29a1c61307c5929ec2a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/4] gnuradio: update to 3.10.4.0.
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9f95ac87a7ea..e9d3d23c6ca8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3219,28 +3219,28 @@ liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.2.so.1 libpipewire0.2-0.2.7_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pmt.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-blocks.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-audio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fec.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fft.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-filter.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-analog.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-digital.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-dtv.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-channels.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-trellis.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-video-sdl.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-vocoder.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-wavelet.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-uhd.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-network.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-soapy.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-qtgui.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-zeromq.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-iio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pdu.so.3.10.4 gnuradio-3.10.4.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index a3c5b9642386..7d747d9adcf0 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=4
+version=3.10.4.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd
python_version=3
if [ "$CROSS_BUILD" ]; then
From 8f34ee24044a2ad6fc5d38ae28a1a6c8de4de16c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:11 +1100
Subject: [PATCH 2/4] gnuradio-nrsc5: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index d3c7377168bc..422c501a8de3 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=2
+revision=3
wrksrc="gr-nrsc5-${version}"
build_style=cmake
make_cmd=make
From de8c4aa7968b12c46810079d6fea6ff74735edfa Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 3/4] gnuradio-rds: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 45e91fe3463a..55b657e3389e 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=3
+revision=4
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 1f51df4ccee83d4bb1252ad10dfad2427a29b7c0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 4/4] gqrx: revbump for gnuradio 3.10.4
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.4.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
2022-10-10 9:36 ` [PR PATCH] [Updated] " unspecd
@ 2022-10-10 11:40 ` unspecd
2022-10-24 10:03 ` unspecd
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-10-10 11:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.4.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 6691 bytes --]
From c1856f94a77774b73a76f29a1c61307c5929ec2a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/5] gnuradio: update to 3.10.4.0.
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9f95ac87a7ea..e9d3d23c6ca8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3219,28 +3219,28 @@ liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.2.so.1 libpipewire0.2-0.2.7_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pmt.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-blocks.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-audio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fec.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fft.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-filter.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-analog.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-digital.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-dtv.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-channels.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-trellis.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-video-sdl.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-vocoder.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-wavelet.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-uhd.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-network.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-soapy.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-qtgui.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-zeromq.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-iio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pdu.so.3.10.4 gnuradio-3.10.4.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index a3c5b9642386..7d747d9adcf0 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=4
+version=3.10.4.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd
python_version=3
if [ "$CROSS_BUILD" ]; then
From 45e0572867eb40da0f4b77a5fc274b1def608d4e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 2/5] gnuradio-osmosdr: revbump for gnuradio 3.10.4
---
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 a62035e545d3..10ca3edaa1a0 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=4
+revision=5
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
wrksrc="gr-osmosdr-${_githash}"
build_style=cmake
From cc03a37e45b707ddf85438c817d5c2cba5de2c4f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:11 +1100
Subject: [PATCH 3/5] gnuradio-nrsc5: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index d3c7377168bc..422c501a8de3 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=2
+revision=3
wrksrc="gr-nrsc5-${version}"
build_style=cmake
make_cmd=make
From 26eb602cbbf5ddc7873515e1a2662e3317065aee Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 4/5] gnuradio-rds: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 45e91fe3463a..55b657e3389e 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=3
+revision=4
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 2d3790a3843c513600356e309c309669293f67ce Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 5/5] gqrx: revbump for gnuradio 3.10.4
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.4.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
2022-10-10 9:36 ` [PR PATCH] [Updated] " unspecd
2022-10-10 11:40 ` unspecd
@ 2022-10-24 10:03 ` unspecd
2022-11-25 9:41 ` unspecd
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-10-24 10:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.4.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 6676 bytes --]
From 1e018fb68b4b36a78c8cea1c7bd67de6cddb9297 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/5] gnuradio: update to 3.10.4.0.
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 17263fadc71a..80139244088f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3227,28 +3227,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pmt.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-blocks.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-audio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fec.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fft.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-filter.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-analog.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-digital.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-dtv.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-channels.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-trellis.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-video-sdl.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-vocoder.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-wavelet.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-uhd.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-network.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-soapy.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-qtgui.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-zeromq.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-iio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pdu.so.3.10.4 gnuradio-3.10.4.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 13528d2af579..4502ba76e4ce 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=4
+version=3.10.4.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd
python_version=3
if [ "$CROSS_BUILD" ]; then
From c21b1c30ffaeea5bc830d58ce27c7f013afdcb95 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 2/5] gnuradio-osmosdr: revbump for gnuradio 3.10.4
---
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 a62035e545d3..10ca3edaa1a0 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=4
+revision=5
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
wrksrc="gr-osmosdr-${_githash}"
build_style=cmake
From db8e3abf951fa1a0dec02791eb10d5a1381dc6ab Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:11 +1100
Subject: [PATCH 3/5] gnuradio-nrsc5: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index d3c7377168bc..422c501a8de3 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=2
+revision=3
wrksrc="gr-nrsc5-${version}"
build_style=cmake
make_cmd=make
From 315019f03b9bc07d4bf7f210be0c3a5e85685565 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 4/5] gnuradio-rds: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 45e91fe3463a..55b657e3389e 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=3
+revision=4
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 1c533ced0bcaa0f321c9c4eabe0ff5dc81719daf Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 5/5] gqrx: revbump for gnuradio 3.10.4
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.4.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (2 preceding siblings ...)
2022-10-24 10:03 ` unspecd
@ 2022-11-25 9:41 ` unspecd
2022-11-25 10:32 ` unspecd
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-11-25 9:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.4.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 7201 bytes --]
From ec61736f613b0937b3bc93d1423559156cb50dac Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/5] gnuradio: update to 3.10.4.0.
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 10 +++------
2 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d24d3cbe695d..7f491a2e6cb6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3235,28 +3235,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pmt.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-blocks.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-audio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fec.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fft.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-filter.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-analog.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-digital.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-dtv.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-channels.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-trellis.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-video-sdl.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-vocoder.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-wavelet.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-uhd.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-network.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-soapy.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-qtgui.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-zeromq.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-iio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pdu.so.3.10.4 gnuradio-3.10.4.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 5012ef4f62e7..d64238ba652e 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=6
+version=3.10.4.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From 4ecf4939f3acb69dbe945aa121bb5a949d5e5eb3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 2/5] gnuradio-osmosdr: revbump for gnuradio 3.10.4
---
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 0ee4c8a8a55b..2b118119d010 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=5
+revision=6
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 9f13723b9d1c1718dd8ae9f4025288e22a2aaf77 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 3/5] gnuradio-nrsc5: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 270bfdb72f5f173944968e098761b10873b7a38c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 4/5] gnuradio-rds: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index e11956f09a3e..b8a95ac05d79 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=4
+revision=5
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From c2e6cd3e20b6f493123113131e69932279894938 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 5/5] gqrx: revbump for gnuradio 3.10.4
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: gnuradio: update to 3.10.4.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (3 preceding siblings ...)
2022-11-25 9:41 ` unspecd
@ 2022-11-25 10:32 ` unspecd
2022-11-28 18:44 ` [PR PATCH] [Updated] " unspecd
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-11-25 10:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/39364#issuecomment-1327304108
Comment:
Rebased on master.
Also enabled tests on i686.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.4.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (4 preceding siblings ...)
2022-11-25 10:32 ` unspecd
@ 2022-11-28 18:44 ` unspecd
2022-12-19 15:01 ` unspecd
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-11-28 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.4.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 7201 bytes --]
From a6b8317aadb881c39110d7cd89020e52a4cf80f0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/5] gnuradio: update to 3.10.4.0.
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 10 +++------
2 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index fc5bb4dda7e6..6a7487538d0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3235,28 +3235,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pmt.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-blocks.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-audio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fec.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-fft.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-filter.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-analog.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-digital.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-dtv.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-channels.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-trellis.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-video-sdl.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-vocoder.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-wavelet.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-uhd.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-network.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-soapy.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-qtgui.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-zeromq.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-iio.so.3.10.4 gnuradio-3.10.4.0_1
+libgnuradio-pdu.so.3.10.4 gnuradio-3.10.4.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 5012ef4f62e7..d64238ba652e 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=6
+version=3.10.4.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From 0b8b6667e7f343444a378aae5675994011e702a8 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 2/5] gnuradio-osmosdr: revbump for gnuradio 3.10.4
---
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 0ee4c8a8a55b..2b118119d010 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=5
+revision=6
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 2f92ca2208bc733fd692c0c8277be389e133f5e2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 3/5] gnuradio-nrsc5: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 3bacb0a6d8f0b38eee7fa0f2e80ab3b3d84b4ac4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 4/5] gnuradio-rds: revbump for gnuradio 3.10.4
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index e11956f09a3e..b8a95ac05d79 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=4
+revision=5
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 9494c5b7a865a4926f0f1bdde186f335f02d5772 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 5/5] gqrx: revbump for gnuradio 3.10.4
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: gnuradio: update to 3.10.4.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (5 preceding siblings ...)
2022-11-28 18:44 ` [PR PATCH] [Updated] " unspecd
@ 2022-12-19 15:01 ` unspecd
2022-12-20 12:23 ` [PR PATCH] [Updated] " unspecd
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-12-19 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/39364#issuecomment-1357797047
Comment:
I will update to 3.10.5.0 this week.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.4.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (6 preceding siblings ...)
2022-12-19 15:01 ` unspecd
@ 2022-12-20 12:23 ` unspecd
2022-12-31 14:21 ` [PR PATCH] [Updated] gnuradio: update to 3.10.5.0 unspecd
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-12-20 12:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.4.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 23560 bytes --]
From 8e6e7c2c0acba64a6826351134f153e62cbfa616 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 20 Dec 2022 19:15:16 +1100
Subject: [PATCH 1/6] [fixme] python3-pyqtgraph: update to 0.13.1.
---
srcpkgs/python3-pyqtgraph/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pyqtgraph/template b/srcpkgs/python3-pyqtgraph/template
index 3550caa52966..0d99426d73be 100644
--- a/srcpkgs/python3-pyqtgraph/template
+++ b/srcpkgs/python3-pyqtgraph/template
@@ -1,18 +1,20 @@
# Template file for 'python3-pyqtgraph'
pkgname=python3-pyqtgraph
-version=0.11.1
-revision=3
+version=0.13.1
+revision=1
build_style=python3-module
make_install_args="--no-compile"
hostmakedepends="python3-setuptools"
-depends="python3-PyQt5 python3-numpy python3-PyOpenGL"
+depends="python3-PyQt5 python3-PyQt5-svg python3-numpy python3-PyOpenGL"
+checkdepends="${depends} python3-pytest"
short_desc="Fast data visualization for scientific/engineering applications"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
homepage="http://www.pyqtgraph.org/"
changelog="https://github.com/pyqtgraph/pyqtgraph/raw/master/CHANGELOG"
distfiles="https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-${version}.tar.gz"
-checksum=9c103e965fb9398570f07c961030cc20fbb80d516a540011f868600a431c4a0d
+checksum=1d906303b336f6a386a0e4f4310ee9847fa8b4a833a2684737870584478b99e1
+make_check=no # FIXME
post_install() {
vlicense LICENSE.txt
From e107c5a3872510246cd621d2365cce193c6abdaa Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 2/6] gnuradio: update to 3.10.5.0.
---
common/shlibs | 44 +--
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
srcpkgs/gnuradio/template | 10 +-
5 files changed, 25 insertions(+), 400 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..a63251ff66f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3234,28 +3234,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 5012ef4f62e7..0816398da87b 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=6
+version=3.10.5.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=04aae0c45e55c8fcaf99829d92db102395c7e10a7ad9910533694806d5ae121a
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From ed5538103543ae26110dfc69f106ad5d21478a2b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 3/6] gnuradio-osmosdr: revbump for gnuradio 3.10.5
---
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 0ee4c8a8a55b..2b118119d010 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=5
+revision=6
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From d77c3fa10bce8408f5930a9b25a0f08436208a82 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 4/6] gnuradio-nrsc5: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From ea58ff514d70e7b4660c8848ef66c48c645664f7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 5/6] gnuradio-rds: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index e11956f09a3e..b8a95ac05d79 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=4
+revision=5
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From e6663736553ecb139b71e9bc2efe59e9dc305d12 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 6/6] gqrx: revbump for gnuradio 3.10.5
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.5.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (7 preceding siblings ...)
2022-12-20 12:23 ` [PR PATCH] [Updated] " unspecd
@ 2022-12-31 14:21 ` unspecd
2022-12-31 15:12 ` unspecd
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-12-31 14:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 22051 bytes --]
From e4169eaa3e5312eda35b4590630d1495b4dd302c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/5] gnuradio: update to 3.10.5.0.
---
common/shlibs | 44 +--
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
srcpkgs/gnuradio/template | 10 +-
5 files changed, 25 insertions(+), 400 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..a63251ff66f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3234,28 +3234,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 5012ef4f62e7..0816398da87b 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=6
+version=3.10.5.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=04aae0c45e55c8fcaf99829d92db102395c7e10a7ad9910533694806d5ae121a
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From 5b82904d0e3e22e7cab88cbb83e1aedfe5f15e86 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 2/5] gnuradio-osmosdr: revbump for gnuradio 3.10.5
---
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 0ee4c8a8a55b..2b118119d010 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=5
+revision=6
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 547062524548304c6e7872a4a01686f772ea0f5a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 3/5] gnuradio-nrsc5: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 3771152cd1755fc44a1033ca99a729f3444f680c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 4/5] gnuradio-rds: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index e11956f09a3e..b8a95ac05d79 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=4
+revision=5
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 2a27614561431a57776a4fa978fc765a7a064350 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 5/5] gqrx: revbump for gnuradio 3.10.5
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.5.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (8 preceding siblings ...)
2022-12-31 14:21 ` [PR PATCH] [Updated] gnuradio: update to 3.10.5.0 unspecd
@ 2022-12-31 15:12 ` unspecd
2022-12-31 15:13 ` unspecd
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-12-31 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 22717 bytes --]
From e4169eaa3e5312eda35b4590630d1495b4dd302c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/5] gnuradio: update to 3.10.5.0.
---
common/shlibs | 44 +--
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
srcpkgs/gnuradio/template | 10 +-
5 files changed, 25 insertions(+), 400 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..a63251ff66f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3234,28 +3234,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 5012ef4f62e7..0816398da87b 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=6
+version=3.10.5.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=04aae0c45e55c8fcaf99829d92db102395c7e10a7ad9910533694806d5ae121a
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From b73013a2d324be193851b294d49b8e3381b64fe9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 2/5] gnuradio-osmosdr: update to 0.2.4.
---
srcpkgs/gnuradio-osmosdr/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 0ee4c8a8a55b..c8680ff1d478 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,8 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
-version=0.2.3git20210128
-revision=5
-_githash=a100eb024c0210b95e4738b6efd836d48225bd03
+version=0.2.4
+revision=1
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
@@ -12,8 +11,8 @@ short_desc="GNU Radio source block for rtlsdr, hackrf and airspy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR"
-distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz"
-checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1
+distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz"
+checksum=28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63
gnuradio-osmosdr-devel_package() {
short_desc+=" - development files"
From 8e13f83342d5cb711fbb5b442d25f026991ba0a3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 3/5] gnuradio-nrsc5: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From cb9d745988fcd74ed0c0f36e9827c24d868cb0e9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 4/5] gnuradio-rds: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index e11956f09a3e..b8a95ac05d79 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=4
+revision=5
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From fa7e02dc065db02bcf87f715d9a972ab03cb4fb3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 5/5] gqrx: revbump for gnuradio 3.10.5
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: gnuradio: update to 3.10.5.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (9 preceding siblings ...)
2022-12-31 15:12 ` unspecd
@ 2022-12-31 15:13 ` unspecd
2023-01-04 21:26 ` [PR PATCH] [Updated] " unspecd
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2022-12-31 15:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/39364#issuecomment-1368239981
Comment:
Updated gnuradio-osmosdr to 0.2.4.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.5.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (10 preceding siblings ...)
2022-12-31 15:13 ` unspecd
@ 2023-01-04 21:26 ` unspecd
2023-01-05 10:15 ` unspecd
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2023-01-04 21:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 21941 bytes --]
From ab986ceffd9342a96f41b1e9813ab02caba02cc3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/4] gnuradio: update to 3.10.5.0.
---
common/shlibs | 44 +--
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
srcpkgs/gnuradio/template | 10 +-
5 files changed, 25 insertions(+), 400 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index 52a6d3e6d5fb..14bf38354bf1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3237,28 +3237,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 20d718ac4ae7..0816398da87b 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=7
+version=3.10.5.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=04aae0c45e55c8fcaf99829d92db102395c7e10a7ad9910533694806d5ae121a
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From a966971ab9419483513374391e255f2262f952b0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 2/4] gnuradio-osmosdr: update to 0.2.4.
---
srcpkgs/gnuradio-osmosdr/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 2b118119d010..c8680ff1d478 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,8 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
-version=0.2.3git20210128
-revision=6
-_githash=a100eb024c0210b95e4738b6efd836d48225bd03
+version=0.2.4
+revision=1
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
@@ -12,8 +11,8 @@ short_desc="GNU Radio source block for rtlsdr, hackrf and airspy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR"
-distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz"
-checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1
+distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz"
+checksum=28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63
gnuradio-osmosdr-devel_package() {
short_desc+=" - development files"
From 9b5087c93add2c1c8507756d78d0947a0672b314 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 3/4] gnuradio-nrsc5: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From c21258f764ee24613f6300641b8981c021e6c0fa Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 4/4] gqrx: revbump for gnuradio 3.10.5
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.5.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (11 preceding siblings ...)
2023-01-04 21:26 ` [PR PATCH] [Updated] " unspecd
@ 2023-01-05 10:15 ` unspecd
2023-01-12 19:38 ` unspecd
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2023-01-05 10:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 22716 bytes --]
From 160dcca9533b119ed0eb628b5e6552c928801ae6 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/5] gnuradio: update to 3.10.5.0.
---
common/shlibs | 44 +--
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
srcpkgs/gnuradio/template | 10 +-
5 files changed, 25 insertions(+), 400 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index 52a6d3e6d5fb..14bf38354bf1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3237,28 +3237,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 20d718ac4ae7..0816398da87b 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=7
+version=3.10.5.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=04aae0c45e55c8fcaf99829d92db102395c7e10a7ad9910533694806d5ae121a
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From 98306d2e423e03b441233277a706005b0a99bfb9 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 2/5] gnuradio-osmosdr: update to 0.2.4.
---
srcpkgs/gnuradio-osmosdr/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 2b118119d010..c8680ff1d478 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,8 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
-version=0.2.3git20210128
-revision=6
-_githash=a100eb024c0210b95e4738b6efd836d48225bd03
+version=0.2.4
+revision=1
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
@@ -12,8 +11,8 @@ short_desc="GNU Radio source block for rtlsdr, hackrf and airspy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR"
-distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz"
-checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1
+distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz"
+checksum=28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63
gnuradio-osmosdr-devel_package() {
short_desc+=" - development files"
From d92fa881a88e58328f0ffb4f037295f2668d16b7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 3/5] gnuradio-nrsc5: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 8c8c41a475e327a6025104291ac232731482e8e1 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 5 Jan 2023 21:14:50 +1100
Subject: [PATCH 4/5] gnuradio-rds: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index b8a95ac05d79..09a928d3759b 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=5
+revision=6
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 559068c66cf1ae3bccd91e67c4f7ff122195d120 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 5/5] gqrx: revbump for gnuradio 3.10.5
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.5.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (12 preceding siblings ...)
2023-01-05 10:15 ` unspecd
@ 2023-01-12 19:38 ` unspecd
2023-01-29 21:25 ` unspecd
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2023-01-12 19:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 22716 bytes --]
From f3163a29fcc8b1b23d2528789f77d9ead557bdd2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 1/5] gnuradio: update to 3.10.5.0.
---
common/shlibs | 44 +--
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
srcpkgs/gnuradio/template | 10 +-
5 files changed, 25 insertions(+), 400 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index 0a803960ab55..697ac934e560 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3232,28 +3232,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index a1b1fee2ab8a..6ad64524d2bd 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=7
+version=3.10.5.0
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=04aae0c45e55c8fcaf99829d92db102395c7e10a7ad9910533694806d5ae121a
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From a98c4d5861c196eb9cc96a65f77f5a169e84b1f1 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 2/5] gnuradio-osmosdr: update to 0.2.4.
---
srcpkgs/gnuradio-osmosdr/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 2b118119d010..c8680ff1d478 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,8 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
-version=0.2.3git20210128
-revision=6
-_githash=a100eb024c0210b95e4738b6efd836d48225bd03
+version=0.2.4
+revision=1
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
@@ -12,8 +11,8 @@ short_desc="GNU Radio source block for rtlsdr, hackrf and airspy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR"
-distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz"
-checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1
+distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz"
+checksum=28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63
gnuradio-osmosdr-devel_package() {
short_desc+=" - development files"
From 51ffa101ac47fe30f9fc46f8cb7bba199d7536d4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 3/5] gnuradio-nrsc5: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 42f8cbd1729823a3cc523e826fe1c57a36e0d5e1 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 5 Jan 2023 21:14:50 +1100
Subject: [PATCH 4/5] gnuradio-rds: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index b8a95ac05d79..09a928d3759b 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=5
+revision=6
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 8e1530e5358c005ebb31f182904fe6ca61f6f787 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 5/5] gqrx: revbump for gnuradio 3.10.5
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.5.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (13 preceding siblings ...)
2023-01-12 19:38 ` unspecd
@ 2023-01-29 21:25 ` unspecd
2023-01-29 21:26 ` unspecd
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2023-01-29 21:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 23816 bytes --]
From e9ff1a3b8ca15ddec4968af79fed41af92fe8fa0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 30 Jan 2023 05:08:43 +1100
Subject: [PATCH 1/6] CastXML: update to 0.5.1.
---
srcpkgs/CastXML/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template
index 5d7d9503658c..00e82ac66b50 100644
--- a/srcpkgs/CastXML/template
+++ b/srcpkgs/CastXML/template
@@ -1,6 +1,6 @@
# Template file for 'CastXML'
pkgname=CastXML
-version=0.4.6
+version=0.5.1
revision=1
build_style=cmake
configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man"
@@ -13,7 +13,7 @@ maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/CastXML/CastXML"
distfiles="https://github.com/CastXML/CastXML/archive/v${version}.tar.gz"
-checksum=8dcdbc1f23a130e4bdb0b09f57c30761a02a346b4db4037555048af2a293d66a
+checksum=a7b40b1530585672f9cf5d7a6b6dd29f20c06cd5edf34ef34c89a184a4d1a006
post_install() {
rm -r ${DESTDIR}/usr/share/castxml/clang/include
From 59e609c968b48bf0130541719f0a9b334cea8ed2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 2/6] gnuradio: update to 3.10.5.0.
---
common/shlibs | 44 +--
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
srcpkgs/gnuradio/template | 10 +-
5 files changed, 25 insertions(+), 400 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index edb8a2c5dd73..ccc172867c90 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3232,28 +3232,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index a1b1fee2ab8a..2478ee440b4c 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=7
+version=3.10.5.1
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=85d90147f7f28450bff75eeefd2b44adc88b231d29fe8e86cc3a65437dba6d9f
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From 93548208b6af07a40359e833dece10e4c71ca999 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 3/6] gnuradio-osmosdr: update to 0.2.4.
---
srcpkgs/gnuradio-osmosdr/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 2b118119d010..c8680ff1d478 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,8 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
-version=0.2.3git20210128
-revision=6
-_githash=a100eb024c0210b95e4738b6efd836d48225bd03
+version=0.2.4
+revision=1
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
@@ -12,8 +11,8 @@ short_desc="GNU Radio source block for rtlsdr, hackrf and airspy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR"
-distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz"
-checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1
+distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz"
+checksum=28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63
gnuradio-osmosdr-devel_package() {
short_desc+=" - development files"
From 2b3eb30e7f5f5e00885904c6e140be3fead9145f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 4/6] gnuradio-nrsc5: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 942799fab3f1a56d4472b32a41c577f98aac31e2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 5 Jan 2023 21:14:50 +1100
Subject: [PATCH 5/6] gnuradio-rds: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index b8a95ac05d79..09a928d3759b 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=5
+revision=6
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From e9650faa05e156a8042456cfe120510a3572a507 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 6/6] gqrx: revbump for gnuradio 3.10.5
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.5.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (14 preceding siblings ...)
2023-01-29 21:25 ` unspecd
@ 2023-01-29 21:26 ` unspecd
2023-01-29 21:30 ` unspecd
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2023-01-29 21:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 23816 bytes --]
From e9ff1a3b8ca15ddec4968af79fed41af92fe8fa0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 30 Jan 2023 05:08:43 +1100
Subject: [PATCH 1/6] CastXML: update to 0.5.1.
---
srcpkgs/CastXML/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template
index 5d7d9503658c..00e82ac66b50 100644
--- a/srcpkgs/CastXML/template
+++ b/srcpkgs/CastXML/template
@@ -1,6 +1,6 @@
# Template file for 'CastXML'
pkgname=CastXML
-version=0.4.6
+version=0.5.1
revision=1
build_style=cmake
configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man"
@@ -13,7 +13,7 @@ maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/CastXML/CastXML"
distfiles="https://github.com/CastXML/CastXML/archive/v${version}.tar.gz"
-checksum=8dcdbc1f23a130e4bdb0b09f57c30761a02a346b4db4037555048af2a293d66a
+checksum=a7b40b1530585672f9cf5d7a6b6dd29f20c06cd5edf34ef34c89a184a4d1a006
post_install() {
rm -r ${DESTDIR}/usr/share/castxml/clang/include
From de40d925139b50cb8262544c8ba2540bf74f517b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 2/6] gnuradio: update to 3.10.5.1.
---
common/shlibs | 44 +--
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
srcpkgs/gnuradio/template | 10 +-
5 files changed, 25 insertions(+), 400 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index edb8a2c5dd73..ccc172867c90 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3232,28 +3232,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index a1b1fee2ab8a..2478ee440b4c 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=7
+version=3.10.5.1
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=85d90147f7f28450bff75eeefd2b44adc88b231d29fe8e86cc3a65437dba6d9f
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From 1c38cae45cb14e27a75036ad83574c4b255f34d5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 3/6] gnuradio-osmosdr: update to 0.2.4.
---
srcpkgs/gnuradio-osmosdr/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 2b118119d010..c8680ff1d478 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,8 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
-version=0.2.3git20210128
-revision=6
-_githash=a100eb024c0210b95e4738b6efd836d48225bd03
+version=0.2.4
+revision=1
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
@@ -12,8 +11,8 @@ short_desc="GNU Radio source block for rtlsdr, hackrf and airspy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR"
-distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz"
-checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1
+distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz"
+checksum=28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63
gnuradio-osmosdr-devel_package() {
short_desc+=" - development files"
From 08b0de8eda0511cf2e80cc054b674247050c83ef Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 4/6] gnuradio-nrsc5: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 33d3e4e034ad95a323a07da5ffbc2f5e75b2f587 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 5 Jan 2023 21:14:50 +1100
Subject: [PATCH 5/6] gnuradio-rds: revbump for gnuradio 3.10.5
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index b8a95ac05d79..09a928d3759b 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=5
+revision=6
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 680d0c626af13b90e945484c336afe605559648d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 6/6] gqrx: revbump for gnuradio 3.10.5
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.5.0
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (15 preceding siblings ...)
2023-01-29 21:26 ` unspecd
@ 2023-01-29 21:30 ` unspecd
2023-01-29 21:31 ` gnuradio: update to 3.10.5.1 unspecd
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2023-01-29 21:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.5.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 23822 bytes --]
From e9ff1a3b8ca15ddec4968af79fed41af92fe8fa0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 30 Jan 2023 05:08:43 +1100
Subject: [PATCH 1/6] CastXML: update to 0.5.1.
---
srcpkgs/CastXML/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template
index 5d7d9503658c..00e82ac66b50 100644
--- a/srcpkgs/CastXML/template
+++ b/srcpkgs/CastXML/template
@@ -1,6 +1,6 @@
# Template file for 'CastXML'
pkgname=CastXML
-version=0.4.6
+version=0.5.1
revision=1
build_style=cmake
configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man"
@@ -13,7 +13,7 @@ maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/CastXML/CastXML"
distfiles="https://github.com/CastXML/CastXML/archive/v${version}.tar.gz"
-checksum=8dcdbc1f23a130e4bdb0b09f57c30761a02a346b4db4037555048af2a293d66a
+checksum=a7b40b1530585672f9cf5d7a6b6dd29f20c06cd5edf34ef34c89a184a4d1a006
post_install() {
rm -r ${DESTDIR}/usr/share/castxml/clang/include
From de40d925139b50cb8262544c8ba2540bf74f517b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 2/6] gnuradio: update to 3.10.5.1.
---
common/shlibs | 44 +--
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
srcpkgs/gnuradio/template | 10 +-
5 files changed, 25 insertions(+), 400 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index edb8a2c5dd73..ccc172867c90 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3232,28 +3232,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.2.5 volk-2.5.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index a1b1fee2ab8a..2478ee440b4c 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=7
+version=3.10.5.1
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=85d90147f7f28450bff75eeefd2b44adc88b231d29fe8e86cc3a65437dba6d9f
python_version=3
if [ "$CROSS_BUILD" ]; then
@@ -33,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
fi
-if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
From 1c38cae45cb14e27a75036ad83574c4b255f34d5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 3/6] gnuradio-osmosdr: update to 0.2.4.
---
srcpkgs/gnuradio-osmosdr/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 2b118119d010..c8680ff1d478 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,8 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
-version=0.2.3git20210128
-revision=6
-_githash=a100eb024c0210b95e4738b6efd836d48225bd03
+version=0.2.4
+revision=1
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
@@ -12,8 +11,8 @@ short_desc="GNU Radio source block for rtlsdr, hackrf and airspy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR"
-distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz"
-checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1
+distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz"
+checksum=28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63
gnuradio-osmosdr-devel_package() {
short_desc+=" - development files"
From d0d01847d700d1668aad109559563cf0253e6041 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 4/6] gnuradio-nrsc5: revbump for gnuradio 3.10.5.1
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 2b9a2a32697bb0c8c847fdd330edf663194c023b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 5 Jan 2023 21:14:50 +1100
Subject: [PATCH 5/6] gnuradio-rds: revbump for gnuradio 3.10.5.1
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index b8a95ac05d79..09a928d3759b 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=5
+revision=6
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 1143def61a6a64ef880ad230c856a35a4f4b98df Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:13 +1100
Subject: [PATCH 6/6] gqrx: revbump for gnuradio 3.10.5.1
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 2561d1cb7f95..c2215b30dc9b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: gnuradio: update to 3.10.5.1
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (16 preceding siblings ...)
2023-01-29 21:30 ` unspecd
@ 2023-01-29 21:31 ` unspecd
2023-03-10 0:08 ` [PR PATCH] [Updated] " unspecd
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2023-01-29 21:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/39364#issuecomment-1407774991
Comment:
Updated to 3.10.5.1.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.5.1
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (17 preceding siblings ...)
2023-01-29 21:31 ` gnuradio: update to 3.10.5.1 unspecd
@ 2023-03-10 0:08 ` unspecd
2023-03-16 9:30 ` unspecd
2023-03-16 15:59 ` [PR PATCH] [Merged]: " abenson
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2023-03-10 0:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.5.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 21576 bytes --]
From 44efdf767326db92cdcbc008dd701b00eb8584cb Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 30 Jan 2023 05:08:43 +1100
Subject: [PATCH 1/6] CastXML: update to 0.5.1.
---
srcpkgs/CastXML/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template
index 5d7d9503658c..00e82ac66b50 100644
--- a/srcpkgs/CastXML/template
+++ b/srcpkgs/CastXML/template
@@ -1,6 +1,6 @@
# Template file for 'CastXML'
pkgname=CastXML
-version=0.4.6
+version=0.5.1
revision=1
build_style=cmake
configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man"
@@ -13,7 +13,7 @@ maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/CastXML/CastXML"
distfiles="https://github.com/CastXML/CastXML/archive/v${version}.tar.gz"
-checksum=8dcdbc1f23a130e4bdb0b09f57c30761a02a346b4db4037555048af2a293d66a
+checksum=a7b40b1530585672f9cf5d7a6b6dd29f20c06cd5edf34ef34c89a184a4d1a006
post_install() {
rm -r ${DESTDIR}/usr/share/castxml/clang/include
From e04182551488c7fc88a01fc2683946bd885fe8f2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 2/6] gnuradio: update to 3.10.5.1.
---
common/shlibs | 23 ++
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
4 files changed, 23 insertions(+), 371 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index 5cc81b9f90b2..04c1ac9437c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3263,6 +3263,29 @@ libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libvolk.so.2.5 volk-2.5.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
From c933bc10a0164da9a7080db29a01fe820fe8b331 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 3/6] gnuradio-osmosdr: update to 0.2.4.
---
srcpkgs/gnuradio-osmosdr/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 2b118119d010..c8680ff1d478 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,8 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
-version=0.2.3git20210128
-revision=6
-_githash=a100eb024c0210b95e4738b6efd836d48225bd03
+version=0.2.4
+revision=1
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
@@ -12,8 +11,8 @@ short_desc="GNU Radio source block for rtlsdr, hackrf and airspy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR"
-distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz"
-checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1
+distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz"
+checksum=28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63
gnuradio-osmosdr-devel_package() {
short_desc+=" - development files"
From 1194863a799ce950c0157461460dde8530b499c4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 4/6] gnuradio-nrsc5: revbump for gnuradio 3.10.5.1
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 46f56eca95b74deb55daff8c77cfc779e3c9e71e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 5 Jan 2023 21:14:50 +1100
Subject: [PATCH 5/6] gnuradio-rds: revbump for gnuradio 3.10.5.1
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index b8a95ac05d79..09a928d3759b 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=5
+revision=6
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 49bb36562ec04499507945ccb979b91353fb8daa Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 10 Mar 2023 11:08:08 +1100
Subject: [PATCH 6/6] gqrx: revbump for gnuradio 3.10.5.1
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index c2215b30dc9b..1966c2a8f09b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=2
+revision=3
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] gnuradio: update to 3.10.5.1
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (18 preceding siblings ...)
2023-03-10 0:08 ` [PR PATCH] [Updated] " unspecd
@ 2023-03-16 9:30 ` unspecd
2023-03-16 15:59 ` [PR PATCH] [Merged]: " abenson
20 siblings, 0 replies; 22+ messages in thread
From: unspecd @ 2023-03-16 9:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gnuradio
https://github.com/void-linux/void-packages/pull/39364
gnuradio: update to 3.10.5.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
A patch file from https://github.com/void-linux/void-packages/pull/39364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gnuradio-39364.patch --]
[-- Type: text/x-diff, Size: 23450 bytes --]
From 8cb1345e6315a3730c6b8c71c7eabbc16f63ce1e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 30 Jan 2023 05:08:43 +1100
Subject: [PATCH 1/6] CastXML: update to 0.5.1.
---
srcpkgs/CastXML/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template
index 5d7d9503658c..00e82ac66b50 100644
--- a/srcpkgs/CastXML/template
+++ b/srcpkgs/CastXML/template
@@ -1,6 +1,6 @@
# Template file for 'CastXML'
pkgname=CastXML
-version=0.4.6
+version=0.5.1
revision=1
build_style=cmake
configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man"
@@ -13,7 +13,7 @@ maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/CastXML/CastXML"
distfiles="https://github.com/CastXML/CastXML/archive/v${version}.tar.gz"
-checksum=8dcdbc1f23a130e4bdb0b09f57c30761a02a346b4db4037555048af2a293d66a
+checksum=a7b40b1530585672f9cf5d7a6b6dd29f20c06cd5edf34ef34c89a184a4d1a006
post_install() {
rm -r ${DESTDIR}/usr/share/castxml/clang/include
From a56783ecf49dd7cc49bd525d707aede1a688793e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 17 Sep 2022 22:34:08 +1100
Subject: [PATCH 2/6] gnuradio: update to 3.10.5.1.
---
common/shlibs | 44 +--
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 ------
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ------------------
.../skip-test-that-hangs-on-32bit.patch | 26 --
srcpkgs/gnuradio/template | 6 +-
5 files changed, 25 insertions(+), 396 deletions(-)
delete mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
delete mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
delete mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
diff --git a/common/shlibs b/common/shlibs
index 5cc81b9f90b2..8a7c321774fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3241,28 +3241,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.0 volk-3.0.0_1
-libgnuradio-runtime.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pmt.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-blocks.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-audio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fec.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-fft.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-filter.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-analog.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-digital.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-dtv.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-channels.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-trellis.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-video-sdl.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-vocoder.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-wavelet.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-uhd.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-network.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-soapy.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-qtgui.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-zeromq.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-iio.so.3.10.3 gnuradio-3.10.3.0_1
-libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
+libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
+libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
deleted file mode 100644
index a0c3f6d4701b..000000000000
--- a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Upstream: no
-
-Honestly, I don't care much. I tries to print as much as it makes sense
---- a/gnuradio-runtime/include/gnuradio/logger.h
-+++ b/gnuradio-runtime/include/gnuradio/logger.h
-@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
- #include <spdlog/fmt/fmt.h>
- #include <spdlog/fmt/ostr.h>
- #include <memory>
-+#include <string>
-+#include <type_traits>
-+#include <utility>
-
- #include <spdlog/spdlog.h>
-
-@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
- }
- };
-
-+namespace fmt {
-+template <typename T>
-+struct formatter<
-+ T,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const T& value, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(value.identifier(), ctx);
-+ }
-+};
-+template <typename T, typename Ch>
-+struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
-+ {
-+ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
-+ }
-+};
-+template <typename T>
-+struct formatter<
-+ std::shared_ptr<T>,
-+ typename std::enable_if<
-+ std::is_convertible<
-+ decltype(std::declval<T>().identifier()),
-+ std::string
-+ >::value,
-+ char
-+ >::type > : fmt::formatter<std::string> {
-+ template <typename FormatCtx>
-+ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
-+ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
-+ {
-+ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
-+ }
-+};
-+}
-+
- #endif
-
- #endif /* INCLUDED_GR_LOGGER_H */
---- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
-@@ -15,7 +15,7 @@
- /* BINDTOOL_GEN_AUTOMATIC(0) */
- /* BINDTOOL_USE_PYGCCXML(0) */
- /* BINDTOOL_HEADER_FILE(logger.h) */
--/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
-+/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
- /***********************************************************************************/
-
- #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
deleted file mode 100644
index 43094abeb976..000000000000
--- a/srcpkgs/gnuradio/patches/fix-i686-tests.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:39:20 -0400
-Subject: [PATCH] blocks: Allow for floating point error in moving average test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-blocks/python/blocks/qa_moving_average.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
-index 8f4169d05cf..6aa3ba3df35 100644
---- a/gr-blocks/python/blocks/qa_moving_average.py
-+++ b/gr-blocks/python/blocks/qa_moving_average.py
-@@ -147,7 +147,7 @@ def test_vector_complex(self):
- ref_data = ref_dst.data()
-
- # make sure result is close to zero
-- self.assertEqual(dut_data, ref_data)
-+ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
-
- def test_complex_scalar(self):
- tb = self.tb
-
-From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 15:52:54 -0400
-Subject: [PATCH] fft: Increase tolerance in qa_window test
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fft/python/fft/qa_window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
-index 93ab1a9f93f..ec4877f7867 100644
---- a/gr-fft/python/fft/qa_window.py
-+++ b/gr-fft/python/fft/qa_window.py
-@@ -35,7 +35,7 @@ def test_normwin(self):
- 21,
- normalize=True)
- power = numpy.sum([x * x for x in win]) / len(win)
-- self.assertAlmostEqual(power, 1.0)
-+ self.assertAlmostEqual(power, 1.0, places=6)
-
-
- if __name__ == '__main__':
-
-From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:29:30 -0400
-Subject: [PATCH 1/2] digital: Account for floating point error in loop
- conditions
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/lib/constellation.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
-index 609b4546b83..4235d17f202 100644
---- a/gr-digital/lib/constellation.cc
-+++ b/gr-digital/lib/constellation.cc
-@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
- float maxd = 1.0f;
- float step = (2.0f * maxd) / (d_lut_scale - 1);
- float y = -maxd;
-- while (y < maxd + step) {
-+ while (y < maxd + (step / 2)) {
- float x = -maxd;
-- while (x < maxd + step) {
-+ while (x < maxd + (step / 2)) {
- gr_complex pt = gr_complex(x, y);
- d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
- x += step;
-
-From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Fri, 14 Oct 2022 17:31:33 -0400
-Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-digital/python/digital/qa_constellation.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
-index 7345f782a2c..1ad86a8d263 100644
---- a/gr-digital/python/digital/qa_constellation.py
-+++ b/gr-digital/python/digital/qa_constellation.py
-@@ -117,10 +117,10 @@ def threed_constell():
- def slicer(x):
- ret = []
- for xi in x:
-- if(xi < 0):
-+ if xi < 0:
- ret.append(0.0)
-- else:
-- ret.append(1.0)
-+ else:
-+ ret.append(1.0)
- return ret
-
-
-From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sat, 15 Oct 2022 10:44:37 -0400
-Subject: [PATCH] fec: Fix LDPC output size calculation
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
- gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-index a76bd76bae2..56a7aeab4c5 100644
---- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
-@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-index f9aaa1b65b4..1475aba70d4 100644
---- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-+++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
-@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
-
- d_frame_size = frame_size;
-
-- d_output_size = static_cast<int>(d_rate * d_frame_size);
-+ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
-
- return ret;
- }
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Sun, 16 Oct 2022 08:22:48 -0400
-Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
- 1 file changed, 45 insertions(+), 17 deletions(-)
-
-diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
-index 6151641aa3c..195e19ab9a3 100644
---- a/gr-analog/python/analog/qa_ctcss_squelch.py
-+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
-@@ -9,6 +9,8 @@
- #
-
-
-+import math
-+import random
- from gnuradio import gr, gr_unittest, analog, blocks
-
-
-@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
-
- def test_ctcss_squelch_002(self):
- # Test runtime, gate=True
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.0
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = True
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-- expected_result = src_data
-- expected_result[0] = 0
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, int(rate * 0.500)):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(int(rate * 0.500), rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
-@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
- self.tb.run()
-
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ # so ~400 ms of audio should make it past the gate
-+ self.assertGreater(len(result_data), rate * 0.390)
-+ self.assertLess(len(result_data), rate * 0.410)
-+ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
-
- def test_ctcss_squelch_003(self):
- # Test runtime, gate=False
-- rate = 1
-+ rate = 8000
- freq = 100
-- level = 0.5
-- length = 1
-- ramp = 1
-+ other_freq = 103.5
-+ level = 0.01
-+ length = 0
-+ ramp = 0
- gate = False
-
-- src_data = [float(x) / 10.0 for x in range(1, 40)]
-+ random.seed(1)
-+ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
-+
-+ # First half-second has incorrect CTCSS tone
-+ for x in range(0, rate // 2):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
-+
-+ # Second half-second has correct CTCSS tone
-+ for x in range(rate // 2, rate):
-+ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
-+
- src = blocks.vector_source_f(src_data)
- op = analog.ctcss_squelch_ff(rate, freq, level,
- length, ramp, gate)
-@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
- self.tb.connect(op, dst)
- self.tb.run()
-
-- expected_result = src_data
-- expected_result[0:5] = [0, 0, 0, 0, 0]
--
- result_data = dst.data()
-- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
-+
-+ # Squelch should open ~100 ms after the correct CTCSS tone appears
-+ min_zero_samples = int(rate * 0.590)
-+ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
-+ max_zero_samples = int(rate * 0.610)
-+ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
-
-
- if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
deleted file mode 100644
index 25a694211100..000000000000
--- a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Skip one test that hangs forever on 32 bit
-
-See: https://github.com/gnuradio/gnuradio/issues/989
-
---- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
-+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
-@@ -98,6 +98,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- LDPC_matrix_object = fec.ldpc_G_matrix(filename)
-@@ -115,6 +118,9 @@
- self.assertEqual(data_in, data_out)
-
- def test_parallelism0_03(self):
-+ from ctypes import sizeof, c_long
-+ if sizeof(c_long) <= 4:
-+ return
- filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
- gap = 4
- k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 9571677a2085..7c74168e8f59 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=9
+version=3.10.5.1
+revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75
+checksum=85d90147f7f28450bff75eeefd2b44adc88b231d29fe8e86cc3a65437dba6d9f
python_version=3
if [ "$CROSS_BUILD" ]; then
From b4ff0a9b48e663937feea00d239b98622ebe8b13 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Oct 2022 22:39:32 +1100
Subject: [PATCH 3/6] gnuradio-osmosdr: update to 0.2.4.
---
srcpkgs/gnuradio-osmosdr/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 2b118119d010..c8680ff1d478 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,8 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
-version=0.2.3git20210128
-revision=6
-_githash=a100eb024c0210b95e4738b6efd836d48225bd03
+version=0.2.4
+revision=1
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
@@ -12,8 +11,8 @@ short_desc="GNU Radio source block for rtlsdr, hackrf and airspy"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR"
-distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz"
-checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1
+distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz"
+checksum=28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63
gnuradio-osmosdr-devel_package() {
short_desc+=" - development files"
From 320ec63d23820a821b5c9a3d80820a762efb5926 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 25 Nov 2022 20:24:41 +1100
Subject: [PATCH 4/6] gnuradio-nrsc5: revbump for gnuradio 3.10.5.1
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index bd544baa4f07..2181d8bd44be 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=3
+revision=4
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 603532b87ef99ccc58b814a396b204cebf75d633 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 5 Jan 2023 21:14:50 +1100
Subject: [PATCH 5/6] gnuradio-rds: revbump for gnuradio 3.10.5.1
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index b8a95ac05d79..09a928d3759b 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=5
+revision=6
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 44c45148aa99a6830c9fa7615facb1b0218dddb5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 10 Mar 2023 11:08:08 +1100
Subject: [PATCH 6/6] gqrx: revbump for gnuradio 3.10.5.1
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index c2215b30dc9b..1966c2a8f09b 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.15.9
-revision=2
+revision=3
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Merged]: gnuradio: update to 3.10.5.1
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
` (19 preceding siblings ...)
2023-03-16 9:30 ` unspecd
@ 2023-03-16 15:59 ` abenson
20 siblings, 0 replies; 22+ messages in thread
From: abenson @ 2023-03-16 15:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1051 bytes --]
There's a merged pull request on the void-packages repository
gnuradio: update to 3.10.5.1
https://github.com/void-linux/void-packages/pull/39364
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc64le-musl
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2023-03-16 15:59 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-19 12:36 [PR PATCH] gnuradio: update to 3.10.4.0 unspecd
2022-10-10 9:36 ` [PR PATCH] [Updated] " unspecd
2022-10-10 11:40 ` unspecd
2022-10-24 10:03 ` unspecd
2022-11-25 9:41 ` unspecd
2022-11-25 10:32 ` unspecd
2022-11-28 18:44 ` [PR PATCH] [Updated] " unspecd
2022-12-19 15:01 ` unspecd
2022-12-20 12:23 ` [PR PATCH] [Updated] " unspecd
2022-12-31 14:21 ` [PR PATCH] [Updated] gnuradio: update to 3.10.5.0 unspecd
2022-12-31 15:12 ` unspecd
2022-12-31 15:13 ` unspecd
2023-01-04 21:26 ` [PR PATCH] [Updated] " unspecd
2023-01-05 10:15 ` unspecd
2023-01-12 19:38 ` unspecd
2023-01-29 21:25 ` unspecd
2023-01-29 21:26 ` unspecd
2023-01-29 21:30 ` unspecd
2023-01-29 21:31 ` gnuradio: update to 3.10.5.1 unspecd
2023-03-10 0:08 ` [PR PATCH] [Updated] " unspecd
2023-03-16 9:30 ` unspecd
2023-03-16 15:59 ` [PR PATCH] [Merged]: " abenson
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).