From 94e015f94a593af89d7719aec9007dafbd239efc Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Mon, 12 Jul 2021 23:02:58 -0400 Subject: [PATCH] sdrangel: bump. this is imperfect to say the least, but better than it was --- net-wireless/sdrangel/Manifest | 3 +- net-wireless/sdrangel/sdrangel-6.12.1.ebuild | 88 ------------------- ...l-6.11.0.ebuild => sdrangel-6.15.1.ebuild} | 14 +-- 3 files changed, 9 insertions(+), 96 deletions(-) delete mode 100644 net-wireless/sdrangel/sdrangel-6.12.1.ebuild rename net-wireless/sdrangel/{sdrangel-6.11.0.ebuild => sdrangel-6.15.1.ebuild} (91%) diff --git a/net-wireless/sdrangel/Manifest b/net-wireless/sdrangel/Manifest index ff946929b..0f802e730 100644 --- a/net-wireless/sdrangel/Manifest +++ b/net-wireless/sdrangel/Manifest @@ -1,2 +1 @@ -DIST sdrangel-6.11.0.tar.gz 47721549 BLAKE2B a6423853a559e8acf7115e36ee41fb5eda00c6849f3934ab892949fb737ba22dd67e432c030d350ac90298522e40c3398af1577dcef9c84db55ba1ddba645ae2 SHA512 e1e3fe303d9b32b0e38c9fc15281995f9f17ba32b7d8b54cb5545f28818dc8213dcb3023473fb799d61de1657544cd92c0fdcc0cfede10e2c5531319d2b59223 -DIST sdrangel-6.12.1.tar.gz 48001523 BLAKE2B 4087d7c3f0c0b05c85eb28f5f83cd3504ac758f73481c77f9ff0d0978569e74a4a44f167b1d854b3432b1ee5d34ff2e865b4d42c9a4bad598b8e8d095f47b3ac SHA512 ce41975f2d96f8ce45b8921f193f933c514596cf5cee64d7cf12a58a98dd666e5601d05c728dd7a52df0b429818125f837ccf211d710eb4356584aad7bc9ce61 +DIST sdrangel-6.15.1.tar.gz 51445885 BLAKE2B 51e11d991b953b18e9583a0de36156a33eb2f5f37a640c90a01040a097b87589c67c63502c8e5298f74507e74181d7c654d82da536dcc91849e2f25d4bcbd01c SHA512 2b1696de65289763267794d16a3703dd492d7f12ba40ca23cf150c767c01d9c8d194d5bc9abf3a460799b00c42fab45bb6e832f56d7a62275a054b4cded04986 diff --git a/net-wireless/sdrangel/sdrangel-6.12.1.ebuild b/net-wireless/sdrangel/sdrangel-6.12.1.ebuild deleted file mode 100644 index 02532348b..000000000 --- a/net-wireless/sdrangel/sdrangel-6.12.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -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 opengl plutosdr rtlsdr server soapy" - -# TODO: perseus, xtrx, mirisdr - -RDEPEND=" - dev-libs/boost - dev-libs/cm256cc - dev-libs/serialDV - >=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 - dev-qt/qtpositioning - dev-qt/qtlocation - dev-qt/qtcharts - dev-qt/qtspeech - >=media-libs/codec2-0.9.1 - media-libs/opus - net-wireless/dsdcc - sci-libs/fftw:3.0 - virtual/libusb:1 - opengl? ( - virtual/opengl - >=dev-qt/qtopengl-5.6.0 - ) - media-libs/opencv - 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 ) - " - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - " - -src_configure() { - # error: invalid conversion from ‘long int’ to ‘QDebug::Stream*’ [-fpermissive] - export CFLAGS='-fpermissive' - export CXXFLAGS='-fpermissive' - - mycmakeargs=( - -DDEBUG_OUTPUT="$(usex debug)" \ - -DSANITIZE_ADDRESS=OFF \ - -DRX_SAMPLE_24BIT=ON \ - -DBUILD_SERVER="$(usex server)" \ - -DBUILD_GUI="$(usex opengl)" \ - -DBUILD_FORCE_SSSE3="$(usex cpu_flags_x86_ssse3)" \ - -DBUILD_FORCE_SSE41="$(usex cpu_flags_x86_sse4_1)" \ - -DENABLE_AIRSPY="$(usex airspy)" \ - -DENABLE_AIRSPYHF="$(usex airspy)" \ - -DENABLE_BLADERF="$(usex bladerf)" \ - -DENABLE_DOXYGEN="$(usex doc)" \ - -DENABLE_FUNCUBE="$(usex fcd)" \ - -DENABLE_HACKRF="$(usex hackrf)" \ - -DENABLE_IIO="$(usex plutosdr)" \ - -DENABLE_MIRISDR=OFF \ - -DENABLE_PERSEUS=OFF \ - -DENABLE_SOAPYSDR="$(usex soapy)" \ - -DENABLE_XTRX=OFF \ - ) - cmake-utils_src_configure -} diff --git a/net-wireless/sdrangel/sdrangel-6.11.0.ebuild b/net-wireless/sdrangel/sdrangel-6.15.1.ebuild similarity index 91% rename from net-wireless/sdrangel/sdrangel-6.11.0.ebuild rename to net-wireless/sdrangel/sdrangel-6.15.1.ebuild index 02532348b..7b7c84267 100644 --- a/net-wireless/sdrangel/sdrangel-6.11.0.ebuild +++ b/net-wireless/sdrangel/sdrangel-6.15.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="SDR Rx/Tx software" HOMEPAGE="https://github.com/f4exb/sdrangel" @@ -59,11 +59,12 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) " -src_configure() { - # error: invalid conversion from ‘long int’ to ‘QDebug::Stream*’ [-fpermissive] - export CFLAGS='-fpermissive' - export CXXFLAGS='-fpermissive' +src_prepare() { + sed -i '/ARCH_OPT/,+1 d' CMakeLists.txt + cmake_src_prepare +} +src_configure() { mycmakeargs=( -DDEBUG_OUTPUT="$(usex debug)" \ -DSANITIZE_ADDRESS=OFF \ @@ -79,10 +80,11 @@ src_configure() { -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_XTRX=OFF \ ) - cmake-utils_src_configure + cmake_src_configure }