summaryrefslogtreecommitdiff
path: root/ham/gnuradio-core
diff options
context:
space:
mode:
authormef <mef@pkgsrc.org>2022-05-26 15:20:08 +0000
committermef <mef@pkgsrc.org>2022-05-26 15:20:08 +0000
commit83701aad11e6045b01d9d6811aad7967348555dc (patch)
treed25cc64423fe5d91377f55786f21fc5412036b31 /ham/gnuradio-core
parent29bfa1e8da2c01b30d703c9de1789257c89b1fed (diff)
downloadpkgsrc-83701aad11e6045b01d9d6811aad7967348555dc.tar.gz
(ham/gnuradio-core) Updated 3.10.1.1 to 3.10.2.0
## [3.10.2.0] - 2022-04-09 ### Changed #### Project Scope - Clayton Smith continues the effort to replace Boost usage with modern C++ equivalents. In a related effort, he has continued the logging modernization started by Marcus M端ller. In his spare time, he has tackled some tricky, intermittent CI failures, some of which turned out to be real bugs. Much of this work is invisible to end users, but is extremely useful in making GNU Radio more reliable and maintainable. Special thanks are due to Clayton for a lot of hard work this cycle. - Use exceptions instead of `exit()` in several places. - Fixed a variety of Python deprecation warnings. - Packager note: `jsonschema` is required for the JSON Config and YAML Config blocks. Those blocks will be disabled if `jsonschema` is not found. #### gnuradio-runtime - Correct size/usage for single-mapped buffers (part of the new Custom Buffers feature). - Correct buffer size allocation. This was actually the single change in v3.10.1.1, which did not get its own CHANGELOG entry. #### GRC - Improve discovery of xterm and related programs. - Save generated hierarchical block code to the block library instead of the directory containing the current GRC flowgraph. - New JSON Config and YAML Config blocks that load configuration variables from files at runtime. Those variables may then be used in block parameters. - Store the GNU Radio version in flowgraph metadata when saving. - Minor change in Python evaluation code to allow `affinity`, `minoutbuf` and `maxoutbuf` to be adjusted via script parameters. #### Build system and packaging - Require C++-17 for `gnuradio-runtime` and code compiled against it (via cmake flags). - Add `pythonschema` to build- and run-time dependencies. #### gr-blocks - Add exponential distribution to Message Strobe Random block's `delay` selection. - Quiet down debug messages in File Sink. - Skip alignment check in File Source when the input file is not seekable (e.g., it is a pipe). #### gr-filter - Fix crash in Rational Resampler logging #### gr-digital - Add generic CRC blocks: CRC Append and CRC Check. #### gr-qtgui - Improve text/background color on Range widget. - Digital Number Control emits message with new, instead of previous, value. - Message Edit Box sends message only when return is pressed, rather than whenever focus is lost. - Vector Sink allows legend to be disabled. - Type error fixes (Python 3.10 is stricter about int casting). #### gr-trellis - Provide Python bindings for PCCC Encoder and Viterbi Combo. #### gr-vocoder - Add C++ generation support to gr-vocoder #### Code generation tools - Support strongly-typed enums in Python bindings
Diffstat (limited to 'ham/gnuradio-core')
-rw-r--r--ham/gnuradio-core/Makefile3
-rw-r--r--ham/gnuradio-core/Makefile.common7
-rw-r--r--ham/gnuradio-core/Nocore.mk21
-rw-r--r--ham/gnuradio-core/PLIST17
-rw-r--r--ham/gnuradio-core/buildlink3.mk4
-rw-r--r--ham/gnuradio-core/distinfo8
-rw-r--r--ham/gnuradio-core/version.mk4
7 files changed, 41 insertions, 23 deletions
diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile
index 15164e26d30..25ce871c3bb 100644
--- a/ham/gnuradio-core/Makefile
+++ b/ham/gnuradio-core/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.94 2022/04/18 19:11:25 adam Exp $
+# $NetBSD: Makefile,v 1.95 2022/05/26 15:20:09 mef Exp $
PKGNAME= gnuradio-core-${VERSION}
-PKGREVISION= 2
COMMENT= Core part of GNU Radio, all others need this
PLIST_MINUS= # empty
diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common
index e01cfc5218c..91886455e50 100644
--- a/ham/gnuradio-core/Makefile.common
+++ b/ham/gnuradio-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2022/04/10 01:05:34 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.41 2022/05/26 15:20:09 mef Exp $
# This Makefile fragment is included in the package Makefiles for
# GNU Radio distributed packages (they all share common configure and build
# settings).
@@ -56,8 +56,13 @@ PATCHDIR= ${.CURDIR}/../../ham/gnuradio-core/patches
# see CMakeLists.txt GR_PYTHON_MIN_VERSION
PYTHON_VERSIONS_INCOMPATIBLE= 27 37 # py-scipy
+# three digit version number for shared library ex 3.10.2.0 -> 3.10.2
+PKGVER_MICRO= ${PKGVERSION_NOREV:C/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\3/}
+
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
+# avoid using the name PKGVERSION in variable, see Nocore.mk
+PLIST_SUBST+= PKGVER_MICRO=${PKGVER_MICRO}
PY_PATCHPLIST= yes
CONFIGURE_DIRS= build
diff --git a/ham/gnuradio-core/Nocore.mk b/ham/gnuradio-core/Nocore.mk
index e84507d01ac..2d66809a542 100644
--- a/ham/gnuradio-core/Nocore.mk
+++ b/ham/gnuradio-core/Nocore.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Nocore.mk,v 1.9 2016/07/12 11:36:46 mef Exp $
+# $NetBSD: Nocore.mk,v 1.10 2022/05/26 15:20:09 mef Exp $
DEPENDS+= gnuradio-core-[0-9]*:../../ham/gnuradio-core
@@ -13,12 +13,16 @@ post-install:
# Take care CONF_FILES stuff
# ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \
# ${DESTDIR}${PREFIX}/${EGDIR}/
+# ------------------------------------------------------------
+# Generate the file .PLIST.minus (note: it is before PLIST_SUBST applies)
+# ------------------------------------------------------------
for i in ${PLIST_MINUS} ; do \
for p in PLIST PLIST.oss PLIST.${OPSYS} ; do \
f="${PKGDIR}/../../ham/gnuradio-$${i}/$${p}"; \
if [ -f "$${f}" ]; then \
${SED} -e 's,$${PYSITELIB},${PYSITELIB},' \
-e 's,$${PKGVERSION},${PKGVERSION_NOREV},' \
+ -e 's,$${PKGVER_MICRO},${PKGVER_MICRO},' \
-e '/^@comment/d' \
-e '/^@pkgdir/d' \
"$${f}"; \
@@ -27,8 +31,19 @@ post-install:
done \
| ${PKGSRC_SETENV} ${_PLIST_AWK_ENV} ${AWK} ${_PLIST_SHLIB_AWK} \
> ${WRKDIR}/.PLIST.minus;
- (cd ${WRKDIR}/.destdir/${PREFIX}; \
- ${RM} -f $$(cat ${WRKDIR}/.PLIST.minus) );
+# ------------------------------------------------------------
+# And then remove the files listed in .PLIST.minus
+# ------------------------------------------------------------
+ (cd ${WRKDIR}/.destdir/${PREFIX}; \
+ ${RM} -f $$(cat ${WRKDIR}/.PLIST.minus) ; \
+ ${RM} -f lib/libaudio.so.* ; \
+ ${RM} -f lib/libgnuradio-analog.so.* ; \
+ ${RM} -f lib/libgnuradio-blocks.so.* ; \
+ ${RM} -f lib/libgnuradio-filter.so.* ; \
+ ${RM} -f lib/libgnuradio-fft.so.* ; \
+ ${RM} -f lib/libgnuradio-pmt.so.* ; \
+ ${RM} -f lib/libgnuradio-runtime.so.* ; \
+ ${RM} -f lib/libgnuradio-audio.so.* ; )
# workaround for gnuradio-doxygen
# (the same target can't be set on gnuradio-doxygen side
#
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index 78d5a241578..adabf36ffc4 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2022/03/12 23:04:45 tnn Exp $
+@comment $NetBSD: PLIST,v 1.37 2022/05/26 15:20:09 mef Exp $
bin/gnuradio-config-info
bin/gr_filter_design
include/gnuradio/analog/agc.h
@@ -262,7 +262,6 @@ include/gnuradio/gr_complex.h
include/gnuradio/hier_block2.h
include/gnuradio/high_res_timer.h
include/gnuradio/host_buffer.h
-include/gnuradio/integer_math.h
include/gnuradio/io_signature.h
include/gnuradio/logger.h
include/gnuradio/math.h
@@ -371,25 +370,25 @@ lib/cmake/gnuradio/gnuradio-runtimeConfig.cmake
lib/cmake/gnuradio/gnuradio-runtimeTargets-release.cmake
lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
lib/libgnuradio-analog.so
-lib/libgnuradio-analog.so.3.10.1
+lib/libgnuradio-analog.so.${PKGVER_MICRO}
lib/libgnuradio-analog.so.${PKGVERSION}
lib/libgnuradio-audio.so
-lib/libgnuradio-audio.so.3.10.1
+lib/libgnuradio-audio.so.${PKGVER_MICRO}
lib/libgnuradio-audio.so.${PKGVERSION}
lib/libgnuradio-blocks.so
-lib/libgnuradio-blocks.so.3.10.1
+lib/libgnuradio-blocks.so.${PKGVER_MICRO}
lib/libgnuradio-blocks.so.${PKGVERSION}
lib/libgnuradio-fft.so
-lib/libgnuradio-fft.so.3.10.1
+lib/libgnuradio-fft.so.${PKGVER_MICRO}
lib/libgnuradio-fft.so.${PKGVERSION}
lib/libgnuradio-filter.so
-lib/libgnuradio-filter.so.3.10.1
+lib/libgnuradio-filter.so.${PKGVER_MICRO}
lib/libgnuradio-filter.so.${PKGVERSION}
lib/libgnuradio-pmt.so
-lib/libgnuradio-pmt.so.3.10.1
+lib/libgnuradio-pmt.so.${PKGVER_MICRO}
lib/libgnuradio-pmt.so.${PKGVERSION}
lib/libgnuradio-runtime.so
-lib/libgnuradio-runtime.so.3.10.1
+lib/libgnuradio-runtime.so.${PKGVER_MICRO}
lib/libgnuradio-runtime.so.${PKGVERSION}
lib/pkgconfig/gnuradio-analog.pc
lib/pkgconfig/gnuradio-audio.pc
diff --git a/ham/gnuradio-core/buildlink3.mk b/ham/gnuradio-core/buildlink3.mk
index 91253c4c1db..a3518100508 100644
--- a/ham/gnuradio-core/buildlink3.mk
+++ b/ham/gnuradio-core/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.35 2022/03/12 23:04:45 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2022/05/26 15:20:09 mef Exp $
BUILDLINK_TREE+= gnuradio-core
.if !defined(GNURADIO_CORE_BUILDLINK3_MK)
GNURADIO_CORE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.10.1.1
+BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.10.2
BUILDLINK_PKGSRCDIR.gnuradio-core?= ../../ham/gnuradio-core
.include "../../devel/gmp/buildlink3.mk"
diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index f509f280ae7..471612f21af 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.47 2022/03/12 23:04:45 tnn Exp $
+$NetBSD: distinfo,v 1.48 2022/05/26 15:20:09 mef Exp $
-BLAKE2s (gnuradio-3.10.1.1.tar.gz) = 74575cc69c55fbf28f97396cb0a74747492543fc807b3a6e45b3b5cd16f539e6
-SHA512 (gnuradio-3.10.1.1.tar.gz) = 71998cbf0c67333a0fabb53882549cdb5d1547c7d2c7317321ccee0c61640147a1c3e7879a2011bd853df9cfa58dd6adaee4312adb9544d94ff7c1d4918fe480
-Size (gnuradio-3.10.1.1.tar.gz) = 4318131 bytes
+BLAKE2s (gnuradio-3.10.2.0.tar.gz) = ce1797e79609b2bf9b418b0cd4d43cb5e5c647da7be8769c26fc99979d18bd9f
+SHA512 (gnuradio-3.10.2.0.tar.gz) = f34cd3aee1a5d72da387246c25f8494d9a28b2d66aa58ec99a6ff2ae45672f3ec65111af095282f026e2ef267bca2e64042a2aa3ee284ce770351629963fe468
+Size (gnuradio-3.10.2.0.tar.gz) = 4323022 bytes
SHA1 (patch-cmake_Modules_GrPybind.cmake) = e2b42c840ca985dc3b1c0cba3029002a088c8407
SHA1 (patch-gnuradio-runtime_CMakeLists.txt) = a5b2b60c7fcc46b5784027e08e137480c0cf3307
SHA1 (patch-gnuradio-runtime_lib_CMakeLists.txt) = 310d0432de07cf5c03fbd9fd34dcb42733cf6367
diff --git a/ham/gnuradio-core/version.mk b/ham/gnuradio-core/version.mk
index 3a48d23d794..f32572da6d7 100644
--- a/ham/gnuradio-core/version.mk
+++ b/ham/gnuradio-core/version.mk
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.6 2022/03/12 23:04:45 tnn Exp $
+# $NetBSD: version.mk,v 1.7 2022/05/26 15:20:09 mef Exp $
-VERSION= 3.10.1.1
+VERSION= 3.10.2.0