[arch-commits] Commit in gnuradio/repos (10 files)

Sat Aug 8 03:03:39 UTC 2015

Date: Saturday, August 8, 2015 @ 05:03:39
  Author: kkeen
Revision: 138084

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  gnuradio/repos/community-staging-i686/
  gnuradio/repos/community-staging-i686/21-fcd.rules
    (from rev 138083, gnuradio/trunk/21-fcd.rules)
  gnuradio/repos/community-staging-i686/PKGBUILD
    (from rev 138083, gnuradio/trunk/PKGBUILD)
  gnuradio/repos/community-staging-i686/gnuradio-companion.install
    (from rev 138083, gnuradio/trunk/gnuradio-companion.install)
  gnuradio/repos/community-staging-i686/gnuradio.install
    (from rev 138083, gnuradio/trunk/gnuradio.install)
  gnuradio/repos/community-staging-x86_64/
  gnuradio/repos/community-staging-x86_64/21-fcd.rules
    (from rev 138083, gnuradio/trunk/21-fcd.rules)
  gnuradio/repos/community-staging-x86_64/PKGBUILD
    (from rev 138083, gnuradio/trunk/PKGBUILD)
  gnuradio/repos/community-staging-x86_64/gnuradio-companion.install
    (from rev 138083, gnuradio/trunk/gnuradio-companion.install)
  gnuradio/repos/community-staging-x86_64/gnuradio.install
    (from rev 138083, gnuradio/trunk/gnuradio.install)

-----------------------------------------------------+
 community-staging-i686/21-fcd.rules                 |    9 +
 community-staging-i686/PKGBUILD                     |  104 ++++++++++++++++++
 community-staging-i686/gnuradio-companion.install   |   15 ++
 community-staging-i686/gnuradio.install             |   53 +++++++++
 community-staging-x86_64/21-fcd.rules               |    9 +
 community-staging-x86_64/PKGBUILD                   |  104 ++++++++++++++++++
 community-staging-x86_64/gnuradio-companion.install |   15 ++
 community-staging-x86_64/gnuradio.install           |   53 +++++++++
 8 files changed, 362 insertions(+)

Copied: gnuradio/repos/community-staging-i686/21-fcd.rules (from rev 138083, gnuradio/trunk/21-fcd.rules)
===================================================================

--- community-staging-i686/21-fcd.rules	                        (rev 0)
+++ community-staging-i686/21-fcd.rules	2015-08-08 03:03:39 UTC (rev 138084)
@@ -0,0 +1,9 @@
+# Udev rules for the Funcube Dongle Pro (0xfb56) and Pro+ (0xfb31)
+
+# HIDAPI/libusb:
+SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb56" MODE:="0666"
+SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb31" MODE:="0666"
+
+# HIDAPI/hidraw:
+KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb56", MODE="0666"
+KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb31", MODE="0666"

