Attachment 246680 Details for Bug 275443 – workaround (prefer elfutils)

[patch] workaround (prefer elfutils)

revert.diff (text/plain), 1.77 KB, created by Jan Beich on 2023-11-30 03:20:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2023-11-30 03:20:28 UTC

Size: 1.77 KB

patch

obsolete

>diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
>index 1095a78d359c..01a84ae81a10 100644
>--- a/graphics/mesa-dri/Makefile.common
>+++ b/graphics/mesa-dri/Makefile.common
>@@ -25,7 +25,6 @@ DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
> 
> PATCH_SITES=	https://gitlab.freedesktop.org/mesa/mesa/-/commit/
> PATCHFILES+=	9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8671
>-PATCHFILES+=	4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26284
> 
> MAINTAINER=	x11@FreeBSD.org
> 
>@@ -44,6 +43,9 @@ USES+=	xorg
> .if ${COMPONENT} != osmesa
> LIB_DEPENDS+=	libdrm.so:graphics/libdrm
> .endif
>+.if exists(${LOCALBASE}/include/libelf.h)
>+LIB_DEPENDS+=	libelf.so:devel/elfutils
>+.endif
> 
> USES+=		compiler:c++11-lib bison meson pathfix pkgconfig \
> 		python:build shebangfix tar:xz
>@@ -90,5 +92,4 @@ LDFLAGS+=	-Wl,--undefined-version
> 
> LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_VERSION}/lib
> MESON_ARGS+=	-Dllvm=enabled \
>-		-Dlibunwind=disabled \
>-		-Dlibelf=disabled
>+		-Dlibunwind=disabled
>diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo
>index de765e7b28f9..c2f6520a8b4d 100644
>--- a/graphics/mesa-dri/distinfo
>+++ b/graphics/mesa-dri/distinfo
>@@ -3,5 +3,3 @@ SHA256 (mesa-23.1.8.tar.xz) = 45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e7
> SIZE (mesa-23.1.8.tar.xz) = 18566724
> SHA256 (9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch) = aac0f0bc9454d177729109103e4e851ee4bc894ba7cc28ea1712ed87b4660e85
> SIZE (9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch) = 1511
>-SHA256 (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 84f18f14788bd8f387e2fc754b945bf30f84b517dd917785ed5d8ef1d594e24a
>-SIZE (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 1626

Actions: View | Diff

Attachments on bug 275443: 246680 | 247955