[gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/, net-wireless/uhd/files/
commit: 1179d29f77023efe2a8adc3a0f2f013607e433d8
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Tue Feb 15 19:55:26 2022 +
Commit: Rick Farina gentoo org>
CommitDate: Thu Feb 24 16:04:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1179d29f
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) gentoo.org>
net-wireless/uhd/Manifest | 2 -
net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch| 45 ---
.../uhd-3.15.0.0-hidden-visibility-tests.patch | 26
net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 146 -
4 files changed, 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..
--- 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..3a6a0 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..
--- a/net-wireless/uhd/files/uhd-3.15.0.0-hidden-visibility-tests.patch
+++
[gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/, net-wireless/uhd/files/
commit: 49c792e6e3a926f807d76c733eb468db6a1f5086
Author: David Seifert gentoo org>
AuthorDate: Tue Feb 15 10:45:32 2022 +
Commit: David Seifert gentoo org>
CommitDate: Tue Feb 15 10:45:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c792e6
net-wireless/uhd: fix build with `-DBUILD_SHARED_LIBS=ON`
Signed-off-by: David Seifert gentoo.org>
.../uhd-3.15.0.0-hidden-visibility-tests.patch | 26 ++
.../uhd-4.1.0.4-hidden-visibility-tests.patch | 24
net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 5 -
net-wireless/uhd/uhd-4.1.0.4.ebuild| 1 +
4 files changed, 55 insertions(+), 1 deletion(-)
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
new file mode 100644
index ..749313267439
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-3.15.0.0-hidden-visibility-tests.patch
@@ -0,0 +1,26 @@
+From 4ecb79d8980fcf7cd0ff25c8c21bf473156fdb19 Mon Sep 17 00:00:00 2001
+From: David Seifert
+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/files/uhd-4.1.0.4-hidden-visibility-tests.patch
b/net-wireless/uhd/files/uhd-4.1.0.4-hidden-visibility-tests.patch
new file mode 100644
index ..ca6704c5dff6
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-4.1.0.4-hidden-visibility-tests.patch
@@ -0,0 +1,24 @@
+From 4ecb79d8980fcf7cd0ff25c8c21bf473156fdb19 Mon Sep 17 00:00:00 2001
+From: David Seifert
+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 | 2 +-
+ 1 file changed, 1 insertion(+), 1 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,6 +8,6 @@
+ # Build uhd_test static lib
+
+ include_directories("${CMAKE_SOURCE_DIR}/lib/include")
+-add_library(uhd_test
++add_library(uhd_test STATIC
+ ${CMAKE_CURRENT_SOURCE_DIR}/mock_zero_copy.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
index 94f22c4bddc2..439b2f78fc50 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -48,7 +48,10 @@ DEPEND="${RDEPEND}
app-arch/gzip
"
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch"
+ "${FILESDIR}/${PN}-3.15.0.0-hidden-visibility-tests.patch"
+)
S="${WORKDIR}/${P}/host"
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild
b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 654ad81cca82..3b262ab66ff5 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -50,6 +50,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-4.0.0.0-tinfo.patch"
+ "${FILESDIR}/${PN}-4.1.0.4-hidden-visibility-tests.patch"
)
S="${WORKDIR}/${P}/host"
[gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/, net-wireless/uhd/files/
commit: cb2949a004bc702258b0e83c757f2641eb4e7bad
Author: Rick Farina gentoo org>
AuthorDate: Thu Jun 3 02:11:55 2021 +
Commit: Rick Farina gentoo org>
CommitDate: Thu Jun 3 02:12:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2949a0
net-wireless/uhd: fixes build with boost 1.76.0
fixes bug #743097 for fun
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Rick Farina gentoo.org>
.../uhd/files/uhd-4.0.0.0-boost-1.76.patch | 59 ++
net-wireless/uhd/uhd-4.0.0.0.ebuild| 7 +--
2 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch
b/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch
new file mode 100644
index 000..123a01bca56
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch
@@ -0,0 +1,59 @@
+From b05285b3853493436f71eb4192365b818005b0af Mon Sep 17 00:00:00 2001
+From: loqs
+Date: Tue, 25 May 2021 22:43:07 +0100
+Subject: [PATCH] Fix Boost 1.76.0 incompatibility
+
+Fixes EttusResearch/uhd/issues/437
+---
+ host/lib/usrp/cores/rx_dsp_core_3000.cpp | 1 +
+ host/lib/usrp/cores/rx_frontend_core_3000.cpp | 1 +
+ host/lib/usrp/usrp2/usrp2_impl.cpp| 5 ++---
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/usrp/cores/rx_dsp_core_3000.cpp
b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
+index ff431fd41..53f3fee69 100644
+--- a/lib/usrp/cores/rx_dsp_core_3000.cpp
b/lib/usrp/cores/rx_dsp_core_3000.cpp
+@@ -14,6 +14,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+diff --git a/lib/usrp/cores/rx_frontend_core_3000.cpp
b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
+index abbe64b13..d51fea2ca 100644
+--- a/lib/usrp/cores/rx_frontend_core_3000.cpp
b/lib/usrp/cores/rx_frontend_core_3000.cpp
+@@ -12,6 +12,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ using namespace uhd;
+diff --git a/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
+index c2514ae02..28aa11083 100644
+--- a/lib/usrp/usrp2/usrp2_impl.cpp
b/lib/usrp/usrp2/usrp2_impl.cpp
+@@ -17,6 +17,8 @@
+ #include
+ #include //used for htonl and ntohl
+ #include
++#include
++#include
+ #include
+ #include
+ #include
+@@ -948,9 +950,6 @@ meta_range_t usrp2_impl::get_tx_dsp_freq_range(const
std::string& mb)
+ return meta_range_t(-dac_rate / 2, +dac_rate / 2, dsp_range_step);
+ }
+
+-#include
+-#include
+-
+ void usrp2_impl::update_clock_source(const std::string& mb, const
std::string& source)
+ {
+ // NOTICE: U2_REG_MISC_CTRL_CLOCK is on the wb clock, and cannot be set
from fifo_ctrl
diff --git a/net-wireless/uhd/uhd-4.0.0.0.ebuild
b/net-wireless/uhd/uhd-4.0.0.0.ebuild
index 25a3b44949e..2515af186ba 100644
--- a/net-wireless/uhd/uhd-4.0.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.0.0.0.ebuild
@@ -48,7 +48,10 @@ DEPEND="${RDEPEND}
app-arch/gzip
"
-PATCHES=( "${FILESDIR}/${PN}-4.0.0.0-tinfo.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.0.0-tinfo.patch"
+ "${FILESDIR}/${PN}-4.0.0.0-boost-1.76.patch"
+)
S="${WORKDIR}/${P}/host"
@@ -70,7 +73,6 @@ 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)"
@@ -85,7 +87,6 @@ src_configure() {
-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}"
[gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/, net-wireless/uhd/files/
commit: b6e383143d1c1b34e7c10fa59fec675bd6470b11
Author: Rick Farina gentoo org>
AuthorDate: Wed Sep 16 16:46:42 2020 +
Commit: Rick Farina gentoo org>
CommitDate: Wed Sep 16 17:01:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e38314
net-wireless/uhd: bump
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Rick Farina gentoo.org>
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch | 42 +++
net-wireless/uhd/uhd-4.0.0.0.ebuild| 149 +
3 files changed, 193 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 56c287e9d84..122ca7ff41e 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,2 +1,4 @@
DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B
75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8
SHA512
ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
+DIST EttusResearch-UHD-4.0.0.0.tar.gz 33942895 BLAKE2B
632e701420c3a1165f2e1f0e2766b457595326141cb42c5701b247857e699dbfd6f8dbbcc668184d87bf0764516213044f79a5acde5db3d3c1c387335474f5fc
SHA512
1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd
DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B
681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977
SHA512
ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
+DIST uhd-images_4.0.0.0.tar.xz 111748176 BLAKE2B
2924cf1b3f150c0afd3c31a03c44f509047fb7122e55faec07860ffa56b95e1ad84d4768a0608ee32403a8b31ae5efd16abdc3469779674faedaf13778335a4d
SHA512
32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f
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
new file mode 100644
index 000..484aa1f9c2f
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch
@@ -0,0 +1,42 @@
+diff -Naur host/CMakeLists.txt uhd-4.0.0.0-patched/host/CMakeLists.txt
+--- host/CMakeLists.txt2020-09-13 15:14:04.0 -0400
host/CMakeLists.txt2020-09-16 10:11:52.266933094 -0400
+@@ -506,6 +506,9 @@
+ if(ENABLE_USB)
+ list(APPEND UHD_LINK_LIST_STATIC "usb-1.0")
+ endif(ENABLE_USB)
++
++LIST(APPEND UHD_LINK_LIST_STATIC "tinfo")
++
+ set(UHD_RFNOC_FOUND "TRUE")
+
+ configure_file(
+diff -Naur host/examples/CMakeLists.txt
uhd-4.0.0.0-patched/host/examples/CMakeLists.txt
+--- host/examples/CMakeLists.txt 2020-09-13 15:14:04.0 -0400
host/examples/CMakeLists.txt 2020-09-16 10:12:49.082935381 -0400
+@@ -55,11 +55,11 @@
+ 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 -Naur host/utils/latency/CMakeLists.txt
uhd-4.0.0.0-patched/host/utils/latency/CMakeLists.txt
+--- host/utils/latency/CMakeLists.txt 2020-09-13 15:14:04.0 -0400
host/utils/latency/CMakeLists.txt 2020-09-16 10:13:55.994938074 -0400
+@@ -25,7 +25,7 @@
+ 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/uhd-4.0.0.0.ebuild
b/net-wireless/uhd/uhd-4.0.0.0.ebuild
new file mode 100644
index 000..72e82395ade
--- /dev/null
+++ b/net-wireless/uhd/uhd-4.0.0.0.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+#not sure why, but eapi 7 fails
+
+PYTHON_COMPAT=( python3_{6,7,8}
[gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/, net-wireless/uhd/files/
commit: 2caa5da1188f83836424f7fd96a2e18de0cc9634
Author: Rick Farina gentoo org>
AuthorDate: Fri Jan 11 03:33:03 2019 +
Commit: Rick Farina gentoo org>
CommitDate: Fri Jan 11 03:33:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2caa5da1
net-wireless/uhd: bump
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Rick Farina gentoo.org>
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch | 45
net-wireless/uhd/uhd-3.13.1.0.ebuild| 130
3 files changed, 177 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 79684a22b4b..5b428d26f33 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -2,7 +2,9 @@ DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B
4267f1cb2e30808e54709946c
DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B
b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951
SHA512
63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B
7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7
SHA512
33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe7d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
DIST EttusResearch-UHD-3.13.0.1.tar.gz 9409122 BLAKE2B
69d84db2b908598545af8175304c19d00bde29d606b6af55e12ed2184d14a08bee7cb229b54dc5f339f587194b493e04f6f584685c2e836f81a9063ffc5e5799
SHA512
83196212326ab43f7996bf297677980f1e2cb2e51fc6479f086e010078d2ff6ee42ffd5af6bdcaaf0d6c45a3e773b117f8bdbf2e8e0add2b8dc6f3e19ad777cd
+DIST EttusResearch-UHD-3.13.1.0.tar.gz 11587157 BLAKE2B
44cd1759c9106c36e149431e655c673ba665b2a632e7bbf598b60950b31d4325921a1fe265d2fc47eb23dd3f90733b1407a6ed522f57ba975a0a4a5d9576c238
SHA512
3ef85e0b166879456fba49ab2a2ffd7ce670130700833fb4ac20376b69bd85354632ee9f320760f94d275449f10a36fdc8c106683a060e02924304fc9bc50bf8
DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B
9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3
SHA512
a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a55e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B
02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938
SHA512
7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
DIST uhd-images_3.13.0.1.tar.xz 73484904 BLAKE2B
0045a9b0ed20661c8e1f2e650635cf4263a192b418ac82a6aea29ff899b3ef62d18591a4faee92b02c0618c5f5992d9177f816ca6050778fa69367afc73b0842
SHA512
94fdd4277306341ed9334b040aa5825edf762459976c1b68471d20ef3b29c102e5ac61be412fea8a1678c4ff59637cb9098594616ebd7153e7434005cfa1b672
+DIST uhd-images_3.13.1.0.tar.xz 176004828 BLAKE2B
3a476337443f58a55773dd55f3605a37591d73ddd875a2cdb0459adfe93774ebc6c6f380aee7b00b70fd26ca5ac72730fdacd213f31239599227e19b24b9cc2a
SHA512
3db7429c99823a7ef48253bb996e284c66f8f44913ed9d48baa3d7553a7d13724cbc1fe2df0032504491b677bdb3d609e3c6c01a580bd717cc311d54aa10d9fa
DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B
1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e
SHA512
1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
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
new file mode 100644
index 000..de165e9deeb
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch
@@ -0,0 +1,45 @@
+diff --git host/CMakeLists.txt host/CMakeLists.txt
+index 2337396e7..3a6a0 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
[gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/, net-wireless/uhd/files/
commit: 8d2de4e17c178c9635b839528a4f5e86bad5666a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jun 3 12:43:44 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jun 6 08:11:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d2de4e1
net-wireless/uhd: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-wireless/uhd/Manifest| 2 -
net-wireless/uhd/files/uhd-3.9.6-tinfo.patch | 34 -
net-wireless/uhd/uhd-3.9.6.ebuild| 56
3 files changed, 92 deletions(-)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index d260b3955ce..e7a1b9c0023 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,6 +1,4 @@
DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B
4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608
SHA512
398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B
b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951
SHA512
63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
-DIST EttusResearch-UHD-3.9.6.tar.gz 2458419 BLAKE2B
39859c9c7a520b91fd0ad11b82a454ae267d0e04bbb3d3f474ab31ea8daac69c03e5abe4ed54f3eec5810d180d00aa700e67b10d989295fdedf73cb198ae324d
SHA512
f8e89f67659e9509d90fb63a91c75b7a5fe037821ccd2f33313ac0b20d856cbdc2cab79715f7fca035ba0e28b240c73408d6764cb09b01700c4ddbdcafa71da1
-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
a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a55e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B
1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e
SHA512
1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
diff --git a/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch
b/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch
deleted file mode 100644
index 511bc3c13fc..000
--- a/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
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.txt2017-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.9.6.ebuild
b/net-wireless/uhd/uhd-3.9.6.ebuild
deleted file mode 100644
index d7bf1683325..000
---
[gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/, net-wireless/uhd/files/
commit: e05c0d5549b494c5e4667b0701275b094d46c972
Author: Peter Levine gmail com>
AuthorDate: Sun Oct 15 23:55:09 2017 +
Commit: Jason Donenfeld gentoo org>
CommitDate: Mon Oct 16 01:13:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e05c0d55
net-wireless/uhd: Fix building with GCC-6
Bug: https://bugs.gentoo.org/611680
Package-Manager: Portage-2.3.10, Repoman-2.3.3
net-wireless/uhd/files/uhd-3.8.5-gcc6.patch | 25 +
net-wireless/uhd/uhd-3.8.5.ebuild | 4
net-wireless/uhd/uhd-3.9.6.ebuild | 2 ++
3 files changed, 31 insertions(+)
diff --git a/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch
b/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch
new file mode 100644
index 000..c2e5e00f70d
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch
@@ -0,0 +1,25 @@
+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 )
++void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, const
std::vector )
+ {
+ 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 );
++void write_lo_regs(dboard_iface::unit_t unit, const
std::vector );
+ max287x_iface::sptr _txlo;
+ max287x_iface::sptr _rxlo;
+ };
diff --git a/net-wireless/uhd/uhd-3.8.5.ebuild
b/net-wireless/uhd/uhd-3.8.5.ebuild
index 1474f296e8c..d6787b88c5f 100644
--- a/net-wireless/uhd/uhd-3.8.5.ebuild
+++ b/net-wireless/uhd/uhd-3.8.5.ebuild
@@ -34,7 +34,11 @@ 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}-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
diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild
b/net-wireless/uhd/uhd-3.9.6.ebuild
index f1f73a61caf..57e30328555 100644
--- a/net-wireless/uhd/uhd-3.9.6.ebuild
+++ b/net-wireless/uhd/uhd-3.9.6.ebuild
@@ -36,6 +36,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
src_prepare() {
+ cmake-utils_src_prepare
+
gnome2_environment_reset #534582
#this may not be needed in 3.4.3 and above, please verify
