git: e70ff172c205 - main - graphics/mesa*: Stop using meson native-file

Reply: Jan Beich : "Re: git: e70ff172c205 - main - graphics/mesa*: Stop using meson native-file"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Thu, 08 Dec 2022 19:01:33 UTC
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e70ff172c20525bf5ec27c7b904a8e2760947add

commit e70ff172c20525bf5ec27c7b904a8e2760947add
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-12-08 15:40:41 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-12-08 19:00:28 +0000

    graphics/mesa*: Stop using meson native-file
    
    Use BINARY_ALIAS instead, this is cleaner.
    While here directly record the deps on libLLVM for packages that
    needs it.
    
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
---
 graphics/libosmesa/Makefile          | 2 ++
 graphics/mesa-dri/Makefile           | 2 ++
 graphics/mesa-dri/Makefile.common    | 3 +--
 graphics/mesa-dri/Makefile.targets   | 5 -----
 graphics/mesa-gallium-va/Makefile    | 1 +
 graphics/mesa-gallium-vdpau/Makefile | 1 +
 graphics/mesa-gallium-xa/Makefile    | 2 ++
 graphics/mesa-libs/Makefile          | 1 +
 lang/clover/Makefile                 | 1 +
 9 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile
index 8fad2587525f..7d68addb1703 100644
--- a/graphics/libosmesa/Makefile
+++ b/graphics/libosmesa/Makefile
@@ -5,6 +5,8 @@ CATEGORIES=	graphics
 COMMENT=	Off-Screen Mesa implementation of the OpenGL API
 WWW=		https://www.mesa3d.org/
 
+LIB_DEPENDS+=	libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT}
+
 USES=		xorg
 USE_XORG=	xorgproto
 
diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 09fb7615be54..ac87f4cef889 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -5,6 +5,8 @@ CATEGORIES=	graphics
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
 WWW=		https://www.mesa3d.org/
 
+LIB_DEPENDS+=	libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT}
+
 OPTIONS_GROUP=			PLATFORM
 OPTIONS_GROUP_PLATFORM=		PLATFORM_X11 PLATFORM_WAYLAND
 PLATFORM_X11_DESC=		Enable X11 support for GBM/EGL
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index 6f740b0dc964..913e78c73650 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -90,8 +90,7 @@ BINARY_ALIAS+=	python3=${PYTHON_VERSION}
 
 LLVM_DEFAULT=	15
 BUILD_DEPENDS+=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-RUN_DEPENDS+=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
+BINARY_ALIAS+=	llvm-config=llvm-config${LLVM_DEFAULT}
 
-MESON_ARGS+=	--native-file="${WRKSRC}/llvm.ini"
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
 MESON_ARGS+=	-Dllvm=enabled
diff --git a/graphics/mesa-dri/Makefile.targets b/graphics/mesa-dri/Makefile.targets
index 64e483ccbbd6..b7e891579ab7 100644
--- a/graphics/mesa-dri/Makefile.targets
+++ b/graphics/mesa-dri/Makefile.targets
@@ -1,10 +1,5 @@
 # this file holds common targets
 
-pre-configure:
-	${PRINTF} "[binaries]\nllvm-config = '${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}'" \
-	> ${WRKSRC}/llvm.ini
-
-
 post-patch:
 	${REINPLACE_CMD} -e '/SYSCONFDIR/ s|/etc|${PREFIX}/etc|g' \
 		-e '/DATADIR/ s|/usr/share|${PREFIX}/share|g' \
diff --git a/graphics/mesa-gallium-va/Makefile b/graphics/mesa-gallium-va/Makefile
index 9d32e46c2b55..58ae8a8a06b1 100644
--- a/graphics/mesa-gallium-va/Makefile
+++ b/graphics/mesa-gallium-va/Makefile
@@ -6,6 +6,7 @@ COMMENT=	Mesa Gallium VAAPI drivers
 WWW=		https://www.mesa3d.org/
 
 LIB_DEPENDS=	libva.so:multimedia/libva \
+		libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \
 		libzstd.so:archivers/zstd
 
 OPTIONS_DEFINE=		X11
diff --git a/graphics/mesa-gallium-vdpau/Makefile b/graphics/mesa-gallium-vdpau/Makefile
index 2a1c8a0a2688..2ee31ea8913c 100644
--- a/graphics/mesa-gallium-vdpau/Makefile
+++ b/graphics/mesa-gallium-vdpau/Makefile
@@ -6,6 +6,7 @@ COMMENT=	Mesa Gallium VDPAU drivers
 WWW=		https://www.mesa3d.org/
 
 LIB_DEPENDS=	libva.so:multimedia/libva \
+		libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \
 		libvdpau.so:multimedia/libvdpau \
 		libzstd.so:archivers/zstd
 
diff --git a/graphics/mesa-gallium-xa/Makefile b/graphics/mesa-gallium-xa/Makefile
index 0b87ebe49f1a..07026c764bbe 100644
--- a/graphics/mesa-gallium-xa/Makefile
+++ b/graphics/mesa-gallium-xa/Makefile
@@ -5,6 +5,8 @@ CATEGORIES=	graphics
 COMMENT=	Mesa Gallium XA state tracker
 WWW=		https://www.mesa3d.org/
 
+LIB_DEPENDS=	libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT}
+
 USES=		xorg
 USE_XORG=	xorgproto
 
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index e009b3a6b86f..d161b86654e7 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mesa-libs
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients
diff --git a/lang/clover/Makefile b/lang/clover/Makefile
index eeea567161f8..50c5fcc201a8 100644
--- a/lang/clover/Makefile
+++ b/lang/clover/Makefile
@@ -8,6 +8,7 @@ WWW=		https://dri.freedesktop.org/wiki/GalliumCompute/
 BUILD_DEPENDS=	libclc>=0.3.0:devel/libclc \
 		opencl>=0:devel/opencl
 LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd \
+		libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	libclc>=0.3.0:devel/libclc \
 		opencl>=0:devel/opencl