Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / 
libuhd


Commits:
dfe47d39 by Antonio Rojas at 2024-08-30T20:50:59+02:00
upgpkg: 4.6.0.0-4: boost 1.86 rebuild

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,10 +1,11 @@
 pkgbase = libuhd
        pkgdesc = Universal Software Radio Peripheral (USRP) userspace driver
        pkgver = 4.6.0.0
-       pkgrel = 3
+       pkgrel = 4
        url = https://files.ettus.com/manual/
        arch = x86_64
        license = GPL
+       makedepends = git
        makedepends = cmake
        makedepends = boost
        makedepends = python-setuptools
@@ -16,7 +17,7 @@ pkgbase = libuhd
        optdepends = python: usrp utils
        optdepends = python-numpy: python api
        options = !lto
-       source = 
libuhd-4.6.0.0.tar.gz::https://github.com/EttusResearch/uhd/archive/v4.6.0.0.tar.gz
-       sha256sums = 
5e6eb05abb4a3973bef8837fb45a5147be04698229e22801369f728fcc6db38d
+       source = git+https://github.com/EttusResearch/uhd#tag=v4.6.0.0
+       sha256sums = 
cbbb74818602b1c035db97530f2d541d90c17bc90f12addc64de01e9eba3115f
 
 pkgname = libuhd


=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
 
 pkgname=libuhd
 pkgver=4.6.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver"
 arch=('x86_64')
 url="https://files.ettus.com/manual/";
@@ -12,22 +12,22 @@ license=('GPL')
 depends=('boost-libs' 'orc' 'libusb')
 optdepends=('python: usrp utils'
             'python-numpy: python api')
-makedepends=('cmake' 'boost' 'python-setuptools' 'python-mako' 'python-numpy')
+makedepends=('git' 'cmake' 'boost' 'python-setuptools' 'python-mako' 
'python-numpy')
 options=(!lto)
 # gpsd?  dpdk?
 
-source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz";)
-sha256sums=('5e6eb05abb4a3973bef8837fb45a5147be04698229e22801369f728fcc6db38d')
+source=(git+https://github.com/EttusResearch/uhd#tag=v$pkgver)
+sha256sums=('cbbb74818602b1c035db97530f2d541d90c17bc90f12addc64de01e9eba3115f')
 
 prepare() {
-  cd "$srcdir/uhd-$pkgver/host"
-  mkdir build
+  cd uhd
+  git cherry-pick -n ea586168c596d13d05d145832519755794649ba0
+  git cherry-pick -n c4863b9b9f8b639260f7797157e8ac4dd81fef93 # Fix build with 
boost 1.85
 }
 
 build() {
-  cd "$srcdir/uhd-$pkgver/host/build"
-
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr/ \
+  cmake -B build -S uhd/host \
+           -DCMAKE_INSTALL_PREFIX=/usr/ \
            -DPYTHON_EXECUTABLE=/usr/bin/python3 \
            -DENABLE_PYTHON_API=ON \
            -DENABLE_EXAMPLES=ON \
@@ -35,16 +35,15 @@ build() {
            -DENABLE_TESTS=OFF \
            -DENABLE_E100=ON \
            -DENABLE_E300=ON
-  make
+  cmake --build build
 }
 
 check() {
-  cd "$srcdir/uhd-$pkgver/host/build"
+  cd 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"
+  DESTDIR="$pkgdir" cmake --install build
+  install -Dm644 uhd/host/utils/uhd-usrp.rules 
"$pkgdir/usr/lib/udev/rules.d/10-uhd-usrp.rules"
 } 



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/libuhd/-/commit/dfe47d39784d7f088b9830188450c2c04cc66182

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/libuhd/-/commit/dfe47d39784d7f088b9830188450c2c04cc66182
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to