[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/, media-libs/embree/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/, media-libs/embree/files/

[Sam James]

commit:     e446f623bcf383e75bbbc12ee10a88a32f9400b5
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Aug 26 13:59:59 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  4 09:31:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e446f623

media-libs/embree: add 3.14.5-r1, 4.3.1-r1 fix 938522

Fixed upstream in 4.3.3

Bug: https://bugs.gentoo.org/937275
Closes: https://bugs.gentoo.org/938522
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38296
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...mbree-3.13.5.ebuild => embree-3.13.5-r1.ebuild} |  1 +
 ...{embree-4.3.1.ebuild => embree-4.3.1-r1.ebuild} |  1 +
 .../files/embree-4.3.2-fix-output-operator.patch   | 43 ++++++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5-r1.ebuild
similarity index 98%
rename from media-libs/embree/embree-3.13.5.ebuild
rename to media-libs/embree/embree-3.13.5-r1.ebuild
index 02aed35aa2cc..44cfda6f3f18 100644
--- a/media-libs/embree/embree-3.13.5.ebuild
+++ b/media-libs/embree/embree-3.13.5-r1.ebuild
@@ -38,6 +38,7 @@ DOCS=( CHANGELOG.md README.md readme.pdf )
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.13.5-fix-openimageio-test.patch
 	"${FILESDIR}"/${PN}-3.13.5-fix-arm64.patch
+	"${FILESDIR}/${PN}-4.3.2-fix-output-operator.patch"
 )
 
 pkg_setup() {

diff --git a/media-libs/embree/embree-4.3.1.ebuild b/media-libs/embree/embree-4.3.1-r1.ebuild
similarity index 99%
rename from media-libs/embree/embree-4.3.1.ebuild
rename to media-libs/embree/embree-4.3.1-r1.ebuild
index 4587a4b2855a..7459d7d763b4 100644
--- a/media-libs/embree/embree-4.3.1.ebuild
+++ b/media-libs/embree/embree-4.3.1-r1.ebuild
@@ -34,6 +34,7 @@ DOCS=( CHANGELOG.md README.md readme.pdf )
 
 PATCHES=(
 	"${FILESDIR}/embree-4.3.1-dont-install-tutorials.patch"
+	"${FILESDIR}/${PN}-4.3.2-fix-output-operator.patch"
 )
 
 pkg_setup() {

diff --git a/media-libs/embree/files/embree-4.3.2-fix-output-operator.patch b/media-libs/embree/files/embree-4.3.2-fix-output-operator.patch
new file mode 100644
index 000000000000..9c28796905a5
--- /dev/null
+++ b/media-libs/embree/files/embree-4.3.2-fix-output-operator.patch
@@ -0,0 +1,43 @@
+https://github.com/RenderKit/embree/commit/cda4cf1919bb2a748e78915fbd6e421a1056638d.patch
+https://bugs.gentoo.org/938522
+https://bugs.gentoo.org/937275
+
+From cda4cf1919bb2a748e78915fbd6e421a1056638d Mon Sep 17 00:00:00 2001
+From: Daniel Opitz <daniel.opitz@intel.com>
+Date: Mon, 13 May 2024 10:17:51 +0200
+Subject: [PATCH] fix output operator, issue #486
+
+---
+ kernels/geometry/pointi.h     | 4 ++--
+ kernels/subdiv/bezier_curve.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/kernels/geometry/pointi.h b/kernels/geometry/pointi.h
+index f81edb9035..aba8ec4ab3 100644
+--- a/kernels/geometry/pointi.h
++++ b/kernels/geometry/pointi.h
+@@ -210,9 +210,9 @@ namespace embree
+     };
+ 
+     /*! 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() << "}";
+     }
+ 
+    public:
+diff --git a/kernels/subdiv/bezier_curve.h b/kernels/subdiv/bezier_curve.h
+index 257e0afd40..5e3b5c83b3 100644
+--- a/kernels/subdiv/bezier_curve.h
++++ b/kernels/subdiv/bezier_curve.h
+@@ -135,7 +135,7 @@ namespace embree
+       }
+       
+       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 << ")";
+       }
+     };
+