Attachment #215249 for bug #246997




. endif
.endif

# 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}" \
			-Dplatforms="${MESA_PLATFORMS:ts,}"

# Disable some options
MESON_ARGS+=	-Dgallium-xa=false \




.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 \

		-Dtools="" \
		-Degl=true \
		-Dgbm=true \
		-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

Return to bug 246997

Lines 75-88 Link Here

(-)graphics/mesa-dri/Makefile (-4 / +6 lines)
75	. endif	75	. endif
76	.endif	76	.endif
77		77
78	# enables VK_KHR_wayland_surface in Vulkan drivers	78	# Default mesa platforms
79	.if ${PORT_OPTIONS:MWAYLAND} && !empty(VULKAN_DRIVERS)	79	MESA_PLATFORMS= x11 surfaceless drm
80	MESON_ARGS+= -Dplatforms=x11,surfaceless,drm,wayland	80	.if ${PORT_OPTIONS:MWAYLAND}
		81	MESA_PLATFORMS+= wayland
81	.endif	82	.endif
82		83
83	MESON_ARGS+= -Ddri-drivers="${DRI_DRIVERS:ts,:tl}" \	84	MESON_ARGS+= -Ddri-drivers="${DRI_DRIVERS:ts,:tl}" \
84	-Dgallium-drivers="${GALLIUM_DRIVERS:ts,:tl}" \	85	-Dgallium-drivers="${GALLIUM_DRIVERS:ts,:tl}" \
85	-Dvulkan-drivers="${VULKAN_DRIVERS:ts,:tl}"	86	-Dvulkan-drivers="${VULKAN_DRIVERS:ts,:tl}" \
		87	-Dplatforms="${MESA_PLATFORMS:ts,}"
86		88
87	# Disable some options	89	# Disable some options
88	MESON_ARGS+= -Dgallium-xa=false \	90	MESON_ARGS+= -Dgallium-xa=false \

Lines 24-29 Link Here

(-)graphics/mesa-libs/Makefile (-5 / +8 lines)
24	.include <bsd.port.options.mk>	24	.include <bsd.port.options.mk>
25	.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"	25	.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
26		26
		27	# Default mesa platforms
		28	MESA_PLATFORMS= x11 surfaceless drm
		29	.if ${PORT_OPTIONS:MWAYLAND}
		30	MESA_PLATFORMS+= wayland
		31	.endif
		32
27	MESON_ARGS+= -Dgallium-drivers="" \	33	MESON_ARGS+= -Dgallium-drivers="" \
28	-Dgallium-vdpau=false \	34	-Dgallium-vdpau=false \
29	-Dgallium-xvmc=false \	35	-Dgallium-xvmc=false \
Lines 36-49 Link Here
36	-Dtools="" \	42	-Dtools="" \
37	-Degl=true \	43	-Degl=true \
38	-Dgbm=true \	44	-Dgbm=true \
39	-Dvulkan-drivers=""	45	-Dvulkan-drivers="" \
		46	-Dplatforms="${MESA_PLATFORMS:ts,}"
40	# Building EGL and GBM requires a dri driver so add swrast	47	# Building EGL and GBM requires a dri driver so add swrast
41	MESON_ARGS+= -Ddri-drivers="swrast"	48	MESON_ARGS+= -Ddri-drivers="swrast"
42		49
43	.if ${PORT_OPTIONS:MWAYLAND}
44	MESON_ARGS+= -Dplatforms=x11,surfaceless,drm,wayland
45	.endif
46
47	.if ${ARCH} == "i386"	50	.if ${ARCH} == "i386"
48	# PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set	51	# PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set
49	LDFLAGS+=-Wl,-z,notext	52	LDFLAGS+=-Wl,-z,notext