public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/, net-wireless/uhd/
@ 2018-02-10 22:26 Chris Reffett
  0 siblings, 0 replies; 5+ messages in thread
From: Chris Reffett @ 2018-02-10 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     3eae56400d9ca7cf331e6222797f09711abaf356
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 22:25:38 2018 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 22:26:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eae5640

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

 net-wireless/uhd/Manifest                          |  4 +--
 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 ++++++++++++++++++++++
 .../uhd/{uhd-3.8.5.ebuild => uhd-3.10.3.0.ebuild}  | 21 +++++++------
 net-wireless/uhd/uhd-3.9.6.ebuild                  |  6 ++--
 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
similarity index 60%
rename from net-wireless/uhd/uhd-3.8.5.ebuild
rename to 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
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/, net-wireless/uhd/
@ 2019-10-01 17:53 Rick Farina
  0 siblings, 0 replies; 5+ messages in thread
From: Rick Farina @ 2019-10-01 17:53 UTC (permalink / raw
  To: gentoo-commits

commit:     6791726e7a7cf216007dc46c9bccfc6a888a6bef
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 17:53:22 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 17:53:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6791726e

net-wireless/uhd: bump, minor QA

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-wireless/uhd/Manifest                          |   2 +
 .../uhd/files/uhd_man_pages_optional_compress.diff |  76 ++++++++++++
 net-wireless/uhd/uhd-3.14.1.1.ebuild               | 138 +++++++++++++++++++++
 3 files changed, 216 insertions(+)

diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 59017e8c6a0..ff210d1f574 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -4,9 +4,11 @@ DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848d
 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 EttusResearch-UHD-3.14.0.0.tar.gz 12935658 BLAKE2B 8b5273ee3cd4c39ebb3848152116dc26caac951b3cea4c5e5efe37a90ac3a1e0580e7ed65af9145e4981abf7abd9ef748f9b3c823d87194ce7a4a5f9b799abec SHA512 c4754dbbd3540a41407a3bb31866a83c8ab319375db300113c0d13a3debbc4f0f820ccb83c30079c22388409edd032609cdb77bf6c098b37152b1985f773d1cb
+DIST EttusResearch-UHD-3.14.1.1.tar.gz 12960651 BLAKE2B 8a2a0ac4d1cf71177dad1334dcc7426dc78a0c6b8c1bd895d7eb1ca4e2eb5b9a4208998118ba084f1932edacc7503b49a5ebd78dd1b1d9acbac6fe83f503b9eb SHA512 461f9314dd0af5feed91b18196cccb7828cee91a712dec0bb8b59878d54500906beea9f6dd938a90eae041dca6a1f6b564b6924d8e53e4b2fb507f2ed7be0ff4
 DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
 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-images_3.14.0.0.tar.xz 112971440 BLAKE2B b0aeb77251500c42ccaa753483b20d82113d55f1e2f2e1181a27cd95f6aec1768e8a02c9dbc65db612d04d43e7756c6b6e3d6f662a4e66043b3ec52b44bbeb77 SHA512 a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
+DIST uhd-images_3.14.1.1.tar.xz 113265248 BLAKE2B b1ac40435b8bce5cdc29bbdfd182f65d8d2f7d80b21a835202551e52cdc5d7f3b028faa73850121a79a1ff4df73620b8c36a5cab38cb2fed9c582a48429e0ee3 SHA512 d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd
 DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8

diff --git a/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff b/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
new file mode 100644
index 00000000000..5847d50c66f
--- /dev/null
+++ b/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
@@ -0,0 +1,76 @@
+diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt
+index 240a534db..7a7108f00 100644
+--- a/host/docs/CMakeLists.txt
++++ b/host/docs/CMakeLists.txt
+@@ -144,34 +144,49 @@ set(man_page_sources
+ ########################################################################
+ # Setup man pages
+ ########################################################################
+-find_package(GZip)
++option(ENABLE_MAN_PAGE_COMPRESSION "Compress man pages if installed." ON)
+ 
+ # No elegant way in CMake to reverse a boolean
+ if(NOT WIN32)
+     set(NOT_WIN32 TRUE)
+ endif(NOT WIN32)
+ 
+-LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "GZIP_FOUND;NOT_WIN32" OFF OFF)
++set(MAN_PAGES_DEPS "NOT_WIN32")
++
++message(STATUS "")
++if(ENABLE_MAN_PAGE_COMPRESSION)
++    message(STATUS "Compress man pages enabled; looking for compression program")
++    find_package(GZip)
++    list(APPEND MAN_PAGES_DEPS "GZIP_FOUND")
++else(ENABLE_MAN_PAGE_COMPRESSION)
++    message(STATUS "Compress man pages disabled")
++endif(ENABLE_MAN_PAGE_COMPRESSION)
++
++LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "${MAN_PAGES_DEPS}" OFF OFF)
+ 
+ if(ENABLE_MAN_PAGES)
+-    #Generate man pages
+-    foreach(manfile ${man_page_sources})
+-        #make the gzip file depend on the text file
+-        string(REPLACE ".1" "" PROGRAM_NAME "${manfile}")
+-        set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz")
+-        set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}")
+-        add_custom_command(
+-            OUTPUT ${gzfile}
+-            DEPENDS ${manfile}
+-            COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile}
+-            COMMENT "Generating ${PROGRAM_NAME} man page"
+-        )
+-
+-        #make the man page target depend on the gz file
+-        list(APPEND man_page_gz_files ${gzfile})
+-        UHD_INSTALL(FILES ${gzfile} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
+-    endforeach(manfile ${man_page_sources})
+-
+-    #make the man pages a build-time dependency
+-    add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files})
++    #Generate man pages; either compressed or not
++    if(ENABLE_MAN_PAGE_COMPRESSION)
++        # compress man pages
++        foreach(manfile ${man_page_sources})
++            #make the gzip file depend on the text file
++            string(REPLACE ".1" "" PROGRAM_NAME "${manfile}")
++            set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz")
++            set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}")
++            add_custom_command(
++                OUTPUT ${gzfile}
++                DEPENDS ${manfile}
++                COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile}
++                COMMENT "Generating ${PROGRAM_NAME} man page"
++            )
++            #make the man page target depend on the gz file
++            list(APPEND man_page_gz_files ${gzfile})
++        endforeach(manfile ${man_page_sources})
++        #make the man pages a build-time dependency
++        UHD_INSTALL(FILES ${man_page_gz_files} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
++        add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files})
++    else(ENABLE_MAN_PAGE_COMPRESSION)
++        # uncompressed man pages; just install them
++        UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
++    endif(ENABLE_MAN_PAGE_COMPRESSION)
+ endif(ENABLE_MAN_PAGES)

