From a6b8317aadb881c39110d7cd89020e52a4cf80f0 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov 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 " 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 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 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 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 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)"