From 3f3c1ba6f1b10f2f5ef5993ac4b59f514a7fb685 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Tue, 17 Jul 2018 11:19:54 +0200 Subject: [PATCH] gnuradio: update to 3.7.13.4. [ci skip] --- common/shlibs | 40 +++++++++++----------- srcpkgs/gnuradio/patches/fix-cxx-abi.patch | 11 ------ srcpkgs/gnuradio/template | 12 +++++-- 3 files changed, 30 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/gnuradio/patches/fix-cxx-abi.patch diff --git a/common/shlibs b/common/shlibs index 769210e1a0..05d6c94ae4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3145,26 +3145,26 @@ liblwipv6.so.2 lwipv6-1.5a_1 libpipewire-0.1.so.0 libpipewire-0.1.9_1 libspa-lib.so.0 libspa-lib-0.1.9_1 libvolk.so.1.4 volk-1.4_1 -libgnuradio-runtime-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-pmt-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-blocks-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-audio-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-noaa-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-fec-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-fft-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-filter-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-analog-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-digital-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-dtv-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-atsc-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-channels-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-pager-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-trellis-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-video-sdl-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-vocoder-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-fcd-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-wavelet-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 -libgnuradio-wxgui-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-runtime-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-pmt-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-blocks-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-audio-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-noaa-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-fec-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-fft-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-filter-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-analog-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-digital-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-dtv-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-atsc-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-channels-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-pager-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-trellis-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-video-sdl-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-vocoder-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-fcd-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-wavelet-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 +libgnuradio-wxgui-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 libgnuradio-osmosdr-0.1.4.so.0.0.0 gnuradio-osmosdr-0.1.4_1 libflann_cpp.so.1.9 flann-1.9.1_1 libflann.so.1.9 flann-1.9.1_1 diff --git a/srcpkgs/gnuradio/patches/fix-cxx-abi.patch b/srcpkgs/gnuradio/patches/fix-cxx-abi.patch deleted file mode 100644 index 0a1ea7fdc0..0000000000 --- a/srcpkgs/gnuradio/patches/fix-cxx-abi.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -61,6 +61,8 @@ - # set(CMAKE_C_STANDARD 90) - # set(CMAKE_CXX_STANDARD 98) - -+add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) -+ - IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") - ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 669bc30d71..b873becda9 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,6 +1,6 @@ # Template file for 'gnuradio' pkgname=gnuradio -version=3.7.13.3 +version=3.7.13.4 revision=1 build_style=cmake nocross="relies on volk, which is not complete for arm" @@ -11,17 +11,25 @@ hostmakedepends="pkg-config doxygen swig python-cheetah python-lxml python-numpy python-Sphinx" makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel libgsm-devel libusb-devel pygtk-devel volk-devel wxPython-devel" +depends="pygtk python-cheetah python-lxml python-numpy" short_desc="Framework for software defined radio" maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="https://www.gnuradio.org" distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz" -checksum=03fc4d63960e1ab1edb881f792f896a47b16e51a04b81abf00db0bd4e5bdb5c1 +checksum=903ca4a7ccccdbd0bf2cc3f4412971f5f56ab6834932056b0f6791112c4e4787 if [ -n "$CROSS_BUILD" ]; then nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/7596/steps/shell_3/logs/stdio" fi +post_install() { + vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \ + usr/share/applications + vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \ + usr/share/pixmaps gnuradio-grc.svg +} + gnuradio-doc_package() { short_desc+=" - documentation" noarch=yes