git: 045150b2cda8 - 2024Q4 - multimedia/mjpegtools: fix build with clang 19
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 20 Oct 2024 09:59:51 UTC
The branch 2024Q4 has been updated by dim:
URL: https://cgit.FreeBSD.org/ports/commit/?id=045150b2cda816ef0410ab12b6ce155369fd6dd4
commit 045150b2cda816ef0410ab12b6ce155369fd6dd4
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-10-06 09:50:53 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-10-20 09:59:39 +0000
multimedia/mjpegtools: fix build with clang 19
Clang 19 has become more strict about errors in member functions, which
results in errors building multimedia/mjpegtools:
./Region2D.hh:439:13: error: no member named 'DoesContainPoint' in 'Region2D<INDEX, SIZE>'
439 | || this->DoesContainPoint (rHere.m_tnY, tnX)))
| ~~~~ ^
./Region2D.hh:446:22: error: no member named 'Begin' in 'Region2D<INDEX, SIZE>'
446 | for (itHere = this->Begin(); itHere != this->End(); ++itHere)
| ~~~~ ^
./Region2D.hh:446:47: error: no member named 'End' in 'Region2D<INDEX, SIZE>'
446 | for (itHere = this->Begin(); itHere != this->End(); ++itHere)
| ~~~~ ^
./Region2D.hh:549:14: error: no member named 'DoesContainPoint' in 'Region2D<INDEX, SIZE>'
549 | && !this->DoesContainPoint (rHere.m_tnY, tnX))
| ~~~~ ^
./Region2D.hh:556:22: error: no member named 'Begin' in 'Region2D<INDEX, SIZE>'
556 | for (itHere = this->Begin(); itHere != this->End(); ++itHere)
| ~~~~ ^
./Region2D.hh:556:47: error: no member named 'End' in 'Region2D<INDEX, SIZE>'
556 | for (itHere = this->Begin(); itHere != this->End(); ++itHere)
| ~~~~ ^
./Region2D.hh:635:16: error: no member named 'DoesContainPoint' in 'Region2D<INDEX, SIZE>'
635 | if (!(this->DoesContainPoint (rHere.m_tnY, tnX)
| ~~~~ ^
./Region2D.hh:643:22: error: no member named 'Begin' in 'Region2D<INDEX, SIZE>'
643 | for (itHere = this->Begin(); itHere != this->End(); ++itHere)
| ~~~~ ^
./Region2D.hh:643:47: error: no member named 'End' in 'Region2D<INDEX, SIZE>'
643 | for (itHere = this->Begin(); itHere != this->End(); ++itHere)
| ~~~~ ^
The member functions `DoesContainPoint`, `Begin` and `End` are all
commented out in Region2D.hh, probably because the code was never
finished up properly. The member functions referencing them are also
never used, so comment those out too, using `#if 0`, `#endif` pairs.
PR: 281887
Approved by: maintainer timeout (2 weeks)
MFH: 2024Q4
(cherry picked from commit 8cf728289caf3a06b225866707277d5ff170dff0)
---
.../mjpegtools/files/patch-y4mdenoise_Region2D.hh | 34 ++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/multimedia/mjpegtools/files/patch-y4mdenoise_Region2D.hh b/multimedia/mjpegtools/files/patch-y4mdenoise_Region2D.hh
new file mode 100644
index 000000000000..51d5f1420de8
--- /dev/null
+++ b/multimedia/mjpegtools/files/patch-y4mdenoise_Region2D.hh
@@ -0,0 +1,34 @@
+--- y4mdenoise/Region2D.hh.orig 2021-09-05 06:14:13 UTC
++++ y4mdenoise/Region2D.hh
+@@ -404,6 +404,7 @@ Region2D<INDEX,SIZE>::~Region2D()
+
+
+
++#if 0
+ // Add the given horizontal extent to the region.
+ template <class INDEX, class SIZE>
+ template <class REGION, class REGION_TEMP>
+@@ -480,6 +481,7 @@ error:
+ PrintRegion (a_rTemp);
+ assert (false);
+ }
++#endif
+
+
+
+@@ -513,6 +515,7 @@ Region2D<INDEX,SIZE>::Union (Status_t &a_reStatus,
+
+
+
++#if 0
+ // Make the current region represent the union between itself
+ // and the other given region.
+ template <class INDEX, class SIZE>
+@@ -686,6 +689,7 @@ error:
+ PrintRegion (a_rTemp);
+ assert (false);
+ }
++#endif
+
+
+