From nobody Thu Feb 22 08:14:07 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TgQsD1VcZz5C8Yk; Thu, 22 Feb 2024 08:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgQsC65NTz4SSP; Thu, 22 Feb 2024 08:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708589647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+1yMVwjXnduwaNjldomPi5rzEjAOQLJwp6VyqRvb9M=; b=iWQKRwlr6BXoVYHyvCmcZFVdpId28BLvK5w0tc1xGe+mid7x1SBvbFHGA7NDhcRyJeMY6r RsX+4B3SVAzoeQz+zmHLfuUK6s5sOkCzqX+TqdH/PYmeGR/7LJsjl/s1/zVeh7X56Afs/b Lq1/jdSNlSAT5aKNfBl9w68X7ks0GqMyMp0EcVm82/v9YfbXPSUpW47vVBXCKyBGTdQNjV JWc44UKXPaWJGJGJQTcfEozMdI0FlRYeHaPbaxW3V6XD9ijSYQ7wDos8Ae9ll/3SSpuD5O HYK2HKu/esRatHBRCG3sQr0Km6zlwDcenYu3nUFJ8z5mhdzzM6wP5pg7XPEpnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708589647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+1yMVwjXnduwaNjldomPi5rzEjAOQLJwp6VyqRvb9M=; b=KSCu24gQ2D2utq6IyN2xq1/t7qsxiL+QDDsqSNsmXCYcn3nNB5uYqJYjNgNeU5trEbcoHS 6LETVnX/fcwMOIOMjenuRcdlKaFwISLuRFGb8SYgPyOaxRIHCGNErgoZB+YbZC86yNkgiC 7s9w16t22rQLRpRHD/9c9OpGAYLrGPAmb3b4W86S0yaaMr7zNAD4+KI/VJxviTQ+1X7nl6 alP0B173Tl3reVop3YNzJwJEH5eYXDs3Mef2uC86BfeejDxvKJ5RKcB0p5SOH6It+6IRvI nnunLoYIr2b/0t8b/vG4tjHsFWDxKy+a23YR95wdt5jZ4YTdF4zuS6LuQGp3yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708589647; a=rsa-sha256; cv=none; b=SARaQif9IkDN3Nk83lfO5NcnsVptgc7k4Vg9MZSiEOIeVxjB2gudyaChuk364gCpg3fOW9 c0R0zd4GfEZMxWkz80tesU4nJOdxbkx81yFEwPjYbCQr9PxW3wfW09fHUog1Nbxf41O1mr unIfOQLBuEnBh+TQuERQ9QLEZuZfAHC17KmdvOc5MOkdXwJxamC8vLBzkrF7SdQ3hKBl4F skplNQFFMQz1c4yjd8S+pGjA/f7RZ5Wi8s3Z40VuRvX7Wa6gxcYEuRT2YHWqTeqZpQEfe8 Y8812D/uYoN5DdQ83xfUKAgknH1Y/hqGBXYZjuw165Mo2BsZyG8DB/1n3ioBXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TgQsC4sGBzPDk; Thu, 22 Feb 2024 08:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41M8E7tX084337; Thu, 22 Feb 2024 08:14:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41M8E7AU084334; Thu, 22 Feb 2024 08:14:07 GMT (envelope-from git) Date: Thu, 22 Feb 2024 08:14:07 GMT Message-Id: <202402220814.41M8E7AU084334@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Lo=C3=AFc?= Bartoletti Subject: git: 2f66c587e244 - main - comms/gnuradio: Prepare to Qwt 6.2.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f66c587e24445ca95684f48870f57661b4d5254 Auto-Submitted: auto-generated The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f66c587e24445ca95684f48870f57661b4d5254 commit 2f66c587e24445ca95684f48870f57661b4d5254 Author: Loïc Bartoletti AuthorDate: 2022-03-24 04:56:52 +0000 Commit: Loïc Bartoletti CommitDate: 2024-02-22 08:14:00 +0000 comms/gnuradio: Prepare to Qwt 6.2.0 - Manual apply patches from https://github.com/gnuradio/gnuradio/pull/5034 --- comms/gnuradio/Makefile | 2 +- ...h-gr-qtgui_include_gnuradio_qtgui_DisplayPlot.h | 14 +++++++++ ..._include_gnuradio_qtgui_TimeRasterDisplayPlot.h | 13 ++++++++ ...i_include_gnuradio_qtgui_WaterfallDisplayPlot.h | 13 ++++++++ ...-gr-qtgui_include_gnuradio_qtgui_plot__raster.h | 15 ++++++++++ ...-qtgui_include_gnuradio_qtgui_plot__waterfall.h | 15 ++++++++++ ...-gr-qtgui_include_gnuradio_qtgui_qtgui__types.h | 10 +++++++ ...i_include_gnuradio_qtgui_timeRasterGlobalData.h | 35 ++++++++++++++++++++++ ...ui_include_gnuradio_qtgui_waterfallGlobalData.h | 35 ++++++++++++++++++++++ .../patch-gr-qtgui_lib_ConstellationDisplayPlot.cc | 10 +++++++ .../files/patch-gr-qtgui_lib_plot__raster.cc | 29 ++++++++++++++++++ .../files/patch-gr-qtgui_lib_plot__waterfall.cc | 28 +++++++++++++++++ .../patch-gr-qtgui_lib_timeRasterGlobalData.cc | 16 ++++++++++ .../patch-gr-qtgui_lib_waterfallGlobalData.cc | 16 ++++++++++ 14 files changed, 250 insertions(+), 1 deletion(-) diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 57a461700628..4205e04581e9 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -1,7 +1,7 @@ PORTNAME= gnuradio DISTVERSIONPREFIX= v DISTVERSION= 3.8.4.0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= comms astro hamradio MAINTAINER= hamradio@FreeBSD.org diff --git a/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot.h b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot.h new file mode 100644 index 000000000000..26a2b59937c9 --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_DisplayPlot.h @@ -0,0 +1,14 @@ +--- gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h.orig 2024-02-19 05:15:00 UTC ++++ gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h +@@ -41,7 +41,10 @@ + #include + + #if QWT_VERSION >= 0x060000 +-#include ++typedef QPointF QwtDoublePoint; ++typedef QRectF QwtDoubleRect; ++ ++typedef QwtInterval QwtDoubleInterval; + #endif + + typedef QList QColorList; diff --git a/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot.h b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot.h new file mode 100644 index 000000000000..9f0ccb6c159f --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_TimeRasterDisplayPlot.h @@ -0,0 +1,13 @@ +--- gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h.orig 2024-02-19 05:15:29 UTC ++++ gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h +@@ -35,7 +35,9 @@ + #if QWT_VERSION < 0x060000 + #include + #else +-#include ++#include ++ ++typedef QwtInterval QwtDoubleInterval; + #endif + + /*! diff --git a/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot.h b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot.h new file mode 100644 index 000000000000..5c77cea2715f --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_WaterfallDisplayPlot.h @@ -0,0 +1,13 @@ +--- gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h.orig 2024-02-19 05:15:53 UTC ++++ gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h +@@ -34,7 +34,9 @@ + #if QWT_VERSION < 0x060000 + #include + #else +-#include ++#include ++ ++typedef QwtInterval QwtDoubleInterval; + #endif + + /*! diff --git a/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_plot__raster.h b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_plot__raster.h new file mode 100644 index 000000000000..a2588451e7cc --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_plot__raster.h @@ -0,0 +1,15 @@ +--- gr-qtgui/include/gnuradio/qtgui/plot_raster.h.orig 2024-02-19 05:17:07 UTC ++++ gr-qtgui/include/gnuradio/qtgui/plot_raster.h +@@ -28,8 +28,10 @@ + #include + + #if QWT_VERSION >= 0x060000 +-#include +-#include // doesn't seem necessary, but is... ++#include ++#include ++ ++typedef QwtInterval QwtDoubleInterval; + #endif + + class QwtColorMap; diff --git a/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_plot__waterfall.h b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_plot__waterfall.h new file mode 100644 index 000000000000..13c1952528df --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_plot__waterfall.h @@ -0,0 +1,15 @@ +--- gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h.orig 2024-02-19 05:17:32 UTC ++++ gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h +@@ -28,8 +28,10 @@ + #include + + #if QWT_VERSION >= 0x060000 +-#include +-#include // doesn't seem necessary, but is... ++#include ++#include ++ ++typedef QwtInterval QwtDoubleInterval; + #endif + + class QwtColorMap; diff --git a/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_qtgui__types.h b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_qtgui__types.h new file mode 100644 index 000000000000..d7ec0bf86b5f --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_qtgui__types.h @@ -0,0 +1,10 @@ +--- gr-qtgui/include/gnuradio/qtgui/qtgui_types.h.orig 2024-02-19 05:18:00 UTC ++++ gr-qtgui/include/gnuradio/qtgui/qtgui_types.h +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + namespace gr { + namespace qtgui { diff --git a/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_timeRasterGlobalData.h b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_timeRasterGlobalData.h new file mode 100644 index 000000000000..b8b260a4e8dc --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_timeRasterGlobalData.h @@ -0,0 +1,35 @@ +--- gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h.orig 2024-02-19 05:18:25 UTC ++++ gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h +@@ -27,8 +27,9 @@ + #include + + #if QWT_VERSION >= 0x060000 +-#include +-#include // doesn't seem necessary, but is... ++#include ++ ++typedef QwtInterval QwtDoubleInterval; + #endif + + class TimeRasterData : public QwtRasterData +@@ -47,6 +48,9 @@ class TimeRasterData : public QwtRasterData (public) + #if QWT_VERSION < 0x060000 + virtual QwtDoubleInterval range() const; + virtual void setRange(const QwtDoubleInterval&); ++#elif QWT_VERSION >= 0x060200 ++ virtual QwtInterval interval(Qt::Axis) const; ++ void setInterval(Qt::Axis, const QwtInterval&); + #endif + + virtual double value(double x, double y) const; +@@ -68,6 +72,10 @@ class TimeRasterData : public QwtRasterData (public) + QwtDoubleInterval d_intensityRange; + #else + QwtInterval d_intensityRange; ++#endif ++ ++#if QWT_VERSION >= 0x060200 ++ QwtInterval d_intervals[3]; + #endif + + private: diff --git a/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_waterfallGlobalData.h b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_waterfallGlobalData.h new file mode 100644 index 000000000000..7def4080f8a2 --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_include_gnuradio_qtgui_waterfallGlobalData.h @@ -0,0 +1,35 @@ +--- gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h.orig 2024-02-19 05:19:43 UTC ++++ gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h +@@ -27,8 +27,9 @@ + #include + + #if QWT_VERSION >= 0x060000 +-#include +-#include // doesn't seem necessary, but is... ++#include ++ ++typedef QwtInterval QwtDoubleInterval; + #endif + + class WaterfallData : public QwtRasterData +@@ -48,6 +49,9 @@ class WaterfallData : public QwtRasterData (public) + #if QWT_VERSION < 0x060000 + virtual QwtDoubleInterval range() const; + virtual void setRange(const QwtDoubleInterval&); ++#elif QWT_VERSION >= 0x060200 ++ virtual QwtInterval interval(Qt::Axis) const; ++ void setInterval(Qt::Axis, const QwtInterval&); + #endif + + virtual double value(double x, double y) const; +@@ -72,6 +76,10 @@ class WaterfallData : public QwtRasterData (public) + QwtDoubleInterval _intensityRange; + #else + QwtInterval _intensityRange; ++#endif ++ ++#if QWT_VERSION >= 0x060200 ++ QwtInterval d_intervals[3]; + #endif + + private: diff --git a/comms/gnuradio/files/patch-gr-qtgui_lib_ConstellationDisplayPlot.cc b/comms/gnuradio/files/patch-gr-qtgui_lib_ConstellationDisplayPlot.cc new file mode 100644 index 000000000000..c2052f012146 --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_lib_ConstellationDisplayPlot.cc @@ -0,0 +1,10 @@ +--- gr-qtgui/lib/ConstellationDisplayPlot.cc.orig 2024-02-19 05:20:52 UTC ++++ gr-qtgui/lib/ConstellationDisplayPlot.cc +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + class ConstellationDisplayZoomer : public QwtPlotZoomer + { diff --git a/comms/gnuradio/files/patch-gr-qtgui_lib_plot__raster.cc b/comms/gnuradio/files/patch-gr-qtgui_lib_plot__raster.cc new file mode 100644 index 000000000000..78548b201aa9 --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_lib_plot__raster.cc @@ -0,0 +1,29 @@ +--- gr-qtgui/lib/plot_raster.cc.orig 2024-02-19 05:21:10 UTC ++++ gr-qtgui/lib/plot_raster.cc +@@ -257,7 +257,11 @@ QImage PlotTimeRaster::renderImage(const QwtScaleMap& + } + 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); +@@ -265,9 +269,13 @@ QImage PlotTimeRaster::renderImage(const QwtScaleMap& + unsigned char* line = image.scanLine(y - rect.top()); + 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 --git a/comms/gnuradio/files/patch-gr-qtgui_lib_plot__waterfall.cc b/comms/gnuradio/files/patch-gr-qtgui_lib_plot__waterfall.cc new file mode 100644 index 000000000000..f20ba3b32598 --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_lib_plot__waterfall.cc @@ -0,0 +1,28 @@ +--- gr-qtgui/lib/plot_waterfall.cc.orig 2024-02-19 05:22:53 UTC ++++ gr-qtgui/lib/plot_waterfall.cc +@@ -252,7 +252,11 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap& x + } + } + } 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 QwtScaleMap& x + 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 --git a/comms/gnuradio/files/patch-gr-qtgui_lib_timeRasterGlobalData.cc b/comms/gnuradio/files/patch-gr-qtgui_lib_timeRasterGlobalData.cc new file mode 100644 index 000000000000..909184d0cbe4 --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_lib_timeRasterGlobalData.cc @@ -0,0 +1,16 @@ +--- gr-qtgui/lib/timeRasterGlobalData.cc.orig 2024-02-19 05:24:01 UTC ++++ gr-qtgui/lib/timeRasterGlobalData.cc +@@ -155,7 +155,13 @@ void TimeRasterData::setRange(const QwtDoubleInterval& + { + d_intensityRange = newRange; + } ++#elif 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 + + diff --git a/comms/gnuradio/files/patch-gr-qtgui_lib_waterfallGlobalData.cc b/comms/gnuradio/files/patch-gr-qtgui_lib_waterfallGlobalData.cc new file mode 100644 index 000000000000..b1e8143339d6 --- /dev/null +++ b/comms/gnuradio/files/patch-gr-qtgui_lib_waterfallGlobalData.cc @@ -0,0 +1,16 @@ +--- gr-qtgui/lib/waterfallGlobalData.cc.orig 2024-02-19 05:24:33 UTC ++++ gr-qtgui/lib/waterfallGlobalData.cc +@@ -158,7 +158,13 @@ void WaterfallData::setRange(const QwtDoubleInterval& + { + _intensityRange = newRange; + } ++#elif 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 + +