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

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

[Ionen Wolkens]

commit:     9b699facc16e9c4ef94d08ca9c00b7a96feead02
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Feb 27 08:54:40 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 09:31:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b699fac

dev-qt/qtquick3d: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch b/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch
deleted file mode 100644
index 37a0ea9c30e9..000000000000
--- a/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 << ")";
-       }

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

[Ionen Wolkens]

commit:     d2e3fee70359cee9d9cce0398d946e170a508b34
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 22 01:02:52 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Sep 22 01:06:11 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e3fee7

dev-qt/qtquick3d: change assimp6.patch description

Really not quite sure what is happening here. I suspect it may
not be an issue in Qt but rather something with assimp itself.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch b/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
index 61348e3e1c1a..81e620666153 100644
--- a/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
+++ b/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
@@ -1,6 +1,12 @@
-Qt bundles assimp-6.x but the system library check still enforces
-the major version (5) rather than only check minimum. Ignore version
-for simplicity (we don't package incompatible <5.1.6 versions).
+Reason is currently unclear, but somehow it thinks 6.0.2 is not
+higher than 5? Or is there some rule that enforces == major version?
+Dropping the lower bound allows it to find assimp6.
+
+Issue could potentially be in our own assimp6 rather than in Qt given
+it does sed some bits, but needs investigation.
+
+Either way, Qt bundles assimp-6.0.2 in Qt 6.9.2 and it should work fine
+with that system version.
 --- a/src/plugins/assetimporters/configure.cmake
 +++ b/src/plugins/assetimporters/configure.cmake
 @@ -16 +16 @@

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

[Ionen Wolkens]

commit:     202ec2fd05adeb25d5dbcc4cb49f7a27a5f0d905
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 22 14:22:07 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Sep 22 14:24:12 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=202ec2fd

dev-qt/qtquick3d: add issue link for assimp6.patch

Seen this issue before but kind of forgot about it.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch b/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
index 81e620666153..9ef0475f53c3 100644
--- a/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
+++ b/dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
@@ -1,12 +1,10 @@
-Reason is currently unclear, but somehow it thinks 6.0.2 is not
-higher than 5? Or is there some rule that enforces == major version?
-Dropping the lower bound allows it to find assimp6.
+Seems that the '5' enforces the major version and it refuses to find
+system's assimp-6.0.2 (which is perfectly usable given Qt 6.9.2 bundles
+that version without it).
 
-Issue could potentially be in our own assimp6 rather than in Qt given
-it does sed some bits, but needs investigation.
+We don't package older ones, so drop the check as a quick workaround.
 
-Either way, Qt bundles assimp-6.0.2 in Qt 6.9.2 and it should work fine
-with that system version.
+https://bugreports.qt.io/browse/QTBUG-137996
 --- a/src/plugins/assetimporters/configure.cmake
 +++ b/src/plugins/assetimporters/configure.cmake
 @@ -16 +16 @@