diff --git a/community/libuhd/0001-remove-ineffectual-neon-check.patch b/community/libuhd/0001-remove-ineffectual-neon-check.patch deleted file mode 100644 index 31e4d34dc..000000000 --- a/community/libuhd/0001-remove-ineffectual-neon-check.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d48353b54007a39d8ef9cb53c3d18adf8be9b62c Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sat, 14 May 2016 11:08:46 -0600 -Subject: [PATCH] remove ineffectual neon check - ---- - host/lib/convert/CMakeLists.txt | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt -index 10376ba..4d793c4 100644 ---- a/host/lib/convert/CMakeLists.txt -+++ b/host/lib/convert/CMakeLists.txt -@@ -54,22 +54,6 @@ IF(HAVE_EMMINTRIN_H) - ENDIF(HAVE_EMMINTRIN_H) - - ######################################################################## --# Check for NEON SIMD headers --######################################################################## --IF(CMAKE_COMPILER_IS_GNUCXX) -- CHECK_INCLUDE_FILE_CXX(arm_neon.h HAVE_ARM_NEON_H) --ENDIF(CMAKE_COMPILER_IS_GNUCXX) -- --IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_VOID_P} EQUAL 4)) -- ENABLE_LANGUAGE(ASM) -- -- LIBUHD_APPEND_SOURCES( -- ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp -- ${CMAKE_CURRENT_SOURCE_DIR}/convert_neon.S -- ) --ENDIF() -- --######################################################################## - # Convert types generation - ######################################################################## - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) --- -2.8.2 - diff --git a/community/libuhd/PKGBUILD b/community/libuhd/PKGBUILD index 3d3f1f0c8..a7a304a55 100644 --- a/community/libuhd/PKGBUILD +++ b/community/libuhd/PKGBUILD @@ -2,11 +2,11 @@ # Contributor: Dominik Heidler # ALARM: Kevin Mihelich -# - patch out ineffectual neon check +# - set -DNEON_SIMD_ENABLE=OFF pkgname=libuhd -pkgver=3.13.0.1 -pkgrel=3 +pkgver=3.14.0.0 +pkgrel=1 pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver" arch=('x86_64') url="http://www.ettus.com/kb/category/software-documentation/uhd-manual" @@ -14,27 +14,19 @@ license=('GPL') depends=('boost-libs' 'orc' 'libusb') optdepends=('python2: usrp utils') makedepends=('cmake' 'boost' 'python2-mako') +# gpsd? dpdk? -source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz" - 'boost-1.67.patch' - 'boost-1.69.patch' - '0001-remove-ineffectual-neon-check.patch') -md5sums=('e7c38546d9dadac41657ee5e53c3f342' - '45fcc6feb0ea9b4ae09e4ba7b010864f' - 'ae53a647b13a9187a3c8b965bfbde2c1' - '2cb16216ee735ab1160e572d523155ea') +source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz") +md5sums=('bc195e12bbdf95eaf88ce20be453020d') prepare() { cd "$srcdir/uhd-$pkgver" - patch -Np1 -i ../boost-1.67.patch - patch -Np1 -i ../boost-1.69.patch - patch -Np1 -i ../0001-remove-ineffectual-neon-check.patch + # fix for py2 + find -name "*.py" -or -name '*.py.in' | xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" } build() { cd "$srcdir/uhd-$pkgver/host" - # fix for py2 - find -name "*.py" -or -name '*.py.in' | xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" mkdir -p build cd build @@ -44,7 +36,8 @@ build() { -DENABLE_UTILS=ON \ -DENABLE_TESTS=OFF \ -DENABLE_E100=ON \ - -DENABLE_E300=ON + -DENABLE_E300=ON \ + -DNEON_SIMD_ENABLE=OFF make } diff --git a/community/libuhd/boost-1.67.patch b/community/libuhd/boost-1.67.patch deleted file mode 100644 index d082b21ee..000000000 --- a/community/libuhd/boost-1.67.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr uhd-3.11.1.0.orig/host/lib/usrp/e300/e300_fifo_config.cpp uhd-3.11.1.0/host/lib/usrp/e300/e300_fifo_config.cpp ---- uhd-3.11.1.0.orig/host/lib/usrp/e300/e300_fifo_config.cpp 2018-05-16 22:25:48.000000000 +0300 -+++ uhd-3.11.1.0/host/lib/usrp/e300/e300_fifo_config.cpp 2018-06-03 00:16:53.119018076 +0300 -@@ -107,7 +107,7 @@ struct e300_fifo_poll_waiter - boost::mutex::scoped_lock l(_mutex); - if (_poll_claimed) - { -- _cond.timed_wait(l, boost::posix_time::microseconds(timeout*1000000)); -+ _cond.timed_wait(l, boost::posix_time::microseconds(long(timeout*1000000))); - } - else - { diff --git a/community/libuhd/boost-1.69.patch b/community/libuhd/boost-1.69.patch deleted file mode 100644 index bc3b2ce49..000000000 --- a/community/libuhd/boost-1.69.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5c012cad7858cadcaa85ec295080f3c8b21fdee0 Mon Sep 17 00:00:00 2001 -From: Martin Braun -Date: Wed, 9 Jan 2019 09:17:07 -0800 -Subject: [PATCH] lib: experts: Add potentially missing but sometimes inferred - include - -This adds an include for boost/core/noncopyable.hpp. Without it, builds -would potentially fail on Boost 1.69++. ---- - host/lib/include/uhdlib/experts/expert_nodes.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp -index 697ca19c3..8fa183835 100644 ---- a/host/lib/include/uhdlib/experts/expert_nodes.hpp -+++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include