diff --git a/0003-enables-use-of-qwt-6_2.patch b/0003-enables-use-of-qwt-6_2.patch deleted file mode 100644 index 3f31eac..0000000 --- a/0003-enables-use-of-qwt-6_2.patch +++ /dev/null @@ -1,302 +0,0 @@ -diff -up gnuradio-3.8.3.1/cmake/Modules/FindQwt.cmake.aaaa gnuradio-3.8.3.1/cmake/Modules/FindQwt.cmake ---- gnuradio-3.8.3.1/cmake/Modules/FindQwt.cmake.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/cmake/Modules/FindQwt.cmake 2021-08-31 00:24:14.515453198 +0200 -@@ -51,13 +51,13 @@ if(QWT_INCLUDE_DIRS) - set(QWT_VERSION "No Version") - string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION}) - string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION) -- string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION) -+ string(COMPARE GREATER ${QWT_VERSION} "6.3.0" QWT_WRONG_VERSION) - - message(STATUS "QWT Version: ${QWT_VERSION}") - if(NOT QWT_WRONG_VERSION) - set(QWT_FOUND TRUE) - else(NOT QWT_WRONG_VERSION) -- message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}") -+ message(STATUS "QWT Version must be >= 5.2 and <= 6.3.0, Found ${QWT_VERSION}") - endif(NOT QWT_WRONG_VERSION) - - endif(QWT_INCLUDE_DIRS) -diff -up gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h.aaaa gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h ---- gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h 2021-08-31 00:24:14.515453198 +0200 -@@ -40,7 +40,12 @@ - #include - #include - --#if QWT_VERSION >= 0x060000 -+#if QWT_VERSION >= 0x060200 -+typedef QPointF QwtDoublePoint; -+typedef QRectF QwtDoubleRect; -+ -+typedef QwtInterval QwtDoubleInterval; -+#elif QWT_VERSION >= 0x060000 - #include - #endif - -diff -up gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/plot_raster.h.aaaa gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/plot_raster.h ---- gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/plot_raster.h.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/plot_raster.h 2021-08-31 00:24:14.515453198 +0200 -@@ -27,7 +27,12 @@ - #include - #include - --#if QWT_VERSION >= 0x060000 -+#if QWT_VERSION >= 0x060200 -+#include "qwt_interval.h" -+#include -+ -+typedef QwtInterval QwtDoubleInterval; -+#elif QWT_VERSION >= 0x060000 - #include - #include // doesn't seem necessary, but is... - #endif -diff -up gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h.aaaa gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h ---- gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h 2021-08-31 00:24:14.515453198 +0200 -@@ -27,7 +27,12 @@ - #include - #include - --#if QWT_VERSION >= 0x060000 -+#if QWT_VERSION >= 0x060200 -+#include "qwt_interval.h" -+#include -+ -+typedef QwtInterval QwtDoubleInterval; -+#elif QWT_VERSION >= 0x060000 - #include - #include // doesn't seem necessary, but is... - #endif -diff -up gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h.aaaa gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h ---- gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h 2021-08-31 00:24:14.515453198 +0200 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - namespace gr { - namespace qtgui { -diff -up gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h.aaaa gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h ---- gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h 2021-08-31 00:24:14.515453198 +0200 -@@ -34,8 +34,13 @@ - - #if QWT_VERSION < 0x060000 - #include --#else -+#elif QWT_VERSION >= 0x060200 -+#include "qwt_interval.h" -+ -+typedef QwtInterval QwtDoubleInterval; -+#elif QWT_VERSION >= 0x060000 - #include -+#include // doesn't seem necessary, but is... - #endif - - /*! -diff -up gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h.aaaa gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h ---- gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h 2021-08-31 00:24:14.515453198 +0200 -@@ -26,7 +26,11 @@ - #include - #include - --#if QWT_VERSION >= 0x060000 -+#if QWT_VERSION >= 0x060200 -+#include "qwt_interval.h" -+ -+typedef QwtInterval QwtDoubleInterval; -+#elif QWT_VERSION >= 0x060000 - #include - #include // doesn't seem necessary, but is... - #endif -@@ -58,6 +62,11 @@ public: - - void incrementResidual(); - -+#if QWT_VERSION >= 0x060200 -+ virtual QwtInterval interval(Qt::Axis) const; -+ void setInterval(Qt::Axis, const QwtInterval&); -+#endif -+ - protected: - double* d_data; - double d_rows, d_cols; -@@ -70,6 +79,10 @@ protected: - QwtInterval d_intensityRange; - #endif - -+#if QWT_VERSION >= 0x060200 -+ QwtInterval d_intervals[3]; -+#endif -+ - private: - }; - -diff -up gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h.aaaa gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h ---- gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h 2021-08-31 00:24:14.515453198 +0200 -@@ -33,8 +33,13 @@ - - #if QWT_VERSION < 0x060000 - #include --#else -+#elif QWT_VERSION >= 0x060200 -+#include "qwt_interval.h" -+ -+typedef QwtInterval QwtDoubleInterval; -+#elif QWT_VERSION >= 0x060000 - #include -+#include // doesn't seem necessary, but is... - #endif - - /*! -diff -up gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h.aaaa gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h ---- gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h 2021-08-31 00:24:14.515453198 +0200 -@@ -26,7 +26,11 @@ - #include - #include - --#if QWT_VERSION >= 0x060000 -+#if QWT_VERSION >= 0x060200 -+#include "qwt_interval.h" -+ -+typedef QwtInterval QwtDoubleInterval; -+#elif QWT_VERSION >= 0x060000 - #include - #include // doesn't seem necessary, but is... - #endif -@@ -62,6 +66,11 @@ public: - virtual void setNumLinesToUpdate(const int); - virtual void incrementNumLinesToUpdate(); - -+#if QWT_VERSION >= 0x060200 -+ virtual QwtInterval interval(Qt::Axis) const; -+ void setInterval(Qt::Axis, const QwtInterval&); -+#endif -+ - protected: - double* _spectrumData; - uint64_t _fftPoints; -@@ -74,6 +83,10 @@ protected: - QwtInterval _intensityRange; - #endif - -+#if QWT_VERSION >= 0x060200 -+ QwtInterval d_intervals[3]; -+#endif -+ - private: - }; - -diff -up gnuradio-3.8.3.1/gr-qtgui/lib/ConstellationDisplayPlot.cc.aaaa gnuradio-3.8.3.1/gr-qtgui/lib/ConstellationDisplayPlot.cc ---- gnuradio-3.8.3.1/gr-qtgui/lib/ConstellationDisplayPlot.cc.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/lib/ConstellationDisplayPlot.cc 2021-08-31 00:24:14.515453198 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - class ConstellationDisplayZoomer : public QwtPlotZoomer - { -diff -up gnuradio-3.8.3.1/gr-qtgui/lib/plot_raster.cc.aaaa gnuradio-3.8.3.1/gr-qtgui/lib/plot_raster.cc ---- gnuradio-3.8.3.1/gr-qtgui/lib/plot_raster.cc.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/lib/plot_raster.cc 2021-08-31 00:24:14.515453198 +0200 -@@ -257,7 +257,11 @@ QImage PlotTimeRaster::renderImage(const - } - d_data->data->incrementResidual(); - } else if (d_data->colorMap->format() == QwtColorMap::Indexed) { -+#if QWT_VERSION >= 0x060200 -+ image.setColorTable(d_data->colorMap->colorTable(256)); -+#else - image.setColorTable(d_data->colorMap->colorTable(intensityRange)); -+#endif - - for (int y = rect.top(); y <= rect.bottom(); y++) { - const double ty = yyMap.invTransform(y); -@@ -266,8 +270,13 @@ QImage PlotTimeRaster::renderImage(const - for (int x = rect.left(); x <= rect.right(); x++) { - const double tx = xxMap.invTransform(x); - -+#if QWT_VERSION >= 0x060200 -+ *line++ = d_data->colorMap->colorIndex( -+ 256, intensityRange, d_data->data->value(tx, ty)); -+#else - *line++ = d_data->colorMap->colorIndex(intensityRange, - d_data->data->value(tx, ty)); -+#endif - } - } - } -diff -up gnuradio-3.8.3.1/gr-qtgui/lib/plot_waterfall.cc.aaaa gnuradio-3.8.3.1/gr-qtgui/lib/plot_waterfall.cc ---- gnuradio-3.8.3.1/gr-qtgui/lib/plot_waterfall.cc.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/lib/plot_waterfall.cc 2021-08-31 00:24:14.515453198 +0200 -@@ -252,7 +252,11 @@ QImage PlotWaterfall::renderImage(const - } - } - } else if (d_data->colorMap->format() == QwtColorMap::Indexed) { -+#if QWT_VERSION >= 0x060200 -+ image.setColorTable(d_data->colorMap->colorTable(256)); -+#else - image.setColorTable(d_data->colorMap->colorTable(intensityRange)); -+#endif - - for (int y = rect.top(); y <= rect.bottom(); y++) { - const double ty = yyMap.invTransform(y); -@@ -261,8 +265,13 @@ QImage PlotWaterfall::renderImage(const - for (int x = rect.left(); x <= rect.right(); x++) { - const double tx = xxMap.invTransform(x); - -+#if QWT_VERSION >= 0x060200 -+ *line++ = d_data->colorMap->colorIndex( -+ 256, intensityRange, d_data->data->value(tx, ty)); -+#else - *line++ = d_data->colorMap->colorIndex(intensityRange, - d_data->data->value(tx, ty)); -+#endif - } - } - } -diff -up gnuradio-3.8.3.1/gr-qtgui/lib/timeRasterGlobalData.cc.aaaa gnuradio-3.8.3.1/gr-qtgui/lib/timeRasterGlobalData.cc ---- gnuradio-3.8.3.1/gr-qtgui/lib/timeRasterGlobalData.cc.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/lib/timeRasterGlobalData.cc 2021-08-31 11:06:50.424496849 +0200 -@@ -60,6 +60,15 @@ TimeRasterData::TimeRasterData(const dou - - TimeRasterData::~TimeRasterData() { delete[] d_data; } - -+#if QWT_VERSION >= 0x060200 -+void TimeRasterData::setInterval(Qt::Axis axis, const QwtInterval& interval) -+{ -+ d_intervals[axis] = interval; -+} -+ -+QwtInterval TimeRasterData::interval(Qt::Axis a) const { return d_intervals[a]; } -+#endif -+ - void TimeRasterData::reset() - { - d_resid = 0; -diff -up gnuradio-3.8.3.1/gr-qtgui/lib/waterfallGlobalData.cc.aaaa gnuradio-3.8.3.1/gr-qtgui/lib/waterfallGlobalData.cc ---- gnuradio-3.8.3.1/gr-qtgui/lib/waterfallGlobalData.cc.aaaa 2021-06-10 22:31:35.000000000 +0200 -+++ gnuradio-3.8.3.1/gr-qtgui/lib/waterfallGlobalData.cc 2021-08-31 11:08:23.085227507 +0200 -@@ -65,6 +65,15 @@ void WaterfallData::reset() - _numLinesToUpdate = -1; - } - -+#if QWT_VERSION >= 0x060200 -+void WaterfallData::setInterval(Qt::Axis axis, const QwtInterval& interval) -+{ -+ d_intervals[axis] = interval; -+} -+ -+QwtInterval WaterfallData::interval(Qt::Axis a) const { return d_intervals[a]; } -+#endif -+ - void WaterfallData::copy(const WaterfallData* rhs) - { - #if QWT_VERSION < 0x060000 diff --git a/gnuradio-3.8.4.0.tar.gz b/gnuradio-3.8.4.0.tar.gz deleted file mode 100644 index 7dd6dca..0000000 --- a/gnuradio-3.8.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6fbf605b4859fbf0862e9b8dc4c345d7e5bb39469d604a49b5e55b715ad45fb7 -size 3395297 diff --git a/gnuradio-3.8.5.0.tar.gz b/gnuradio-3.8.5.0.tar.gz new file mode 100644 index 0000000..716dace --- /dev/null +++ b/gnuradio-3.8.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:492fe7d84fbd7a5106465326dc9fef5935288ea8f749d6038461a21eda649d13 +size 3399660 diff --git a/gnuradio.changes b/gnuradio.changes index 6e8cd3e..0ffc05d 100644 --- a/gnuradio.changes +++ b/gnuradio.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sun Jan 9 21:44:48 UTC 2022 - Wojciech Kazubski + +- Update to version 3.8.5.0 + * GRC + + GRC now runs on Fedora 35 ... Gtk initialization checks were + too strict + + Fix: dependent variables sometimes fail to evaluate + + Change type aliasing to allow interleaved short/byte to be + connected to vectors of short/byte. Stricter type checking + was added previously and caused some blocks to be unconnectable + when using these types. + + Account for scale factor when computing drawing area size + + Tooltips fixed for categories and modules + * gr-digital + + Fix yml file for Header/Payload Demux + * gr-dtv + + Add energy normalization for DVB-S2X constellations. + * gr-filter + + Remove pyqwt and qt4 from filter_design + * gr-qtgui + + Enable use of Qwt 6.2 + + Remove unusable int type in Number Sink yml + + RangeWidget - implement Eng & EngSlider +- Patch 0003-enables-use-of-qwt-6_2.patch removed (applied upstream). + ------------------------------------------------------------------- Tue Oct 19 09:55:51 UTC 2021 - Guillaume GARDET diff --git a/gnuradio.spec b/gnuradio.spec index 0a77a9f..8d0e68a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -16,10 +16,10 @@ # -%define sover 3_8_4 +%define sover 3_8_5 %bcond_without docs Name: gnuradio -Version: 3.8.4.0 +Version: 3.8.5.0 Release: 0 Summary: GNU software radio License: GPL-3.0-or-later @@ -32,7 +32,6 @@ Source99: %{name}-rpmlintrc Patch0: missing_library.patch Patch1: revert-23cece0d0.patch Patch2: 0001-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch -Patch3: 0003-enables-use-of-qwt-6_2.patch BuildRequires: alsa-devel BuildRequires: cmake >= 3.8 BuildRequires: cppunit-devel