From 9cb5d77a6732fadf391fd38da00e6921f3e23112 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 1 Apr 2025 01:33:27 +0100 Subject: gentoo auto-resync : 01:04:2025 - 01:33:27 --- net-wireless/Manifest.gz | Bin 13895 -> 13894 bytes net-wireless/uhd/Manifest | 3 +- net-wireless/uhd/files/uhd-4.8.0.0-cmake4.patch | 16 +++ net-wireless/uhd/uhd-4.8.0.0-r1.ebuild | 153 ++++++++++++++++++++++++ net-wireless/uhd/uhd-4.8.0.0.ebuild | 152 ----------------------- 5 files changed, 171 insertions(+), 153 deletions(-) create mode 100644 net-wireless/uhd/files/uhd-4.8.0.0-cmake4.patch create mode 100644 net-wireless/uhd/uhd-4.8.0.0-r1.ebuild delete mode 100644 net-wireless/uhd/uhd-4.8.0.0.ebuild (limited to 'net-wireless') diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz index 09d01c0e15ec..f74e183c4e6b 100644 Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest index 34ec214b5f87..d4c4ed6f5a65 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -2,6 +2,7 @@ AUX uhd-4.6.0.0-boost-1.85-1.patch 3665 BLAKE2B 1fe78699d1e3c6e2359733ca8ca46ed1 AUX uhd-4.6.0.0-boost-1.85-2.patch 1155 BLAKE2B 84002da36d755899d3921a68d5748f80cf12a65f289001843bfdc04d6e69e3a3003c75099564d13cc8e8b6e7f8069c677f033d5fdc74469cb2d9de4c9129430c SHA512 0705b4102b3e73a2dd046f2b00d1d8f08f4324c7c9a5c41a9ce1a998c7439b8532cc77d97eeea23b191e5a0bb6c831e9a0d68659bb03f158c2fb8913c4bbaf8e AUX uhd-4.6.0.0-boost-1.87-1.patch 43586 BLAKE2B ab4bb57eca11c38573103899fc1673efe587c07400cf23503ab018320f1e81310b6bffd3a939e9e7ed39b5f789491d70b981f23bcfc0f85bc91276bfe9feb4c4 SHA512 b6f849e8255d560dc0d28d3d239494a10d381c62de0d4f3626b9793db868de9192e43f14d8fe5456360896a0540266e1c769d4ba5294850f87dd1fc475158092 AUX uhd-4.6.0.0-boost-1.87-2.patch 941 BLAKE2B ab1bed4e0e0492137893327b05cb29ef5596b4f249f7071df5c61c4319d4d7cf2267a0a83c8fc7fd26dc746f946f90dd0dd71333b9fd291ef5aacf4611d588a0 SHA512 b7cb6acfd7afc9e1eb50c982128bda982f2aba0ccef893416d69fd0543e62211724704b0ec362af02d65a75caec9e549911b02372aa9de498d98bc3cc0b7baff +AUX uhd-4.8.0.0-cmake4.patch 515 BLAKE2B cd8f6d4941f448877eed797715365aa70ae9453bc42889db69f2c5f2d1ef40fa3f97b2e1b7f829e4a62c8f7ad0c3944579e3cc5a9d497ddcf6137cad40e54779 SHA512 08b20ad4f4e640253c6beaf76ebba27305739a56557dab8f8a2dd4b052e7d40b20ba80faa42304f362b67f9c02570fb6baf60bad746b9f50a6df93ca803da6e5 AUX uhd-4.8.0.0-includes.patch 1268 BLAKE2B a3412df91e58ab84752e43f0dba5a77fdc380a84891d9a8262290c9422f2a0e7d4c24eb4d813ad951312ff78399dedc6939f45077159c2a9e84f1be53eb0e594 SHA512 283f5b93b6dd6faabeef1e0c97c597f2a4c498d7ef80c09ebdecb478fd5465066b9458ca7aab7fb2289a2a6a3ec96a4d99c569f740982f3b063ae5478573a60b DIST EttusResearch-UHD-4.4.0.0.tar.gz 38210999 BLAKE2B defc2ae91c1422491c0c434f76852c253d84e2bdc43f6768069e23c40803d33aac8f087d51c28037102ab4760c5f3d5e04dc090655ddca26eef3440bf703db61 SHA512 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a DIST EttusResearch-UHD-4.6.0.0.tar.gz 41235519 BLAKE2B 4a9c9d0064bf52edd4a4a93ee8602eaa61029b5350728431e4e2e17d9f4a06de21c2598a6ffde0832ecfd5a499344d190ba113f1c5d96ffea0a029186f95de87 SHA512 de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30 @@ -11,5 +12,5 @@ DIST uhd-images_4.6.0.0.tar.xz 180745328 BLAKE2B f698c68c66e706146cd2163abca10bc DIST uhd-images_4.8.0.0.tar.xz 180420544 BLAKE2B 5cce16db59c6c78035512e5275ac36b02a5d928104ff77877f8a13a9df64d0bde6c832497675b27a0090debef78ef4c284c48ef3b6169fae3420ca4d87e8209e SHA512 4203e5b7f642d7850e9563ba495a60efe965a64223d9208c780e1400ea755b322125fff53c3f8a3fb010617b57a4da638dc3cf80bf7d95604e20788cc469edb9 EBUILD uhd-4.4.0.0.ebuild 3707 BLAKE2B 0bef82e613b6f7fdfc89487382d5358db8787d53c308431697170c204deb57986e00578bd6a3c648aa57df9449af6e26a362d812c033d334d32273bdba8f2209 SHA512 e55d9be83e3262c094a3087ac77b5db2afff622be05df27a728d4e95affcc3d4a60e25dbf39de8a523d5f4b98e4ac4335e1d841d3744075ef4df82e5da3b500f EBUILD uhd-4.6.0.0.ebuild 3877 BLAKE2B 11e4c123d3092e465f77ddf3a1eb379b74add6878c9d0ed5de0f95be6a42894b2881e4215dd87cc54eaa819356bb5a2061f622e04e02d1b16ce8f5a47f03b343 SHA512 3b3faf2ebfddf03fb7fa2d41a7b29a15abfd78b318af70ed3d6a870372504490b9521c1e00092988afe62ff4d59baf243721ed347259ce0fe53a4255e9cbf360 -EBUILD uhd-4.8.0.0.ebuild 3731 BLAKE2B add7be691ccabe279eeea01320a6f9b691f034b50e04490f2267080214a14be9dd36e684576866524e0a93b43fda6c52278951af6e57f5c87b47f27ad4bf8857 SHA512 0579bccea0b6275a21dcd06821222119e910c4d47a0e51968e614b8d6f8c4b2f8432be819e8e24033272f2703f88ea22562d619d4b68a97e4903faf84cd4a150 +EBUILD uhd-4.8.0.0-r1.ebuild 3766 BLAKE2B 228342179d594f2de8999d0b8fcb8c3c2fe5d9eb43c3f444c7aa48b9f398f086f03ef6227e31c702a39b0633b6f4ed847769ac0ebf85eb353ab8a97e7502c2b1 SHA512 8df1fcca6ca0b164bfb18c1e6667fa29d3f9a9aca2a0b4f7611dd37b3bf73d20d4c6f00be342db0eaac103dab67db9e047c1d38a3a1e2abc982f945a0fbe18be MISC metadata.xml 1112 BLAKE2B 7bf2e25d7618581200731789b4c5ee05c6cd6b33c21a7912b3904ffd53e6948d4d2e36bb071d3f966febb5b3da1523c2316558f66d4297341264d534e08d122f SHA512 ac48857213ada598edec618d0c39fc8faaa2b405444b37958e47dc23068fdd61d80bffb8033b20428f2fa63caf8ca322eb4bb765c59389d4a070fee260dee66d diff --git a/net-wireless/uhd/files/uhd-4.8.0.0-cmake4.patch b/net-wireless/uhd/files/uhd-4.8.0.0-cmake4.patch new file mode 100644 index 000000000000..afdd84002962 --- /dev/null +++ b/net-wireless/uhd/files/uhd-4.8.0.0-cmake4.patch @@ -0,0 +1,16 @@ +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 + diff --git a/net-wireless/uhd/uhd-4.8.0.0-r1.ebuild b/net-wireless/uhd/uhd-4.8.0.0-r1.ebuild new file mode 100644 index 000000000000..fad6c47a4fe6 --- /dev/null +++ b/net-wireless/uhd/uhd-4.8.0.0-r1.ebuild @@ -0,0 +1,153 @@ +# 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 +) + +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 +} diff --git a/net-wireless/uhd/uhd-4.8.0.0.ebuild b/net-wireless/uhd/uhd-4.8.0.0.ebuild deleted file mode 100644 index f1b64b55481d..000000000000 --- a/net-wireless/uhd/uhd-4.8.0.0.ebuild +++ /dev/null @@ -1,152 +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 -) - -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 -} -- cgit v1.2.3