[arch-commits] Commit in libuhd/repos/community-staging-x86_64 (4 files)
Kyle Keen
kkeen at gemini.archlinux.org
Fri Jul 23 16:56:43 UTC 2021
Date: Friday, July 23, 2021 @ 16:56:43
Author: kkeen
Revision: 984567
archrelease: copy trunk to community-staging-x86_64
Added:
libuhd/repos/community-staging-x86_64/PKGBUILD
(from rev 984566, libuhd/trunk/PKGBUILD)
Deleted:
libuhd/repos/community-staging-x86_64/PKGBUILD
libuhd/repos/community-staging-x86_64/boost-1.76.patch
libuhd/repos/community-staging-x86_64/gcc11.patch
------------------+
PKGBUILD | 105 ++++++++++++++++++++++++-----------------------------
boost-1.76.patch | 59 -----------------------------
gcc11.patch | 25 ------------
3 files changed, 48 insertions(+), 141 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-23 16:56:31 UTC (rev 984566)
+++ PKGBUILD 2021-07-23 16:56:43 UTC (rev 984567)
@@ -1,57 +0,0 @@
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Dominik Heidler <dheidler at gmail.com>
-
-pkgname=libuhd
-pkgver=4.1.0.1
-pkgrel=1
-pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver"
-arch=('x86_64')
-url="https://files.ettus.com/manual/"
-license=('GPL')
-depends=('boost-libs' 'orc' 'libusb')
-optdepends=('python: usrp utils'
- 'python-numpy: python api')
-makedepends=('cmake' 'boost' 'python-mako' 'python-numpy')
-# gpsd? dpdk?
-
-source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz"
- gcc11.patch
- boost-1.76.patch)
-sha256sums=('e468d5f118c84174754b34613d2b2b9e5fcab9c49062fe3ff7c209c9ac37da7b'
- '967ef02684f8b07ceebc3fbfc36b97f5ca74e3c1ecf481f643ec20ca0af4f08c'
- '14907a6fc67b59fdfaee7c46f91b903296e4e0e335f39ff2e83bb935ee10b4f5')
-
-prepare() {
- cd "$srcdir/uhd-$pkgver/host"
- mkdir build
-
- #patch -Np1 -d .. -i ../gcc11.patch
-
- # https://github.com/EttusResearch/uhd/issues/437
- #patch -Np1 -d .. -i ../boost-1.76.patch
-}
-
-build() {
- cd "$srcdir/uhd-$pkgver/host/build"
-
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr/ \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
- -DENABLE_PYTHON_API=ON \
- -DENABLE_EXAMPLES=OFF \
- -DENABLE_UTILS=ON \
- -DENABLE_TESTS=OFF \
- -DENABLE_E100=ON \
- -DENABLE_E300=ON
- make
-}
-
-check() {
- cd "$srcdir/uhd-$pkgver/host/build"
- make test
-}
-
-package() {
- cd "$srcdir/uhd-$pkgver/host/build"
- make DESTDIR="$pkgdir" install
- install -Dm644 "../utils/uhd-usrp.rules" "$pkgdir/usr/lib/udev/rules.d/10-uhd-usrp.rules"
-}
Copied: libuhd/repos/community-staging-x86_64/PKGBUILD (from rev 984566, libuhd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-07-23 16:56:43 UTC (rev 984567)
@@ -0,0 +1,48 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Dominik Heidler <dheidler at gmail.com>
+
+pkgname=libuhd
+pkgver=4.1.0.1
+pkgrel=2
+pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver"
+arch=('x86_64')
+url="https://files.ettus.com/manual/"
+license=('GPL')
+depends=('boost-libs' 'orc' 'libusb')
+optdepends=('python: usrp utils'
+ 'python-numpy: python api')
+makedepends=('cmake' 'boost' 'python-mako' 'python-numpy')
+# gpsd? dpdk?
+
+source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz")
+sha256sums=('e468d5f118c84174754b34613d2b2b9e5fcab9c49062fe3ff7c209c9ac37da7b')
+
+prepare() {
+ cd "$srcdir/uhd-$pkgver/host"
+ mkdir build
+}
+
+build() {
+ cd "$srcdir/uhd-$pkgver/host/build"
+
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr/ \
+ -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+ -DENABLE_PYTHON_API=ON \
+ -DENABLE_EXAMPLES=OFF \
+ -DENABLE_UTILS=ON \
+ -DENABLE_TESTS=OFF \
+ -DENABLE_E100=ON \
+ -DENABLE_E300=ON
+ make
+}
+
+check() {
+ cd "$srcdir/uhd-$pkgver/host/build"
+ make test
+}
+
+package() {
+ cd "$srcdir/uhd-$pkgver/host/build"
+ make DESTDIR="$pkgdir" install
+ install -Dm644 "../utils/uhd-usrp.rules" "$pkgdir/usr/lib/udev/rules.d/10-uhd-usrp.rules"
+}
Deleted: boost-1.76.patch
===================================================================
--- boost-1.76.patch 2021-07-23 16:56:31 UTC (rev 984566)
+++ boost-1.76.patch 2021-07-23 16:56:43 UTC (rev 984567)
@@ -1,59 +0,0 @@
-From b05285b3853493436f71eb4192365b818005b0af Mon Sep 17 00:00:00 2001
-From: loqs <loqs at 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/host/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
-index ff431fd41..53f3fee69 100644
---- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp
-+++ b/host/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/host/lib/usrp/cores/rx_frontend_core_3000.cpp b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
-index abbe64b13..d51fea2ca 100644
---- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp
-+++ b/host/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/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
-index c2514ae02..28aa11083 100644
---- a/host/lib/usrp/usrp2/usrp2_impl.cpp
-+++ b/host/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
Deleted: gcc11.patch
===================================================================
--- gcc11.patch 2021-07-23 16:56:31 UTC (rev 984566)
+++ gcc11.patch 2021-07-23 16:56:43 UTC (rev 984567)
@@ -1,25 +0,0 @@
-From 9c4d9d826a6f40f199c526afd5ec168d5d088591 Mon Sep 17 00:00:00 2001
-From: Martin Braun <martin.braun at ettus.com>
-Date: Fri, 29 Jan 2021 12:23:50 +0100
-Subject: [PATCH] lib: Fix missing includes in rpc.hpp
-
----
- host/lib/include/uhdlib/utils/rpc.hpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/host/lib/include/uhdlib/utils/rpc.hpp b/host/lib/include/uhdlib/utils/rpc.hpp
-index e87a2ee32..ca89c1054 100644
---- a/host/lib/include/uhdlib/utils/rpc.hpp
-+++ b/host/lib/include/uhdlib/utils/rpc.hpp
-@@ -12,7 +12,11 @@
- #include <rpc/client.h>
- #include <rpc/rpc_error.h>
- #include <boost/format.hpp>
-+#include <chrono>
- #include <memory>
-+#include <mutex>
-+#include <string>
-+#include <thread>
-
- namespace {
-
More information about the arch-commits
mailing list