fix bild

1 files changed, 58 insertions, 86 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 75e7bf7d208d..c7d83e3ff69a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,114 +1,87 @@
 pkgbase=gnuradio38
 pkgname=(gnuradio38 gnuradio38-companion)
-pkgver=3.8.4.0
+pkgver=v3.8.4.0.r22.g9a2be0397
 pkgrel=1
 pkgdesc="General purpose DSP and SDR toolkit. 3.8 branch."
 arch=('x86_64')
 url="https://gnuradio.org"
 license=('GPL')
 depends=(
-'python-numpy'
-'gsl'
-'blas'
-'libuhd'
-'libvolk'
-'log4cpp'
-'python-yaml'
-'gmp'
-'gsm'
-'codec2'
-'python-mako'
-'python-click-plugins'
+python-numpy
+gsl
+blas
+libuhd
+libvolk
+log4cpp
+python-yaml
+gmp
+gsm
+codec2-git
+python-mako
+python-click-plugins
 )
 makedepends=(
-'alsa-lib'
-'boost'
-'cmake'
-'fftw'
-'glu'
-'gtk3'
-'jack'
-'pango'
-'portaudio'
-'python-gobject'
-'python-lxml'
-'python-pyqt5'
-'python-cairo'
-'qwt'
-'swig'
-'zeromq'
+alsa-lib
+boost
+cmake
+fftw
+glu
+gtk3
+jack
+pango
+portaudio
+python-gobject
+python-lxml
+python-pyqt5
+python-cairo
+qwt
+swig
+zeromq
 )
 
