mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-08 00:05:33 +03:00
net-wireless/uhd: drop 4.8.0.0-r2, 4.8.0.0-r3
Closes: https://bugs.gentoo.org/963355 Closes: https://bugs.gentoo.org/964453 Signed-off-by: Thomas Beierlein <tomjbe@gentoo.org>
This commit is contained in:
Thomas Beierlein
parent
9eea0ade6f
commit
b95081d30c
@ -1,4 +1,2 @@
|
||||
DIST EttusResearch-UHD-4.8.0.0.tar.gz 41358938 BLAKE2B c69af5aabcd7e02290b4a168f319dc43bb6cb277e235407a5ded8eb617fe957ca1326042a892efa7b688cfae52f3c345e0930a614ff59b25c05e8b202d62e82e SHA512 61e92209e69994b1c5d3a2a88f749ddca612a3fa3c1580c00a9577e25fab5055d7c80571f2843cca3951fc941d1a81566bafc21070fb93cb3e566228c46331e7
|
||||
DIST EttusResearch-UHD-4.9.0.1.tar.gz 37508709 BLAKE2B ff3d51480e1c49f30957365c6a4d3439910cf08f66cbdb1c60de22f5a83e47135e94b1bf517486cb57b9229c85e7d8c47c8b923539eb21c836d400a03f56d645 SHA512 efb4ef440e102c7705100980a8ea0a9e55de6e631d70c1e9a39a8b6cd8991129f2fd39ba93094300bdc4878c73023a956a4f79488f6aaf5104371410de6f0497
|
||||
DIST uhd-images_4.8.0.0.tar.xz 180420544 BLAKE2B 5cce16db59c6c78035512e5275ac36b02a5d928104ff77877f8a13a9df64d0bde6c832497675b27a0090debef78ef4c284c48ef3b6169fae3420ca4d87e8209e SHA512 4203e5b7f642d7850e9563ba495a60efe965a64223d9208c780e1400ea755b322125fff53c3f8a3fb010617b57a4da638dc3cf80bf7d95604e20788cc469edb9
|
||||
DIST uhd-images_4.9.0.0.tar.xz 176470760 BLAKE2B bd0728bda0531f23ae6f45f2b3aef3759fa3f55ee0a914f2d40644a0dbd08fc038fe24de510066c355f38dbf88aacaa5a16e5ed380b2c65282038b2868c24437 SHA512 df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 2725c664ce617ec949670d449fe6172b7661a3bd Mon Sep 17 00:00:00 2001
|
||||
From: Michael Cho <michael@michaelcho.dev>
|
||||
Date: Mon, 31 Mar 2025 15:09:37 -0400
|
||||
Subject: [PATCH] examples: update for upcoming Boost 1.88.0
|
||||
|
||||
Boost.Process 1.88.0 will make `boost::process::v2` the default which
|
||||
breaks compilation of rx_samples_to_file.cpp. This change uses v1
|
||||
headers and inline namespace to fix build.
|
||||
---
|
||||
host/examples/rx_samples_to_file.cpp | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/host/examples/rx_samples_to_file.cpp b/host/examples/rx_samples_to_file.cpp
|
||||
index c8caeaec43..4b122e1d5e 100644
|
||||
--- a/examples/rx_samples_to_file.cpp
|
||||
+++ b/examples/rx_samples_to_file.cpp
|
||||
@@ -15,7 +15,15 @@
|
||||
#include <boost/program_options.hpp>
|
||||
#ifdef __linux__
|
||||
# include <boost/filesystem.hpp>
|
||||
-# include <boost/process.hpp>
|
||||
+# include <boost/version.hpp>
|
||||
+# if BOOST_VERSION >= 108800
|
||||
+# define BOOST_PROCESS_VERSION 1
|
||||
+# include <boost/process/v1/child.hpp>
|
||||
+# include <boost/process/v1/io.hpp>
|
||||
+# include <boost/process/v1/pipe.hpp>
|
||||
+# else
|
||||
+# include <boost/process.hpp>
|
||||
+# endif
|
||||
#endif
|
||||
#include <chrono>
|
||||
#include <complex>
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/cmake/Modules/CMakeRC.cmake b/cmake/Modules/CMakeRC.cmake
|
||||
index ce6d8fb..ba3c668 100644
|
||||
--- a/cmake/Modules/CMakeRC.cmake
|
||||
+++ b/cmake/Modules/CMakeRC.cmake
|
||||
@@ -60,7 +60,7 @@ endif()
|
||||
|
||||
set(_version 2.0.0)
|
||||
|
||||
-cmake_minimum_required(VERSION 3.3)
|
||||
+cmake_minimum_required(VERSION 3.10)
|
||||
include(CMakeParseArguments)
|
||||
|
||||
if(COMMAND cmrc_add_resource_library)
|
||||
diff --git a/include/uhd/features/ref_clk_calibration_iface.hpp b/include/uhd/features/ref_clk_calibration_iface.hpp
|
||||
index 86a2005..0408489 100644
|
||||
|
||||
@ -1,154 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
|
||||
inherit cmake gnome2-utils python-single-r1 udev
|
||||
|
||||
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
|
||||
HOMEPAGE="https://kb.ettus.com"
|
||||
|
||||
SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
|
||||
https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
|
||||
#https://github.com/EttusResearch/UHD-Mirror/tags
|
||||
#http://files.ettus.com/binaries/images/
|
||||
|
||||
S="${WORKDIR}/${P}/host"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0/$(ver_cut 1-3)"
|
||||
KEYWORDS="amd64 ~arm ~riscv ~x86"
|
||||
IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
|
||||
RESTRICT="!test? ( test )"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
b100? ( usb )
|
||||
b200? ( usb )
|
||||
usrp1? ( usb )
|
||||
usrp2? ( usb )
|
||||
|| ( b100 b200 e300 mpmd usrp1 usrp2 x300 )"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
e300? ( virtual/udev )
|
||||
usb? ( virtual/libusb:1 )
|
||||
dev-libs/boost:=
|
||||
sys-libs/ncurses:0=
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
dev-python/requests[${PYTHON_USEDEP}]
|
||||
')
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
#zip and gzip are directly used by the build system
|
||||
BDEPEND="
|
||||
doc? ( app-text/doxygen )
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/mako[${PYTHON_USEDEP}]
|
||||
')
|
||||
app-arch/unzip
|
||||
app-arch/gzip
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/"${P}"-includes.patch
|
||||
"${FILESDIR}"/"${P}"-cmake4.patch
|
||||
"${FILESDIR}"/"${P}"-boost-1.88.0.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
mv "uhd-images_${PV}" images || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
gnome2_environment_reset #534582
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
#https://gitlab.kitware.com/cmake/cmake/-/issues/23236
|
||||
#https://github.com/EttusResearch/uhd/pull/560
|
||||
local mycmakeargs=(
|
||||
-DENABLE_LIBUHD=ON
|
||||
-DENABLE_C_API=ON
|
||||
-DENABLE_MAN_PAGES=ON
|
||||
-DENABLE_MAN_PAGE_COMPRESSION=OFF
|
||||
-DENABLE_EXAMPLES="$(usex examples)"
|
||||
-DENABLE_TESTS="$(usex test)"
|
||||
-DENABLE_USB="$(usex usb)"
|
||||
-DENABLE_UTILS="$(usex utils)"
|
||||
-DENABLE_MANUAL="$(usex doc)"
|
||||
-DENABLE_DOXYGEN="$(usex doc)"
|
||||
-DENABLE_B100="$(usex b100)"
|
||||
-DENABLE_B200="$(usex b200)"
|
||||
-DENABLE_E300="$(usex e300)"
|
||||
-DENABLE_USRP1="$(usex usrp1)"
|
||||
-DENABLE_USRP2="$(usex usrp2)"
|
||||
-DENABLE_X300="$(usex x300)"
|
||||
-DENABLE_MPMD="$(usex mpmd)"
|
||||
-DENABLE_OCTOCLOCK="$(usex octoclock)"
|
||||
-DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)"
|
||||
-DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)"
|
||||
-DPYTHON_EXECUTABLE="${PYTHON}"
|
||||
-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
|
||||
-DUHD_VERSION="${PV}"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
python_optimize
|
||||
if use utils; then
|
||||
python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
|
||||
if [[ "${PV}" != "9999" ]]; then
|
||||
rm -r "${ED}/usr/bin/uhd_images_downloader" || die
|
||||
fi
|
||||
fi
|
||||
# do not install test files (bug #857492)
|
||||
if use test; then
|
||||
rm "${ED}/usr/lib64/${PN}/tests" -R || die
|
||||
fi
|
||||
|
||||
udev_dorules "${S}/utils/uhd-usrp.rules"
|
||||
|
||||
rm -r "${WORKDIR}/images/winusb_driver" || die
|
||||
if ! use b100; then
|
||||
rm "${WORKDIR}"/images/usrp_b100* || die
|
||||
fi
|
||||
if ! use b200; then
|
||||
rm "${WORKDIR}"/images/usrp_b2[01]* || die
|
||||
fi
|
||||
if ! use e300; then
|
||||
rm "${WORKDIR}"/images/usrp_e3* || die
|
||||
fi
|
||||
if ! use mpmd; then
|
||||
rm "${WORKDIR}"/images/usrp_n310* || die
|
||||
fi
|
||||
if ! use octoclock; then
|
||||
rm "${WORKDIR}"/images/octoclock* || die
|
||||
fi
|
||||
if ! use usrp1; then
|
||||
rm "${WORKDIR}"/images/usrp1* || die
|
||||
fi
|
||||
if ! use usrp2; then
|
||||
rm "${WORKDIR}"/images/usrp2* || die
|
||||
rm "${WORKDIR}"/images/usrp_n2[01]* || die
|
||||
rm -r "${WORKDIR}"/images/bit || die
|
||||
fi
|
||||
if ! use x300; then
|
||||
rm "${WORKDIR}/"images/usrp_x3* || die
|
||||
fi
|
||||
insinto /usr/share/${PN}
|
||||
doins -r "${WORKDIR}/images"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
@ -1,154 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
|
||||
inherit cmake gnome2-utils python-single-r1 udev
|
||||
|
||||
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
|
||||
HOMEPAGE="https://kb.ettus.com"
|
||||
|
||||
SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
|
||||
https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
|
||||
#https://github.com/EttusResearch/UHD-Mirror/tags
|
||||
#http://files.ettus.com/binaries/images/
|
||||
|
||||
S="${WORKDIR}/${P}/host"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0/$(ver_cut 1-3)"
|
||||
KEYWORDS="amd64 ~arm ~riscv ~x86"
|
||||
IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
|
||||
RESTRICT="!test? ( test )"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
b100? ( usb )
|
||||
b200? ( usb )
|
||||
usrp1? ( usb )
|
||||
usrp2? ( usb )
|
||||
|| ( b100 b200 e300 mpmd usrp1 usrp2 x300 )"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
e300? ( virtual/udev )
|
||||
usb? ( virtual/libusb:1 )
|
||||
dev-libs/boost:=
|
||||
sys-libs/ncurses:0=
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
dev-python/requests[${PYTHON_USEDEP}]
|
||||
')
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
#zip and gzip are directly used by the build system
|
||||
BDEPEND="
|
||||
doc? ( app-text/doxygen )
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/mako[${PYTHON_USEDEP}]
|
||||
')
|
||||
app-arch/unzip
|
||||
app-arch/gzip
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/"${P}"-includes.patch
|
||||
"${FILESDIR}"/"${P}"-cmake4.patch
|
||||
"${FILESDIR}"/"${P}"-boost-1.88.0.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
mv "uhd-images_${PV}" images || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
gnome2_environment_reset #534582
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
#https://gitlab.kitware.com/cmake/cmake/-/issues/23236
|
||||
#https://github.com/EttusResearch/uhd/pull/560
|
||||
local mycmakeargs=(
|
||||
-DENABLE_LIBUHD=ON
|
||||
-DENABLE_C_API=ON
|
||||
-DENABLE_MAN_PAGES=ON
|
||||
-DENABLE_MAN_PAGE_COMPRESSION=OFF
|
||||
-DENABLE_EXAMPLES="$(usex examples)"
|
||||
-DENABLE_TESTS="$(usex test)"
|
||||
-DENABLE_USB="$(usex usb)"
|
||||
-DENABLE_UTILS="$(usex utils)"
|
||||
-DENABLE_MANUAL="$(usex doc)"
|
||||
-DENABLE_DOXYGEN="$(usex doc)"
|
||||
-DENABLE_B100="$(usex b100)"
|
||||
-DENABLE_B200="$(usex b200)"
|
||||
-DENABLE_E300="$(usex e300)"
|
||||
-DENABLE_USRP1="$(usex usrp1)"
|
||||
-DENABLE_USRP2="$(usex usrp2)"
|
||||
-DENABLE_X300="$(usex x300)"
|
||||
-DENABLE_MPMD="$(usex mpmd)"
|
||||
-DENABLE_OCTOCLOCK="$(usex octoclock)"
|
||||
-DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)"
|
||||
-DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)"
|
||||
-DPYTHON_EXECUTABLE="${PYTHON}"
|
||||
-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
|
||||
-DUHD_VERSION="${PV}"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
python_optimize
|
||||
if use utils; then
|
||||
python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
|
||||
if [[ "${PV}" != "9999" ]]; then
|
||||
rm -r "${ED}/usr/bin/uhd_images_downloader" || die
|
||||
fi
|
||||
fi
|
||||
# do not install test files (bug #857492)
|
||||
if use test; then
|
||||
rm "${ED}/usr/$(get_libdir)/${PN}/tests" -R || die
|
||||
fi
|
||||
|
||||
udev_dorules "${S}/utils/uhd-usrp.rules"
|
||||
|
||||
rm -r "${WORKDIR}/images/winusb_driver" || die
|
||||
if ! use b100; then
|
||||
rm "${WORKDIR}"/images/usrp_b100* || die
|
||||
fi
|
||||
if ! use b200; then
|
||||
rm "${WORKDIR}"/images/usrp_b2[01]* || die
|
||||
fi
|
||||
if ! use e300; then
|
||||
rm "${WORKDIR}"/images/usrp_e3* || die
|
||||
fi
|
||||
if ! use mpmd; then
|
||||
rm "${WORKDIR}"/images/usrp_n310* || die
|
||||
fi
|
||||
if ! use octoclock; then
|
||||
rm "${WORKDIR}"/images/octoclock* || die
|
||||
fi
|
||||
if ! use usrp1; then
|
||||
rm "${WORKDIR}"/images/usrp1* || die
|
||||
fi
|
||||
if ! use usrp2; then
|
||||
rm "${WORKDIR}"/images/usrp2* || die
|
||||
rm "${WORKDIR}"/images/usrp_n2[01]* || die
|
||||
rm -r "${WORKDIR}"/images/bit || die
|
||||
fi
|
||||
if ! use x300; then
|
||||
rm "${WORKDIR}/"images/usrp_x3* || die
|
||||
fi
|
||||
insinto /usr/share/${PN}
|
||||
doins -r "${WORKDIR}/images"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user