sdrangel-6.19.0.ebuild

This commit is contained in:
Anton Bolshakov 2022-02-14 08:15:08 +08:00
parent 88d9a60595
commit 8c3f8c46b2
No known key found for this signature in database
GPG key ID: 32BDCED870788F04
5 changed files with 6 additions and 277 deletions

View file

@ -1,4 +1,2 @@
DIST sdrangel-6.17.5.tar.gz 57848616 BLAKE2B 714a35d70c36ae6c53f0791193c84daa0c423e34390ebce029df9a8cd31035ec6bf3f25c9337617fec98bf5f4b027a93a0dc073569501402d20d87cedf62b366 SHA512 4eda127968c722c5a610c1ba188592e4f10cf9dcb6aead92b1ca1a79d7443f01d81252fb2cc565737490ebbf3ae19c255ae5167167767a5b34c206e98f8d5acf
DIST sdrangel-6.17.6.tar.gz 57866385 BLAKE2B c9f3fbdc055c1a99b32a602502921fd9af36895f26b28bf7a1c99cf9e6bafb88db2523106d3b8eb20a9236f13fa3dafcd496b69ca17ab6012228a8052de5abfc SHA512 f92de32f6af64980d725a7080901261508d56c767e3b139740b3acc43171277fb5c08e468a1511e0eafa003db1e66c3a8c83ead5a8199ab63e0f229c2ed99b34
DIST sdrangel-6.17.7.tar.gz 57903970 BLAKE2B 0c8d91b27ae0d2a041d0e89139bd0d789efd460dd00d56dc355d012d4647de38eda030717b5167a14e9aec64d3188bf660e6771d9aab33fd1e0ea53fc4b49ede SHA512 71b32d56ca020025b8b5f8155688780c336c7a295873a3b8469e8fd3d3f9b5541a479967499f59dc7bfa4bd2fcbe7405cf2bd913f115ec0913e5c60eeb38ee62
DIST sdrangel-6.18.1.tar.gz 59382041 BLAKE2B c435b9180a0ece31b13d342a39bc47ee4a34535dd7fbc5d4036c7d734baa424c6b4a5cc66df3a618eaa23fd290c3fda3b54dbc8a95ab15627567672e6c03fb4a SHA512 2117ae3c144228d14d13e5835064c63cb5e47f99193e48780d24a4af0444e9a721450cf08051bdf7ec8a4efd5815c4c5d81c7bd46faece37e4561f2c9684c9bb
DIST sdrangel-6.19.0.tar.gz 68121732 BLAKE2B a09bfbfaeaa6daf050553ff681832f2312c82b207a6287439c61702e59a0fb1ac12db66fba3308a068f91b50eb220f9b3517a3fb9c7738728158152abe168440 SHA512 86872a346f3d2d8fd4bd9c89c4f30a561f5b3fe73e69ee0deb21946b616f443a47276c866d74291a4b158090d6e3f422a3331a8af3c1370a69fa9c87ffbbc48a

View file

@ -1,78 +0,0 @@
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);

View file

