From 90a3be9d71a22834f9bc82c072f1b993f9a10e31 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Aug 2023 21:42:17 +0100 Subject: gentoo auto-resync : 20:08:2023 - 21:42:17 --- net-wireless/uhd/Manifest | 2 - .../uhd-4.1.0.5-hidden-visibility-tests.patch | 24 ------ net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch | 95 ---------------------- 3 files changed, 121 deletions(-) delete mode 100644 net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch delete mode 100644 net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch (limited to 'net-wireless/uhd') diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest index 0f99d99d4e04..348cf735c4c4 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -1,5 +1,3 @@ -AUX uhd-4.1.0.5-hidden-visibility-tests.patch 870 BLAKE2B 97c7e1c477d57f32cd1ed8a4c96de5761f422719783c1da247c3d00a1ddf51087484b95daa57fd3a4a417c6227a5fe2de2d7d3637575a7a5cab83a243ae270bf SHA512 017ce990463d332a5a67853dcf6362063935b10af67083c88385ef5659694e3af765349b89663b9e0f95ccd11da43f690feddbf71faa7ddcc109344c41c9dd6c -AUX uhd-4.3.0.0-gcc-13.patch 2418 BLAKE2B 5abfff140f5eb95a77103f48468b0a976cac3d2f86742f6b22d841fee2276bead6fe94b7412ca6221e4a4409b3dc6d1ae15457813cad89e13e0c300d0ce53189 SHA512 ab1f7b9c44bc835355a2981e110a5e9fef49587f3d75f0b12ee5bec784300797f2b19c60c44a6b5da611b26fd3c2c743e343aa577474c19de896dad75c2f5c84 DIST EttusResearch-UHD-4.4.0.0.tar.gz 38210999 BLAKE2B defc2ae91c1422491c0c434f76852c253d84e2bdc43f6768069e23c40803d33aac8f087d51c28037102ab4760c5f3d5e04dc090655ddca26eef3440bf703db61 SHA512 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a DIST uhd-images_4.4.0.0.tar.xz 127558912 BLAKE2B bb7135241c4e39db2450e0fca8c8c6b0421d76f512dca08e50732ee0a2dbfa5f330df168101607d52b6215aba083cd966027a9da8f14331f6bac17fdd76d766b SHA512 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463 EBUILD uhd-4.4.0.0.ebuild 3706 BLAKE2B 1df28f95ff2a7aefe82c1ac04caf4b0411071f5faa2601fb9c46875b0ff20436e793b3d3c13b56a807dde68a5352e1e21b83a598a29644d09b38bcb1ec239fcd SHA512 fb6e8ca655e53c86b550fabf0a923ae7ed9973fee5fb9f2966938cfcab64e140c61a0ef2e0cac6acf5b9d9b3b9ebc2aea6ddf958bec6fa0fdc44c20bb9abb1a4 diff --git a/net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch b/net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch deleted file mode 100644 index 7c353ec6d717..000000000000 --- a/net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -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("${UHD_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/files/uhd-4.3.0.0-gcc-13.patch b/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch deleted file mode 100644 index 8559ecb8331f..000000000000 --- a/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch +++ /dev/null @@ -1,95 +0,0 @@ -https://github.com/EttusResearch/uhd/pull/652 - -From 48a05bf621a056af7764437760ad5d64684ce7d2 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 3 Jan 2023 23:04:52 +0000 -Subject: [PATCH] Fix build with GCC 13 (add missing include) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so is no longer transitively included. - -Explicitly include 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 ''; did you forget to '#include '? - +++ |+#include - 1 | // -``` - -Signed-off-by: Sam James ---- a/include/uhd/cal/database.hpp -+++ b/include/uhd/cal/database.hpp -@@ -8,6 +8,7 @@ - - #include - #include -+#include - #include - #include - #include ---- a/include/uhd/rfnoc/defaults.hpp -+++ b/include/uhd/rfnoc/defaults.hpp -@@ -8,6 +8,7 @@ - - #pragma once - -+#include - #include - - namespace uhd { namespace rfnoc { ---- a/include/uhd/types/eeprom.hpp -+++ b/include/uhd/types/eeprom.hpp -@@ -6,6 +6,7 @@ - - #pragma once - -+#include - #include - #include - #include ---- 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 -+#include - #include - #include - #include ---- a/lib/usrp/dboard/magnesium/magnesium_constants.hpp -+++ b/lib/usrp/dboard/magnesium/magnesium_constants.hpp -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - ---- a/lib/usrp/dboard/rhodium/rhodium_constants.hpp -+++ b/lib/usrp/dboard/rhodium/rhodium_constants.hpp -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - ---- a/lib/utils/serial_number.cpp -+++ b/lib/utils/serial_number.cpp -@@ -5,6 +5,7 @@ - // - - #include -+#include - #include - #include - --- -2.39.0 - -- cgit v1.2.3