summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2018-02-10 17:25:38 -0500
committerChris Reffett <creffett@gentoo.org>2018-02-10 17:26:19 -0500
commit3eae56400d9ca7cf331e6222797f09711abaf356 (patch)
tree04ce021f20945a0126d46683c9b986d9f0a62981
parentbzr.eclass: Drop bzr_bootstrap and bzr_src_prepare. (diff)
downloadgentoo-3eae56400d9ca7cf331e6222797f09711abaf356.tar.gz
gentoo-3eae56400d9ca7cf331e6222797f09711abaf356.tar.bz2
gentoo-3eae56400d9ca7cf331e6222797f09711abaf356.zip
net-wireless/uhd: Bump, fix tinfo, remove old
Bug: https://bugs.gentoo.org/597098 Bug: https://bugs.gentoo.org/597614 Package-Manager: Portage-2.3.24, Repoman-2.3.6
-rw-r--r--net-wireless/uhd/Manifest4
-rw-r--r--net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch34
-rw-r--r--net-wireless/uhd/files/uhd-3.8.5-gcc6.patch25
-rw-r--r--net-wireless/uhd/files/uhd-3.9.6-tinfo.patch34
-rw-r--r--net-wireless/uhd/uhd-3.10.3.0.ebuild (renamed from net-wireless/uhd/uhd-3.8.5.ebuild)21
-rw-r--r--net-wireless/uhd/uhd-3.9.6.ebuild6
6 files changed, 86 insertions, 38 deletions
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index d8f9ca92056..e1e05e780aa 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,4 +1,4 @@
-DIST EttusResearch-UHD-3.8.5.tar.gz 2910398 BLAKE2B 7f185202060d3372e938342b2357cfa0017efa89a13dbacfaa89a81c6ea7d3d44c39b05639ad939e3433129be746a86f875c45ac5769e4b0e37a97b22ae4865d SHA512 edbc79e5a524e655e6c9016d2e1d2f0d242a9c7dcfa0130995b4c7cf77b95d4c9ba486e31891554746db755e0b47c46b0b8b9323e8c5de250a15d1271a8ccfc1
+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
+DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
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 00000000000..ff9956fee41
--- /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 c2e5e00f70d..00000000000
--- 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<boost::uint32_t> &regs)
-+void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, const std::vector<boost::uint32_t> &regs)
- {
- 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<boost::uint32_t> &regs);
-+ void write_lo_regs(dboard_iface::unit_t unit, const std::vector<boost::uint32_t> &regs);
- 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 00000000000..511bc3c13fc
--- /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.8.5.ebuild b/net-wireless/uhd/uhd-3.10.3.0.ebuild
index d6787b88c5f..9a1c22cdf24 100644
--- a/net-wireless/uhd/uhd-3.8.5.ebuild
+++ b/net-wireless/uhd/uhd-3.10.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
@@ -10,8 +10,8 @@ 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 \
+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/
@@ -26,15 +26,18 @@ RDEPEND="${PYTHON_DEPS}
virtual/libusb:1
dev-lang/orc
dev-libs/boost:=
- sys-libs/ncurses:0[-tinfo]
- "
+ sys-libs/ncurses:0[tinfo]
+"
+
DEPEND="${RDEPEND}
+ dev-python/mako
dev-python/cheetah
- app-arch/unzip"
+ 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}-tinfo.patch" )
-PATCHES=( "${FILESDIR}"/${P}-gcc6.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
diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild
index 57e30328555..d7bf1683325 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