diff --git a/net-wireless/uhd/uhd-3.14.1.1.ebuild b/net-wireless/uhd/uhd-3.14.1.1.ebuild
new file mode 100644
index 00000000000..8f61652cc09
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.14.1.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+#not sure why, but eapi 7 fails
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
+
+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/
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+			b100? ( usb )
+			b200? ( usb )
+			usrp1? ( usb )
+			usrp2? ( usb )
+			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+	e300? ( virtual/udev )
+	usb? ( virtual/libusb:1 )
+	dev-libs/boost:=
+	sys-libs/ncurses:0[tinfo]
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-python/mako
+	app-arch/unzip
+	app-arch/gzip
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+	default
+	mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+	cd ..
+	eapply "${FILESDIR}"/uhd_man_pages_optional_compress.diff
+	cd host
+
+	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_configure() {
+	mycmakeargs=(
+		-DENABLE_LIBUHD=ON
+		-DENABLE_C_API=ON
+		-DENABLE_LIBERIO=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_GPSD=OFF
+		-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_N230="$(usex n230)"
+		-DENABLE_MPMD="$(usex mpmd)"
+		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+	)
+	cmake-utils_src_configure
+}
+src_install() {
+	cmake-utils_src_install
+	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+	if [ "${PV}" != "9999" ]; then
+		rm -rf "${ED}/usr/bin/uhd_images_downloader"
+		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1"
+	fi
+
+	insinto /lib/udev/rules.d/
+	doins "${S}/utils/uhd-usrp.rules"
+
+	rm -rf "${WORKDIR}/images/winusb_driver"
+	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 n230; then
+		rm "${WORKDIR}"/images/usrp_n230* || 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"
+
+	#fix doc location
+	mv "${ED}"/usr/share/doc/uhd "${ED}/usr/share/doc/${PF}" || die
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/, net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
  0 siblings, 0 replies; 5+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     78c9b6a3899e6fed89d1966e46322e5a30d1b40f
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 22:35:24 2022 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c9b6a3

net-wireless/uhd: add 4.1.0.5, drop 4.1.0.4

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 net-wireless/uhd/Manifest                                             | 4 ++--
 ...sibility-tests.patch => uhd-4.1.0.5-hidden-visibility-tests.patch} | 0
 net-wireless/uhd/{uhd-4.1.0.4.ebuild => uhd-4.1.0.5.ebuild}           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 9bdd5508da08..6bb84d840684 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,2 +1,2 @@
