Date: Tuesday, December 17, 2013 @ 20:22:29
Author: kkeen
Revision: 102720
upgpkg: gnuradio 3.7.2.1-1
Modified:
gnuradio/trunk/PKGBUILD
gnuradio/trunk/gnuradio.install
------------------+
PKGBUILD | 31 +++++++++++++++++++++++--------
gnuradio.install | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 67 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-12-17 19:19:57 UTC (rev 102719)
+++ PKGBUILD 2013-12-17 19:22:29 UTC (rev 102720)
@@ -1,9 +1,10 @@
# $Id$
# Maintainer: Kyle Keen <keen...@gmail.com>
# Contributor: Dominik Heidler <dheid...@gmail.com>
+# Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com>
pkgname=gnuradio
-pkgver=3.7.2
-pkgrel=2
+pkgver=3.7.2.1
+pkgrel=1
pkgdesc="General purpose DSP and SDR toolkit. With drivers for usrp and fcd."
arch=('i686' 'x86_64')
url="http://gnuradio.org";
@@ -14,13 +15,19 @@
'python2-lxml: gnuradio-companion'
'pygtk: gnuradio-companion'
'wxpython: gr-wxgui'
- 'qwtplot3d: gr-qtgui'
- 'pyqwt: gr-qtgui'
- 'doxygen: autogenerated documentation'
- 'pkgconfig: ?')
+ 'pkgconfig: libuhd')
conflicts=('gnuradio-git')
install=gnuradio.install
+# gr-qtgui todo
+# talk to ronald about adding qwt5 to qwt package
+# bring pyqwt in from AUR
+# update optdepends
+# 'qwtplot3d: gr-qtgui'
+# 'pyqwt: gr-qtgui'
+# update makedepends
+# 'qwtplot3d'
+
# todo
# add gr-osmosdr-git to optdepends
# split the gui components?
@@ -27,14 +34,22 @@
# build doxygen docs?
# icons
+# comedilib: gr-comedi
+# zeroc-ice: gr-ctrlport
+# doxygen: C++ autogenerated documentation
+# python2-sphinx: Python autogenerated documentation
+
source=("http://gnuradio.org/releases/$pkgname/$pkgname-$pkgver.tar.gz";
"21-fcd.rules")
-md5sums=('9a9da8458fd0c1b452487524ed29f3fd'
+md5sums=('f2ea23a30cb02802870fe8cb9bf272c9'
'465e12c454c6a22ebec9849181af7bdc')
build() {
export PYTHON=python2
cd "$srcdir/$pkgname-$pkgver"
+ sed -i -e "s|GR_PKG_LIBEXEC_DIR|GR_RUNTIME_DIR|"
grc/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
@@ -43,7 +58,7 @@
-DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
-DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
-DENABLE_GRC=ON \
- -DCMAKE_INSTALL_PREFIX=/usr ../
+ -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ../
make
}
Modified: gnuradio.install
===================================================================
--- gnuradio.install 2013-12-17 19:19:57 UTC (rev 102719)
+++ gnuradio.install 2013-12-17 19:22:29 UTC (rev 102720)
@@ -1,11 +1,50 @@
-post_install() {
+
+# clean up for anyone silly enough to run this as root
+
+# it would be great if pkgname and not just pkgver was passed in the arg list
+
+_pkg='gnuradio'
+_cpython='cpython-33'
+
+post_upgrade() {
+ while read _f; do
+ if [[ "${_f:(-3)}" != ".py" ]]; then
+ continue
+ fi
+ if [[ ! -f "$_f" ]]; then
+ continue
+ fi
+ if [[ -e "${_f}c" ]]; then
+ rm -f "${_f}c"
+ fi
+ if [[ -e "${_f}o" ]]; then
+ rm -f "${_f}o"
+ fi
+ _thisdir="$(dirname "$_f")/__pycache__"
+ if [[ ! -d "$_thisdir" ]]; then
+ continue
+ fi
+ _thisfile="$(basename "$_f")"
+ _thisfile="${_thisfile/%.py/.${_cpython}.py}"
+ if [[ -e "${_thisdir}/${_thisfile}c" ]]; then
+ rm -f "${_thisdir}/${_thisfile}c"
+ fi
+ if [[ -e "${_thisdir}/${_thisfile}o" ]]; then
+ rm -f "${_thisdir}/${_thisfile}o"
+ fi
+ # no good way to test for empty dir
+ # would be 25% faster if there were
+ rmdir --ignore-fail-on-non-empty "$_thisdir" &> /dev/null
+ done <<< "$(pacman -Qql $_pkg | grep '\.py$')"
+
update-desktop-database -q
}
-post_upgrade() {
- post_install
+post_install() {
+ post_upgrade $1
}
-post_remove() {
- post_install
+pre_remove() {
+ post_upgrade $1
}
+
