Attachment 215249 Details for Bug 246997 – Specify platform in mesa-dri and mesa-libs based on options.

[patch] Specify platform in mesa-dri and mesa-libs based on options.

mesa.diff (text/plain), 1.78 KB, created by Guido Falsi on 2020-06-05 14:48:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2020-06-05 14:48:36 UTC

Size: 1.78 KB

patch

obsolete

>Index: graphics/mesa-dri/Makefile
>===================================================================
>--- graphics/mesa-dri/Makefile	(revision 538019)
>+++ graphics/mesa-dri/Makefile	(working copy)
>@@ -75,14 +75,16 @@
> . 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 \
>Index: graphics/mesa-libs/Makefile
>===================================================================
>--- graphics/mesa-libs/Makefile	(revision 538019)
>+++ graphics/mesa-libs/Makefile	(working copy)
>@@ -24,6 +24,12 @@
> .include <bsd.port.options.mk>
> .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
> 
>+# Default mesa platforms
>+MESA_PLATFORMS=	x11 surfaceless drm
>+.if ${PORT_OPTIONS:MWAYLAND}
>+MESA_PLATFORMS+=	wayland
>+.endif
>+
> MESON_ARGS+=	-Dgallium-drivers="" \
> 		-Dgallium-vdpau=false \
> 		-Dgallium-xvmc=false \
>@@ -36,14 +42,11 @@
> 		-Dtools="" \
> 		-Degl=true \
> 		-Dgbm=true \
>-		-Dvulkan-drivers=""
>+		-Dvulkan-drivers="" \
>+		-Dplatforms="${MESA_PLATFORMS:ts,}"
> # Building EGL and GBM requires a dri driver so add swrast
> MESON_ARGS+=	-Ddri-drivers="swrast"
> 
>-.if ${PORT_OPTIONS:MWAYLAND}
>-MESON_ARGS+=	-Dplatforms=x11,surfaceless,drm,wayland
>-.endif
>-
> .if ${ARCH} == "i386"
> # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set
> LDFLAGS+=-Wl,-z,notext

Actions: View | Diff

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