forked from pool/gnuradio
Accepting request 593206 from hardware:sdr
OBS-URL: https://build.opensuse.org/request/show/593206 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnuradio?expand=0&rev=25
This commit is contained in:
Git OBS Bridge
commit
e364b5f28f
@ -1,37 +0,0 @@
|
||||
From cee483f7851f13e797b75d08934b5d779aca5d49 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Dickens <michael.dickens@ettus.com>
|
||||
Date: Fri, 10 Mar 2017 12:35:05 -0500
|
||||
Subject: [PATCH] gr-fec: switch possible C++11 code from 'constexpr' to just
|
||||
'const'.
|
||||
|
||||
---
|
||||
gr-fec/include/gnuradio/fec/polar_decoder_common.h | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
||||
index 13b25ea19..c160f4b87 100644
|
||||
--- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
||||
+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
||||
@@ -28,10 +28,6 @@
|
||||
#include <gnuradio/fec/generic_decoder.h>
|
||||
#include <gnuradio/fec/polar_common.h>
|
||||
|
||||
-#ifndef BOOST_CONSTEXPR_OR_CONST
|
||||
-#define BOOST_CONSTEXPR_OR_CONST const
|
||||
-#endif
|
||||
-
|
||||
namespace gr {
|
||||
namespace fec {
|
||||
namespace code {
|
||||
@@ -68,7 +64,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:
|
||||
--
|
||||
2.12.0
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0ac65fe..0d8b63f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -56,31 +56,33 @@ IF (NOT MSVC)
|
||||
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
|
||||
ENDIF()
|
||||
|
||||
-# Set C/C++ standard for all targets
|
||||
-# NOTE: Starting with cmake v3.1 this should be used:
|
||||
-# set(CMAKE_C_STANDARD 90)
|
||||
-# set(CMAKE_CXX_STANDARD 98)
|
||||
-
|
||||
-IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
- 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")
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
|
||||
-ELSE()
|
||||
- message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
|
||||
-ENDIF()
|
||||
+# Configure C++ and C standards
|
||||
+IF(CMAKE_VERSION VERSION_LESS "3.1")
|
||||
+ IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
+ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
+ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
+ ELSE()
|
||||
+ MESSAGE(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
|
||||
+ ENDIF()
|
||||
|
||||
-IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
|
||||
- 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")
|
||||
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
|
||||
+ IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
|
||||
+ 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")
|
||||
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
|
||||
+ ELSE()
|
||||
+ MESSAGE(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
|
||||
+ ENDIF()
|
||||
ELSE()
|
||||
- message(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
|
||||
+ SET(CMAKE_C_STANDARD 99)
|
||||
+ SET(CMAKE_CXX_STANDARD 11)
|
||||
ENDIF()
|
||||
|
||||
+
|
||||
# Set cmake policies.
|
||||
# This will suppress developer warnings during the cmake process that can occur
|
||||
# if a newer cmake version than the minimum is used.
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:87d9ba3183858efdbb237add3f9de40f7d65f25e16904a9bc8d764a7287252d4
|
||||
size 4357123
|
||||
3
gnuradio-3.7.12.0.tar.gz
Normal file
3
gnuradio-3.7.12.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:20bb08263fb934c3474b20bd55e58b9324782b5a18cdb3f7bb5150276fcb5ceb
|
||||
size 4428450
|
||||
@ -2,6 +2,7 @@
|
||||
addFilter("arch-dependent-file-in-usr-share.*/usr/share/gnuradio/examples/audio/.*")
|
||||
addFilter("arch-dependent-file-in-usr-share.*/usr/share/gnuradio/examples/fcd/.*")
|
||||
addFilter("arch-dependent-file-in-usr-share.*/usr/share/gnuradio/examples/uhd/.*")
|
||||
addFilter("arch-dependent-file-in-usr-share.*/usr/share/gnuradio/examples/qt-gui/.*")
|
||||
addFilter("unstripped-binary-or-object.*/usr/share/gnuradio/examples/audio/.*")
|
||||
addFilter("unstripped-binary-or-object.*/usr/share/gnuradio/examples/fcd/.*")
|
||||
addFilter("unstripped-binary-or-object.*/usr/share/gnuradio/examples/uhd/.*")
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 2 22:28:38 UTC 2018 - mardnh@gmx.de
|
||||
|
||||
- Update to version 3.7.12.0
|
||||
* see /usr/share/doc/packages/gnuradio/CHANGELOG.md
|
||||
- Remove Patches (not longer needed):
|
||||
* CMake-set-C++-standard-to-c++11-and-C-standard-to-C99.diff
|
||||
* 0001-gr-fec-switch-possible-C-11-code-from-constexpr-to-j.patch
|
||||
- Update URLs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 12 15:52:26 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
|
||||
@ -16,21 +16,21 @@
|
||||
#
|
||||
|
||||
|
||||
%define sover 3_7_11-0_0_0
|
||||
%define sover_volk 1_3
|
||||
%define sover 3_7_12-0_0_0
|
||||
%define sover_volk 1_4
|
||||
%define volk_version 1.4
|
||||
Name: gnuradio
|
||||
Version: 3.7.11
|
||||
Version: 3.7.12.0
|
||||
Release: 0
|
||||
Summary: GNU software radio
|
||||
License: GPL-3.0+
|
||||
Group: Productivity/Hamradio/Other
|
||||
URL: http://gnuradio.org
|
||||
Source: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz
|
||||
Source1: %{name}-rpmlintrc
|
||||
Source: https://github.com/gnuradio/gnuradio/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source1: https://github.com/gnuradio/volk/archive/v%{volk_version}.tar.gz#/volk-%{volk_version}.tar.gz
|
||||
# http://www.nathanwest.us/grc_to_37.sh
|
||||
Source2: grc_to_37.sh
|
||||
Patch0: CMake-set-C++-standard-to-c++11-and-C-standard-to-C99.diff
|
||||
Patch1: 0001-gr-fec-switch-possible-C-11-code-from-constexpr-to-j.patch
|
||||
Source99: %{name}-rpmlintrc
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake
|
||||
@ -50,6 +50,7 @@ BuildRequires: python-Cheetah
|
||||
BuildRequires: python-Sphinx
|
||||
BuildRequires: python-gtk
|
||||
BuildRequires: python-lxml
|
||||
BuildRequires: python-mako
|
||||
BuildRequires: python-numpy
|
||||
BuildRequires: python-qt4-devel
|
||||
BuildRequires: qwt6-devel
|
||||
@ -188,11 +189,7 @@ This package contains the examples of using GNU Radio depending on wxWidgets.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
# Workaround for Tumbleweed until GNURadio 3.8 is released
|
||||
%if 0%{?suse_version} > 1320
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%endif
|
||||
tar xzf %{SOURCE1} -C volk/ --strip-components=1
|
||||
# remove buildtime from documentation
|
||||
sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.in
|
||||
sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.swig_doc.in
|
||||
@ -263,6 +260,7 @@ rm -rf %{buildroot}%{_prefix}/libexec
|
||||
%config(noreplace) %{_sysconfdir}/gnuradio/conf.d/*.conf
|
||||
%dir %{_docdir}/%{name}/
|
||||
%{_docdir}/%{name}/README*
|
||||
%{_docdir}/%{name}/CHANGELOG*
|
||||
# doc package
|
||||
%exclude %{_docdir}/%{name}/html/
|
||||
%exclude %{_docdir}/%{name}/xml/
|
||||
|
||||
3
volk-1.4.tar.gz
Normal file
3
volk-1.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:32131ba17846850c07270bc5897dd2de7130ec02ca029875a36966335120e7bf
|
||||
size 233371
|
||||
Loading…
x
Reference in New Issue
Block a user