1 |
commit: b6e383143d1c1b34e7c10fa59fec675bd6470b11 |
2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 16 16:46:42 2020 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 16 17:01:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e38314 |
7 |
|
8 |
net-wireless/uhd: bump |
9 |
|
10 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
11 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
12 |
|
13 |
net-wireless/uhd/Manifest | 2 + |
14 |
net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch | 42 +++++++ |
15 |
net-wireless/uhd/uhd-4.0.0.0.ebuild | 149 +++++++++++++++++++++++++ |
16 |
3 files changed, 193 insertions(+) |
17 |
|
18 |
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest |
19 |
index 56c287e9d84..122ca7ff41e 100644 |
20 |
--- a/net-wireless/uhd/Manifest |
21 |
+++ b/net-wireless/uhd/Manifest |
22 |
@@ -1,2 +1,4 @@ |
23 |
DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0 |
24 |
+DIST EttusResearch-UHD-4.0.0.0.tar.gz 33942895 BLAKE2B 632e701420c3a1165f2e1f0e2766b457595326141cb42c5701b247857e699dbfd6f8dbbcc668184d87bf0764516213044f79a5acde5db3d3c1c387335474f5fc SHA512 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd |
25 |
DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033 |
26 |
+DIST uhd-images_4.0.0.0.tar.xz 111748176 BLAKE2B 2924cf1b3f150c0afd3c31a03c44f509047fb7122e55faec07860ffa56b95e1ad84d4768a0608ee32403a8b31ae5efd16abdc3469779674faedaf13778335a4d SHA512 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f |
27 |
|
28 |
diff --git a/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch b/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..484aa1f9c2f |
31 |
--- /dev/null |
32 |
+++ b/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch |
33 |
@@ -0,0 +1,42 @@ |
34 |
+diff -Naur host/CMakeLists.txt uhd-4.0.0.0-patched/host/CMakeLists.txt |
35 |
+--- host/CMakeLists.txt 2020-09-13 15:14:04.000000000 -0400 |
36 |
++++ host/CMakeLists.txt 2020-09-16 10:11:52.266933094 -0400 |
37 |
+@@ -506,6 +506,9 @@ |
38 |
+ if(ENABLE_USB) |
39 |
+ list(APPEND UHD_LINK_LIST_STATIC "usb-1.0") |
40 |
+ endif(ENABLE_USB) |
41 |
++ |
42 |
++LIST(APPEND UHD_LINK_LIST_STATIC "tinfo") |
43 |
++ |
44 |
+ set(UHD_RFNOC_FOUND "TRUE") |
45 |
+ |
46 |
+ configure_file( |
47 |
+diff -Naur host/examples/CMakeLists.txt uhd-4.0.0.0-patched/host/examples/CMakeLists.txt |
48 |
+--- host/examples/CMakeLists.txt 2020-09-13 15:14:04.000000000 -0400 |
49 |
++++ host/examples/CMakeLists.txt 2020-09-16 10:12:49.082935381 -0400 |
50 |
+@@ -55,11 +55,11 @@ |
51 |
+ if(CURSES_FOUND) |
52 |
+ include_directories(${CURSES_INCLUDE_DIR}) |
53 |
+ add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp) |
54 |
+- target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) |
55 |
++ target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) |
56 |
+ UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) |
57 |
+ |
58 |
+ add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp) |
59 |
+- target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) |
60 |
++ target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) |
61 |
+ UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) |
62 |
+ endif(CURSES_FOUND) |
63 |
+ |
64 |
+diff -Naur host/utils/latency/CMakeLists.txt uhd-4.0.0.0-patched/host/utils/latency/CMakeLists.txt |
65 |
+--- host/utils/latency/CMakeLists.txt 2020-09-13 15:14:04.000000000 -0400 |
66 |
++++ host/utils/latency/CMakeLists.txt 2020-09-16 10:13:55.994938074 -0400 |
67 |
+@@ -25,7 +25,7 @@ |
68 |
+ get_filename_component(name ${source} NAME_WE) |
69 |
+ add_executable(${name} ${source} ${latency_lib_path}) |
70 |
+ LIBUHD_APPEND_SOURCES(${name}) |
71 |
+- target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) |
72 |
++ target_link_libraries(${name} uhd ${Boost_LIBRARIES} tinfo ${CURSES_LIBRARIES}) |
73 |
+ UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) |
74 |
+ endforeach(source) |
75 |
+ |
76 |
|
77 |
diff --git a/net-wireless/uhd/uhd-4.0.0.0.ebuild b/net-wireless/uhd/uhd-4.0.0.0.ebuild |
78 |
new file mode 100644 |
79 |
index 00000000000..72e82395ade |
80 |
--- /dev/null |
81 |
+++ b/net-wireless/uhd/uhd-4.0.0.0.ebuild |
82 |
@@ -0,0 +1,149 @@ |
83 |
+# Copyright 1999-2020 Gentoo Authors |
84 |
+# Distributed under the terms of the GNU General Public License v2 |
85 |
+ |
86 |
+EAPI=6 |
87 |
+#not sure why, but eapi 7 fails |
88 |
+ |
89 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
90 |
+ |
91 |
+inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib |
92 |
+ |
93 |
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver" |
94 |
+HOMEPAGE="https://kb.ettus.com" |
95 |
+ |
96 |
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \ |
97 |
+ https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz" |
98 |
+#https://github.com/EttusResearch/UHD-Mirror/tags |
99 |
+#http://files.ettus.com/binaries/images/ |
100 |
+ |
101 |
+LICENSE="GPL-3" |
102 |
+SLOT="0/$(ver_cut 1-3)" |
103 |
+KEYWORDS="~amd64 ~arm ~x86" |
104 |
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300" |
105 |
+RESTRICT="!test? ( test )" |
106 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
107 |
+ b100? ( usb ) |
108 |
+ b200? ( usb ) |
109 |
+ usrp1? ( usb ) |
110 |
+ usrp2? ( usb ) |
111 |
+ || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )" |
112 |
+ |
113 |
+RDEPEND="${PYTHON_DEPS} |
114 |
+ e300? ( virtual/udev ) |
115 |
+ usb? ( virtual/libusb:1 ) |
116 |
+ dev-libs/boost:= |
117 |
+ sys-libs/ncurses:0[tinfo] |
118 |
+ $(python_gen_cond_dep ' |
119 |
+ || ( |
120 |
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] |
121 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
122 |
+ ) |
123 |
+ dev-python/requests[${PYTHON_MULTI_USEDEP}] |
124 |
+ ') |
125 |
+" |
126 |
+ |
127 |
+DEPEND="${RDEPEND} |
128 |
+ doc? ( app-doc/doxygen ) |
129 |
+ $(python_gen_cond_dep ' |
130 |
+ dev-python/mako[${PYTHON_MULTI_USEDEP}] |
131 |
+ ') |
132 |
+ app-arch/unzip |
133 |
+ app-arch/gzip |
134 |
+" |
135 |
+ |
136 |
+PATCHES=( "${FILESDIR}/${PN}-4.0.0.0-tinfo.patch" ) |
137 |
+ |
138 |
+S="${WORKDIR}/${P}/host" |
139 |
+ |
140 |
+src_unpack() { |
141 |
+ default |
142 |
+ mv "uhd-images_${PV}" images || die |
143 |
+} |
144 |
+ |
145 |
+src_prepare() { |
146 |
+ cmake-utils_src_prepare |
147 |
+ |
148 |
+ gnome2_environment_reset #534582 |
149 |
+ |
150 |
+ #rpath is set for apple and no one else, just remove the conditional |
151 |
+ sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die |
152 |
+} |
153 |
+ |
154 |
+src_configure() { |
155 |
+ mycmakeargs=( |
156 |
+ -DENABLE_LIBUHD=ON |
157 |
+ -DENABLE_C_API=ON |
158 |
+ -DENABLE_LIBERIO=OFF |
159 |
+ -DENABLE_MAN_PAGES=ON |
160 |
+ -DENABLE_MAN_PAGE_COMPRESSION=OFF |
161 |
+ -DENABLE_EXAMPLES="$(usex examples)" |
162 |
+ -DENABLE_TESTS="$(usex test)" |
163 |
+ -DENABLE_USB="$(usex usb)" |
164 |
+ -DENABLE_UTILS="$(usex utils)" |
165 |
+ -DENABLE_MANUAL="$(usex doc)" |
166 |
+ -DENABLE_DOXYGEN="$(usex doc)" |
167 |
+ -DENABLE_B100="$(usex b100)" |
168 |
+ -DENABLE_B200="$(usex b200)" |
169 |
+ -DENABLE_E300="$(usex e300)" |
170 |
+ -DENABLE_USRP1="$(usex usrp1)" |
171 |
+ -DENABLE_USRP2="$(usex usrp2)" |
172 |
+ -DENABLE_X300="$(usex x300)" |
173 |
+ -DENABLE_N230="$(usex n230)" |
174 |
+ -DENABLE_MPMD="$(usex mpmd)" |
175 |
+ -DENABLE_OCTOCLOCK="$(usex octoclock)" |
176 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
177 |
+ -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" |
178 |
+ ) |
179 |
+ cmake-utils_src_configure |
180 |
+} |
181 |
+src_install() { |
182 |
+ cmake-utils_src_install |
183 |
+ python_optimize |
184 |
+ use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ |
185 |
+ if [ "${PV}" != "9999" ]; then |
186 |
+ rm -rf "${ED}/usr/bin/uhd_images_downloader" |
187 |
+ rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1" |
188 |
+ fi |
189 |
+ |
190 |
+ insinto /lib/udev/rules.d/ |
191 |
+ doins "${S}/utils/uhd-usrp.rules" |
192 |
+ |
193 |
+ rm -rf "${WORKDIR}/images/winusb_driver" |
194 |
+ if ! use b100; then |
195 |
+ rm "${WORKDIR}"/images/usrp_b100* || die |
196 |
+ fi |
197 |
+ if ! use b200; then |
198 |
+ rm "${WORKDIR}"/images/usrp_b2[01]* || die |
199 |
+ fi |
200 |
+ if ! use e300; then |
201 |
+ rm "${WORKDIR}"/images/usrp_e3* || die |
202 |
+ fi |
203 |
+ if ! use mpmd; then |
204 |
+ rm "${WORKDIR}"/images/usrp_n310* || die |
205 |
+ fi |
206 |
+ if ! use n230; then |
207 |
+ rm "${WORKDIR}"/images/usrp_n230* || die |
208 |
+ fi |
209 |
+ if ! use octoclock; then |
210 |
+ rm "${WORKDIR}"/images/octoclock* || die |
211 |
+ fi |
212 |
+ if ! use usrp1; then |
213 |
+ rm "${WORKDIR}"/images/usrp1* || die |
214 |
+ fi |
215 |
+ if ! use usrp2; then |
216 |
+ rm "${WORKDIR}"/images/usrp2* || die |
217 |
+ rm "${WORKDIR}"/images/usrp_n2[01]* || die |
218 |
+ rm -r "${WORKDIR}"/images/bit || die |
219 |
+ fi |
220 |
+ if ! use x300; then |
221 |
+ rm "${WORKDIR}/"images/usrp_x3* || die |
222 |
+ fi |
223 |
+ insinto /usr/share/${PN} |
224 |
+ doins -r "${WORKDIR}/images" |
225 |
+} |
226 |
+ |
227 |
+src_test() { |
228 |
+ #we can disable the python tests |
229 |
+ #ctest -E 'py*' |
230 |
+ PYTHON_PATH=python/ cmake-utils_src_test |
231 |
+} |