@ -1,95 +0,0 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="SDR Rx/Tx software"
HOMEPAGE="https://github.com/f4exb/sdrangel"
SRC_URI=""
if [[ ${PV} =~ "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/f4exb/sdrangel.git"
else
SRC_URI="https://github.com/f4exb/sdrangel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-3"
SLOT="0"
IUSE="airspy bladerf cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 fcd -debug -doc hackrf limesuite plutosdr +qt5 rtlsdr server soapy uhd"
# TODO: perseus, xtrx, mirisdr
RDEPEND="
dev-libs/boost
dev-libs/cm256cc
dev-libs/serialDV
>=media-libs/codec2-0.9.1
media-libs/opus
net-wireless/dsdcc
sci-libs/fftw:3.0
virtual/libusb:1
>=dev-qt/qtcore-5.6.0
>=dev-qt/qtwidgets-5.6.0
>=dev-qt/qtwebsockets-5.6.0
>=dev-qt/qtmultimedia-5.6.0[widgets]
dev-qt/qtserialport
qt5? (
dev-qt/qtdeclarative
dev-qt/qtpositioning
dev-qt/qtlocation
dev-qt/qtcharts
dev-qt/qtspeech
dev-qt/qtnetwork
dev-qt/qtgui
>=dev-qt/qtopengl-5.6.0
)
media-libs/opencv
media-video/ffmpeg
airspy? ( net-wireless/airspy )
bladerf? ( net-wireless/bladerf )
hackrf? ( net-libs/libhackrf )
plutosdr? ( net-libs/libiio )
limesuite? ( net-wireless/limesuite )
rtlsdr? ( net-wireless/rtl-sdr )
soapy? ( net-wireless/soapysdr )
uhd? ( net-wireless/uhd )
"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
"
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
cmake_src_prepare
}
src_configure() {
mycmakeargs=(
-DDEBUG_OUTPUT="$(usex debug)" \
-DSANITIZE_ADDRESS=OFF \
-DRX_SAMPLE_24BIT=ON \
-DBUILD_SERVER="$(usex server)" \
-DBUILD_GUI="$(usex qt5)" \
-DENABLE_AIRSPY="$(usex airspy)" \
-DENABLE_AIRSPYHF="$(usex airspy)" \
-DENABLE_BLADERF="$(usex bladerf)" \
-DWITH_DOC="$(usex doc)" \
-DENABLE_FUNCUBE="$(usex fcd)" \
-DENABLE_HACKRF="$(usex hackrf)" \
-DENABLE_IIO="$(usex plutosdr)" \
-DENABLE_LIMESUITE="$(usex limesuite)" \
-DENABLE_MIRISDR=OFF \
-DENABLE_PERSEUS=OFF \
-DENABLE_SOAPYSDR="$(usex soapy)" \
-DENABLE_USRP="$(usex uhd)" \
-DENABLE_XTRX=OFF \
)
cmake_src_configure
}

View file

@ -1,97 +0,0 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="SDR Rx/Tx software"
HOMEPAGE="https://github.com/f4exb/sdrangel"
SRC_URI=""
if [[ ${PV} =~ "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/f4exb/sdrangel.git"
else
SRC_URI="https://github.com/f4exb/sdrangel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-3"
SLOT="0"
IUSE="airspy bladerf cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 fcd -debug -doc hackrf limesuite plutosdr +qt5 rtlsdr server soapy uhd"
# TODO: perseus, xtrx, mirisdr
RDEPEND="
dev-libs/boost
dev-libs/cm256cc
dev-libs/serialDV
>=media-libs/codec2-0.9.1
media-libs/opus
net-wireless/dsdcc
sci-libs/fftw:3.0
virtual/libusb:1
>=dev-qt/qtcore-5.6.0
>=dev-qt/qtwidgets-5.6.0
>=dev-qt/qtwebsockets-5.6.0
>=dev-qt/qtmultimedia-5.6.0[widgets]
dev-qt/qtserialport
qt5? (
dev-qt/qtdeclarative
dev-qt/qtpositioning
dev-qt/qtlocation
dev-qt/qtcharts
dev-qt/qtspeech
dev-qt/qtnetwork
dev-qt/qtgui
>=dev-qt/qtopengl-5.6.0
)
media-libs/opencv
media-video/ffmpeg
airspy? ( net-wireless/airspy )
bladerf? ( net-wireless/bladerf )
hackrf? ( net-libs/libhackrf )
plutosdr? ( net-libs/libiio )
limesuite? ( net-wireless/limesuite )
rtlsdr? ( net-wireless/rtl-sdr )
soapy? ( net-wireless/soapysdr )
uhd? ( net-wireless/uhd )
"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
"
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
eapply "${FILESDIR}/cc3f4ab2f8eeddeee6ce9740b940c8c07e4031bf.patch"
#epatch_user
cmake_src_prepare
}
src_configure() {
mycmakeargs=(
-DDEBUG_OUTPUT="$(usex debug)" \
-DSANITIZE_ADDRESS=OFF \
-DRX_SAMPLE_24BIT=ON \
-DBUILD_SERVER="$(usex server)" \
-DBUILD_GUI="$(usex qt5)" \
-DENABLE_AIRSPY="$(usex airspy)" \
-DENABLE_AIRSPYHF="$(usex airspy)" \
-DENABLE_BLADERF="$(usex bladerf)" \
-DWITH_DOC="$(usex doc)" \
-DENABLE_FUNCUBE="$(usex fcd)" \
-DENABLE_HACKRF="$(usex hackrf)" \
-DENABLE_IIO="$(usex plutosdr)" \
-DENABLE_LIMESUITE="$(usex limesuite)" \
-DENABLE_MIRISDR=OFF \
-DENABLE_PERSEUS=OFF \
-DENABLE_SOAPYSDR="$(usex soapy)" \
-DENABLE_USRP="$(usex uhd)" \
-DENABLE_XTRX=OFF \
)
cmake_src_configure
}

View file

@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
inherit cmake
@ -19,7 +19,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
IUSE="airspy bladerf cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 fcd -debug -doc hackrf limesuite plutosdr +qt5 rtlsdr server soapy uhd"
IUSE="airspy bladerf cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 fcd -debug -doc -gui hackrf limesuite plutosdr rtlsdr server soapy uhd"
# TODO: perseus, xtrx, mirisdr
@ -37,7 +37,8 @@ RDEPEND="
>=dev-qt/qtwebsockets-5.6.0
>=dev-qt/qtmultimedia-5.6.0[widgets]
dev-qt/qtserialport
qt5? (
gui? (
dev-qt/qtwebengine
dev-qt/qtdeclarative
dev-qt/qtpositioning
dev-qt/qtlocation
@ -74,7 +75,7 @@ src_configure() {
-DSANITIZE_ADDRESS=OFF \
-DRX_SAMPLE_24BIT=ON \
-DBUILD_SERVER="$(usex server)" \
-DBUILD_GUI="$(usex qt5)" \
-DBUILD_GUI="$(usex gui)" \
-DENABLE_AIRSPY="$(usex airspy)" \
-DENABLE_AIRSPYHF="$(usex airspy)" \
-DENABLE_BLADERF="$(usex bladerf)" \