Copied: gnuradio/repos/community-staging-i686/PKGBUILD (from rev 138083, gnuradio/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2015-08-08 03:03:39 UTC (rev 138084)
@@ -0,0 +1,104 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Dominik Heidler <dheidler at gmail.com>
+# Contributor:	Jonatan Sastre <jsastreh [ at ] hotmail.com>
+pkgbase=gnuradio
+pkgname=(gnuradio gnuradio-companion)
+pkgver=3.7.8
+pkgrel=1
+pkgdesc="General purpose DSP and SDR toolkit.  With drivers for usrp and fcd."
+arch=('i686' 'x86_64')
+url="http://gnuradio.org"
+license=('GPL')
+depends=('fftw' 'python2-numpy' 'cppunit' 'gsl' 'blas' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd' 'zeromq')
+makedepends=('boost' 'cmake' 'python2-lxml' 'python2-cheetah' 'glu' 'swig'
+    'pygtk' 'wxpython' 'python2-pyqwt' 'qwtplot3d')
+install=gnuradio.install
+
+# todo
+# split the gui components?
+# build doxygen docs?
+# gr-video-sdl ?
+# icons
+
+# comedilib: gr-comedi
+# zeroc-ice: gr-ctrlport
+# doxygen: C++ autogenerated documentation
+# python2-sphinx: Python autogenerated documentation
+
+# secret release directory
+#source=("http://s3-dist.gnuradio.org/gnuradio-$pkgver.tar.gz"
+source=("http://gnuradio.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz"
+        "21-fcd.rules")
+md5sums=('afc83b06136537071397007c3243c02a'
+         '465e12c454c6a22ebec9849181af7bdc')
+
+build() {
+  export PYTHON=python2
+  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
+  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 \
+    -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ../
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgbase-$pkgver/build"
+  export PYTHON=python2
+  #make test
+}
+
+package_gnuradio() {
+  optdepends=('boost: gr_modtool'
+              'swig: gr_modtool'
+              'cmake: gr_modtool'
+              'pkgconfig: libuhd')
+  conflicts=('gnuradio-git')
+  cd "$srcdir"
+  install -Dm644 21-fcd.rules "$pkgdir/usr/lib/udev/rules.d/21-fcd.rules"
+  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=('gnuradio' 'python2-cheetah' 'python2-lxml'
+      'pygtk' 'wxpython' 'python2-opengl' 'python2-pyqwt' 'qwtplot3d')
+  optdepends=('python2-numarray: filter design tool')
+  conflicts=()
+  install="gnuradio-companion.install"
+  # Yup, nothing in the package except dependencies,
+  # because more than 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" \
+# -DCMAKE_C_FLAGS:STRING="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
+
+# options for armv7:
+# -DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard"
+# -DCMAKE_C_FLAGS:STRING="-march=armv7-a -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard"
+# line 341 add /usr/lib/arm-linux-gnueabihf /usr/lib/arm-linux-gnueabi
+

Copied: gnuradio/repos/community-staging-i686/gnuradio-companion.install (from rev 138083, gnuradio/trunk/gnuradio-companion.install)
===================================================================
--- community-staging-i686/gnuradio-companion.install	                        (rev 0)
+++ community-staging-i686/gnuradio-companion.install	2015-08-08 03:03:39 UTC (rev 138084)
@@ -0,0 +1,15 @@
+
+# null file because devtools breaks without it
+
+post_upgrade() {
+  true
+}
+
+post_install() {
+  true
+}
+
+pre_remove() {
+  true
+}
+

Copied: gnuradio/repos/community-staging-i686/gnuradio.install (from rev 138083, gnuradio/trunk/gnuradio.install)
===================================================================
--- community-staging-i686/gnuradio.install	                        (rev 0)
+++ community-staging-i686/gnuradio.install	2015-08-08 03:03:39 UTC (rev 138084)
@@ -0,0 +1,53 @@
+
+# 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-34'
+
+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
+    continue
+    _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$')"
+
+  if [[ -e /usr/bin/update-desktop-database ]]; then
+    update-desktop-database -q
+  fi
+}
+
+post_install() {
+  post_upgrade $1
+}
+
+pre_remove() {
+  post_upgrade $1
+}
+

Copied: gnuradio/repos/community-staging-x86_64/21-fcd.rules (from rev 138083, gnuradio/trunk/21-fcd.rules)
===================================================================
--- community-staging-x86_64/21-fcd.rules	                        (rev 0)
+++ community-staging-x86_64/21-fcd.rules	2015-08-08 03:03:39 UTC (rev 138084)
@@ -0,0 +1,9 @@
+# Udev rules for the Funcube Dongle Pro (0xfb56) and Pro+ (0xfb31)
+
+# HIDAPI/libusb:
+SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb56" MODE:="0666"
+SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb31" MODE:="0666"
+
+# HIDAPI/hidraw:
+KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb56", MODE="0666"
+KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb31", MODE="0666"

Copied: gnuradio/repos/community-staging-x86_64/PKGBUILD (from rev 138083, gnuradio/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2015-08-08 03:03:39 UTC (rev 138084)
@@ -0,0 +1,104 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Dominik Heidler <dheidler at gmail.com>
+# Contributor:	Jonatan Sastre <jsastreh [ at ] hotmail.com>
+pkgbase=gnuradio
+pkgname=(gnuradio gnuradio-companion)
+pkgver=3.7.8
+pkgrel=1
+pkgdesc="General purpose DSP and SDR toolkit.  With drivers for usrp and fcd."
+arch=('i686' 'x86_64')
+url="http://gnuradio.org"
+license=('GPL')
+depends=('fftw' 'python2-numpy' 'cppunit' 'gsl' 'blas' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd' 'zeromq')
+makedepends=('boost' 'cmake' 'python2-lxml' 'python2-cheetah' 'glu' 'swig'
+    'pygtk' 'wxpython' 'python2-pyqwt' 'qwtplot3d')
+install=gnuradio.install
+
+# todo
+# split the gui components?
+# build doxygen docs?
+# gr-video-sdl ?
+# icons
+
+# comedilib: gr-comedi
+# zeroc-ice: gr-ctrlport
+# doxygen: C++ autogenerated documentation
+# python2-sphinx: Python autogenerated documentation
+
+# secret release directory
+#source=("http://s3-dist.gnuradio.org/gnuradio-$pkgver.tar.gz"
+source=("http://gnuradio.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz"
+        "21-fcd.rules")
+md5sums=('afc83b06136537071397007c3243c02a'
+         '465e12c454c6a22ebec9849181af7bdc')
+
+build() {
+  export PYTHON=python2
+  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
+  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 \
+    -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ../
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgbase-$pkgver/build"
+  export PYTHON=python2
+  #make test
+}
+
+package_gnuradio() {
+  optdepends=('boost: gr_modtool'
+              'swig: gr_modtool'
+              'cmake: gr_modtool'
+              'pkgconfig: libuhd')
+  conflicts=('gnuradio-git')
+  cd "$srcdir"
+  install -Dm644 21-fcd.rules "$pkgdir/usr/lib/udev/rules.d/21-fcd.rules"
+  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=('gnuradio' 'python2-cheetah' 'python2-lxml'
+      'pygtk' 'wxpython' 'python2-opengl' 'python2-pyqwt' 'qwtplot3d')
+  optdepends=('python2-numarray: filter design tool')
+  conflicts=()
+  install="gnuradio-companion.install"
+  # Yup, nothing in the package except dependencies,
+  # because more than 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" \
+# -DCMAKE_C_FLAGS:STRING="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
+
+# options for armv7:
+# -DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard"
+# -DCMAKE_C_FLAGS:STRING="-march=armv7-a -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard"
+# line 341 add /usr/lib/arm-linux-gnueabihf /usr/lib/arm-linux-gnueabi
+

Copied: gnuradio/repos/community-staging-x86_64/gnuradio-companion.install (from rev 138083, gnuradio/trunk/gnuradio-companion.install)
===================================================================
--- community-staging-x86_64/gnuradio-companion.install	                        (rev 0)
+++ community-staging-x86_64/gnuradio-companion.install	2015-08-08 03:03:39 UTC (rev 138084)
@@ -0,0 +1,15 @@
+
+# null file because devtools breaks without it
+
+post_upgrade() {
+  true
+}
+
+post_install() {
+  true
+}
+
+pre_remove() {
+  true
+}
+

Copied: gnuradio/repos/community-staging-x86_64/gnuradio.install (from rev 138083, gnuradio/trunk/gnuradio.install)
===================================================================
--- community-staging-x86_64/gnuradio.install	                        (rev 0)
+++ community-staging-x86_64/gnuradio.install	2015-08-08 03:03:39 UTC (rev 138084)
@@ -0,0 +1,53 @@
+
+# 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-34'
+
+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
+    continue
+    _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$')"
+
+  if [[ -e /usr/bin/update-desktop-database ]]; then
+    update-desktop-database -q
+  fi
+}
+
+post_install() {
+  post_upgrade $1
+}
+
+pre_remove() {
+  post_upgrade $1
+}
+

