[arch-commits] Commit in gnuradio/trunk (3 files)

[Kyle Keen]

    Date: Saturday, November 15, 2014 @ 04:15:58
  Author: kkeen
Revision: 122584

upgpkg: gnuradio 3.7.5.1-3 split gnuradio-companion

Added:
  gnuradio/trunk/gnuradio-companion.install
Modified:
  gnuradio/trunk/PKGBUILD
  gnuradio/trunk/gnuradio.install

----------------------------+
 PKGBUILD                   |   36 ++++++++++++++++++++++--------------
 gnuradio-companion.install |   15 +++++++++++++++
 gnuradio.install           |    1 +
 3 files changed, 38 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-14 21:24:50 UTC (rev 122583)
+++ PKGBUILD	2014-11-15 03:15:58 UTC (rev 122584)
@@ -2,9 +2,10 @@
 # Maintainer: Kyle Keen <keenerd at gmail.com>
 # Contributor: Dominik Heidler <dheidler at gmail.com>
 # Contributor:	Jonatan Sastre <jsastreh [ at ] hotmail.com>
-pkgname=gnuradio
+pkgbase=gnuradio
+pkgname=(gnuradio gnuradio-companion)
 pkgver=3.7.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="General purpose DSP and SDR toolkit.  With drivers for usrp and fcd."
 arch=('i686' 'x86_64')
 url="http://gnuradio.org"
@@ -12,11 +13,6 @@
 depends=('fftw' 'python2-numpy' 'cppunit' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd' 'zeromq')
 makedepends=('boost' 'cmake' 'python2-lxml' 'pygtk' 'wxpython' 'python2-cheetah' 'glu' 'swig' )
 optdepends=('gnuradio-osmosdr: pile of driver blocks'
-            'python2-cheetah: gnuradio-companion'
-            'python2-lxml: gnuradio-companion'
-            'pygtk: gnuradio-companion'
-            'wxpython: gr-wxgui'
-            'python2-opengl: gr-wxgui'
             'boost: gr_modtool'
             'swig: gr_modtool'
             'cmake: gr_modtool'
@@ -47,7 +43,7 @@
 # doxygen: C++ autogenerated documentation
 # python2-sphinx: Python autogenerated documentation
 
-source=("http://gnuradio.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
+source=("http://gnuradio.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz"
         "21-fcd.rules")
 md5sums=('bfd2116b344a949aacc3d7e2eff07642'
          '465e12c454c6a22ebec9849181af7bdc')
@@ -54,7 +50,7 @@
 
 build() {
   export PYTHON=python2
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgbase-$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
@@ -72,26 +68,38 @@
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver/build"
+  cd "$srcdir/$pkgbase-$pkgver/build"
   export PYTHON=python2
   #make test
 }
 
-package() {
+package_gnuradio() {
   cd "$srcdir"
   install -Dm644 21-fcd.rules "$pkgdir/usr/lib/udev/rules.d/21-fcd.rules"
-  cd "$srcdir/$pkgname-$pkgver/grc/freedesktop"
-  install -Dm644 gnuradio-grc.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-  cd "$srcdir/$pkgname-$pkgver/build"
+  cd "$srcdir/$pkgbase-$pkgver/grc/freedesktop"
+  install -Dm644 gnuradio-grc.desktop "$pkgdir/usr/share/applications/$pkgbase.desktop"
+  cd "$srcdir/$pkgbase-$pkgver/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
 }
 
+package_gnuradio-companion() {
+  pkgdesc="GUI frontend for gnuradio and SDR."
+  depends=('python2-cheetah' 'python2-lxml' 'pygtk' 'wxpython' 'python2-opengl')
+  optdepends=()
+  conflicts=()
+  install="gnuradio-companion.install"
+  # Yup, nothing in the package except dependencies,
+  # because five optdeps is too many for most people.
+}
+
 # options for armv6:
 # -Dhave_mfpu_neon=0 \
 # -DCMAKE_CXX_FLAGS:STRING="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \

Added: gnuradio-companion.install
===================================================================
--- gnuradio-companion.install	                        (rev 0)
+++ gnuradio-companion.install	2014-11-15 03:15:58 UTC (rev 122584)
@@ -0,0 +1,15 @@
+
+# null file because devtools breaks without it
+
+post_upgrade() {
+  true
+}
+
+post_install() {
+  true
+}
+
+pre_remove() {
+  true
+}
+

Modified: gnuradio.install
===================================================================
--- gnuradio.install	2014-11-14 21:24:50 UTC (rev 122583)
+++ gnuradio.install	2014-11-15 03:15:58 UTC (rev 122584)
@@ -20,6 +20,7 @@
     if [[ -e "${_f}o" ]]; then
       rm -f "${_f}o"
     fi
+    continue
     _thisdir="$(dirname "$_f")/__pycache__"
     if [[ ! -d "$_thisdir" ]]; then
       continue