Date: Monday, February 20, 2023 @ 06:05:22 Author: anatolik Revision: 1403013
archrelease: copy trunk to community-x86_64 Added: gnuradio/repos/community-x86_64/21-fcd.rules (from rev 1403012, gnuradio/trunk/21-fcd.rules) gnuradio/repos/community-x86_64/PKGBUILD (from rev 1403012, gnuradio/trunk/PKGBUILD) gnuradio/repos/community-x86_64/gnuradio-bind-placeholders.patch (from rev 1403012, gnuradio/trunk/gnuradio-bind-placeholders.patch) gnuradio/repos/community-x86_64/gnuradio-fmt-9.0.patch (from rev 1403012, gnuradio/trunk/gnuradio-fmt-9.0.patch) gnuradio/repos/community-x86_64/keys/ Deleted: gnuradio/repos/community-x86_64/21-fcd.rules gnuradio/repos/community-x86_64/PKGBUILD gnuradio/repos/community-x86_64/gnuradio-bind-placeholders.patch gnuradio/repos/community-x86_64/gnuradio-fmt-9.0.patch gnuradio/repos/community-x86_64/keys/ ----------------------------------+ 21-fcd.rules | 18 PKGBUILD | 404 ++++++++-------- gnuradio-bind-placeholders.patch | 922 ++++++++++++++++++------------------- gnuradio-fmt-9.0.patch | 290 +++++------ 4 files changed, 817 insertions(+), 817 deletions(-) Deleted: 21-fcd.rules =================================================================== --- 21-fcd.rules 2023-02-20 06:04:39 UTC (rev 1403012) +++ 21-fcd.rules 2023-02-20 06:05:22 UTC (rev 1403013) @@ -1,9 +0,0 @@ -# Udev rules for the Funcube Dongle Pro (0xfb56) and Pro+ (0xfb31) - -# HIDAPI/libusb: -SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb56" MODE:="0666" -SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb31" MODE:="0666" - -# HIDAPI/hidraw: -KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb56", MODE="0666" -KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb31", MODE="0666" Copied: gnuradio/repos/community-x86_64/21-fcd.rules (from rev 1403012, gnuradio/trunk/21-fcd.rules) =================================================================== --- 21-fcd.rules (rev 0) +++ 21-fcd.rules 2023-02-20 06:05:22 UTC (rev 1403013) @@ -0,0 +1,9 @@ +# Udev rules for the Funcube Dongle Pro (0xfb56) and Pro+ (0xfb31) + +# HIDAPI/libusb: +SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb56" MODE:="0666" +SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb31" MODE:="0666" + +# HIDAPI/hidraw: +KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb56", MODE="0666" +KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb31", MODE="0666" Deleted: PKGBUILD =================================================================== --- PKGBUILD 2023-02-20 06:04:39 UTC (rev 1403012) +++ PKGBUILD 2023-02-20 06:05:22 UTC (rev 1403013) @@ -1,202 +0,0 @@ -# Maintainer: Kyle Keen <keen...@gmail.com> -# Contributor: David Runge <dv...@archlinux.org> -# Contributor: Dominik Heidler <dheid...@gmail.com> -# Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com> - -# NOTE: sonames change on each release, so *all* dependent packages have to be rebuilt! -pkgbase=gnuradio -pkgname=(gnuradio gnuradio-companion) -pkgver=3.10.5.0 -pkgrel=3 -pkgdesc="General purpose DSP and SDR toolkit with drivers for usrp and fcd." -arch=(x86_64) -url="https://gnuradio.org" -license=(GPL3) -depends=( - codec2 # host - gcc-libs - glibc - gmp # host - gsl # host - libad9361 # gnuradio.iio - libuhd # gnuradio.uhd - libunwind - libvolk # host - pybind11 # host - python-click # host - python-click-plugins # host - python-mako # host - python-matplotlib - python-numpy # host - python-packaging # host - # python-pygccxml # gnuradio.modtool # TODO: package - python-pyyaml # various - python-pyzmq # gnuradio.zeromq - python-scipy - python-thrift # runtime - sdl12-compat # gnuradio.video_sdl - soapysdr # gnuradio.soapy - spdlog # host - thrift # host -) -makedepends=( - alsa-lib # gnuradio.audio - boost - # cppzmq # gnuradio.zeromq # TODO: package - cmake - fftw # host - fmt - gtk3 - jack # gnuradio.audio - libiio # gnuradio.iio - libsndfile # host - portaudio # gnuradio.audio - python-cairo # gnuradio.companion - python-gobject # gnuradio.companion - python-lxml # gnuradio.companion - python-pyqt5 # gnuradio.qtgui - python-pyqtgraph # gnuradio.qtgui - python-pytest # only required for tests - qt5-base - qwt # gnuradio.qtgui - zeromq # gnuradio.zeromq -) -checkdepends=( - python-jsonschema - python-setuptools # gnuradio.modtool - xorg-server-xvfb -) -source=( - $pkgbase-$pkgver.tar.gz::https://github.com/$pkgbase/$pkgbase/archive/v$pkgver/$pkgbase-v$pkgver.tar.gz - https://github.com/gnuradio/gnuradio/releases/download/v$pkgver/$pkgbase-$pkgver.tar.gz.asc - 21-fcd.rules -) -validpgpkeys=( - 'B90DDFAC56989BF62262EB812987C77CBB8ED9B2' # GNU Radio Project (Admin) <ad...@gnuradio.org> - 'D74F9F146E7F755783583158B343B2BA293E5174' # Marcus Müller (GNU Radio Maintainer) <mmuel...@gnuradio.org> - '723EC3A2B90533C6B93DFBC8ED797743F7951435' # GNU Radio (Software Signing Key) <i...@gnuradio.org> -) -sha512sums=('82f3028cbcb0175f9f354b19613ee59b052881b894c6d668d04235acda2e3be0ca2713642141a917264e70039f23795c647c47364af9ffad63f108da517d77c5' - 'SKIP' - '6f02dc8e20a7a1cd11099c851a7c8427fcd21e9652e6cddd0a72ca747b0e93cd4fd1b7b7b7e426b6231348bcc34fb2417716a2f03c92ec141889edc65031c3a0') -b2sums=('c21e310d4cc50112e7d2085be5a82f4eb633305936004cc60cabbac340a0cbd0016bb5f24229380c36281c4e52e6763c5152ceb6ad0f2efc43bd28b2b55c4df8' - 'SKIP' - '83657a141a7a4fc52ae62e19b480fd7b7e651efffc2186d3eb96e8612beffbbe71b434a2323ae37c74465ff6a959a4ca1f9c9db5ed02ab641f1784e704ab5f4d') - -build() { - local cmake_options=( - -D CMAKE_INSTALL_PREFIX=/usr - -D CMAKE_BUILD_TYPE=None - -D ENABLE_GR_ANALOG=ON - -D ENABLE_GR_AUDIO=ON - -D ENABLE_GR_BLOCKS=ON - -D ENABLE_GR_BLOCKTOOL=ON - -D ENABLE_GR_CHANNELS=ON - -D ENABLE_GR_CTRLPORT=ON - -D ENABLE_GR_DIGITAL=ON - -D ENABLE_GR_DTV=ON - -D ENABLE_GR_FEC=ON - -D ENABLE_GR_FFT=ON - -D ENABLE_GR_FILTER=ON - -D ENABLE_GR_IIO=ON - -D ENABLE_GR_MODTOOL=ON - -D ENABLE_GR_NETWORK=ON - -D ENABLE_GR_PDU=ON - -D ENABLE_GR_QTGUI=ON - -D ENABLE_GR_SOAPY=ON - -D ENABLE_GR_TRELLIS=ON - -D ENABLE_GR_UHD=ON - -D ENABLE_GR_UTILS=ON - -D ENABLE_GR_VIDEO_SDL=ON - -D ENABLE_GR_VOCODER=ON - -D ENABLE_GR_WAVELET=ON - -D ENABLE_GR_ZEROMQ=ON - -D ENABLE_GRC=ON - -D ENABLE_POSTINSTALL=OFF # we distribute freedesktop integration directly - -W no-dev - -B build - -S $pkgbase-$pkgver - ) - - cmake "${cmake_options[@]}" - cmake --build build --verbose -} - -check() { - # NOTE: disable broken tests - xvfb-run ctest --test-dir build --output-on-failure -E 'pfb_synthesizer|filter_qa_fir_filter_with_buffer.cc' -} - -package_gnuradio() { - depends+=( - alsa-lib libasound.so - boost-libs libboost_{program_options,thread}.so - fftw libfftw3f.so libfftw3f_threads.so - fmt libfmt.so - jack libjack.so - libiio libiio.so - libsndfile libsndfile.so - portaudio libportaudio.so - spdlog libspdlog.so - zeromq libzmq.so - ) - optdepends=( - 'gnuradio-companion: for GUI frontend' - 'python-setuptools: for gr_modtool' - ) - provides=( - libgnuradio-analog.so - libgnuradio-audio.so - libgnuradio-blocks.so - libgnuradio-channels.so - libgnuradio-digital.so - libgnuradio-dtv.so - libgnuradio-fec.so - libgnuradio-fft.so - libgnuradio-filter.so - libgnuradio-iio.so - libgnuradio-network.so - libgnuradio-pmt.so - libgnuradio-qtgui.so - libgnuradio-runtime.so - libgnuradio-soapy.so - libgnuradio-trellis.so - libgnuradio-uhd.so - libgnuradio-video-sdl.so - libgnuradio-vocoder.so - libgnuradio-wavelet.so - libgnuradio-zeromq.so - ) - backup=( - etc/$pkgbase/conf.d/00-grc-docs.conf - etc/$pkgbase/conf.d/gnuradio-runtime.conf - etc/$pkgbase/conf.d/gr-audio{,-{alsa,jack,oss,portaudio}}.conf - etc/$pkgbase/conf.d/gr-qtgui.conf - etc/$pkgbase/conf.d/gr_log_default.conf - etc/$pkgbase/conf.d/grc.conf - etc/$pkgbase/conf.d/modtool.conf - ) - - DESTDIR="$pkgdir" cmake --install build - install -vDm 644 21-fcd.rules -t "$pkgdir/usr/lib/udev/rules.d/" - # remove optimized bytecode files: https://github.com/gnuradio/gnuradio/issues/6463 - find "$pkgdir" -type f -iname "*.pyo" -delete - # remove unneeded freedesktop integration tooling: https://github.com/gnuradio/gnuradio/issues/6464 - rm -frv "$pkgdir/usr/libexec/" -} - -package_gnuradio-companion() { - pkgdesc="GUI frontend for gnuradio and SDR." - depends=( - gnuradio - python-cairo - python-gobject - python-lxml - python-opengl - python-pyqt5 - python-pyqtgraph - qt5-base - qwt - ) - # NOTE: we are only pulling in dependencies here -} Copied: gnuradio/repos/community-x86_64/PKGBUILD (from rev 1403012, gnuradio/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2023-02-20 06:05:22 UTC (rev 1403013) @@ -0,0 +1,202 @@ +# Maintainer: Kyle Keen <keen...@gmail.com> +# Contributor: David Runge <dv...@archlinux.org> +# Contributor: Dominik Heidler <dheid...@gmail.com> +# Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com> + +# NOTE: sonames change on each release, so *all* dependent packages have to be rebuilt! +pkgbase=gnuradio +pkgname=(gnuradio gnuradio-companion) +pkgver=3.10.5.0 +pkgrel=4 +pkgdesc="General purpose DSP and SDR toolkit with drivers for usrp and fcd." +arch=(x86_64) +url="https://gnuradio.org" +license=(GPL3) +depends=( + codec2 # host + gcc-libs + glibc + gmp # host + gsl # host + libad9361 # gnuradio.iio + libuhd # gnuradio.uhd + libunwind + libvolk # host + pybind11 # host + python-click # host + python-click-plugins # host + python-mako # host + python-matplotlib + python-numpy # host + python-packaging # host + # python-pygccxml # gnuradio.modtool # TODO: package + python-pyyaml # various + python-pyzmq # gnuradio.zeromq + python-scipy + python-thrift # runtime + sdl12-compat # gnuradio.video_sdl + soapysdr # gnuradio.soapy + spdlog # host + thrift # host +) +makedepends=( + alsa-lib # gnuradio.audio + boost + # cppzmq # gnuradio.zeromq # TODO: package + cmake + fftw # host + fmt + gtk3 + jack # gnuradio.audio + libiio # gnuradio.iio + libsndfile # host + portaudio # gnuradio.audio + python-cairo # gnuradio.companion + python-gobject # gnuradio.companion + python-lxml # gnuradio.companion + python-pyqt5 # gnuradio.qtgui + python-pyqtgraph # gnuradio.qtgui + python-pytest # only required for tests + qt5-base + qwt # gnuradio.qtgui + zeromq # gnuradio.zeromq +) +checkdepends=( + python-jsonschema + python-setuptools # gnuradio.modtool + xorg-server-xvfb +) +source=( + $pkgbase-$pkgver.tar.gz::https://github.com/$pkgbase/$pkgbase/archive/v$pkgver/$pkgbase-v$pkgver.tar.gz + https://github.com/gnuradio/gnuradio/releases/download/v$pkgver/$pkgbase-$pkgver.tar.gz.asc + 21-fcd.rules +) +validpgpkeys=( + 'B90DDFAC56989BF62262EB812987C77CBB8ED9B2' # GNU Radio Project (Admin) <ad...@gnuradio.org> + 'D74F9F146E7F755783583158B343B2BA293E5174' # Marcus Müller (GNU Radio Maintainer) <mmuel...@gnuradio.org> + '723EC3A2B90533C6B93DFBC8ED797743F7951435' # GNU Radio (Software Signing Key) <i...@gnuradio.org> +) +sha512sums=('82f3028cbcb0175f9f354b19613ee59b052881b894c6d668d04235acda2e3be0ca2713642141a917264e70039f23795c647c47364af9ffad63f108da517d77c5' + 'SKIP' + '6f02dc8e20a7a1cd11099c851a7c8427fcd21e9652e6cddd0a72ca747b0e93cd4fd1b7b7b7e426b6231348bcc34fb2417716a2f03c92ec141889edc65031c3a0') +b2sums=('c21e310d4cc50112e7d2085be5a82f4eb633305936004cc60cabbac340a0cbd0016bb5f24229380c36281c4e52e6763c5152ceb6ad0f2efc43bd28b2b55c4df8' + 'SKIP' + '83657a141a7a4fc52ae62e19b480fd7b7e651efffc2186d3eb96e8612beffbbe71b434a2323ae37c74465ff6a959a4ca1f9c9db5ed02ab641f1784e704ab5f4d') + +build() { + local cmake_options=( + -D CMAKE_INSTALL_PREFIX=/usr + -D CMAKE_BUILD_TYPE=None + -D ENABLE_GR_ANALOG=ON + -D ENABLE_GR_AUDIO=ON + -D ENABLE_GR_BLOCKS=ON + -D ENABLE_GR_BLOCKTOOL=ON + -D ENABLE_GR_CHANNELS=ON + -D ENABLE_GR_CTRLPORT=ON + -D ENABLE_GR_DIGITAL=ON + -D ENABLE_GR_DTV=ON + -D ENABLE_GR_FEC=ON + -D ENABLE_GR_FFT=ON + -D ENABLE_GR_FILTER=ON + -D ENABLE_GR_IIO=ON + -D ENABLE_GR_MODTOOL=ON + -D ENABLE_GR_NETWORK=ON + -D ENABLE_GR_PDU=ON + -D ENABLE_GR_QTGUI=ON + -D ENABLE_GR_SOAPY=ON + -D ENABLE_GR_TRELLIS=ON + -D ENABLE_GR_UHD=ON + -D ENABLE_GR_UTILS=ON + -D ENABLE_GR_VIDEO_SDL=ON + -D ENABLE_GR_VOCODER=ON + -D ENABLE_GR_WAVELET=ON + -D ENABLE_GR_ZEROMQ=ON + -D ENABLE_GRC=ON + -D ENABLE_POSTINSTALL=OFF # we distribute freedesktop integration directly + -W no-dev + -B build + -S $pkgbase-$pkgver + ) + + cmake "${cmake_options[@]}" + cmake --build build --verbose +} + +check() { + # NOTE: disable broken tests + xvfb-run ctest --test-dir build --output-on-failure -E 'pfb_synthesizer|filter_qa_fir_filter_with_buffer.cc' +} + +package_gnuradio() { + depends+=( + alsa-lib libasound.so + boost-libs libboost_{program_options,thread}.so + fftw libfftw3f.so libfftw3f_threads.so + fmt libfmt.so + jack libjack.so + libiio libiio.so + libsndfile libsndfile.so + portaudio libportaudio.so + spdlog libspdlog.so + zeromq libzmq.so + ) + optdepends=( + 'gnuradio-companion: for GUI frontend' + 'python-setuptools: for gr_modtool' + ) + provides=( + libgnuradio-analog.so + libgnuradio-audio.so + libgnuradio-blocks.so + libgnuradio-channels.so + libgnuradio-digital.so + libgnuradio-dtv.so + libgnuradio-fec.so + libgnuradio-fft.so + libgnuradio-filter.so + libgnuradio-iio.so + libgnuradio-network.so + libgnuradio-pmt.so + libgnuradio-qtgui.so + libgnuradio-runtime.so + libgnuradio-soapy.so + libgnuradio-trellis.so + libgnuradio-uhd.so + libgnuradio-video-sdl.so + libgnuradio-vocoder.so + libgnuradio-wavelet.so + libgnuradio-zeromq.so + ) + backup=( + etc/$pkgbase/conf.d/00-grc-docs.conf + etc/$pkgbase/conf.d/gnuradio-runtime.conf + etc/$pkgbase/conf.d/gr-audio{,-{alsa,jack,oss,portaudio}}.conf + etc/$pkgbase/conf.d/gr-qtgui.conf + etc/$pkgbase/conf.d/gr_log_default.conf + etc/$pkgbase/conf.d/grc.conf + etc/$pkgbase/conf.d/modtool.conf + ) + + DESTDIR="$pkgdir" cmake --install build + install -vDm 644 21-fcd.rules -t "$pkgdir/usr/lib/udev/rules.d/" + # remove optimized bytecode files: https://github.com/gnuradio/gnuradio/issues/6463 + find "$pkgdir" -type f -iname "*.pyo" -delete + # remove unneeded freedesktop integration tooling: https://github.com/gnuradio/gnuradio/issues/6464 + rm -frv "$pkgdir/usr/libexec/" +} + +package_gnuradio-companion() { + pkgdesc="GUI frontend for gnuradio and SDR." + depends=( + gnuradio + python-cairo + python-gobject + python-lxml + python-opengl + python-pyqt5 + python-pyqtgraph + qt5-base + qwt + ) + # NOTE: we are only pulling in dependencies here +} Deleted: gnuradio-bind-placeholders.patch =================================================================== --- gnuradio-bind-placeholders.patch 2023-02-20 06:04:39 UTC (rev 1403012) +++ gnuradio-bind-placeholders.patch 2023-02-20 06:05:22 UTC (rev 1403013) @@ -1,461 +0,0 @@ ---- gnuradio-3.8.1.0/gnuradio-runtime/lib/block.cc~ 2020-06-03 15:51:57.779451140 +0100 -+++ gnuradio-3.8.1.0/gnuradio-runtime/lib/block.cc 2020-06-03 15:52:03.567451466 +0100 -@@ -34,6 +34,8 @@ - - namespace gr { - -+using namespace boost::placeholders; -+ - block::block(const std::string& name, - io_signature::sptr input_signature, - io_signature::sptr output_signature) ---- gnuradio-3.8.1.0/gr-blocks/lib/copy_impl.cc~ 2020-06-03 16:48:48.001299713 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/copy_impl.cc 2020-06-03 16:48:15.300285011 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - copy::sptr copy::make(size_t itemsize) - { - return gnuradio::get_initial_sptr(new copy_impl(itemsize)); ---- gnuradio-3.8.1.0/gr-blocks/lib/message_debug_impl.cc~ 2020-06-03 16:52:57.083411688 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/message_debug_impl.cc 2020-06-03 16:52:59.468412760 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - message_debug::sptr message_debug::make() - { - return gnuradio::get_initial_sptr(new message_debug_impl()); ---- gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_impl.cc~ 2020-06-03 16:53:34.139428345 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_impl.cc 2020-06-03 16:53:35.651429024 +0100 -@@ -38,6 +38,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - message_strobe::sptr message_strobe::make(pmt::pmt_t msg, long period_ms) - { - return gnuradio::get_initial_sptr(new message_strobe_impl(msg, period_ms)); ---- gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_random_impl.cc~ 2020-06-03 16:53:52.959436804 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_random_impl.cc 2020-06-03 16:53:55.259437840 +0100 -@@ -38,6 +38,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - message_strobe_random::sptr - message_strobe_random::make(pmt::pmt_t msg, - message_strobe_random_distribution_t dist, ---- gnuradio-3.8.1.0/gr-blocks/lib/multiply_matrix_impl.cc~ 2020-06-03 16:48:42.217297113 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/multiply_matrix_impl.cc 2020-06-03 16:48:44.149297981 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - // Copy tags from input k to output l if A[l][k] is not zero - template <> - void multiply_matrix_impl<gr_complex>::propagate_tags_by_A(int noutput_items, ---- gnuradio-3.8.1.0/gr-blocks/lib/mute_impl.cc~ 2020-06-03 16:44:53.010194065 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/mute_impl.cc 2020-06-03 16:45:12.423202794 +0100 -@@ -33,6 +33,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - template <class T> - typename mute_blk<T>::sptr mute_blk<T>::make(bool mute) - { ---- gnuradio-3.8.1.0/gr-blocks/lib/pdu_filter_impl.cc~ 2020-06-03 16:55:05.835454141 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_filter_impl.cc 2020-06-03 16:55:08.074454516 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - pdu_filter::sptr pdu_filter::make(pmt::pmt_t k, pmt::pmt_t v, bool invert) - { - return gnuradio::get_initial_sptr(new pdu_filter_impl(k, v, invert)); ---- gnuradio-3.8.1.0/gr-blocks/lib/pdu_remove_impl.cc~ 2020-06-03 16:56:03.653466103 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_remove_impl.cc 2020-06-03 16:56:05.132466450 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - pdu_remove::sptr pdu_remove::make(pmt::pmt_t k) - { - return gnuradio::get_initial_sptr(new pdu_remove_impl(k)); ---- gnuradio-3.8.1.0/gr-blocks/lib/pdu_set_impl.cc~ 2020-06-03 16:55:43.765461437 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_set_impl.cc 2020-06-03 16:55:45.990461957 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - pdu_set::sptr pdu_set::make(pmt::pmt_t k, pmt::pmt_t v) - { - return gnuradio::get_initial_sptr(new pdu_set_impl(k, v)); ---- gnuradio-3.8.1.0/gr-blocks/lib/random_pdu_impl.cc~ 2020-06-03 16:56:32.885472969 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/random_pdu_impl.cc 2020-06-03 16:56:34.848473430 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - random_pdu::sptr - random_pdu::make(int min_items, int max_items, unsigned char byte_mask, int length_modulo) - { ---- gnuradio-3.8.1.0/gr-blocks/lib/repeat_impl.cc~ 2020-06-03 16:57:12.092482177 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/repeat_impl.cc 2020-06-03 16:57:13.822482583 +0100 -@@ -30,6 +30,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - repeat::sptr repeat::make(size_t itemsize, int interp) - { - return gnuradio::get_initial_sptr(new repeat_impl(itemsize, interp)); ---- gnuradio-3.8.1.0/gr-zeromq/lib/push_msg_sink_impl.cc~ 2020-06-03 16:48:54.673302712 +0100 -+++ gnuradio-3.8.1.0/gr-zeromq/lib/push_msg_sink_impl.cc 2020-06-03 16:47:55.975276324 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace zeromq { - -+using namespace boost::placeholders; -+ - push_msg_sink::sptr push_msg_sink::make(char* address, int timeout, bool bind) - { - return gnuradio::get_initial_sptr(new push_msg_sink_impl(address, timeout, bind)); ---- gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc~ 2020-06-03 17:20:39.245825015 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc 2020-06-03 17:20:52.819828566 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - socket_pdu::sptr socket_pdu::make(std::string type, - std::string addr, - std::string port, ---- gnuradio-3.8.1.0/gr-zeromq/lib/pub_msg_sink_impl.cc~ 2020-06-03 17:21:50.046843529 +0100 -+++ gnuradio-3.8.1.0/gr-zeromq/lib/pub_msg_sink_impl.cc 2020-06-03 17:21:57.819845564 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace zeromq { - -+using namespace boost::placeholders; -+ - pub_msg_sink::sptr pub_msg_sink::make(char* address, int timeout, bool bind) - { - return gnuradio::get_initial_sptr(new pub_msg_sink_impl(address, timeout, bool)); ---- gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc~ 2020-06-03 17:35:50.436093636 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2020-06-03 17:36:01.704097517 +0100 -@@ -30,6 +30,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - tagged_stream_multiply_length::sptr tagged_stream_multiply_length::make( - size_t itemsize, const std::string& lengthtagname, double scalar) - { ---- gnuradio-3.8.1.0/gr-blocks/lib/tuntap_pdu_impl.cc~ 2020-06-03 17:46:10.583307228 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/tuntap_pdu_impl.cc 2020-06-03 17:46:23.642311727 +0100 -@@ -42,6 +42,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - tuntap_pdu::sptr tuntap_pdu::make(std::string dev, int MTU, bool istunflag) - { - #if (defined(linux) || defined(__linux) || defined(__linux__)) ---- gnuradio-3.8.1.0/gr-fec/lib/async_encoder_impl.cc~ 2020-06-03 17:53:59.572468794 +0100 -+++ gnuradio-3.8.1.0/gr-fec/lib/async_encoder_impl.cc 2020-06-03 17:54:10.438472537 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace fec { - -+using namespace boost::placeholders; -+ - async_encoder::sptr async_encoder::make(generic_encoder::sptr my_encoder, - bool packed, - bool rev_unpack, ---- gnuradio-3.8.1.0/gr-fec/lib/async_decoder_impl.cc~ 2020-06-03 17:54:23.920477182 +0100 -+++ gnuradio-3.8.1.0/gr-fec/lib/async_decoder_impl.cc 2020-06-03 17:54:33.581480511 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace fec { - -+using namespace boost::placeholders; -+ - async_decoder::sptr - async_decoder::make(generic_decoder::sptr my_decoder, bool packed, bool rev_pack, int mtu) - { ---- gnuradio-3.8.1.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc~ 2020-06-03 17:54:45.106484482 +0100 -+++ gnuradio-3.8.1.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc 2020-06-03 17:54:57.687488823 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace filter { - -+using namespace boost::placeholders; -+ - template <class IN_T, class OUT_T, class TAP_T> - typename freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>::sptr - freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>::make(int decimation, ---- gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_ff_impl.cc~ 2020-06-03 18:11:26.622789087 +0100 -+++ gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_ff_impl.cc 2020-06-03 18:11:49.178794574 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace filter { - -+using namespace boost::placeholders; -+ - mmse_resampler_ff::sptr mmse_resampler_ff::make(float phase_shift, float resamp_ratio) - { - return gnuradio::get_initial_sptr( ---- gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_cc_impl.cc~ 2020-06-03 18:12:00.982797440 +0100 -+++ gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_cc_impl.cc 2020-06-03 18:12:09.225799444 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace filter { - -+using namespace boost::placeholders; -+ - mmse_resampler_cc::sptr mmse_resampler_cc::make(float phase_shift, float resamp_ratio) - { - return gnuradio::get_initial_sptr( ---- gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_f_impl.cc~ 2020-06-03 18:33:55.755116400 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_f_impl.cc 2020-06-03 18:34:05.401118739 +0100 -@@ -37,6 +37,7 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; - - freq_sink_f::sptr freq_sink_f::make(int fftsize, - int wintype, ---- gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_c_impl.cc~ 2020-06-03 18:34:16.116121337 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_c_impl.cc 2020-06-03 18:34:26.130123766 +0100 -@@ -38,6 +38,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - freq_sink_c::sptr freq_sink_c::make(int fftsize, - int wintype, - double fc, ---- gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_f_impl.cc~ 2020-06-03 18:34:49.413129410 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_f_impl.cc 2020-06-03 18:35:00.258132040 +0100 -@@ -36,6 +36,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - time_raster_sink_f::sptr time_raster_sink_f::make(double samp_rate, - double rows, - double cols, ---- gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_b_impl.cc~ 2020-06-03 18:35:16.004135858 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_b_impl.cc 2020-06-03 18:35:28.818138965 +0100 -@@ -36,6 +36,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - time_raster_sink_b::sptr time_raster_sink_b::make(double samp_rate, - double rows, - double cols, ---- gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_f_impl.cc~ 2020-06-03 18:35:46.982143370 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_f_impl.cc 2020-06-03 18:35:58.555146176 +0100 -@@ -40,6 +40,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - time_sink_f::sptr time_sink_f::make(int size, - double samp_rate, - const std::string& name, ---- gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_c_impl.cc~ 2020-06-03 18:36:10.189148997 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_c_impl.cc 2020-06-03 18:36:21.394151714 +0100 -@@ -39,6 +39,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - time_sink_c::sptr time_sink_c::make(int size, - double samp_rate, - const std::string& name, ---- gnuradio-3.8.1.0/gr-qtgui/lib/sink_f_impl.cc~ 2020-06-03 18:36:31.583154184 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/sink_f_impl.cc 2020-06-03 18:36:41.626156620 +0100 -@@ -36,6 +36,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - sink_f::sptr sink_f::make(int fftsize, - int wintype, - double fc, ---- gnuradio-3.8.1.0/gr-qtgui/lib/sink_c_impl.cc~ 2020-06-03 18:36:54.167159661 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/sink_c_impl.cc 2020-06-03 18:37:04.898162263 +0100 -@@ -36,6 +36,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - sink_c::sptr sink_c::make(int fftsize, - int wintype, - double fc, ---- gnuradio-3.8.1.0/gr-analog/lib/sig_source_impl.cc~ 2020-06-03 18:37:26.774167567 +0100 -+++ gnuradio-3.8.1.0/gr-analog/lib/sig_source_impl.cc 2020-06-03 18:37:38.170170330 +0100 -@@ -36,6 +36,8 @@ - namespace gr { - namespace analog { - -+using namespace boost::placeholders; -+ - template <class T> - typename sig_source<T>::sptr sig_source<T>::make(double sampling_freq, - gr_waveform_t waveform, ---- gnuradio-3.8.1.0/gr-digital/lib/chunks_to_symbols_impl.cc~ 2020-06-03 19:28:24.388506913 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/chunks_to_symbols_impl.cc 2020-06-03 19:28:36.713514932 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - template <class IN_T, class OUT_T> - typename chunks_to_symbols<IN_T, OUT_T>::sptr - chunks_to_symbols<IN_T, OUT_T>::make(const std::vector<OUT_T>& symbol_table, const int D) ---- gnuradio-3.8.1.0/gr-digital/lib/constellation_receiver_cb_impl.cc~ 2020-06-03 19:28:46.334521192 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/constellation_receiver_cb_impl.cc 2020-06-03 19:28:57.697528585 +0100 -@@ -34,6 +34,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - #define VERBOSE_MM 0 // Used for debugging symbol timing loop - #define VERBOSE_COSTAS 0 // Used for debugging phase and frequency tracking - ---- gnuradio-3.8.1.0/gr-digital/lib/costas_loop_cc_impl.cc~ 2020-06-03 19:29:06.799534507 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/costas_loop_cc_impl.cc 2020-06-03 19:29:16.802541015 +0100 -@@ -34,6 +34,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - costas_loop_cc::sptr costas_loop_cc::make(float loop_bw, int order, bool use_snr) - { - return gnuradio::get_initial_sptr(new costas_loop_cc_impl(loop_bw, order, use_snr)); ---- gnuradio-3.8.1.0/gr-qtgui/lib/const_sink_c_impl.cc~ 2020-06-03 19:29:29.694549403 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/const_sink_c_impl.cc 2020-06-03 19:29:38.089554865 +0100 -@@ -35,6 +35,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - const_sink_c::sptr - const_sink_c::make(int size, const std::string& name, int nconnections, QWidget* parent) - { ---- gnuradio-3.8.1.0/gr-digital/lib/crc32_async_bb_impl.cc~ 2020-06-03 19:29:48.487561630 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/crc32_async_bb_impl.cc 2020-06-03 19:30:02.250570584 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - crc32_async_bb::sptr crc32_async_bb::make(bool check) - { - return gnuradio::get_initial_sptr(new crc32_async_bb_impl(check)); ---- gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_f_impl.cc~ 2020-06-03 19:30:17.822580714 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_f_impl.cc 2020-06-03 19:30:28.490587655 +0100 -@@ -37,6 +37,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - waterfall_sink_f::sptr waterfall_sink_f::make(int fftsize, - int wintype, - double fc, ---- gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_c_impl.cc~ 2020-06-03 19:32:58.390685182 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_c_impl.cc 2020-06-03 19:33:14.002695338 +0100 -@@ -39,6 +39,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - waterfall_sink_c::sptr waterfall_sink_c::make(int fftsize, - int wintype, - double fc, ---- gnuradio-3.8.1.0/gr-qtgui/lib/histogram_sink_f_impl.cc~ 2020-06-03 19:33:35.366709261 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/histogram_sink_f_impl.cc 2020-06-03 19:33:41.602713329 +0100 -@@ -37,6 +37,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - histogram_sink_f::sptr histogram_sink_f::make(int size, - int bins, - double xmin, ---- gnuradio-3.8.1.0/gr-qtgui/lib/edit_box_msg_impl.cc~ 2020-06-03 19:33:51.836719995 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/edit_box_msg_impl.cc 2020-06-03 19:34:00.055725357 +0100 -@@ -35,6 +35,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - edit_box_msg::sptr edit_box_msg::make(data_type_t type, - const std::string& label, - const std::string& value, ---- gnuradio-3.8.1.0/gr-digital/lib/header_payload_demux_impl.cc~ 2020-06-03 19:34:13.356734041 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/header_payload_demux_impl.cc 2020-06-03 19:34:20.622738782 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - const pmt::pmt_t header_payload_demux_impl::msg_port_id() - { - static const pmt::pmt_t msg_port_id = pmt::mp("header_data"); ---- gnuradio-3.8.1.0/gr-digital/lib/protocol_formatter_async_impl.cc~ 2020-06-03 19:34:29.133744331 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/protocol_formatter_async_impl.cc 2020-06-03 19:34:34.557747861 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - protocol_formatter_async::sptr - protocol_formatter_async::make(const header_format_base::sptr& format) - { Copied: gnuradio/repos/community-x86_64/gnuradio-bind-placeholders.patch (from rev 1403012, gnuradio/trunk/gnuradio-bind-placeholders.patch) =================================================================== --- gnuradio-bind-placeholders.patch (rev 0) +++ gnuradio-bind-placeholders.patch 2023-02-20 06:05:22 UTC (rev 1403013) @@ -0,0 +1,461 @@ +--- gnuradio-3.8.1.0/gnuradio-runtime/lib/block.cc~ 2020-06-03 15:51:57.779451140 +0100 ++++ gnuradio-3.8.1.0/gnuradio-runtime/lib/block.cc 2020-06-03 15:52:03.567451466 +0100 +@@ -34,6 +34,8 @@ + + namespace gr { + ++using namespace boost::placeholders; ++ + block::block(const std::string& name, + io_signature::sptr input_signature, + io_signature::sptr output_signature) +--- gnuradio-3.8.1.0/gr-blocks/lib/copy_impl.cc~ 2020-06-03 16:48:48.001299713 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/copy_impl.cc 2020-06-03 16:48:15.300285011 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + copy::sptr copy::make(size_t itemsize) + { + return gnuradio::get_initial_sptr(new copy_impl(itemsize)); +--- gnuradio-3.8.1.0/gr-blocks/lib/message_debug_impl.cc~ 2020-06-03 16:52:57.083411688 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/message_debug_impl.cc 2020-06-03 16:52:59.468412760 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + message_debug::sptr message_debug::make() + { + return gnuradio::get_initial_sptr(new message_debug_impl()); +--- gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_impl.cc~ 2020-06-03 16:53:34.139428345 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_impl.cc 2020-06-03 16:53:35.651429024 +0100 +@@ -38,6 +38,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + message_strobe::sptr message_strobe::make(pmt::pmt_t msg, long period_ms) + { + return gnuradio::get_initial_sptr(new message_strobe_impl(msg, period_ms)); +--- gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_random_impl.cc~ 2020-06-03 16:53:52.959436804 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_random_impl.cc 2020-06-03 16:53:55.259437840 +0100 +@@ -38,6 +38,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + message_strobe_random::sptr + message_strobe_random::make(pmt::pmt_t msg, + message_strobe_random_distribution_t dist, +--- gnuradio-3.8.1.0/gr-blocks/lib/multiply_matrix_impl.cc~ 2020-06-03 16:48:42.217297113 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/multiply_matrix_impl.cc 2020-06-03 16:48:44.149297981 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + // Copy tags from input k to output l if A[l][k] is not zero + template <> + void multiply_matrix_impl<gr_complex>::propagate_tags_by_A(int noutput_items, +--- gnuradio-3.8.1.0/gr-blocks/lib/mute_impl.cc~ 2020-06-03 16:44:53.010194065 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/mute_impl.cc 2020-06-03 16:45:12.423202794 +0100 +@@ -33,6 +33,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + template <class T> + typename mute_blk<T>::sptr mute_blk<T>::make(bool mute) + { +--- gnuradio-3.8.1.0/gr-blocks/lib/pdu_filter_impl.cc~ 2020-06-03 16:55:05.835454141 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_filter_impl.cc 2020-06-03 16:55:08.074454516 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + pdu_filter::sptr pdu_filter::make(pmt::pmt_t k, pmt::pmt_t v, bool invert) + { + return gnuradio::get_initial_sptr(new pdu_filter_impl(k, v, invert)); +--- gnuradio-3.8.1.0/gr-blocks/lib/pdu_remove_impl.cc~ 2020-06-03 16:56:03.653466103 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_remove_impl.cc 2020-06-03 16:56:05.132466450 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + pdu_remove::sptr pdu_remove::make(pmt::pmt_t k) + { + return gnuradio::get_initial_sptr(new pdu_remove_impl(k)); +--- gnuradio-3.8.1.0/gr-blocks/lib/pdu_set_impl.cc~ 2020-06-03 16:55:43.765461437 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_set_impl.cc 2020-06-03 16:55:45.990461957 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + pdu_set::sptr pdu_set::make(pmt::pmt_t k, pmt::pmt_t v) + { + return gnuradio::get_initial_sptr(new pdu_set_impl(k, v)); +--- gnuradio-3.8.1.0/gr-blocks/lib/random_pdu_impl.cc~ 2020-06-03 16:56:32.885472969 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/random_pdu_impl.cc 2020-06-03 16:56:34.848473430 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + random_pdu::sptr + random_pdu::make(int min_items, int max_items, unsigned char byte_mask, int length_modulo) + { +--- gnuradio-3.8.1.0/gr-blocks/lib/repeat_impl.cc~ 2020-06-03 16:57:12.092482177 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/repeat_impl.cc 2020-06-03 16:57:13.822482583 +0100 +@@ -30,6 +30,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + repeat::sptr repeat::make(size_t itemsize, int interp) + { + return gnuradio::get_initial_sptr(new repeat_impl(itemsize, interp)); +--- gnuradio-3.8.1.0/gr-zeromq/lib/push_msg_sink_impl.cc~ 2020-06-03 16:48:54.673302712 +0100 ++++ gnuradio-3.8.1.0/gr-zeromq/lib/push_msg_sink_impl.cc 2020-06-03 16:47:55.975276324 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace zeromq { + ++using namespace boost::placeholders; ++ + push_msg_sink::sptr push_msg_sink::make(char* address, int timeout, bool bind) + { + return gnuradio::get_initial_sptr(new push_msg_sink_impl(address, timeout, bind)); +--- gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc~ 2020-06-03 17:20:39.245825015 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc 2020-06-03 17:20:52.819828566 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + socket_pdu::sptr socket_pdu::make(std::string type, + std::string addr, + std::string port, +--- gnuradio-3.8.1.0/gr-zeromq/lib/pub_msg_sink_impl.cc~ 2020-06-03 17:21:50.046843529 +0100 ++++ gnuradio-3.8.1.0/gr-zeromq/lib/pub_msg_sink_impl.cc 2020-06-03 17:21:57.819845564 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace zeromq { + ++using namespace boost::placeholders; ++ + pub_msg_sink::sptr pub_msg_sink::make(char* address, int timeout, bool bind) + { + return gnuradio::get_initial_sptr(new pub_msg_sink_impl(address, timeout, bool)); +--- gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc~ 2020-06-03 17:35:50.436093636 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2020-06-03 17:36:01.704097517 +0100 +@@ -30,6 +30,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + tagged_stream_multiply_length::sptr tagged_stream_multiply_length::make( + size_t itemsize, const std::string& lengthtagname, double scalar) + { +--- gnuradio-3.8.1.0/gr-blocks/lib/tuntap_pdu_impl.cc~ 2020-06-03 17:46:10.583307228 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/tuntap_pdu_impl.cc 2020-06-03 17:46:23.642311727 +0100 +@@ -42,6 +42,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + tuntap_pdu::sptr tuntap_pdu::make(std::string dev, int MTU, bool istunflag) + { + #if (defined(linux) || defined(__linux) || defined(__linux__)) +--- gnuradio-3.8.1.0/gr-fec/lib/async_encoder_impl.cc~ 2020-06-03 17:53:59.572468794 +0100 ++++ gnuradio-3.8.1.0/gr-fec/lib/async_encoder_impl.cc 2020-06-03 17:54:10.438472537 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace fec { + ++using namespace boost::placeholders; ++ + async_encoder::sptr async_encoder::make(generic_encoder::sptr my_encoder, + bool packed, + bool rev_unpack, +--- gnuradio-3.8.1.0/gr-fec/lib/async_decoder_impl.cc~ 2020-06-03 17:54:23.920477182 +0100 ++++ gnuradio-3.8.1.0/gr-fec/lib/async_decoder_impl.cc 2020-06-03 17:54:33.581480511 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace fec { + ++using namespace boost::placeholders; ++ + async_decoder::sptr + async_decoder::make(generic_decoder::sptr my_decoder, bool packed, bool rev_pack, int mtu) + { +--- gnuradio-3.8.1.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc~ 2020-06-03 17:54:45.106484482 +0100 ++++ gnuradio-3.8.1.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc 2020-06-03 17:54:57.687488823 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace filter { + ++using namespace boost::placeholders; ++ + template <class IN_T, class OUT_T, class TAP_T> + typename freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>::sptr + freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>::make(int decimation, +--- gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_ff_impl.cc~ 2020-06-03 18:11:26.622789087 +0100 ++++ gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_ff_impl.cc 2020-06-03 18:11:49.178794574 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace filter { + ++using namespace boost::placeholders; ++ + mmse_resampler_ff::sptr mmse_resampler_ff::make(float phase_shift, float resamp_ratio) + { + return gnuradio::get_initial_sptr( +--- gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_cc_impl.cc~ 2020-06-03 18:12:00.982797440 +0100 ++++ gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_cc_impl.cc 2020-06-03 18:12:09.225799444 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace filter { + ++using namespace boost::placeholders; ++ + mmse_resampler_cc::sptr mmse_resampler_cc::make(float phase_shift, float resamp_ratio) + { + return gnuradio::get_initial_sptr( +--- gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_f_impl.cc~ 2020-06-03 18:33:55.755116400 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_f_impl.cc 2020-06-03 18:34:05.401118739 +0100 +@@ -37,6 +37,7 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; + + freq_sink_f::sptr freq_sink_f::make(int fftsize, + int wintype, +--- gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_c_impl.cc~ 2020-06-03 18:34:16.116121337 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_c_impl.cc 2020-06-03 18:34:26.130123766 +0100 +@@ -38,6 +38,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + freq_sink_c::sptr freq_sink_c::make(int fftsize, + int wintype, + double fc, +--- gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_f_impl.cc~ 2020-06-03 18:34:49.413129410 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_f_impl.cc 2020-06-03 18:35:00.258132040 +0100 +@@ -36,6 +36,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + time_raster_sink_f::sptr time_raster_sink_f::make(double samp_rate, + double rows, + double cols, +--- gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_b_impl.cc~ 2020-06-03 18:35:16.004135858 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_b_impl.cc 2020-06-03 18:35:28.818138965 +0100 +@@ -36,6 +36,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + time_raster_sink_b::sptr time_raster_sink_b::make(double samp_rate, + double rows, + double cols, +--- gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_f_impl.cc~ 2020-06-03 18:35:46.982143370 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_f_impl.cc 2020-06-03 18:35:58.555146176 +0100 +@@ -40,6 +40,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + time_sink_f::sptr time_sink_f::make(int size, + double samp_rate, + const std::string& name, +--- gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_c_impl.cc~ 2020-06-03 18:36:10.189148997 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_c_impl.cc 2020-06-03 18:36:21.394151714 +0100 +@@ -39,6 +39,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + time_sink_c::sptr time_sink_c::make(int size, + double samp_rate, + const std::string& name, +--- gnuradio-3.8.1.0/gr-qtgui/lib/sink_f_impl.cc~ 2020-06-03 18:36:31.583154184 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/sink_f_impl.cc 2020-06-03 18:36:41.626156620 +0100 +@@ -36,6 +36,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + sink_f::sptr sink_f::make(int fftsize, + int wintype, + double fc, +--- gnuradio-3.8.1.0/gr-qtgui/lib/sink_c_impl.cc~ 2020-06-03 18:36:54.167159661 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/sink_c_impl.cc 2020-06-03 18:37:04.898162263 +0100 +@@ -36,6 +36,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + sink_c::sptr sink_c::make(int fftsize, + int wintype, + double fc, +--- gnuradio-3.8.1.0/gr-analog/lib/sig_source_impl.cc~ 2020-06-03 18:37:26.774167567 +0100 ++++ gnuradio-3.8.1.0/gr-analog/lib/sig_source_impl.cc 2020-06-03 18:37:38.170170330 +0100 +@@ -36,6 +36,8 @@ + namespace gr { + namespace analog { + ++using namespace boost::placeholders; ++ + template <class T> + typename sig_source<T>::sptr sig_source<T>::make(double sampling_freq, + gr_waveform_t waveform, +--- gnuradio-3.8.1.0/gr-digital/lib/chunks_to_symbols_impl.cc~ 2020-06-03 19:28:24.388506913 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/chunks_to_symbols_impl.cc 2020-06-03 19:28:36.713514932 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + template <class IN_T, class OUT_T> + typename chunks_to_symbols<IN_T, OUT_T>::sptr + chunks_to_symbols<IN_T, OUT_T>::make(const std::vector<OUT_T>& symbol_table, const int D) +--- gnuradio-3.8.1.0/gr-digital/lib/constellation_receiver_cb_impl.cc~ 2020-06-03 19:28:46.334521192 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/constellation_receiver_cb_impl.cc 2020-06-03 19:28:57.697528585 +0100 +@@ -34,6 +34,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + #define VERBOSE_MM 0 // Used for debugging symbol timing loop + #define VERBOSE_COSTAS 0 // Used for debugging phase and frequency tracking + +--- gnuradio-3.8.1.0/gr-digital/lib/costas_loop_cc_impl.cc~ 2020-06-03 19:29:06.799534507 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/costas_loop_cc_impl.cc 2020-06-03 19:29:16.802541015 +0100 +@@ -34,6 +34,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + costas_loop_cc::sptr costas_loop_cc::make(float loop_bw, int order, bool use_snr) + { + return gnuradio::get_initial_sptr(new costas_loop_cc_impl(loop_bw, order, use_snr)); +--- gnuradio-3.8.1.0/gr-qtgui/lib/const_sink_c_impl.cc~ 2020-06-03 19:29:29.694549403 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/const_sink_c_impl.cc 2020-06-03 19:29:38.089554865 +0100 +@@ -35,6 +35,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + const_sink_c::sptr + const_sink_c::make(int size, const std::string& name, int nconnections, QWidget* parent) + { +--- gnuradio-3.8.1.0/gr-digital/lib/crc32_async_bb_impl.cc~ 2020-06-03 19:29:48.487561630 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/crc32_async_bb_impl.cc 2020-06-03 19:30:02.250570584 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + crc32_async_bb::sptr crc32_async_bb::make(bool check) + { + return gnuradio::get_initial_sptr(new crc32_async_bb_impl(check)); +--- gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_f_impl.cc~ 2020-06-03 19:30:17.822580714 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_f_impl.cc 2020-06-03 19:30:28.490587655 +0100 +@@ -37,6 +37,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + waterfall_sink_f::sptr waterfall_sink_f::make(int fftsize, + int wintype, + double fc, +--- gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_c_impl.cc~ 2020-06-03 19:32:58.390685182 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_c_impl.cc 2020-06-03 19:33:14.002695338 +0100 +@@ -39,6 +39,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + waterfall_sink_c::sptr waterfall_sink_c::make(int fftsize, + int wintype, + double fc, +--- gnuradio-3.8.1.0/gr-qtgui/lib/histogram_sink_f_impl.cc~ 2020-06-03 19:33:35.366709261 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/histogram_sink_f_impl.cc 2020-06-03 19:33:41.602713329 +0100 +@@ -37,6 +37,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + histogram_sink_f::sptr histogram_sink_f::make(int size, + int bins, + double xmin, +--- gnuradio-3.8.1.0/gr-qtgui/lib/edit_box_msg_impl.cc~ 2020-06-03 19:33:51.836719995 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/edit_box_msg_impl.cc 2020-06-03 19:34:00.055725357 +0100 +@@ -35,6 +35,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + edit_box_msg::sptr edit_box_msg::make(data_type_t type, + const std::string& label, + const std::string& value, +--- gnuradio-3.8.1.0/gr-digital/lib/header_payload_demux_impl.cc~ 2020-06-03 19:34:13.356734041 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/header_payload_demux_impl.cc 2020-06-03 19:34:20.622738782 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + const pmt::pmt_t header_payload_demux_impl::msg_port_id() + { + static const pmt::pmt_t msg_port_id = pmt::mp("header_data"); +--- gnuradio-3.8.1.0/gr-digital/lib/protocol_formatter_async_impl.cc~ 2020-06-03 19:34:29.133744331 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/protocol_formatter_async_impl.cc 2020-06-03 19:34:34.557747861 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + protocol_formatter_async::sptr + protocol_formatter_async::make(const header_format_base::sptr& format) + { Deleted: gnuradio-fmt-9.0.patch =================================================================== --- gnuradio-fmt-9.0.patch 2023-02-20 06:04:39 UTC (rev 1403012) +++ gnuradio-fmt-9.0.patch 2023-02-20 06:05:22 UTC (rev 1403013) @@ -1,145 +0,0 @@ -From e63ee41fd455cdd39ae983c258d8632c3ea57fc6 Mon Sep 17 00:00:00 2001 -From: Huang Rui <vows...@gmail.com> -Date: Sun, 7 Aug 2022 22:06:30 +0800 -Subject: [PATCH] Fix build failures with libfmt-9.0.0 - -libfmt-9.0.0 require explicit tagging of ARG types. This commit -adds those tags for the types that are currently formatted via fmt. - -Bug: https://bugs.gentoo.org/858659 -Closes: https://github.com/gnuradio/gnuradio/issues/6052 -Signed-off-by: Huang Rui <vows...@gmail.com> ---- - gnuradio-runtime/lib/flat_flowgraph.cc | 25 ++++++++++++++++++++++ - gnuradio-runtime/lib/flowgraph.cc | 10 +++++++++ - gnuradio-runtime/lib/hier_block2_detail.cc | 19 ++++++++++++++++ - gr-analog/lib/sig_source_impl.cc | 10 +++++++++ - gr-uhd/lib/usrp_block_impl.cc | 7 ++++++ - 5 files changed, 71 insertions(+) - -diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc -index 42875fb4c32..ac7c8ce9109 100644 ---- a/gnuradio-runtime/lib/flat_flowgraph.cc -+++ b/gnuradio-runtime/lib/flat_flowgraph.cc -@@ -25,6 +25,31 @@ - #include <map> - #include <numeric> - -+#if FMT_VERSION >= 90000 -+#include <fmt/ostream.h> -+template <> -+struct fmt::formatter<gr::edge> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<gr::msg_endpoint> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<gr::block_detail>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<gr::buffer_reader>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<gr::buffer>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { -+}; -+#endif // FMT_VERSION >= 90000 -+ - namespace gr { - - -diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc -index 0bc04adc22c..6c63b834a89 100644 ---- a/gnuradio-runtime/lib/flowgraph.cc -+++ b/gnuradio-runtime/lib/flowgraph.cc -@@ -20,6 +20,16 @@ - // TODO: Replace with GNU Radio logging - #include <iostream> - -+#if FMT_VERSION >= 90000 -+#include <fmt/ostream.h> -+template <> -+struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { -+}; -+#endif // FMT_VERSION >= 90000 -+ - namespace gr { - - edge::~edge() {} -diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc -index 5cb42030dca..d3e27aee5b4 100644 ---- a/gnuradio-runtime/lib/hier_block2_detail.cc -+++ b/gnuradio-runtime/lib/hier_block2_detail.cc -@@ -22,6 +22,25 @@ - // TODO: Replace with GNU Radio logging - #include <iostream> - -+#if FMT_VERSION >= 90000 -+#include <fmt/ostream.h> -+template <> -+struct fmt::formatter<gr::edge> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<gr::endpoint> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<gr::msg_endpoint> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { -+}; -+#endif // FMT_VERSION >= 90000 -+ - namespace gr { - - hier_block2_detail::hier_block2_detail(hier_block2* owner) -diff --git a/gr-analog/lib/sig_source_impl.cc b/gr-analog/lib/sig_source_impl.cc -index 0e1db81648a..afa6d779cb0 100644 ---- a/gr-analog/lib/sig_source_impl.cc -+++ b/gr-analog/lib/sig_source_impl.cc -@@ -21,6 +21,16 @@ - #include <algorithm> - #include <stdexcept> - -+#if FMT_VERSION >= 90000 -+#include <fmt/ostream.h> -+template <> -+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<gr::analog::gr_waveform_t&> : ostream_formatter { -+}; -+#endif // FMT_VERSION >= 90000 -+ - namespace gr { - namespace analog { - -diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc -index cb6dccfcdea..b11b82a9e70 100644 ---- a/gr-uhd/lib/usrp_block_impl.cc -+++ b/gr-uhd/lib/usrp_block_impl.cc -@@ -12,6 +12,13 @@ - #include <chrono> - #include <thread> - -+#if FMT_VERSION >= 90000 -+#include <fmt/ostream.h> -+template <> -+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { -+}; -+#endif // FMT_VERSION >= 90000 -+ - using namespace gr::uhd; - using namespace std::chrono_literals; - Copied: gnuradio/repos/community-x86_64/gnuradio-fmt-9.0.patch (from rev 1403012, gnuradio/trunk/gnuradio-fmt-9.0.patch) =================================================================== --- gnuradio-fmt-9.0.patch (rev 0) +++ gnuradio-fmt-9.0.patch 2023-02-20 06:05:22 UTC (rev 1403013) @@ -0,0 +1,145 @@ +From e63ee41fd455cdd39ae983c258d8632c3ea57fc6 Mon Sep 17 00:00:00 2001 +From: Huang Rui <vows...@gmail.com> +Date: Sun, 7 Aug 2022 22:06:30 +0800 +Subject: [PATCH] Fix build failures with libfmt-9.0.0 + +libfmt-9.0.0 require explicit tagging of ARG types. This commit +adds those tags for the types that are currently formatted via fmt. + +Bug: https://bugs.gentoo.org/858659 +Closes: https://github.com/gnuradio/gnuradio/issues/6052 +Signed-off-by: Huang Rui <vows...@gmail.com> +--- + gnuradio-runtime/lib/flat_flowgraph.cc | 25 ++++++++++++++++++++++ + gnuradio-runtime/lib/flowgraph.cc | 10 +++++++++ + gnuradio-runtime/lib/hier_block2_detail.cc | 19 ++++++++++++++++ + gr-analog/lib/sig_source_impl.cc | 10 +++++++++ + gr-uhd/lib/usrp_block_impl.cc | 7 ++++++ + 5 files changed, 71 insertions(+) + +diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc +index 42875fb4c32..ac7c8ce9109 100644 +--- a/gnuradio-runtime/lib/flat_flowgraph.cc ++++ b/gnuradio-runtime/lib/flat_flowgraph.cc +@@ -25,6 +25,31 @@ + #include <map> + #include <numeric> + ++#if FMT_VERSION >= 90000 ++#include <fmt/ostream.h> ++template <> ++struct fmt::formatter<gr::edge> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<gr::msg_endpoint> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<std::shared_ptr<gr::block_detail>> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<std::shared_ptr<gr::buffer_reader>> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<std::shared_ptr<gr::buffer>> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { ++}; ++#endif // FMT_VERSION >= 90000 ++ + namespace gr { + + +diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc +index 0bc04adc22c..6c63b834a89 100644 +--- a/gnuradio-runtime/lib/flowgraph.cc ++++ b/gnuradio-runtime/lib/flowgraph.cc +@@ -20,6 +20,16 @@ + // TODO: Replace with GNU Radio logging + #include <iostream> + ++#if FMT_VERSION >= 90000 ++#include <fmt/ostream.h> ++template <> ++struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { ++}; ++#endif // FMT_VERSION >= 90000 ++ + namespace gr { + + edge::~edge() {} +diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc +index 5cb42030dca..d3e27aee5b4 100644 +--- a/gnuradio-runtime/lib/hier_block2_detail.cc ++++ b/gnuradio-runtime/lib/hier_block2_detail.cc +@@ -22,6 +22,25 @@ + // TODO: Replace with GNU Radio logging + #include <iostream> + ++#if FMT_VERSION >= 90000 ++#include <fmt/ostream.h> ++template <> ++struct fmt::formatter<gr::edge> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<gr::endpoint> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<gr::msg_endpoint> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { ++}; ++#endif // FMT_VERSION >= 90000 ++ + namespace gr { + + hier_block2_detail::hier_block2_detail(hier_block2* owner) +diff --git a/gr-analog/lib/sig_source_impl.cc b/gr-analog/lib/sig_source_impl.cc +index 0e1db81648a..afa6d779cb0 100644 +--- a/gr-analog/lib/sig_source_impl.cc ++++ b/gr-analog/lib/sig_source_impl.cc +@@ -21,6 +21,16 @@ + #include <algorithm> + #include <stdexcept> + ++#if FMT_VERSION >= 90000 ++#include <fmt/ostream.h> ++template <> ++struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { ++}; ++template <> ++struct fmt::formatter<gr::analog::gr_waveform_t&> : ostream_formatter { ++}; ++#endif // FMT_VERSION >= 90000 ++ + namespace gr { + namespace analog { + +diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc +index cb6dccfcdea..b11b82a9e70 100644 +--- a/gr-uhd/lib/usrp_block_impl.cc ++++ b/gr-uhd/lib/usrp_block_impl.cc +@@ -12,6 +12,13 @@ + #include <chrono> + #include <thread> + ++#if FMT_VERSION >= 90000 ++#include <fmt/ostream.h> ++template <> ++struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { ++}; ++#endif // FMT_VERSION >= 90000 ++ + using namespace gr::uhd; + using namespace std::chrono_literals; +