diff --git a/gnuradio-3.6.5-bigendian.patch b/gnuradio-3.6.5-bigendian.patch new file mode 100644 index 0000000..7f1bb15 --- /dev/null +++ b/gnuradio-3.6.5-bigendian.patch @@ -0,0 +1,21 @@ +diff -up gnuradio-3.6.5/gr-blocks/lib/wavfile.cc.bigendian gnuradio-3.6.5/gr-blocks/lib/wavfile.cc +--- gnuradio-3.6.5/gr-blocks/lib/wavfile.cc.bigendian 2013-06-12 13:41:54.000000000 +0200 ++++ gnuradio-3.6.5/gr-blocks/lib/wavfile.cc 2013-06-12 13:42:22.000000000 +0200 +@@ -38,14 +38,14 @@ namespace gr { + // Define host to/from worknet (little endian) short and long + #ifdef BOOST_BIG_ENDIAN + +- static inline uint16_t __wav_bs16(uint16_t x) ++ static inline uint16_t __gri_wav_bs16(uint16_t x) + { + return (x>>8) | (x<<8); + } + +- static inline uint32_t __wav_bs32(uint32_t x) ++ static inline uint32_t __gri_wav_bs32(uint32_t x) + { +- return (uint32_t(__wav_bs16(uint16_t(x&0xfffful)))<<16) | (__wav_bs16(uint16_t(x>>16))); ++ return (uint32_t(__gri_wav_bs16(uint16_t(x&0xfffful)))<<16) | (__gri_wav_bs16(uint16_t(x>>16))); + } + + #define htowl(x) __gri_wav_bs32(x) diff --git a/gnuradio.spec b/gnuradio.spec index f99368d..138c21e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -52,6 +52,8 @@ Obsoletes: grc < 0.80-1 # Make cmake modules installation directory configurable, # patch sent upstream, ticket 548 Patch0: gnuradio-3.6.5-cmake-modules-fix.patch +# big endian fix +Patch1: gnuradio-3.6.5-bigendian.patch %description GNU Radio is a collection of software that when combined with minimal @@ -90,6 +92,7 @@ GNU Radio examples %setup -q %patch0 -p1 -b .cmake-modules-fix +%patch1 -p1 -b .bigendian #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -167,6 +170,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Jun 12 2013 Dan Horák - 3.6.5-2 +- fix build on big endian arches + * Tue Jun 4 2013 Jaroslav Škarvada - 3.6.5-1 - New version Resolves: rhbz#967804