Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-04-20 05:41:12 +02:00
Code Issues Projects Releases Wiki Activity

sdrangel: https://github.com/f4exb/sdrangel/issues/1087 patch

Browse source
This commit is contained in:
Anton Bolshakov 2021-12-29 08:51:09 +08:00
parent b161743a97
commit c311e7483a
No known key found for this signature in database
GPG key ID: 32BDCED870788F04
2 changed files with 81 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
net-wireless/sdrangel/files/cc3f4ab2f8eeddeee6ce9740b940c8c07e4031bf.patch Normal file
View file

@ -0,0 +1,78 @@
From cc3f4ab2f8eeddeee6ce9740b940c8c07e4031bf Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Tue, 28 Dec 2021 11:31:15 +0000
Subject: [PATCH] Fix for #1087. Support compilation with Boost >= 1.77
---
plugins/channelrx/noisefigure/noisefigure.cpp | 9 ++++++++-
.../channelrx/noisefigure/noisefigureenrdialog.cpp | 11 ++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/plugins/channelrx/noisefigure/noisefigure.cpp b/plugins/channelrx/noisefigure/noisefigure.cpp
index a6a08d413..646fbf065 100644
--- a/plugins/channelrx/noisefigure/noisefigure.cpp
+++ b/plugins/channelrx/noisefigure/noisefigure.cpp
@@ -16,6 +16,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
+#include <boost/version.hpp>
#include <boost/math/interpolators/barycentric_rational.hpp>
#include "noisefigure.h"
@@ -41,6 +42,12 @@
#include "channel/channelwebapiutils.h"
#include "maincore.h"
+#if BOOST_VERSION < 107700
+using namespace boost::math;
+#else
+using namespace boost::math::interpolators;
+#endif
+
MESSAGE_CLASS_DEFINITION(NoiseFigure::MsgConfigureNoiseFigure, Message)
MESSAGE_CLASS_DEFINITION(NoiseFigure::MsgPowerMeasurement, Message)
MESSAGE_CLASS_DEFINITION(NoiseFigure::MsgNFMeasurement, Message)
@@ -180,7 +187,7 @@ double NoiseFigure::calcENR(double frequency)
else
{
int order = size - 1;
- boost::math::barycentric_rational<double> interpolant(std::move(x), std::move(y), order);
+ barycentric_rational<double> interpolant(std::move(x), std::move(y), order);
enr = interpolant(frequency);
}
}
diff --git a/plugins/channelrx/noisefigure/noisefigureenrdialog.cpp b/plugins/channelrx/noisefigure/noisefigureenrdialog.cpp
index 1200fe989..e51afe232 100644
--- a/plugins/channelrx/noisefigure/noisefigureenrdialog.cpp
+++ b/plugins/channelrx/noisefigure/noisefigureenrdialog.cpp
@@ -17,11 +17,20 @@
#include <QDebug>
+#include <array>
+
+#include <boost/version.hpp>
#include <boost/math/interpolators/barycentric_rational.hpp>
#include "noisefigureenrdialog.h"
#include "util/interpolation.h"
+#if BOOST_VERSION < 107700
+using namespace boost::math;
+#else
+using namespace boost::math::interpolators;
+#endif
+
NoiseFigureENRDialog::NoiseFigureENRDialog(NoiseFigureSettings *settings, QWidget* parent) :
QDialog(parent),
m_settings(settings),
@@ -153,7 +162,7 @@ void NoiseFigureENRDialog::plotChart()
y[i] = points[i][1];
}
int order = size - 1;
- boost::math::barycentric_rational<double> interpolant(std::move(x), std::move(y), order);
+ barycentric_rational<double> interpolant(std::move(x), std::move(y), order);
x.resize(size);
y.resize(size);

4
net-wireless/sdrangel/sdrangel-6.17.6.ebuild
View file

@ -66,7 +66,9 @@ DEPEND="${RDEPEND}
src_prepare() {
sed -i '/ARCH_OPT/,+1 d' CMakeLists.txt
#https://github.com/f4exb/sdrangel/issues/1087
sed -i '/Boost_FOUND AND Boost_VERSION_STRING/,+2 d' plugins/channelrx/CMakeLists.txt
# sed -i '/Boost_FOUND AND Boost_VERSION_STRING/,+2 d' plugins/channelrx/CMakeLists.txt
eapply "${FILESDIR}/cc3f4ab2f8eeddeee6ce9740b940c8c07e4031bf.patch"
#epatch_user
cmake_src_prepare
}