-DIST EttusResearch-UHD-4.1.0.4.tar.gz 37913211 BLAKE2B 28cd3892490aaa8ec01ca8233c4f0500fd49a3184be74f77dbb8a5fdafc08d74144eb01485e5059d8c115406606024261f851fa7c592687637a5906e12d42b2e SHA512 f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6
-DIST uhd-images_4.1.0.4.tar.xz 118536976 BLAKE2B 6ac9b0b4aff5cbe1336edcb07a450dba3e050bf36c87af37fdbb2e83c472d86a2a8b51720fad3046d4f58d5ad1b6a836d35d1d7c57e1a36171161c22f2c7fe30 SHA512 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b
+DIST EttusResearch-UHD-4.1.0.5.tar.gz 37975618 BLAKE2B ff5b38be7ef7088168f2bf8908e59e74d2f492a860dac6b7fef48abd5d25840435a57b3ef980ceb7416efd1d3520a3f83bace3bc5bca5caaecc14088e9609fcd SHA512 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af
+DIST uhd-images_4.1.0.5.tar.xz 118480128 BLAKE2B 90803ca0a7452e601481837d006dbaf0eab57070d4fccfd0576a7a7736c11fa62caf9ea141be807a5c4d65ba2bb0f7a5361833ff2afb9f732f231b2bb659f08e SHA512 fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c

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.5-hidden-visibility-tests.patch
similarity index 100%
rename from net-wireless/uhd/files/uhd-4.1.0.4-hidden-visibility-tests.patch
rename to net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch

diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.5.ebuild
similarity index 98%
rename from net-wireless/uhd/uhd-4.1.0.4.ebuild
rename to net-wireless/uhd/uhd-4.1.0.5.ebuild
index f0add2574dad..fc72374bca2c 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.5.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0.4-hidden-visibility-tests.patch"
+	"${FILESDIR}/${PN}-4.1.0.5-hidden-visibility-tests.patch"
 )
 
 S="${WORKDIR}/${P}/host"


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/, net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
  0 siblings, 0 replies; 5+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     2fc1a014d1e2979f4318492b621fa273eba230d2
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 22:33:40 2022 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fc1a014

net-wireless/uhd: better tinfo workaround

Reported upstream https://gitlab.kitware.com/cmake/cmake/-/issues/23236

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch | 42 --------------------------
 net-wireless/uhd/uhd-4.1.0.4.ebuild            |  3 +-
 2 files changed, 2 insertions(+), 43 deletions(-)

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
deleted file mode 100644
index 484aa1f9c2f5..000000000000
--- a/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur host/CMakeLists.txt uhd-4.0.0.0-patched/host/CMakeLists.txt
---- host/CMakeLists.txt	2020-09-13 15:14:04.000000000 -0400
-+++ host/CMakeLists.txt	2020-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.000000000 -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.000000000 -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.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 4bcb7e47ea2c..f0add2574dad 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -49,7 +49,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0.0-tinfo.patch"
 	"${FILESDIR}/${PN}-4.1.0.4-hidden-visibility-tests.patch"
 )
 
