rpm/gnuradio
SHA256
1
0
Fork 0
forked from pool/gnuradio
Code Pull Requests Activity

Accepting request 404538 from science

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/404538
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnuradio?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2016-06-29 13:10:26 +00:00 committed by Git OBS Bridge
parent 20d5460c2f
commit 15ee1cbfe1
6 changed files with 63 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnuradio-3.7.9.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c06f0f1ec14113203e0486fd526dd46ecef216dfe42f12d78d9b781b1ef967e
size 4857025

28
gnuradio-3.7.9.2-gcc6.patch Normal file
View File

@ -0,0 +1,28 @@
Index: b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
===================================================================
--- 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,11 @@ namespace gr {
bool set_frame_size(unsigned int frame_size){return false;};
private:
- static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR = -2.19722458f;
+#if defined(__GNUC__) && (( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 600)
+ static constexpr float D_LLR_FACTOR = -2.19722458f;
+#else
+ static const float D_LLR_FACTOR = -2.19722458f;
+#endif
unsigned int d_frozen_bit_counter;
protected:

3
gnuradio-3.7.9.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71662ff8089b8533cd8162ecef57661ec97d0026735876b1b55d0efcf654b561
size 4911047

18
gnuradio.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Jun 23 10:43:20 UTC 2016 - i@marguerite.su
- add patch: gnuradio-3.7.9.2-gcc6.patch
* fix 'constexpr' needed for in-class initialization of static
data member of non-integral type
-------------------------------------------------------------------
Mon Jun 20 07:30:54 UTC 2016 - dmitry_r@opensuse.org
- Use wxPython 3.0 for Tumbleweed
-------------------------------------------------------------------
Fri Apr 29 09:24:43 UTC 2016 - wk@ire.pw.edu.pl
- update to version 3.7.9.2
- remove volk-cmake-3.5.patch not needed (applied upstream)
-------------------------------------------------------------------
Tue Mar 22 11:40:28 UTC 2016 - dmitry_r@opensuse.org

22
gnuradio.spec
View File

@ -17,10 +17,10 @@
Name: gnuradio
Version: 3.7.9.1
Version: 3.7.9.2
Release: 0
%define soname 3_7_9-0_0_0
%define soname_volk 1_2_1
%define soname_volk 1_2_2
Summary: GNU software radio
License: GPL-3.0+
Group: Productivity/Hamradio/Other
@ -29,8 +29,9 @@ Source: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz
Source1: %{name}-rpmlintrc
# http://www.nathanwest.us/grc_to_37.sh
Source2: grc_to_37.sh
# PATCH-FIX-UPSTREAM volk-cmake-3.5.patch -- https://github.com/gnuradio/volk/pull/65
Patch1: volk-cmake-3.5.patch
#PATCH-FIX-UPSTREAM marguerite@opensuse.org - 'constexpr' needed for in-class initialization of static data member
# of non-integral type
Patch: gnuradio-3.7.9.2-gcc6.patch
BuildRequires: alsa-devel
BuildRequires: boost-devel
BuildRequires: cmake
@ -52,7 +53,11 @@ BuildRequires: python-gtk
BuildRequires: python-lxml
BuildRequires: python-numpy
BuildRequires: python-qt4-devel
%if 0%{?suse_version} > 1320
BuildRequires: python-wxWidgets-3_0
%else
BuildRequires: python-wxWidgets
%endif
BuildRequires: qwt6-devel
BuildRequires: swig
BuildRequires: texlive-dvips
@ -79,7 +84,11 @@ performance wireless devices into software problems.
%package wxgui
Summary: Libraries for GNU Radio
Group: System/Libraries
%if 0%{?suse_version} > 1320
Requires: python-wxWidgets-3_0
%else
Requires: python-wxWidgets
%endif
%description wxgui
GNU Radio is a collection of software that when combined with minimal
@ -179,10 +188,7 @@ This package contains the examples of using GNU Radio depending on wxWidgets.
%prep
%setup -q
pushd volk
%patch1 -p1
popd
%patch -p1
# 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

158
volk-cmake-3.5.patch
View File

@ -1,158 +0,0 @@
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 74ed18d..f9ef6e0 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -19,23 +19,23 @@
# Setup profiler
########################################################################
if(MSVC)
- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
endif(MSVC)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/include
- ${CMAKE_BINARY_DIR}/include
- ${CMAKE_SOURCE_DIR}/lib
- ${CMAKE_BINARY_DIR}/lib
+ ${PROJECT_SOURCE_DIR}/include
+ ${PROJECT_BINARY_DIR}/include
+ ${PROJECT_SOURCE_DIR}/lib
+ ${PROJECT_BINARY_DIR}/lib
${Boost_INCLUDE_DIRS}
)
# MAKE volk_profile
add_executable(volk_profile
${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc
- ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
+ ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc
)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 35b67dc..f00200a 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -90,7 +90,7 @@ endif()
########################################################################
execute_process(
COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
--mode "arch_flags" --compiler "${COMPILER_NAME}"
OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE
)
@@ -278,7 +278,7 @@ message(STATUS "Available architectures: ${available_archs}")
########################################################################
execute_process(
COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
--mode "machines" --archs "${available_archs}"
OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE
)
@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${available_machines}")
########################################################################
#dependencies are all python, xml, and header implementation files
-file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml)
-file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py)
-file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h)
+file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml)
+file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py)
+file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h)
macro(gen_template tmpl output)
list(APPEND volk_gen_sources ${output})
@@ -320,21 +320,21 @@ macro(gen_template tmpl output)
OUTPUT ${output}
DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl}
COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
- ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py
+ ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py
--input ${tmpl} --output ${output} ${ARGN}
)
endmacro(gen_template)
-make_directory(${CMAKE_BINARY_DIR}/include/volk)
+make_directory(${PROJECT_BINARY_DIR}/include/volk)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk.h)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk.c)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_cpu.c)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${CMAKE_BINARY_DIR}/lib/volk_machines.h)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_machines.c)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk.h)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk.c)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_cpu.c)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${PROJECT_BINARY_DIR}/lib/volk_machines.h)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_machines.c)
set(BASE_CFLAGS NONE)
string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU)
@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}:::${CMAKE_C_FLAGS_${GRCBTU}} ${CMAKE_C_FL
foreach(machine_name ${available_machines})
#generate machine source
set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c)
- gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
+ gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
#determine machine flags
execute_process(
COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
--mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}"
OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE
)
@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO ${COMPILER_INFO})
# Set local include directories first
########################################################################
include_directories(
- ${CMAKE_BINARY_DIR}/include
- ${CMAKE_SOURCE_DIR}/include
- ${CMAKE_SOURCE_DIR}/kernels
+ ${PROJECT_BINARY_DIR}/include
+ ${PROJECT_SOURCE_DIR}/include
+ ${PROJECT_SOURCE_DIR}/kernels
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
# setup architecture specific assembler flags
set(ARCH_ASM_FLAGS "-mfpu=neon -g")
# then add the files
- include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon)
- file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
+ include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon)
+ file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
foreach(asm_file ${asm_files})
list(APPEND volk_sources ${asm_file})
message(STATUS "Adding source file: ${asm_file}")
@@ -453,7 +453,7 @@ if(ORC_FOUND)
list(APPEND volk_libraries ${ORC_LIBRARIES})
#setup orc functions
- file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
+ file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
foreach(orc_file ${orc_files})
#extract the name for the generated c source from the orc file
@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machine_defs}")
if(MSVC)
#add compatibility includes for stdint types
- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
add_definitions(-DHAVE_CONFIG_H)
#compile the sources as C++ due to the lack of complex.h under MSVC
set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX)