Attachment 254019 Details for Bug 281868 – graphics/embree: fix build with clang 19

[patch] graphics/embree: fix build with clang 19

graphics__embree-fix-clang19-build-1.diff (text/plain), 2.43 KB, created by Dimitry Andric on 2024-10-05 14:27:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-10-05 14:27:40 UTC

Size: 2.43 KB

patch

obsolete

>commit c3955f5f212479dff1d02244f99fa6a4611f9609
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-10-05T16:27:05+02:00
>
>    graphics/embree: fix build with clang 19
>    
>    Clang 19 has become more strict about errors in member functions, which
>    results in errors building graphics/embree:
>    
>      /wrkdirs/usr/ports/graphics/embree/work/embree-3.13.5/kernels/geometry/../common/../subdiv/bezier_curve.h:138:56: error: no member named 'u' in 'QuadraticBezierCurve<V>'
>        138 |         return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
>            |                                                      ~ ^
>      /wrkdirs/usr/ports/graphics/embree/work/embree-3.13.5/kernels/geometry/../common/../subdiv/bezier_curve.h:138:77: error: no member named 'u' in 'QuadraticBezierCurve<V>'
>        138 |         return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
>            |                                                                           ~ ^
>    
>    Upstream fixed this for https://github.com/RenderKit/embree/issues/486
>    in https://github.com/RenderKit/embree/commit/cda4cf191, so add a
>    PATCHFILES entry for it.
>    
>    PR:             281868
>    MFH:            2024Q3
>
>diff --git a/graphics/embree/Makefile b/graphics/embree/Makefile
>index 17e765e21b4d..3ecb4d907313 100644
>--- a/graphics/embree/Makefile
>+++ b/graphics/embree/Makefile
>@@ -4,6 +4,9 @@ PORTREVISION=	8
> DISTVERSIONPREFIX=	v
> CATEGORIES=	graphics
> 
>+PATCH_SITES=	https://github.com/RenderKit/${PORTNAME}/commit/
>+PATCHFILES+=	cda4cf1919bb2a748e78915fbd6e421a1056638d.patch:-p1 # https://github.com/RenderKit/embree/issues/486
>+
> MAINTAINER=	danfe@FreeBSD.org
> COMMENT=	Collection of high-performance ray tracing kernels
> WWW=		https://www.embree.org/
>diff --git a/graphics/embree/distinfo b/graphics/embree/distinfo
>index 3c3f4179535b..0553ed30b504 100644
>--- a/graphics/embree/distinfo
>+++ b/graphics/embree/distinfo
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1662619243
>+TIMESTAMP = 1728136927
> SHA256 (embree-embree-v3.13.5_GH0.tar.gz) = b8c22d275d9128741265537c559d0ea73074adbf2f2b66b0a766ca52c52d665b
> SIZE (embree-embree-v3.13.5_GH0.tar.gz) = 13739115
>+SHA256 (cda4cf1919bb2a748e78915fbd6e421a1056638d.patch) = dcd769d6f1466b6a362205caa23aaf875aa3b9dfeab7ccbd2505692a3c16ebd1
>+SIZE (cda4cf1919bb2a748e78915fbd6e421a1056638d.patch) = 1594

Flags:

danfe: maintainer-approval+

Actions: View | Diff

Attachments on bug 281868: 254019