-# todo
-# split the gui components?
-# build doxygen docs?
-# gr-video-sdl ?
-# icons
-# add thrift?
-
-# zeroc-ice: gr-ctrlport
-# doxygen: C++ autogenerated documentation
-# python-sphinx: Python autogenerated documentation
-
-# secret release directory
-#source=("http://s3-dist.gnuradio.org/gnuradio-$pkgver.tar.gz"
-# neglected official release directory
-#source=("https://gnuradio.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz"
+source=(
+  "git+https://github.com/gnuradio/gnuradio.git#branch=maint-3.8"
+  #"https://github.com/gnuradio/gnuradio/archive/refs/tags/v${pkgver}.tar.gz"
+  gnuradio-bind-placeholders.patch
+  21-fcd.rules
+)
+sha256sums=('SKIP'
+            'dc3171060b778245716229fe5ee9dd9162df1699ae6aed653a7e2d5f92418920'
+            '928f4e4b5d8d9fab634e119b83ba9db9fb3501b4d5527cceb7bfa595818be81a')
+pkgver() {
+  cd gnuradio
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
-# seems upstream stopped doing signed tags/release assets > 3.8.0.0 :-/
-# https://github.com/gnuradio/gnuradio/issues/3858
-source=("https://github.com/gnuradio/gnuradio/archive/refs/tags/v${pkgver}.tar.gz"
-        #"https://github.com/gnuradio/gnuradio/releases/download/v$pkgver/gnuradio-$pkgver.tar.gz.asc"
-        gnuradio-bind-placeholders.patch
-        "21-fcd.rules")
-validpgpkeys=('B90DDFAC56989BF62262EB812987C77CBB8ED9B2'  # GNU Radio Project
-              'D74F9F146E7F755783583158B343B2BA293E5174') # Marcus Müller
-sha512sums=('80d34c6351947f45decf8ba09288d4fc4c411c8d286d2765fad59da421b99c15a4c7b7c25a17c89dacfafd872f13ba8d9a8d84d89a35568e5b088f77fcaaae67'
-            'f4e52e6e9ef6054f358d3ee00cbcb70bab65c36dfac8975c3182f6514c547905f36801a049f0918d69c9ffd98ce801891a3bfc4e4faeb8fb33582d84140a70b7'
-            '6f02dc8e20a7a1cd11099c851a7c8427fcd21e9652e6cddd0a72ca747b0e93cd4fd1b7b7b7e426b6231348bcc34fb2417716a2f03c92ec141889edc65031c3a0')
 
 prepare() {
-  cd "$srcdir/gnuradio-$pkgver"
+  cd gnuradio
   patch -Np1 -i ../gnuradio-bind-placeholders.patch
   sed -i -e "s|GR_PKG_LIBEXEC_DIR|GR_RUNTIME_DIR|" grc/scripts/freedesktop/CMakeLists.txt
   #sed -i -e "s|/qwt$|/qwt5|" -e "s| qwt | qwt5 |" cmake/Modules/FindQwt.cmake
   sed -i -e "s| sphinx-build$| sphinx-build2|" cmake/Modules/FindSphinx.cmake
-
-  sed "s|^#if QWT_VERSION >= 0x060000|#if QWT_VERSION <= 0x060000|" -i gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
-  sed "s|^#if QWT_VERSION >= 0x060000|#if QWT_VERSION <= 0x060000|" -i gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
-  sed "s|^#if QWT_VERSION >= 0x060000|#if QWT_VERSION <= 0x060000|" -i gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
-  sed "s|^#if QWT_VERSION >= 0x060000|#if QWT_VERSION <= 0x060000|" -i gr-qtgui/include/gnuradio/qtgui/plot_raster.h
-  sed "s|^#if QWT_VERSION >= 0x060000|#if QWT_VERSION <= 0x060000|" -i gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h
-  sed "s|^#if QWT_VERSION >= 0x060000|#if QWT_VERSION <= 0x060000|" -i gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h
-  sed "s|^#if QWT_VERSION >= 0x060000|#if QWT_VERSION <= 0x060000|" -i gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h
 }
 
 build() {
   export PYTHON=python3
-  cd "gnuradio-$pkgver"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=$(which python3) \
-    -DPYTHON_INCLUDE_DIR=/usr/include/python3.9 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.9.so \
-    -DGR_PYTHON_DIR=/usr/lib/python3.9/site-packages \
-    -DENABLE_INTERNAL_VOLK=OFF \
-    -DENABLE_GRC=ON \
-    -DENABLE_GR_QTGUI=ON \
-    -DQWT_LIBRARIES=/usr/lib/libqwt.so \
-    -Wno-dev \
+  cd gnuradio
+  cmake \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    -D PYTHON_EXECUTABLE=$(which python3) \
+    -D PYTHON_INCLUDE_DIR=/usr/include/python3.9 \
+    -D PYTHON_LIBRARY=/usr/lib/libpython3.9.so \
+    -D GR_PYTHON_DIR=/usr/lib/python3.9/site-packages \
+    -D ENABLE_INTERNAL_VOLK=OFF \
+    -D ENABLE_GRC=ON \
+    -D ENABLE_GR_QTGUI=ON \
+    -D QWT_LIBRARIES=/usr/lib/libqwt.so \
+    -W no-dev \
     -B build \
     -G Ninja \
     -S .
   cmake --build build
 }
 
-check() {
-  cd "gnuradio-$pkgver"
-  # TODO: investigate zeromq related test failures
-  # export PYTHON=python3
-  # make VERBOSE=1 test -C build
-}
-
 package_gnuradio38() {
   depends+=('libasound.so' 'libboost_filesystem.so'
   'libboost_program_options.so' 'libboost_thread.so' 'libfftw3f.so'
@@ -139,11 +112,10 @@ package_gnuradio38() {
   )
   confilcts=(gnuradio)
 
-  cd "gnuradio-$pkgver"
+  cd gnuradio
   DESTDIR="${pkgdir}" cmake --install build
-  install -vDm 644 ../21-fcd.rules -t "$pkgdir/usr/lib/udev/rules.d/"
-  install -vDm 644 grc/scripts/freedesktop/gnuradio-grc.desktop \
-    -t "$pkgdir/usr/share/applications/"
+  install -vDm 644 ../21-fcd.rules -t "${pkgdir}/usr/lib/udev/rules.d/"
+  install -vDm 644 grc/scripts/freedesktop/gnuradio-grc.desktop -t "${pkgdir}/usr/share/applications/"
 }
 
 package_gnuradio38-companion() {