summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO27
-rw-r--r--PKGBUILD37
2 files changed, 15 insertions, 49 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 02f5fc64b5fe..2f1314b6fd83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gnuradio-git
pkgdesc = General purpose DSP and SDR toolkit, with drivers for usrp and fcd.
- pkgver = 3.7.12git.295.ga0adcd334
+ pkgver = 3.8tech.preview.111.gd3801c393
pkgrel = 1
url = https://github.com/gnuradio/gnuradio
arch = i686
@@ -9,38 +9,29 @@ pkgbase = gnuradio-git
makedepends = git
makedepends = boost
makedepends = cmake
- makedepends = python2-lxml
- makedepends = python2-cheetah
+ makedepends = python-lxml
+ makedepends = python-cheetah
makedepends = glu
makedepends = swig
makedepends = pygtk
makedepends = wxpython
- makedepends = python2-pyqwt
makedepends = qwtplot3d
+ makedepends = qwt
+ makedepends = python-sphinx
depends = fftw
- depends = python2-numpy
+ depends = python
+ depends = python-numpy
depends = cppunit
depends = gsl
depends = blas
depends = guile
- depends = boost-libs>=1.53
+ depends = boost-libs>=1.54
depends = libusbx
depends = portaudio
depends = libuhd
depends = zeromq
depends = libvolk
- optdepends = boost: gr_modtool
- optdepends = swig: gr_modtool
- optdepends = cmake: gr_modtool
- optdepends = pkgconfig: libuhd
- optdepends = python2-cheetah: grc
- optdepends = python2-lxml: grc
- optdepends = pygtk: grc
- optdepends = wxpython: grc
- optdepends = python2-opengl: grc
- optdepends = python2-pyqwt: grc
- optdepends = qwtplot3d: grc
- optdepends = python2-numarray: grc
+ depends = log4cpp
provides = gnuradio
conflicts = gnuradio
source = git://github.com/gnuradio/gnuradio.git
diff --git a/PKGBUILD b/PKGBUILD
index f5e5dbb4b575..575930aa1875 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,27 +5,14 @@
pkgname=gnuradio-git
_gitname=gnuradio
-pkgver=3.7.12git.295.ga0adcd334
+pkgver=3.8tech.preview.111.gd3801c393
pkgrel=1
pkgdesc="General purpose DSP and SDR toolkit, with drivers for usrp and fcd."
arch=('i686' 'x86_64')
url="https://github.com/gnuradio/gnuradio"
license=('GPL')
-depends=('fftw' 'python2-numpy' 'cppunit' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd' 'zeromq' 'libvolk')
-makedepends=('git' 'boost' 'cmake' 'python2-lxml' 'python2-cheetah' 'glu' 'swig'
- 'pygtk' 'wxpython' 'python2-pyqwt' 'qwtplot3d')
-optdepends=('boost: gr_modtool'
- 'swig: gr_modtool'
- 'cmake: gr_modtool'
- 'pkgconfig: libuhd'
- 'python2-cheetah: grc'
- 'python2-lxml: grc'
- 'pygtk: grc'
- 'wxpython: grc'
- 'python2-opengl: grc'
- 'python2-pyqwt: grc'
- 'qwtplot3d: grc'
- 'python2-numarray: grc')
+depends=('fftw' 'python' 'python-numpy' 'cppunit' 'gsl' 'blas' 'guile' 'boost-libs>=1.54' 'libusbx' 'portaudio' 'libuhd' 'zeromq' 'libvolk' 'log4cpp')
+makedepends=('git' 'boost' 'cmake' 'python-lxml' 'python-cheetah' 'glu' 'swig' 'pygtk' 'wxpython' 'qwtplot3d' 'qwt' 'python-sphinx')
source=("git://github.com/gnuradio/gnuradio.git")
md5sums=('SKIP')
conflicts=('gnuradio')
@@ -37,30 +24,24 @@ pkgver() {
}
build() {
- export PYTHON=python2
cd "$srcdir/$_gitname"
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
msg "Starting build."
mkdir -p build
cd build
cmake \
- -DPYTHON_EXECUTABLE=$(which python2) \
- -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
- -DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
-DENABLE_GRC=ON \
- -DENABLE_GR_WXGUI=ON \
-DENABLE_GR_QTGUI=ON \
-DENABLE_INTERNAL_VOLK=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ../
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DGR_PYTHON_DIR=/usr/lib/python3.7/site-packages \
+ -DQWT_LIBRARIES=/usr/lib/libqwt.so -Wno-dev ../
make
}
check() {
cd "$srcdir/$_gitname/build"
- export PYTHON=python2
#make test
}
@@ -69,12 +50,6 @@ package() {
install -Dm644 gnuradio-grc.desktop "$pkgdir/usr/share/applications/$pkgbase.desktop"
cd "$srcdir/$_gitname/build"
make DESTDIR="$pkgdir" install
- msg "Replacing filenames to use python2."
- sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- $(find "$pkgdir" -name '*.py') \
- $(find "$pkgdir" -name 'gnuradio-companion' -o -name 'flow_graph.tmpl')
- sed -i -e "s|#![ ]*/usr/bin/env /usr/bin/python$|#!/usr/bin/env python2|" \
- $(find "$pkgdir" -name '*.py')
find "$pkgdir/" -name '*.pyc' -delete
find "$pkgdir/" -name '*.pyo' -delete
}