@@ -67,7 +66,9 @@ src_prepare() {
 }
 
 src_configure() {
+	#https://gitlab.kitware.com/cmake/cmake/-/issues/23236
 	local mycmakeargs=(
+		-DCURSES_NEED_NCURSES=ON
 		-DENABLE_LIBUHD=ON
 		-DENABLE_C_API=ON
 		-DENABLE_MAN_PAGES=ON


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/, net-wireless/uhd/
@ 2023-01-03 23:25 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-01-03 23:25 UTC (permalink / raw
  To: gentoo-commits

commit:     c3d6effbcedd49a205c45b515e80aa0a216d4918
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 23:24:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 23:24:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d6effb

net-wireless/uhd: fix build w/ gcc 13

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch | 95 +++++++++++++++++++++++++
 net-wireless/uhd/uhd-4.3.0.0.ebuild             |  6 +-
 2 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch b/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch
new file mode 100644
index 000000000000..8559ecb8331f
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch
@@ -0,0 +1,95 @@
+https://github.com/EttusResearch/uhd/pull/652
+
+From 48a05bf621a056af7764437760ad5d64684ce7d2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 3 Jan 2023 23:04:52 +0000
+Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <cstdint> is no longer transitively included.
+
+Explicitly include <cstdint> for uint8_t.
+
+```
+/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/include/uhd/rfnoc/defaults.hpp:43:14: error: 'uint32_t' does not name a type
+   43 | static const uint32_t DEFAULT_NOC_ID  = 0xFFFFFFFF;
+      |              ^~~~~~~~
+/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/include/uhd/rfnoc/defaults.hpp:1:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
+  +++ |+#include <cstdint>
+    1 | //
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/include/uhd/cal/database.hpp
++++ b/include/uhd/cal/database.hpp
+@@ -8,6 +8,7 @@
+ 
+ #include <uhd/config.hpp>
+ #include <stddef.h>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include <functional>
+--- a/include/uhd/rfnoc/defaults.hpp
++++ b/include/uhd/rfnoc/defaults.hpp
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ namespace uhd { namespace rfnoc {
+--- a/include/uhd/types/eeprom.hpp
++++ b/include/uhd/types/eeprom.hpp
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <map>
+ #include <string>
+ #include <vector>
+--- a/include/uhd/usrp/zbx_tune_map_item.hpp
++++ b/include/uhd/usrp/zbx_tune_map_item.hpp
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ #include <uhd/config.hpp>
++#include <cstdint>
+ #include <cstring>
+ #include <string>
+ #include <vector>
+--- a/lib/usrp/dboard/magnesium/magnesium_constants.hpp
++++ b/lib/usrp/dboard/magnesium/magnesium_constants.hpp
+@@ -9,6 +9,7 @@
+ 
+ #include <uhd/types/ranges.hpp>
+ #include <cstddef>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/lib/usrp/dboard/rhodium/rhodium_constants.hpp
++++ b/lib/usrp/dboard/rhodium/rhodium_constants.hpp
+@@ -9,6 +9,7 @@
+ 
+ #include <array>
+ #include <cstddef>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/lib/utils/serial_number.cpp
++++ b/lib/utils/serial_number.cpp
+@@ -5,6 +5,7 @@
+ //
+ 
+ #include <uhdlib/utils/serial_number.hpp>
++#include <cstdint>
+ #include <stdexcept>
+ #include <string>
+ 
+-- 
+2.39.0
+

diff --git a/net-wireless/uhd/uhd-4.3.0.0.ebuild b/net-wireless/uhd/uhd-4.3.0.0.ebuild
index 43bc62d7590a..8e1f3f3cd9ac 100644
--- a/net-wireless/uhd/uhd-4.3.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,6 +50,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P}/host"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0.0-gcc-13.patch
+)
+
 src_unpack() {
 	default
 	mv "uhd-images_${PV}" images || die


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-01-03 23:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-10 22:26 [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/, net-wireless/uhd/ Chris Reffett
  -- strict thread matches above, loose matches on Subject: below --
2019-10-01 17:53 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2023-01-03 23:25 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox