Date: Saturday, November 5, 2022 @ 21:55:30
  Author: blakkheim
Revision: 1342556

upgpkg: gnuradio-osmosdr 0.2.3-14: use git+https, minor cleanup

Modified:
  gnuradio-osmosdr/trunk/PKGBUILD

----------+
 PKGBUILD |   49 ++++++++++++++++---------------------------------
 1 file changed, 16 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-11-05 21:52:08 UTC (rev 1342555)
+++ PKGBUILD    2022-11-05 21:55:30 UTC (rev 1342556)
@@ -2,12 +2,12 @@
 # Contributor: Dominik Heidler <[email protected]>
 
 pkgname=gnuradio-osmosdr
-_reponame=gr-osmosdr
+_pkgname=gr-osmosdr
 pkgver=0.2.3
-_commit=a100eb02  # WHY no new tag for gr39 & pybind?
-pkgrel=13
+_commit=a100eb024c0210b95e4738b6efd836d48225bd03
+pkgrel=14
 pkgdesc='Source block for Funcube Dongle, RTL-SDR, USRP, OsmoSDR, BladeRF, 
HackRF and AirSpy devices'
-url='http://osmocom.org/projects/gr-osmosdr'
+url='https://osmocom.org/projects/gr-osmosdr'
 arch=('x86_64')
 license=('GPL')
 depends=('gnuradio' 'libvolk' 'gnuradio-iqbal' 'rtl-sdr' 'hackrf' 'bladerf' 
'airspy' 'soapysdr')
@@ -14,42 +14,25 @@
 optdepends=('python-opengl: osmocom_fft')
 makedepends=('git' 'cmake' 'boost' 'spdlog')
 replaces=('gr-osmosdr')
-#source=("git://git.osmocom.org/gr-osmosdr/#tag=v$pkgver"
-source=("git://git.osmocom.org/gr-osmosdr/#commit=$_commit"
+source=("git+https://gitea.osmocom.org/sdr/gr-osmosdr.git#commit=$_commit";
         "gnuradio-osmosdr.pc")
-md5sums=('SKIP'
-         'a62fdf732f8a9a59f667bbda5542a824')
+sha256sums=('SKIP'
+            '2efced5c85ef8375b8261d82c0319f94505e2b77cf30b3fa56ff73a9ddb87b05')
 
-# add support for miri, osmo?
-# figure out what happened to libtool
-# gnuradio-fcdproplus doesn't support pybind, remove from osmosdr for now
-
-prepare() {
-  cd $_reponame
-}
-
 build() {
-  cd $_reponame
-
-  mkdir -p build
-  cd build
-
-  cmake \
+  local _pyver=$(python -c 'import sys; 
print(str(sys.version_info[0])+"."+str(sys.version_info[1]))')
+  cmake -B build -S $_pkgname \
     -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release \
-    -DPYTHON_EXECUTABLE="$(which python3)" \
-    -DPYTHON_INCLUDE_DIR="$(echo /usr/include/python3*)" \
-    -DPYTHON_LIBRARY="$(echo /usr/lib/libpython3.*.so)" \
+    -DPYTHON_EXECUTABLE="/usr/bin/python3" \
+    -DPYTHON_INCLUDE_DIR="/usr/include/python${_pyver}" \
+    -DPYTHON_LIBRARY="/usr/lib/libpython${_pyver}.so" \
     -DBoost_NO_BOOST_CMAKE=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr ../
-
-  make
+    -DCMAKE_INSTALL_PREFIX=/usr
+  cmake --build build
 }
 
 package() {
-  cd $_reponame/build
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/gnuradio-osmosdr.pc" 
"$pkgdir/usr/lib/pkgconfig/gnuradio-osmosdr.pc"
+  DESTDIR="$pkgdir" cmake --install build
+  install -Dm644 gnuradio-osmosdr.pc 
"$pkgdir/usr/lib/pkgconfig/gnuradio-osmosdr.pc"
 }

Reply via email to