From 3ea32fed2dedd80bbb6a94d01101f8c8e435a43a Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Mar 17 2014 10:20:22 +0000 Subject: Use system gsm instead of bundled one --- diff --git a/gnuradio-3.7.3-system-gsm.patch b/gnuradio-3.7.3-system-gsm.patch new file mode 100644 index 0000000..ca21b7a --- /dev/null +++ b/gnuradio-3.7.3-system-gsm.patch @@ -0,0 +1,41 @@ +diff -up gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt~ gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt +--- gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt~ 2013-06-30 03:05:51.000000000 +0300 ++++ gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt 2014-03-16 13:56:08.728983153 +0200 +@@ -79,12 +79,12 @@ endif(MSVC) + ######################################################################## + GR_INCLUDE_SUBDIRECTORY(codec2) + GR_INCLUDE_SUBDIRECTORY(g7xx) +-GR_INCLUDE_SUBDIRECTORY(gsm) + + list(APPEND vocoder_libs + gnuradio-runtime + ${Boost_LIBRARIES} + ${LOG4CPP_LIBRARIES} ++ gsm + ) + + add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources}) +diff -up gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc~ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc +--- gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc~ 2013-06-30 03:05:51.000000000 +0300 ++++ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc 2014-03-16 14:34:42.850165603 +0200 +@@ -29,6 +29,8 @@ + #include + #include + ++#define GSM_SAMPLES_PER_FRAME 160 ++ + namespace gr { + namespace vocoder { + +diff -up gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc~ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc +--- gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc~ 2014-03-07 20:28:19.000000000 +0200 ++++ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc 2014-03-16 14:41:43.520202465 +0200 +@@ -28,6 +28,8 @@ + #include + #include + ++#define GSM_SAMPLES_PER_FRAME 160 ++ + namespace gr { + namespace vocoder { + diff --git a/gnuradio.spec b/gnuradio.spec index e0cea08..e6273f2 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -33,12 +33,13 @@ Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz +Patch0: %{name}-3.7.3-system-gsm.patch Requires(pre): shadow-utils BuildRequires: cmake, fftw-devel, cppunit-devel, wxPython-devel, xmlto BuildRequires: graphviz, boost-devel, python-devel, swig, doxygen BuildRequires: libusbx-devel, alsa-lib-devel, SDL-devel, guile-devel -BuildRequires: portaudio-devel, libtool +BuildRequires: portaudio-devel, libtool, gsm-devel # Gnuradio deprecated gr-comedi # http://gnuradio.org/redmine/issues/show/395 # BuildRequires: comedilib-devel @@ -87,6 +88,8 @@ GNU Radio examples %prep %setup -q +%patch0 -p1 +rm -r gr-vocoder/lib/gsm #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -174,6 +177,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Sun Mar 16 2014 Ville Skyttä - 3.7.3-2 +- Use system gsm instead of bundled one + * Tue Mar 11 2014 Jaroslav Škarvada - 3.7.3-1 - New version Resolves: rhbz#1074899