iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
package/gqrx/0001-boost_qualify_placeholders_with_their_full_namespace.patch Normal file
View File

@@ -0,0 +1,46 @@
From 0510f6ffee646171bb105e0e8d016ac35e606cd4 Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Mon, 22 Jun 2020 15:45:20 +0200
Subject: [PATCH] qualify placeholders with their full namespace
With boost >= 1.73, placeholders must be qualified by using the full namespace.
Without the namespace, the build fails with:
gqrx-2.12.1/src/dsp/rds/parser_impl.cc: In constructor 'gr::rds::parser_impl::parser_impl(bool, bool)':
gqrx-2.12.1/src/dsp/rds/parser_impl.cc:42:72: error: '_1' was not declared in this scope
set_msg_handler(pmt::mp("in"), boost::bind(&parser_impl::parse, this, _1));
[Upstream status: https://github.com/csete/gqrx/pull/811]
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
src/dsp/rds/parser_impl.cc | 2 +-
src/dsp/rx_rds.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/dsp/rds/parser_impl.cc b/src/dsp/rds/parser_impl.cc
index b10fdb01..07dae038 100644
--- a/src/dsp/rds/parser_impl.cc
+++ b/src/dsp/rds/parser_impl.cc
@@ -40,7 +40,7 @@ parser_impl::parser_impl(bool log, bool debug, unsigned char pty_locale)
pty_locale(pty_locale)
{
message_port_register_in(pmt::mp("in"));
- set_msg_handler(pmt::mp("in"), boost::bind(&parser_impl::parse, this, _1));
+ set_msg_handler(pmt::mp("in"), boost::bind(&parser_impl::parse, this, boost::placeholders::_1));
message_port_register_out(pmt::mp("out"));
reset();
}
diff --git a/src/dsp/rx_rds.cpp b/src/dsp/rx_rds.cpp
index c4a541f3..c09835b0 100644
--- a/src/dsp/rx_rds.cpp
+++ b/src/dsp/rx_rds.cpp
@@ -97,7 +97,7 @@ rx_rds_store::rx_rds_store() : gr::block ("rx_rds_store",
gr::io_signature::make (0, 0, 0))
{
message_port_register_in(pmt::mp("store"));
- set_msg_handler(pmt::mp("store"), boost::bind(&rx_rds_store::store, this, _1));
+ set_msg_handler(pmt::mp("store"), boost::bind(&rx_rds_store::store, this, boost::placeholders::_1));
d_messages.set_capacity(100);
}

6
package/gqrx/Config.in
View File

@@ -1,6 +1,5 @@
comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library"
depends on BR2_USE_MMU # gnuradio
depends on !BR2_PACKAGE_PYTHON3 # gnuradio
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_USE_WCHAR || !BR2_STATIC_LIBS
@@ -8,6 +7,9 @@ comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library"
comment "gqrx needs qt5"
depends on !BR2_PACKAGE_QT5
comment "gqrx needs a toolchain not affected by GCC bug 64735"
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
config BR2_PACKAGE_GQRX
bool "gqrx"
depends on BR2_USE_MMU # gnuradio
@@ -17,7 +19,7 @@ config BR2_PACKAGE_GQRX
depends on BR2_USE_WCHAR # boost
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_PACKAGE_QT5
depends on !BR2_PACKAGE_PYTHON3
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # gnuradio
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
select BR2_PACKAGE_BOOST_SYSTEM

6
package/gqrx/gqrx.hash
View File

@@ -1,4 +1,4 @@
# Locally calculated:
sha256 c4e836c552dc99bf383ca84b2ddc0c67e3d05b073676318e2a011bcd463303ef gqrx-2.11.4.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK
sha256 7c626db9f22c3edbe30299a08f7f549b4f30dd83c883595468029a27c3e8fda9 gqrx-2.12.1.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK

2
package/gqrx/gqrx.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
GQRX_VERSION = 2.11.4
GQRX_VERSION = 2.12.1
GQRX_SITE = $(call github,csete,gqrx,v$(GQRX_VERSION))
GQRX_LICENSE = GPL-3.0+, Apache-2.0
GQRX_LICENSE_FILES = COPYING LICENSE-CTK