Attachment 215245 Details for Bug 246997 – Specify platform based on the option

[patch] Specify platform based on the option

0002-mesa-dri-Default-the-platform-to-x11-surfaceless-and.patch (text/plain), 3.98 KB, created by Emmanuel Vadot on 2020-06-05 10:15:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emmanuel Vadot

Created: 2020-06-05 10:15:30 UTC

Size: 3.98 KB

patch

obsolete

>From 6547773c694aba85e4701090fc26e1be64467013 Mon Sep 17 00:00:00 2001
>From: Emmanuel Vadot <manu@FreeBSD.org>
>Date: Fri, 5 Jun 2020 12:14:08 +0200
>Subject: [PATCH 2/2] mesa-dri: Default the platform to x11 surfaceless and drm
>
>If wayland option is choosen, add it to the platforms.
>
>Signed-off-by: Emmanuel Vadot <manu@FreeBSD.org>
>---
> graphics/mesa-dri/Makefile | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
>index ad299791b566..8d88a7f9a360 100644
>--- a/graphics/mesa-dri/Makefile
>+++ b/graphics/mesa-dri/Makefile
>@@ -1,121 +1,123 @@
> # Created by: Eric Anholt <anholt@FreeBSD.org>
> # $FreeBSD$
> 
> PORTNAME=	mesa-dri
> PORTVERSION=	${MESAVERSION}
> PORTREVISION=	2
> CATEGORIES=	graphics
> 
> COMMENT=	OpenGL hardware acceleration drivers for DRI2+
> 
> USES=		xorg
> USE_XORG=	xorgproto x11 xdamage xext xfixes xshmfence xv xvmc
> 
> OPTIONS_DEFINE=	VAAPI VDPAU WAYLAND
> OPTIONS_DEFAULT=WAYLAND
> OPTIONS_SUB=	yes
> 
> VAAPI_MESON_ON=		-Dgallium-va=true
> VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
> VAAPI_USE=		XORG=xcb
> 
> VDPAU_MESON_ON=		-Dgallium-vdpau=true
> VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
> 
> WAYLAND_DESC=		Enable support for the Wayland platform in Vulkan drivers
> WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.8:graphics/wayland-protocols
> WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
> 
> .include <bsd.port.options.mk>
> .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
> 
> ALL_DRI_DRIVERS=	I915 I965 R100 R200 SWRAST
> ALL_GALLIUM_DRIVERS=	R300 R600 RADEONSI SVGA SWRAST
> ALL_VULKAN_DRIVERS=	INTEL AMD
> 
> .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*}
> GALLIUM_DRIVERS=	SWRAST	# llvmpipe
> .else
> GALLIUM_DRIVERS=	""
> .endif
> VULKAN_DRIVERS=		#
> 
> .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 \
>  || ${ARCH} == powerpc || ${ARCH} == powerpc64
> DRI_DRIVERS+=		R100 R200
> GALLIUM_DRIVERS+=	R300 R600 RADEONSI
> VULKAN_DRIVERS+=	AMD
> MESON_ARGS+=		-Dgallium-xvmc=true
> .endif
> .if ${ARCH} == amd64 || ${ARCH} == i386
> DRI_DRIVERS+=		I915 I965
> GALLIUM_DRIVERS+=	SVGA
> . if ${OPSYS} == FreeBSD
> EXTRA_PATCHES+=	${PATCHDIR}/extra-src_mesa_drivers_dri_i965_intel__screen.c
> . endif
> VULKAN_DRIVERS+=	INTEL
> .endif
> 
> .if ${VULKAN_DRIVERS}
> BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
> USE_XORG+=		xcb xrandr
> .endif
> 
> LDFLAGS_i386=		-Wl,-znotext
> .if ${DRI_DRIVERS} || ${VULKAN_DRIVERS:MINTEL}
> . if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
> # --build-id isn't supported by old GNU ld.bfd in base
> USE_BINUTILS=		yes
> LDFLAGS+=		-B${LOCALBASE}/bin
> . endif
> .endif
> 
>-# enables VK_KHR_wayland_surface in Vulkan drivers
>-.if ${PORT_OPTIONS:MWAYLAND} && !empty(VULKAN_DRIVERS)
>-MESON_ARGS+=	-Dplatforms=x11,surfaceless,drm,wayland
>+# Default mesa platforms
>+MESA_PLATFORMS=	x11 surfaceless drm
>+.if ${PORT_OPTIONS:MWAYLAND}
>+MESA_PLATFORMS+=	wayland
> .endif
> 
> MESON_ARGS+=	-Ddri-drivers="${DRI_DRIVERS:ts,:tl}" \
> 			-Dgallium-drivers="${GALLIUM_DRIVERS:ts,:tl}" \
>-			-Dvulkan-drivers="${VULKAN_DRIVERS:ts,:tl}"
>+			-Dvulkan-drivers="${VULKAN_DRIVERS:ts,:tl}" \
>+			-Dplatforms="${MESA_PLATFORMS:ts,}"
> 
> # Disable some options
> MESON_ARGS+=	-Dgallium-xa=false \
> 		-Dgles1=false \
> 		-Dgles2=false \
> 		-Dglx=disabled \
> 		-Degl=false \
> 		-Dosmesa=none \
> 		-Dtools=""
> 
> .for _d in ${ALL_DRI_DRIVERS}
> . if ${DRI_DRIVERS:M${_d}}
> PLIST_SUB+=	${_d}_DRIVER=""
> . else
> PLIST_SUB+=	${_d}_DRIVER="@comment "
> . endif
> .endfor
> 
> .for _gd in ${ALL_GALLIUM_DRIVERS}
> . if ${GALLIUM_DRIVERS:M${_gd}}
> PLIST_SUB+=	${_gd}_GDRIVER=""
> . else
> PLIST_SUB+=	${_gd}_GDRIVER="@comment "
> . endif
> .endfor
> 
> PLIST_SUB += ARCH=${ARCH:S/amd/x86_/}
> .for _vd in ${ALL_VULKAN_DRIVERS}
> . if ${VULKAN_DRIVERS:M${_vd}}
> PLIST_SUB+=	${_vd}_VDRIVER=""
> . else
> PLIST_SUB+=	${_vd}_VDRIVER="@comment "
> . endif
> .endfor
> 
> .include "${MASTERDIR}/Makefile.targets"
> 
> post-install:
> 	@${RM} -r ${STAGEDIR}/etc/OpenCL
> 
> .include <bsd.port.post.mk>
>-- 
>2.26.2
>

Actions: View | Diff

Attachments on bug 246997: 215245 | 215249 | 215281 | 215288