Date: Wednesday, May 24, 2017 @ 20:22:33 Author: arojas Revision: 229968
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 229967, gnuradio/trunk/21-fcd.rules) gnuradio/repos/community-staging-i686/PKGBUILD (from rev 229967, gnuradio/trunk/PKGBUILD) gnuradio/repos/community-staging-i686/gnuradio-gcc7.patch (from rev 229967, gnuradio/trunk/gnuradio-gcc7.patch) gnuradio/repos/community-staging-x86_64/ gnuradio/repos/community-staging-x86_64/21-fcd.rules (from rev 229967, gnuradio/trunk/21-fcd.rules) gnuradio/repos/community-staging-x86_64/PKGBUILD (from rev 229967, gnuradio/trunk/PKGBUILD) gnuradio/repos/community-staging-x86_64/gnuradio-gcc7.patch (from rev 229967, gnuradio/trunk/gnuradio-gcc7.patch) ----------------------------------------------+ community-staging-i686/21-fcd.rules | 9 ++ community-staging-i686/PKGBUILD | 110 +++++++++++++++++++++++++ community-staging-i686/gnuradio-gcc7.patch | 71 ++++++++++++++++ community-staging-x86_64/21-fcd.rules | 9 ++ community-staging-x86_64/PKGBUILD | 110 +++++++++++++++++++++++++ community-staging-x86_64/gnuradio-gcc7.patch | 71 ++++++++++++++++ 6 files changed, 380 insertions(+) Copied: gnuradio/repos/community-staging-i686/21-fcd.rules (from rev 229967, gnuradio/trunk/21-fcd.rules) =================================================================== --- community-staging-i686/21-fcd.rules (rev 0) +++ community-staging-i686/21-fcd.rules 2017-05-24 20:22:33 UTC (rev 229968) @@ -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 229967, gnuradio/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2017-05-24 20:22:33 UTC (rev 229968) @@ -0,0 +1,110 @@ +# $Id$ +# Maintainer: Kyle Keen <keen...@gmail.com> +# Contributor: Dominik Heidler <dheid...@gmail.com> +# Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com> +pkgbase=gnuradio +pkgname=(gnuradio gnuradio-companion) +pkgver=3.7.11 +pkgrel=2 +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' 'libvolk') +makedepends=('boost' 'cmake' 'python2-lxml' 'python2-cheetah' 'glu' 'swig' + 'pygtk' 'wxpython' 'python2-pyqwt' 'qwtplot3d') + +# 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" + "http://gnuradio.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz.asc" + "21-fcd.rules" "gnuradio-gcc7.patch") +validpgpkeys=('B90DDFAC56989BF62262EB812987C77CBB8ED9B2') # GNU Radio Project +md5sums=('7b7b871237ae6fc109d203f78c4654ef' + 'SKIP' + '465e12c454c6a22ebec9849181af7bdc' + 'c510104fa2ad9852a683c265c42ae1da') + +prepare() { + cd "$srcdir/$pkgbase-$pkgver" + msg "Replacing filenames to use python2." + sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find ./ -name '*.py') \ + $(find ./ -name 'gnuradio-companion' -o -name 'flow_graph.tmpl') + sed -i -e "s|#![ ]*/usr/bin/env /usr/bin/python$|#!/usr/bin/env python2|" \ + $(find ./ -name '*.py') + # fix build with GCC 7 (Fedora) + patch -p1 -i ../gnuradio-gcc7.patch +} + +build() { + export PYTHON=python2 + cd "$srcdir/$pkgbase-$pkgver" + 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_INTERNAL_VOLK=OFF \ + -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') + cd "$srcdir" + install -Dm644 21-fcd.rules "$pkgdir/usr/lib/udev/rules.d/21-fcd.rules" + cd "$srcdir/$pkgbase-$pkgver/grc/scripts/freedesktop" + install -Dm644 gnuradio-grc.desktop "$pkgdir/usr/share/applications/gnuradio-grc.desktop" + cd "$srcdir/$pkgbase-$pkgver/build" + make DESTDIR="$pkgdir" install +} + +package_gnuradio-companion() { + pkgdesc="GUI frontend for gnuradio and SDR." + depends=('gnuradio' 'python2-cheetah' 'python2-lxml' + 'pygtk' 'wxpython' 'python2-opengl' 'python2-pyqwt' 'qwtplot3d' + 'python2-numarray') + # 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-gcc7.patch (from rev 229967, gnuradio/trunk/gnuradio-gcc7.patch) =================================================================== --- community-staging-i686/gnuradio-gcc7.patch (rev 0) +++ community-staging-i686/gnuradio-gcc7.patch 2017-05-24 20:22:33 UTC (rev 229968) @@ -0,0 +1,71 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ac65fe..71378aa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,7 +62,7 @@ ENDIF() + # set(CMAKE_CXX_STANDARD 98) + + IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") ++# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") + ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") + ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +@@ -72,7 +72,7 @@ ELSE() + ENDIF() + + IF(CMAKE_C_COMPILER_ID STREQUAL "GNU") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") ++# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") + ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") + ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC") +diff --git a/gnuradio-runtime/lib/math/qa_fxpt.h b/gnuradio-runtime/lib/math/qa_fxpt.h +index 58a6f02..6020e47 100644 +--- a/gnuradio-runtime/lib/math/qa_fxpt.h ++++ b/gnuradio-runtime/lib/math/qa_fxpt.h +@@ -25,6 +25,7 @@ + + #include <cppunit/extensions/HelperMacros.h> + #include <cppunit/TestCase.h> ++#include <memory> + + class qa_fxpt : public CppUnit::TestCase + { +diff --git a/gnuradio-runtime/lib/math/qa_fxpt_nco.h b/gnuradio-runtime/lib/math/qa_fxpt_nco.h +index 1b2cdae..1755904 100644 +--- a/gnuradio-runtime/lib/math/qa_fxpt_nco.h ++++ b/gnuradio-runtime/lib/math/qa_fxpt_nco.h +@@ -25,6 +25,7 @@ + + #include <cppunit/extensions/HelperMacros.h> + #include <cppunit/TestCase.h> ++#include <memory> + + class qa_fxpt_nco : public CppUnit::TestCase + { +diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.h b/gnuradio-runtime/lib/math/qa_fxpt_vco.h +index 72693f3..76e0b6d 100644 +--- a/gnuradio-runtime/lib/math/qa_fxpt_vco.h ++++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.h +@@ -25,6 +25,7 @@ + + #include <cppunit/extensions/HelperMacros.h> + #include <cppunit/TestCase.h> ++#include <memory> + + class qa_fxpt_vco : public CppUnit::TestCase + { +diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h +index 13b25ea..8a3d65d 100644 +--- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h ++++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h +@@ -68,7 +68,7 @@ namespace gr { + bool set_frame_size(unsigned int frame_size){return false;}; + + private: +- static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR; ++ static const float D_LLR_FACTOR; + unsigned int d_frozen_bit_counter; + + protected: Copied: gnuradio/repos/community-staging-x86_64/21-fcd.rules (from rev 229967, gnuradio/trunk/21-fcd.rules) =================================================================== --- community-staging-x86_64/21-fcd.rules (rev 0) +++ community-staging-x86_64/21-fcd.rules 2017-05-24 20:22:33 UTC (rev 229968) @@ -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 229967, gnuradio/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2017-05-24 20:22:33 UTC (rev 229968) @@ -0,0 +1,110 @@ +# $Id$ +# Maintainer: Kyle Keen <keen...@gmail.com> +# Contributor: Dominik Heidler <dheid...@gmail.com> +# Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com> +pkgbase=gnuradio +pkgname=(gnuradio gnuradio-companion) +pkgver=3.7.11 +pkgrel=2 +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' 'libvolk') +makedepends=('boost' 'cmake' 'python2-lxml' 'python2-cheetah' 'glu' 'swig' + 'pygtk' 'wxpython' 'python2-pyqwt' 'qwtplot3d') + +# 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" + "http://gnuradio.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz.asc" + "21-fcd.rules" "gnuradio-gcc7.patch") +validpgpkeys=('B90DDFAC56989BF62262EB812987C77CBB8ED9B2') # GNU Radio Project +md5sums=('7b7b871237ae6fc109d203f78c4654ef' + 'SKIP' + '465e12c454c6a22ebec9849181af7bdc' + 'c510104fa2ad9852a683c265c42ae1da') + +prepare() { + cd "$srcdir/$pkgbase-$pkgver" + msg "Replacing filenames to use python2." + sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find ./ -name '*.py') \ + $(find ./ -name 'gnuradio-companion' -o -name 'flow_graph.tmpl') + sed -i -e "s|#![ ]*/usr/bin/env /usr/bin/python$|#!/usr/bin/env python2|" \ + $(find ./ -name '*.py') + # fix build with GCC 7 (Fedora) + patch -p1 -i ../gnuradio-gcc7.patch +} + +build() { + export PYTHON=python2 + cd "$srcdir/$pkgbase-$pkgver" + 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_INTERNAL_VOLK=OFF \ + -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') + cd "$srcdir" + install -Dm644 21-fcd.rules "$pkgdir/usr/lib/udev/rules.d/21-fcd.rules" + cd "$srcdir/$pkgbase-$pkgver/grc/scripts/freedesktop" + install -Dm644 gnuradio-grc.desktop "$pkgdir/usr/share/applications/gnuradio-grc.desktop" + cd "$srcdir/$pkgbase-$pkgver/build" + make DESTDIR="$pkgdir" install +} + +package_gnuradio-companion() { + pkgdesc="GUI frontend for gnuradio and SDR." + depends=('gnuradio' 'python2-cheetah' 'python2-lxml' + 'pygtk' 'wxpython' 'python2-opengl' 'python2-pyqwt' 'qwtplot3d' + 'python2-numarray') + # 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-gcc7.patch (from rev 229967, gnuradio/trunk/gnuradio-gcc7.patch) =================================================================== --- community-staging-x86_64/gnuradio-gcc7.patch (rev 0) +++ community-staging-x86_64/gnuradio-gcc7.patch 2017-05-24 20:22:33 UTC (rev 229968) @@ -0,0 +1,71 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ac65fe..71378aa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,7 +62,7 @@ ENDIF() + # set(CMAKE_CXX_STANDARD 98) + + IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") ++# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") + ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") + ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +@@ -72,7 +72,7 @@ ELSE() + ENDIF() + + IF(CMAKE_C_COMPILER_ID STREQUAL "GNU") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") ++# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") + ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") + ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC") +diff --git a/gnuradio-runtime/lib/math/qa_fxpt.h b/gnuradio-runtime/lib/math/qa_fxpt.h +index 58a6f02..6020e47 100644 +--- a/gnuradio-runtime/lib/math/qa_fxpt.h ++++ b/gnuradio-runtime/lib/math/qa_fxpt.h +@@ -25,6 +25,7 @@ + + #include <cppunit/extensions/HelperMacros.h> + #include <cppunit/TestCase.h> ++#include <memory> + + class qa_fxpt : public CppUnit::TestCase + { +diff --git a/gnuradio-runtime/lib/math/qa_fxpt_nco.h b/gnuradio-runtime/lib/math/qa_fxpt_nco.h +index 1b2cdae..1755904 100644 +--- a/gnuradio-runtime/lib/math/qa_fxpt_nco.h ++++ b/gnuradio-runtime/lib/math/qa_fxpt_nco.h +@@ -25,6 +25,7 @@ + + #include <cppunit/extensions/HelperMacros.h> + #include <cppunit/TestCase.h> ++#include <memory> + + class qa_fxpt_nco : public CppUnit::TestCase + { +diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.h b/gnuradio-runtime/lib/math/qa_fxpt_vco.h +index 72693f3..76e0b6d 100644 +--- a/gnuradio-runtime/lib/math/qa_fxpt_vco.h ++++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.h +@@ -25,6 +25,7 @@ + + #include <cppunit/extensions/HelperMacros.h> + #include <cppunit/TestCase.h> ++#include <memory> + + class qa_fxpt_vco : public CppUnit::TestCase + { +diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h +index 13b25ea..8a3d65d 100644 +--- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h ++++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h +@@ -68,7 +68,7 @@ namespace gr { + bool set_frame_size(unsigned int frame_size){return false;}; + + private: +- static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR; ++ static const float D_LLR_FACTOR; + unsigned int d_frozen_bit_counter; + + protected: