From f78108598211053d41752a83e0345441bb9014ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Feb 2018 16:09:52 +0000 Subject: gentoo resync : 11.02.2018 --- net-wireless/uhd/Manifest | 11 ++--- net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch | 34 +++++++++++++++ net-wireless/uhd/files/uhd-3.8.5-gcc6.patch | 25 ----------- net-wireless/uhd/files/uhd-3.9.6-tinfo.patch | 34 +++++++++++++++ net-wireless/uhd/uhd-3.10.3.0.ebuild | 58 +++++++++++++++++++++++++ net-wireless/uhd/uhd-3.8.5.ebuild | 55 ----------------------- net-wireless/uhd/uhd-3.9.6.ebuild | 6 ++- 7 files changed, 136 insertions(+), 87 deletions(-) create mode 100644 net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch delete mode 100644 net-wireless/uhd/files/uhd-3.8.5-gcc6.patch create mode 100644 net-wireless/uhd/files/uhd-3.9.6-tinfo.patch create mode 100644 net-wireless/uhd/uhd-3.10.3.0.ebuild delete mode 100644 net-wireless/uhd/uhd-3.8.5.ebuild (limited to 'net-wireless/uhd') diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest index 620c6875758e..d161ec5098e4 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -1,8 +1,9 @@ -AUX uhd-3.8.5-gcc6.patch 1084 BLAKE2B 8ef37818a9e10efd1ae6b8ecc98b9c9feae08c012f1c3b863d6038dd9c782b0428f9f14edd53642170b2619047d02b3c498d3ddd5667892b268da78a7cb01350 SHA512 bc5f0b61035b37190e75922fb39376ecc77d59ca708fccc0606a9686b2b8524ab40b1b718a937e59fa25a6e0b074436d4c87e554187637d578a89a691190e43d -DIST EttusResearch-UHD-3.8.5.tar.gz 2910398 BLAKE2B 7f185202060d3372e938342b2357cfa0017efa89a13dbacfaa89a81c6ea7d3d44c39b05639ad939e3433129be746a86f875c45ac5769e4b0e37a97b22ae4865d SHA512 edbc79e5a524e655e6c9016d2e1d2f0d242a9c7dcfa0130995b4c7cf77b95d4c9ba486e31891554746db755e0b47c46b0b8b9323e8c5de250a15d1271a8ccfc1 +AUX uhd-3.10.3.0-tinfo.patch 1680 BLAKE2B 6b31b95c4b63d043e66e5fb41f75b3e73d0e9327d304a211d950bc982209f12425ee716ff2218ceace317ba978ddfe7d0b94961c9feeb0a08dd5454515df7505 SHA512 2c0e6163ddb005b5d02a380033030d111d1eff23f8327aff802e80e449594e48bdd8f2656ffd21c6281233a36ac89d52aa6833e2ea0349276baaef497c463cba +AUX uhd-3.9.6-tinfo.patch 1824 BLAKE2B bbbd4f17e7e24532d49847f7ab476bc2105d4de63346d73cecc77cf422e471a9f8cb6bec6545eac8226da12e66ee6be9088070970408ec2aa48867e817fa0aeb SHA512 66d1b7197b727c1e16469e47fa7392585e68f30e61c23114152f8cb0dab41bb074236f33637bba4e7b03421468e43943ad65b8f148a341666cc407ebc10f5522 +DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b DIST EttusResearch-UHD-3.9.6.tar.gz 2458419 BLAKE2B 39859c9c7a520b91fd0ad11b82a454ae267d0e04bbb3d3f474ab31ea8daac69c03e5abe4ed54f3eec5810d180d00aa700e67b10d989295fdedf73cb198ae324d SHA512 f8e89f67659e9509d90fb63a91c75b7a5fe037821ccd2f33313ac0b20d856cbdc2cab79715f7fca035ba0e28b240c73408d6764cb09b01700c4ddbdcafa71da1 -DIST uhd-images_003.008.005-release.zip 24897325 BLAKE2B d795d2bdfd3682f3f8a591faae9dde10bf4ddb88fd9afcf0a9b87e2043522c89a4c253c74c70d18e13b078ed756709c5c679c8ed7e999d5b21303e4b2acb509f SHA512 4d3d60453320a05bf5008ffeddafdf01c08a906e6469a32ece9f1102072e03a8d140487febad7c392ba64f10fc3b94e2fdbe26e2e263a8fe1b1a29077a15e512 DIST uhd-images_003.009.006-release.zip 26268656 BLAKE2B 7d8c1b0bbd627a0180d5e2de996eb68b1fb995ea2c28ed12fa73705cda680d6304ff013a80cfd4ea5928137c16ac128546bdb9ed3cf932a837faa6dfe0866ffa SHA512 3b07a054583a55424edeb37d3ee70b9bd8c7b6cb4c83a10faf4dd518aa148be17af7cb8b5e4fb7cbb643eae32d7a3295a94d9a0eb031823ccf1f414da0cef631 -EBUILD uhd-3.8.5.ebuild 1890 BLAKE2B 185b813a6234daa3d5ab9f8b0257687c0dcaaa815c607fbe3874f6297db5a3881b7e635cde1bed4d47279b4b86fee82624b6fb0ad92f2a11ca7d4ab59cd7d37a SHA512 3a7be78cc24276f2e98375765994a28d18a1e8b2de6c637b0c2026f17dc3466829b8903d2f1a79f7bbd705d87288a0889c0d87b646ebd135c4c8b8114e1b9c78 -EBUILD uhd-3.9.6.ebuild 1864 BLAKE2B 84380185adfbca5e047feb0b4cb771253ae502997e3dd1ec7f13e5c023d3c903983174adb6cfc5d267868cfb81052a9acaa74f1a45873e1beba894469eca0ab1 SHA512 4040ee39d8567068ac1da6b64cb1fbc9f4692ad390df0b6b7e778de283849b2a4a36edc235f3d7476a5a74c10079971d7cdd0803af9c6006909f3487e9782abc +DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7 +EBUILD uhd-3.10.3.0.ebuild 2043 BLAKE2B 299a8f73dbabe40dafae728cca63636e29ba90b0ee48bec4637bbab4c61668fb2121f6a65808a44696a2c4f8bf5f2bc773d4485a2b6556bc6e7c3e819b5bf1cd SHA512 777d6d6fd40bd74816916dc94e712de0cecc9e5a4275bfff67d69cef63866e9ae75cdaf0ed75bf17591b8667e3f73fda35f513ab13070c40d855b807bc53d93e +EBUILD uhd-3.9.6.ebuild 1900 BLAKE2B 99a2bb4b1e3a391408c48222a4ebb0e7a423d48400468993554e127bd3c16a7a5f415f91a8ba8d39d766ff3ee4361e51d89ea580f0114f67af8ba9dfa8084e39 SHA512 38673ebcb6d9acff3be5173dec793fc0a8f3dcc3839c92e80dabcfeae34a5cfbeadd5bd2acb48cbbd5834abe7416ec1d232714d1ec3f91a965bbfe22a9522bec MISC metadata.xml 539 BLAKE2B 9cca11848a29f0af91766974dad1fb2edb48aea214c4d24115af5bc2539e15f5351cab70c65fee8477ec7796fb8153b6185b191be9e58e5a983fa8c7e70fe12d SHA512 b5e66134c30244fa689a554543686eac535908aed543eb6179a8c51a98c11d0f1d204518a40e0f79990dba2806b027ea97f6edac382a5bb76fb041231eb61451 diff --git a/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch b/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch new file mode 100644 index 000000000000..ff9956fee41c --- /dev/null +++ b/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch @@ -0,0 +1,34 @@ +--- host/utils/latency/CMakeLists.txt.orig 2017-05-11 19:44:54.824946672 +0300 ++++ host/utils/latency/CMakeLists.txt 2017-05-11 19:45:08.498880360 +0300 +@@ -35,7 +35,8 @@ + 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} ++ ${CURSES_LIBRARIES} tinfo) + UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) + ENDFOREACH(source) + +--- host/examples/CMakeLists.txt.orig 2017-05-11 19:41:02.322302577 +0300 ++++ host/examples/CMakeLists.txt 2017-05-11 19:44:32.604066325 +0300 +@@ -59,7 +59,7 @@ + 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) + ENDIF(CURSES_FOUND) + +--- host/CMakeLists.txt.orig 2017-05-11 19:36:38.944798634 +0300 ++++ host/CMakeLists.txt 2017-05-11 19:36:40.819788408 +0300 +@@ -436,6 +436,8 @@ + LIST(APPEND UHD_LINK_LIST_STATIC "usb-1.0") + ENDIF(ENABLE_USB) + ++LIST(APPEND UHD_LINK_LIST_STATIC "tinfo") ++ + CONFIGURE_FILE( + ${CMAKE_SOURCE_DIR}/cmake/Modules/UHDConfigVersion.cmake.in + ${CMAKE_BINARY_DIR}/cmake/Modules/UHDConfigVersion.cmake diff --git a/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch b/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch deleted file mode 100644 index c2e5e00f70d6..000000000000 --- a/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch +++ /dev/null @@ -1,25 +0,0 @@ -Bug: https://bugs.gentoo.org/611680 -Backported from: https://github.com/EttusResearch/uhd/commit/b6ad4c0531ef56f4e197cccd06f1d11fc89e4aab - ---- a/host/lib/usrp/dboard/db_cbx.cpp -+++ b/host/lib/usrp/dboard/db_cbx.cpp -@@ -38,7 +38,7 @@ sbx_xcvr::cbx::~cbx(void){ - /* NOP */ - } - --void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, std::vector ®s) -+void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, const std::vector ®s) - { - BOOST_FOREACH(boost::uint32_t reg, regs) - { ---- a/host/lib/usrp/dboard/db_sbx_common.hpp -+++ b/host/lib/usrp/dboard/db_sbx_common.hpp -@@ -225,7 +225,7 @@ class sbx_xcvr : public xcvr_dboard_base{ - /*! This is the registered instance of the wrapper class, sbx_base. */ - sbx_xcvr *self_base; - private: -- void write_lo_regs(dboard_iface::unit_t unit, std::vector ®s); -+ void write_lo_regs(dboard_iface::unit_t unit, const std::vector ®s); - max287x_iface::sptr _txlo; - max287x_iface::sptr _rxlo; - }; diff --git a/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch b/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch new file mode 100644 index 000000000000..511bc3c13fcd --- /dev/null +++ b/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch @@ -0,0 +1,34 @@ +--- uhd-release_003_009_006/host/utils/latency/CMakeLists.txt.orig 2017-05-11 19:44:54.824946672 +0300 ++++ uhd-release_003_009_006/host/utils/latency/CMakeLists.txt 2017-05-11 19:45:08.498880360 +0300 +@@ -35,7 +35,8 @@ + 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} ++ ${CURSES_LIBRARIES} tinfo) + UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) + ENDFOREACH(source) + +--- uhd-release_003_009_006/host/examples/CMakeLists.txt.orig 2017-05-11 19:41:02.322302577 +0300 ++++ uhd-release_003_009_006/host/examples/CMakeLists.txt 2017-05-11 19:44:32.604066325 +0300 +@@ -59,7 +59,7 @@ + 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) + ENDIF(CURSES_FOUND) + +--- uhd-release_003_009_006/host/CMakeLists.txt.orig 2017-05-11 19:36:38.944798634 +0300 ++++ uhd-release_003_009_006/host/CMakeLists.txt 2017-05-11 19:36:40.819788408 +0300 +@@ -436,6 +436,8 @@ + LIST(APPEND UHD_LINK_LIST_STATIC "usb-1.0") + ENDIF(ENABLE_USB) + ++LIST(APPEND UHD_LINK_LIST_STATIC "tinfo") ++ + CONFIGURE_FILE( + ${CMAKE_SOURCE_DIR}/cmake/Modules/UHDConfigVersion.cmake.in + ${CMAKE_BINARY_DIR}/cmake/Modules/UHDConfigVersion.cmake diff --git a/net-wireless/uhd/uhd-3.10.3.0.ebuild b/net-wireless/uhd/uhd-3.10.3.0.ebuild new file mode 100644 index 000000000000..9a1c22cdf241 --- /dev/null +++ b/net-wireless/uhd/uhd-3.10.3.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit versionator python-single-r1 gnome2-utils cmake-utils multilib + +DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver" +HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki" + +image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release +SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).$(get_version_component_range 4).tar.gz \ + http://files.ettus.com/binaries/images/${image_version}.zip" +#https://github.com/EttusResearch/UHD-Mirror/tags +#http://files.ettus.com/binaries/images/ + +LICENSE="GPL-3" +SLOT="0/1" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + virtual/libusb:1 + dev-lang/orc + dev-libs/boost:= + sys-libs/ncurses:0[tinfo] +" + +DEPEND="${RDEPEND} + dev-python/mako + dev-python/cheetah + app-arch/unzip +" + +PATCHES=( "${FILESDIR}/${P}-tinfo.patch" ) + +S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4)/host + +src_prepare() { + cmake-utils_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 +} + +src_install() { + cmake-utils_src_install + python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ + insinto /lib/udev/rules.d/ + doins "${S}"/utils/uhd-usrp.rules + insinto /usr/share/${PN} + doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images +} diff --git a/net-wireless/uhd/uhd-3.8.5.ebuild b/net-wireless/uhd/uhd-3.8.5.ebuild deleted file mode 100644 index d6787b88c5f4..000000000000 --- a/net-wireless/uhd/uhd-3.8.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit versionator python-single-r1 gnome2-utils cmake-utils multilib - -DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver" -HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki" - -image_version=uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).00$(get_version_component_range 3)-release -SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \ - http://files.ettus.com/binaries/images/${image_version}.zip" -#https://github.com/EttusResearch/UHD-Mirror/tags -#http://files.ettus.com/binaries/images/ - -LICENSE="GPL-3" -SLOT="0/1" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - virtual/libusb:1 - dev-lang/orc - dev-libs/boost:= - sys-libs/ncurses:0[-tinfo] - " -DEPEND="${RDEPEND} - dev-python/cheetah - app-arch/unzip" - -S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host - -PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) - -src_prepare() { - cmake-utils_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 -} - -src_install() { - cmake-utils_src_install - python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ - insinto /lib/udev/rules.d/ - doins "${S}"/utils/uhd-usrp.rules - insinto /usr/share/${PN} - doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images -} diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild index 57e303285555..d7bf1683325c 100644 --- a/net-wireless/uhd/uhd-3.9.6.ebuild +++ b/net-wireless/uhd/uhd-3.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,7 +26,7 @@ RDEPEND="${PYTHON_DEPS} virtual/libusb:1 dev-lang/orc dev-libs/boost:= - sys-libs/ncurses:0[-tinfo] + sys-libs/ncurses:0 " DEPEND="${RDEPEND} dev-python/mako @@ -35,6 +35,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host +PATCHES=( "${FILESDIR}/${P}-tinfo.patch" ) + src_prepare() { cmake-utils_src_prepare -- cgit v1.2.3