system/uhd: Updated for version 4.1.0.5.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 29 insertions, 21 deletions

diff --git a/system/uhd/README b/system/uhd/README
index 3e7c6e766ab8c..8519eb1755a25 100644
--- a/system/uhd/README
+++ b/system/uhd/README
@@ -1,6 +1,9 @@
-The USRP Hardware Driver software (UHD) is the hardware driver for all
-USRP devices. It works on all major platforms (Linux, Windows, and Mac)
-and can be built with GCC, Clang, and MSVC compilers. The goal of the
-UHD software is to provide a host driver and API for current and future
-Ettus Research products. Users will be able to use UHD software
+The USRP Hardware Driver software (UHD) is the hardware driver for
+all USRP devices. It works on all major platforms (Linux, Windows, and
+Mac) and can be built with GCC, Clang, and MSVC compilers. The goal of
+the UHD software is to provide a host driver and API for current and
+future Ettus Research products. Users will be able to use UHD software
 standalone or with third-party applications.
+
+Optional dependency: numpy3. This is required for building the UHD
+Python API.
diff --git a/system/uhd/uhd.SlackBuild b/system/uhd/uhd.SlackBuild
index 9093409ce37aa..54aa0051ed009 100644
--- a/system/uhd/uhd.SlackBuild
+++ b/system/uhd/uhd.SlackBuild
@@ -22,10 +22,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220224 bkw: Modified by SlackBuilds.org:
+# - updated to latest release, 4.1.0.5. the previous version was
+#   unbuildable on Slackware 15.0.
+# - move man pages to /usr/man (they were going to /usr/share/man).
+
+# Note: This is a driver for hardware I don't own and can't test. It'd
+# be nice if someone who does own this hardware would test the new
+# version.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=uhd
-VERSION=${VERSION:-003_009_007}
+VERSION=${VERSION:-4.1.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +47,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -69,15 +75,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-release_$VERSION
-tar xvf $CWD/$PRGNAM-release_$VERSION.tar.gz
-cd $PRGNAM-release_$VERSION/host
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION/host
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -90,11 +96,10 @@ cd build
     -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release ..
   make 
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mv $PKG/usr/share/man $PKG/usr/man
 
 mv $PKG/usr/share/doc $PKG/usr/doc
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/uhd/uhd.info b/system/uhd/uhd.info
index a4c50feceaa9a..eb8f9550dfb68 100644
--- a/system/uhd/uhd.info
+++ b/system/uhd/uhd.info
@@ -1,10 +1,10 @@
 PRGNAM="uhd"
-VERSION="003_009_007"
+VERSION="4.1.0.5"
 HOMEPAGE="https://www.ettus.com/"
-DOWNLOAD="https://github.com/EttusResearch/uhd/archive/release_003_009_007/uhd-release_003_009_007.tar.gz"
-MD5SUM="3f024ac4d536a8aaf1ad66617deda941"
+DOWNLOAD="https://github.com/EttusResearch/uhd/archive/v4.1.0.5/uhd-4.1.0.5.tar.gz"
+MD5SUM="8fd12ef06fb56654edc6da7720fd925e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python2-cheetah"
+REQUIRES=""
 MAINTAINER="Georgi Kolev"
 EMAIL="shadowx@escom.bg"