public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/
@ 2020-06-09 19:59 Rick Farina
  0 siblings, 0 replies; 4+ messages in thread
From: Rick Farina @ 2020-06-09 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     beb2068d75725789029679b66427c7d3059b81d2
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 19:59:43 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 19:59:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb2068d

net-wireless/uhd: imported from gh pr #16108

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch    | 34 ----------
 .../uhd/files/uhd_man_pages_optional_compress.diff | 76 ----------------------
 2 files changed, 110 deletions(-)

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
deleted file mode 100644
index ff9956fee41..00000000000
--- a/net-wireless/uhd/files/uhd-3.10.3.0-tinfo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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_man_pages_optional_compress.diff b/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
deleted file mode 100644
index 5847d50c66f..00000000000
--- a/net-wireless/uhd/files/uhd_man_pages_optional_compress.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-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)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/
@ 2021-10-29 22:01 Conrad Kostecki
  0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2021-10-29 22:01 UTC (permalink / raw
  To: gentoo-commits

commit:     68cf2f52beceb077a9f9dbf33127e16a11e4ed8f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Oct 14 18:20:02 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 21:46:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68cf2f52

net-wireless/uhd: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/22578
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../uhd/files/uhd-4.0.0.0-boost-1.76.patch         | 59 ----------------------
 1 file changed, 59 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
deleted file mode 100644
index 123a01bca56..00000000000
--- a/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From b05285b3853493436f71eb4192365b818005b0af Mon Sep 17 00:00:00 2001
-From: loqs <loqs@users.noreply.github.com>
-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 <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
- #include <boost/assign/list_of.hpp>
- #include <boost/math/special_functions/round.hpp>
-+#include <boost/math/special_functions/sign.hpp>
- #include <algorithm>
- #include <cmath>
- #include <functional>
-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 <uhdlib/usrp/cores/rx_frontend_core_3000.hpp>
- #include <boost/assign/list_of.hpp>
- #include <boost/math/special_functions/round.hpp>
-+#include <boost/math/special_functions/sign.hpp>
- #include <functional>
- 
- 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 <uhdlib/usrp/common/apply_corrections.hpp>
- #include <boost/asio.hpp> //used for htonl and ntohl
- #include <boost/asio/ip/address_v4.hpp>
-+#include <boost/math/special_functions/round.hpp>
-+#include <boost/math/special_functions/sign.hpp>
- #include <boost/format.hpp>
- #include <boost/thread.hpp>
- #include <functional>
-@@ -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 <boost/math/special_functions/round.hpp>
--#include <boost/math/special_functions/sign.hpp>
--
- 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

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

commit:     7d56e5e037c55a1fafd3b5f7116630af0b01d204
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 22:35:38 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=7d56e5e0

net-wireless/uhd: forward port test patch

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

 net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index ca6704c5dff6..7c353ec6d717 100644
--- 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
@@ -17,7 +17,7 @@ index ac0e1b4492..36c9f9b076 100644
 @@ -8,6 +8,6 @@
  # Build uhd_test static lib
  ########################################################################
- include_directories("${CMAKE_SOURCE_DIR}/lib/include")
+ include_directories("${UHD_SOURCE_DIR}/lib/include")
 -add_library(uhd_test
 +add_library(uhd_test STATIC
      ${CMAKE_CURRENT_SOURCE_DIR}/mock_zero_copy.cpp


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/
@ 2023-08-20 17:47 Rick Farina
  0 siblings, 0 replies; 4+ messages in thread
From: Rick Farina @ 2023-08-20 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ccd2c3eb2aca6888ba60ac00e924e8625c311fb9
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug 20 15:10:46 2023 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 17:46:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd2c3eb

net-wireless/uhd: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/32390

 .../uhd-4.1.0.5-hidden-visibility-tests.patch      | 24 ------
 net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch    | 95 ----------------------
 2 files changed, 119 deletions(-)

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 <soap@gentoo.org>
-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 <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
-


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-08-20 17:47 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-20 17:47 [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/ Rick Farina
  -- strict thread matches above, loose matches on Subject: below --
2022-02-24 16:04 Rick Farina
2021-10-29 22:01 Conrad Kostecki
2020-06-09 19:59 Rick Farina

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