diff options
author | Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2022-02-15 14:55:26 -0500 |
---|---|---|
committer | Rick Farina <zerochaos@gentoo.org> | 2022-02-24 11:04:26 -0500 |
commit | 1179d29f77023efe2a8adc3a0f2f013607e433d8 (patch) | |
tree | ec68e61db1b0869d0a12bbb494e22e77b19c4b29 /net-wireless/uhd | |
parent | net-wireless/uhd: remove unneeded functions (diff) | |
download | gentoo-1179d29f77023efe2a8adc3a0f2f013607e433d8.tar.gz gentoo-1179d29f77023efe2a8adc3a0f2f013607e433d8.tar.bz2 gentoo-1179d29f77023efe2a8adc3a0f2f013607e433d8.zip |
net-wireless/uhd: drop 3.15.0.0-r100
This version is no longer maintained upstream.
Does not build with modern eapi/eclasses.
Nothing in gentoo depends this version.
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
Diffstat (limited to 'net-wireless/uhd')
-rw-r--r-- | net-wireless/uhd/Manifest | 2 | ||||
-rw-r--r-- | net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch | 45 | ||||
-rw-r--r-- | net-wireless/uhd/files/uhd-3.15.0.0-hidden-visibility-tests.patch | 26 | ||||
-rw-r--r-- | net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 146 |
4 files changed, 0 insertions, 219 deletions
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest index db104b0ddc9b..9bdd5508da08 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -1,4 +1,2 @@ -DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0 DIST EttusResearch-UHD-4.1.0.4.tar.gz 37913211 BLAKE2B 28cd3892490aaa8ec01ca8233c4f0500fd49a3184be74f77dbb8a5fdafc08d74144eb01485e5059d8c115406606024261f851fa7c592687637a5906e12d42b2e SHA512 f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6 -DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033 DIST uhd-images_4.1.0.4.tar.xz 118536976 BLAKE2B 6ac9b0b4aff5cbe1336edcb07a450dba3e050bf36c87af37fdbb2e83c472d86a2a8b51720fad3046d4f58d5ad1b6a836d35d1d7c57e1a36171161c22f2c7fe30 SHA512 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b diff --git a/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch b/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch deleted file mode 100644 index de165e9deebf..000000000000 --- a/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git host/CMakeLists.txt host/CMakeLists.txt -index 2337396e7..3a77776a0 100644 ---- host/CMakeLists.txt -+++ host/CMakeLists.txt -@@ -531,6 +531,9 @@ endforeach(Boost_Comp) - if(ENABLE_USB) - list(APPEND UHD_LINK_LIST_STATIC "usb-1.0") - endif(ENABLE_USB) -+ -+LIST(APPEND UHD_LINK_LIST_STATIC "tinfo") -+ - # UHDConfig.cmake also needs UHD_RFNOC_FOUND - if(ENABLE_RFNOC) - set(UHD_RFNOC_FOUND "TRUE") -diff --git host/examples/CMakeLists.txt host/examples/CMakeLists.txt -index b384d978c..402aded94 100644 ---- host/examples/CMakeLists.txt -+++ host/examples/CMakeLists.txt -@@ -58,11 +58,11 @@ find_package(Curses) - if(CURSES_FOUND) - include_directories(${CURSES_INCLUDE_DIR}) - add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp) -- target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - - add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp) -- target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - endif(CURSES_FOUND) - -diff --git host/utils/latency/CMakeLists.txt host/utils/latency/CMakeLists.txt -index 05bacd77a..d3b1449a6 100644 ---- host/utils/latency/CMakeLists.txt -+++ host/utils/latency/CMakeLists.txt -@@ -25,7 +25,7 @@ if(CURSES_FOUND) - get_filename_component(name ${source} NAME_WE) - add_executable(${name} ${source} ${latency_lib_path}) - LIBUHD_APPEND_SOURCES(${name}) -- target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) -+ target_link_libraries(${name} uhd ${Boost_LIBRARIES} tinfo ${CURSES_LIBRARIES}) - UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) - endforeach(source) - diff --git a/net-wireless/uhd/files/uhd-3.15.0.0-hidden-visibility-tests.patch b/net-wireless/uhd/files/uhd-3.15.0.0-hidden-visibility-tests.patch deleted file mode 100644 index 749313267439..000000000000 --- a/net-wireless/uhd/files/uhd-3.15.0.0-hidden-visibility-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4ecb79d8980fcf7cd0ff25c8c21bf473156fdb19 Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Tue, 15 Feb 2022 11:24:54 +0100 -Subject: [PATCH] Build uhd_test library as static when - `-DBUILD_SHARED_LIBS=ON` - -* A uhd_test.so lacks the necessary symbols for testing - due to default visibility set to hidden. ---- - tests/common/CMakeLists.txt | 3 +- - 1 file changed, 1 insertion(+), 2 deletion(-) - -diff --git a/tests/common/CMakeLists.txt b/tests/common/CMakeLists.txt -index ac0e1b4492..36c9f9b076 100644 ---- a/tests/common/CMakeLists.txt -+++ b/tests/common/CMakeLists.txt -@@ -8,7 +8,8 @@ - # Build uhd_test static lib - ######################################################################## - include_directories("${CMAKE_SOURCE_DIR}/lib/include") --add_library(uhd_test ${CMAKE_CURRENT_SOURCE_DIR}/mock_ctrl_iface_impl.cpp -+add_library(uhd_test STATIC -+ ${CMAKE_CURRENT_SOURCE_DIR}/mock_ctrl_iface_impl.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/mock_zero_copy.cpp - ${CMAKE_SOURCE_DIR}/lib/rfnoc/graph_impl.cpp - ${CMAKE_SOURCE_DIR}/lib/rfnoc/async_msg_handler.cpp diff --git a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild deleted file mode 100644 index 8d5e3e111f99..000000000000 --- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8,9,10} ) - -inherit python-single-r1 gnome2-utils cmake - -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/ - -LICENSE="GPL-3" -SLOT="0/$(ver_cut 1-3)" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 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 n230 usrp1 usrp2 x300 )" - -RDEPEND="${PYTHON_DEPS} - e300? ( virtual/udev ) - usb? ( virtual/libusb:1 ) - dev-libs/boost:= - sys-libs/ncurses:0[tinfo] - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') -" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - $(python_gen_cond_dep ' - dev-python/mako[${PYTHON_USEDEP}] - ') - app-arch/unzip - app-arch/gzip -" - -PATCHES=( - "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" - "${FILESDIR}/${PN}-3.15.0.0-hidden-visibility-tests.patch" -) - -S="${WORKDIR}/${P}/host" - -src_unpack() { - default - mv "uhd-images_${PV}" images || die -} - -src_prepare() { - cmake_src_prepare - - gnome2_environment_reset #534582 - - #this may not be needed in 3.4.3 and above, please verify - sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die - - #rpath is set for apple and no one else, just remove the conditional - sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die -} - -src_configure() { - mycmakeargs=( - -DENABLE_LIBUHD=ON - -DENABLE_C_API=ON - -DENABLE_LIBERIO=OFF - -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_N230="$(usex n230)" - -DENABLE_MPMD="$(usex mpmd)" - -DENABLE_OCTOCLOCK="$(usex octoclock)" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_optimize - use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ - if [[ "${PV}" != "9999" ]]; then - rm -rf "${ED}/usr/bin/uhd_images_downloader" - rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1" - fi - - insinto /lib/udev/rules.d/ - doins "${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 n230; then - rm "${WORKDIR}"/images/usrp_n230* || 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" -} |