[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtquick3d/files/, dev-qt/qtquick3d/

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtquick3d/files/, dev-qt/qtquick3d/

[Ionen Wolkens]

commit:     c7f2b75f092a62d79a8032c2ea0ff5929e9ab2bc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 01:06:52 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 02:07:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f2b75f

dev-qt/qtquick3d: backport gcc15 fix for bundled embree

Likely be a while before this lands in qtquick3d itself (bundled embree
has not been touched in 2 years), so may as well backport now even if
not urgent.

Relatively long build so not going to revbump/re-stabilize over this.

Closes: https://bugs.gentoo.org/936410
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch | 24 ++++++++++++++++++++++
 dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild            |  1 +
 dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild         |  1 +
 dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild         |  1 +
 dev-qt/qtquick3d/qtquick3d-6.9999.ebuild           |  1 +
 5 files changed, 28 insertions(+)

diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch b/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch
new file mode 100644
index 000000000000..37a0ea9c30e9
--- /dev/null
+++ b/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch
@@ -0,0 +1,24 @@
+Newly caught as an error by gcc15.
+https://bugs.gentoo.org/936410
+https://github.com/RenderKit/embree/issues/486
+https://github.com/RenderKit/embree/commit/cda4cf1919bb2a748e78915fbd6e421a1056638d
+From: Daniel Opitz <daniel.opitz@intel.com>
+Date: Mon, 13 May 2024 10:17:51 +0200
+Subject: [PATCH] fix output operator, issue #486
+--- a/src/3rdparty/embree/kernels/geometry/pointi.h
++++ b/src/3rdparty/embree/kernels/geometry/pointi.h
+@@ -212,5 +212,5 @@
+     /*! output operator */
+-    friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line)
++    friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point)
+     {
+-      return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}";
++      return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}";
+     }
+--- a/src/3rdparty/embree/kernels/subdiv/bezier_curve.h
++++ b/src/3rdparty/embree/kernels/subdiv/bezier_curve.h
+@@ -137,3 +137,3 @@
+       friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) {
+-        return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
++        return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
+       }

diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
index 09ff3f5ce309..a5bf7527d264 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
 )
 
 CMAKE_SKIP_TESTS=(

diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
index 44521151cdbd..21502bc53a04 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
 )
 
 CMAKE_SKIP_TESTS=(

diff --git a/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
index ea6e9c04ad8a..ff9c71b3433b 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
 )
 
 CMAKE_SKIP_TESTS=(

diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
index ea6e9c04ad8a..ff9c71b3433b 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
 )
 
 CMAKE_SKIP_TESTS=(