From eff6d52b933a5b22dff53c5878b14174cf329a75 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sat, 16 Dec 2023 11:00:29 -0600 Subject: [PATCH 1/8] New package: cpu_features-0.9.0 --- srcpkgs/cpu_features-devel | 1 + srcpkgs/cpu_features/template | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 120000 srcpkgs/cpu_features-devel create mode 100644 srcpkgs/cpu_features/template diff --git a/srcpkgs/cpu_features-devel b/srcpkgs/cpu_features-devel new file mode 120000 index 0000000000000..e70244f342ab9 --- /dev/null +++ b/srcpkgs/cpu_features-devel @@ -0,0 +1 @@ +cpu_features \ No newline at end of file diff --git a/srcpkgs/cpu_features/template b/srcpkgs/cpu_features/template new file mode 100644 index 0000000000000..d89008324c2aa --- /dev/null +++ b/srcpkgs/cpu_features/template @@ -0,0 +1,21 @@ +# Template file for 'cpu_features' +pkgname=cpu_features +version=0.9.0 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=NO" +short_desc="Cross platform C99 library to get cpu features at runtime" +maintainer="Andrew Benson " +license="Apache-2.0" +homepage="https://github.com/google/cpu_features" +distfiles="https://github.com/google/cpu_features/archive/v${version}.tar.gz" +checksum=bdb3484de8297c49b59955c3b22dba834401bc2df984ef5cfc17acbe69c5018e + +cpu_features-devel_package() { + short_desc+=" - development files" + depends+=" $sourcepkg>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib + } +} From 66ecfe78988e8e2162b315d6636037d2cc370419 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sat, 16 Dec 2023 10:27:42 -0600 Subject: [PATCH 2/8] volk: update to 3.1.0. --- common/shlibs | 2 +- srcpkgs/volk/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index bc699186c0d6d..58be8fa33f3d7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3188,7 +3188,7 @@ libarcan_tui.so.0.15 arcan-0.6.1.1_1 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 +libvolk.so.3.1 volk-3.1.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 diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template index 2c920f19b5dd1..8d30817ce3411 100644 --- a/srcpkgs/volk/template +++ b/srcpkgs/volk/template @@ -1,20 +1,20 @@ # Template file for 'volk' pkgname=volk -version=3.0.0 -revision=2 +version=3.1.0 +revision=1 _cpu_features_gitrev="188d0d3c383689cdb6bb70dc6da2469faec84f61" create_wrksrc=yes build_style=cmake configure_args="-DENABLE_LGPL=OFF" hostmakedepends="pkg-config python3-cheetah3 git python3-Mako python3-six" -makedepends="python3-cheetah3 python3-devel python3-Mako python3-six" +makedepends="python3-cheetah3 python3-devel python3-Mako python3-six cpu_features-devel" short_desc="Vector-Optimized Library of Kernels" maintainer="Andrew Benson " license="LGPL-3.0-or-later" homepage="http://libvolk.org/" distfiles="https://github.com/gnuradio/volk/archive/v${version}.tar.gz https://github.com/google/cpu_features/archive/${_cpu_features_gitrev}.tar.gz" -checksum="617c25a5a240e41e50d695851925541b19e011d516c3e0c288a5aeefb3ceb7fd +checksum="9a46d85d24435b8f221e1ae03d4e9e8458d4281e3e4d2b541a8844a55b7526ac ef383c81e84e7ce56eeb9207ded6937f0aefd6747c319d8d3265e6d9be164db1" case "$XBPS_TARGET_MACHINE" in From 915e8bff30b731becadb804e9be9c72449118bdb Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 18 Dec 2023 11:34:18 -0600 Subject: [PATCH 3/8] gnuradio: update to 3.10.8.0. --- common/shlibs | 44 +++++++++---------- .../patches/fix-x11-library-call.patch | 13 ------ srcpkgs/gnuradio/template | 6 +-- 3 files changed, 25 insertions(+), 38 deletions(-) diff --git a/common/shlibs b/common/shlibs index 58be8fa33f3d7..baf9e547c2e1e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3189,28 +3189,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.1 volk-3.1.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-runtime.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-pmt.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-blocks.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-audio.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-fec.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-fft.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-filter.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-analog.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-digital.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-dtv.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-channels.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-trellis.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-video-sdl.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-vocoder.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-wavelet.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-uhd.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-network.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-soapy.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-qtgui.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-zeromq.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-iio.so.3.10.8 gnuradio-3.10.8.0_1 +libgnuradio-pdu.so.3.10.8 gnuradio-3.10.8.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/fix-x11-library-call.patch b/srcpkgs/gnuradio/patches/fix-x11-library-call.patch index 589c87e2ee353..65f0208188a22 100644 --- a/srcpkgs/gnuradio/patches/fix-x11-library-call.patch +++ b/srcpkgs/gnuradio/patches/fix-x11-library-call.patch @@ -24,16 +24,3 @@ index 0d9cb56c2..ea5e430f3 100755 X11.XInitThreads() except: print("Warning: failed to XInitThreads()") -diff --git a/grc/core/generator/flow_graph.py.mako b/grc/core/generator/flow_graph.py.mako -index b1c369177..6e9c56a08 100644 ---- a/grc/core/generator/flow_graph.py.mako -+++ b/grc/core/generator/flow_graph.py.mako -@@ -29,7 +29,7 @@ if __name__ == '__main__': - import sys - if sys.platform.startswith('linux'): - try: -- x11 = ctypes.cdll.LoadLibrary('libX11.so') -+ x11 = ctypes.cdll.LoadLibrary('libX11.so.6') - x11.XInitThreads() - except: - print("Warning: failed to XInitThreads()") diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index a1e1f75c8f6bc..58127cedd3ddc 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio -version=3.10.5.1 -revision=5 +version=3.10.8.0 +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 " license="GPL-3.0-or-later" homepage="https://www.gnuradio.org" distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz" -checksum=85d90147f7f28450bff75eeefd2b44adc88b231d29fe8e86cc3a65437dba6d9f +checksum=a66709939b28f5919e804ba0ff7b8791f7f02180954cc2218367e9f22d262f95 python_version=3 if [ "$CROSS_BUILD" ]; then From b82d5c212a8cef2b7fda184f553d4816cd66c51d Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 18 Dec 2023 11:28:40 -0600 Subject: [PATCH 4/8] uhd: update to 4.6.0.0 --- common/shlibs | 2 +- srcpkgs/uhd/patches/boost-math.patch | 31 --------------------- srcpkgs/uhd/patches/fix-include.patch | 39 --------------------------- srcpkgs/uhd/patches/std-complex.patch | 10 ------- srcpkgs/uhd/template | 6 ++--- 5 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 srcpkgs/uhd/patches/boost-math.patch delete mode 100644 srcpkgs/uhd/patches/fix-include.patch delete mode 100644 srcpkgs/uhd/patches/std-complex.patch diff --git a/common/shlibs b/common/shlibs index baf9e547c2e1e..6d5ec2baef94e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3553,7 +3553,7 @@ libbinpac.so.0 zeek-3.2.4_2 libllhttp.so.1 llhttp-1.0.1_1 libpinyin.so.15 libpinyin-2.8.1_1 libzhuyin.so.15 libzhuyin-2.8.1_1 -libuhd.so.4.0.0 uhd-4.0.0.0_1 +libuhd.so.4.6.0 uhd-4.6.0.0_1 libeditline.so.1 editline-1.16.0_1 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1 libgnuradio-nrsc5.so.2.0.0git gnuradio-nrsc5-2.0.0_1 diff --git a/srcpkgs/uhd/patches/boost-math.patch b/srcpkgs/uhd/patches/boost-math.patch deleted file mode 100644 index 9ac6dae1df9d9..0000000000000 --- a/srcpkgs/uhd/patches/boost-math.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/host/lib/usrp/usrp2/usrp2_impl.cpp -+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp -@@ -18,6 +18,8 @@ - #include //used for htonl and ntohl - #include - #include -+#include -+#include - #include - #include - ---- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp -+++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - - using namespace uhd; ---- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp -+++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/srcpkgs/uhd/patches/fix-include.patch b/srcpkgs/uhd/patches/fix-include.patch deleted file mode 100644 index 4a30a6864903b..0000000000000 --- a/srcpkgs/uhd/patches/fix-include.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: uhd-4.0.0.0/host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.cpp -=================================================================== ---- uhd-4.0.0.0.orig/host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.cpp -+++ uhd-4.0.0.0/host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.cpp -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - using namespace uhd; - using namespace uhd::usrp; -Index: uhd-4.0.0.0/host/lib/include/uhdlib/utils/rpc.hpp -=================================================================== ---- uhd-4.0.0.0.orig/host/lib/include/uhdlib/utils/rpc.hpp -+++ uhd-4.0.0.0/host/lib/include/uhdlib/utils/rpc.hpp -@@ -12,7 +12,10 @@ - #include - #include - #include -+#include - #include -+#include -+#include - - namespace { - -Index: uhd-4.0.0.0/host/lib/usrp/common/lmx2592.cpp -=================================================================== ---- uhd-4.0.0.0.orig/host/lib/usrp/common/lmx2592.cpp -+++ uhd-4.0.0.0/host/lib/usrp/common/lmx2592.cpp -@@ -7,6 +7,7 @@ - #include "lmx2592_regs.hpp" - #include - #include -+#include - #include - #include - diff --git a/srcpkgs/uhd/patches/std-complex.patch b/srcpkgs/uhd/patches/std-complex.patch deleted file mode 100644 index c7573bf4ade2d..0000000000000 --- a/srcpkgs/uhd/patches/std-complex.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/host/tests/tx_streamer_test.cpp -+++ b/host/tests/tx_streamer_test.cpp -@@ -7,6 +7,7 @@ - #include "../common/mock_link.hpp" - #include - #include -+#include - #include - #include - diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template index 40f3875d0c04a..6e41492d155fa 100644 --- a/srcpkgs/uhd/template +++ b/srcpkgs/uhd/template @@ -1,7 +1,7 @@ # Template file for 'uhd' pkgname=uhd -version=4.0.0.0 -revision=5 +version=4.6.0.0 +revision=1 build_wrksrc=host build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://files.ettus.com/manual/" changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG" distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz" -checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14 +checksum=5e6eb05abb4a3973bef8837fb45a5147be04698229e22801369f728fcc6db38d python_version=3 case "${XBPS_TARGET_MACHINE}" in From 999795f794f6dd858250d092e0eb0b998044ab5c Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 18 Dec 2023 11:33:57 -0600 Subject: [PATCH 5/8] SoapyUHD: update to 0.4.1 --- srcpkgs/SoapyUHD/patches/uhd-4.0.0.0.patch | 23 ---------------------- srcpkgs/SoapyUHD/template | 6 +++--- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/SoapyUHD/patches/uhd-4.0.0.0.patch diff --git a/srcpkgs/SoapyUHD/patches/uhd-4.0.0.0.patch b/srcpkgs/SoapyUHD/patches/uhd-4.0.0.0.patch deleted file mode 100644 index 5183ca9f20cab..0000000000000 --- a/srcpkgs/SoapyUHD/patches/uhd-4.0.0.0.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/SoapyUHDDevice.cpp 2020-11-28 06:35:26.325250052 +0700 -+++ b/SoapyUHDDevice.cpp 2020-11-28 06:35:57.557546069 +0700 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - /*********************************************************************** - * Stream wrapper ---- a/UHDSoapyDevice.cpp 2020-11-28 06:37:27.567376170 +0700 -+++ b/UHDSoapyDevice.cpp 2020-11-28 06:43:28.476925258 +0700 -@@ -179,8 +179,8 @@ - std::map> _sampleRates; - - //stash streamers to implement old-style issue stream cmd and async message -- std::map > _rx_streamers; -- std::map > _tx_streamers; -+ std::map > _rx_streamers; -+ std::map > _tx_streamers; - }; - - /*********************************************************************** diff --git a/srcpkgs/SoapyUHD/template b/srcpkgs/SoapyUHD/template index 79dec030e3d0e..da7e98692512b 100644 --- a/srcpkgs/SoapyUHD/template +++ b/srcpkgs/SoapyUHD/template @@ -1,7 +1,7 @@ # Template file for 'SoapyUHD' pkgname=SoapyUHD -version=0.3.6 -revision=4 +version=0.4.1 +revision=1 build_style=cmake hostmakedepends="pkg-config" makedepends="SoapySDR-devel uhd-devel" @@ -10,4 +10,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/pothosware/SoapyUHD" distfiles="${homepage}/archive/soapy-uhd-${version}.tar.gz" -checksum=0ac7fd0967e6922f16d1ba1a7ecb72f1fbcc14dd80e5134af9a5c9b86c1bccb8 +checksum=9779cce2e732cd41905b6cf8ea85edbbf51b1ac918e6180bd4891eebb4c8d085 From 7213c57a388b8088789fa0ae291632a659f91e27 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 18 Dec 2023 11:34:41 -0600 Subject: [PATCH 6/8] gnuradio-osmosdr: rebuild for gnuradio/volk --- 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 da0a23e2d56ab..740642b1b2c77 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.4 -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 d90b5820d794846d51fd2681f67e72240a6ec363 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sat, 16 Dec 2023 11:03:13 -0600 Subject: [PATCH 7/8] gqrx: rebuild for gnuradio/volk --- srcpkgs/gqrx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template index ccf41d0e87b45..255ee7b753add 100644 --- a/srcpkgs/gqrx/template +++ b/srcpkgs/gqrx/template @@ -1,7 +1,7 @@ # Template file for 'gqrx' pkgname=gqrx version=2.17.3 -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)" From 1ca06a747bdca189121f0f9b2a9dffcfb9a55ae5 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sat, 16 Dec 2023 11:03:13 -0600 Subject: [PATCH 8/8] SDRPlusPlus: rebuild for gnuradio/volk --- srcpkgs/SDRPlusPlus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SDRPlusPlus/template b/srcpkgs/SDRPlusPlus/template index 48d8acd9e6d38..5d23934afa7d5 100644 --- a/srcpkgs/SDRPlusPlus/template +++ b/srcpkgs/SDRPlusPlus/template @@ -1,7 +1,7 @@ # Template file for 'SDRPlusPlus' pkgname=SDRPlusPlus version=1.0.4 -revision=2 +revision=3 build_style=cmake configure_args="-DOPT_BUILD_PLUTOSDR_SOURCE=0" hostmakedepends="pkg-config"