 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.201 2022/07/25 09:49:06 he Exp $
+# $NetBSD: Makefile,v 1.202 2022/08/02 20:36:51 tnn Exp $
 DISTNAME=	mesa-21.3.9
 PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
 CATEGORIES=	graphics
 MASTER_SITES=	https://mesa.freedesktop.org/archive/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	nia@NetBSD.org
 HOMEPAGE=	https://www.mesa3d.org/
 COMMENT=	Open source OpenGL implementation
 LICENSE=	mit
 USE_TOOLS+=	bison flex pkg-config xgettext
 @@ -33,48 +33,50 @@ MESA_PLATFORMS=		#
 .include "features.mk"
 .include "options.mk"
 PLIST_SUBST+=	GLVER="1.2.0"
 PLIST_SUBST+=	MACHINE_ARCH=${MACHINE_ARCH}
 # classic DRI drivers
 PLIST_VARS+=		i830 i915 i965 r100 r200 nouveau_dri
 # Gallium drivers
 PLIST_VARS+=		r300 svga nouveau iris
 # other features
-PLIST_VARS+=		arm kms vaapi
+PLIST_VARS+=		arm kms vaapi xa
 .if ${MESALIB_SUPPORTS_DRI} == "yes"
 BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.100
 .include "../../x11/libdrm/buildlink3.mk"
 .  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 .    include "../../sysutils/libpciaccess/buildlink3.mk"
 .  endif
 MESON_ARGS+=		-Degl=true
 MESON_ARGS+=		-Dgbm=true
-PLIST_VARS+=		xa
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" ||	\
-.  if empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
+      ${MACHINE_ARCH:M*arm*} || ${MACHINE_CPU} == "aarch64"
 # XA state tracker requires at least one of the following gallium drivers:
 # nouveau, freedreno, i915, svga
 MESON_ARGS+=		-Dgallium-xa=enabled
 PLIST.xa=		yes
 .  else
 MESON_ARGS+=		-Dgallium-xa=disabled
 .  endif
 .  if ${X11_TYPE} == "native" && !exists(${X11BASE}/include/xcb/dri3.h)
 MESON_ARGS+=		-Ddri3=false
 .  endif
 PLIST.kms=		yes
-.  if !empty(MACHINE_ARCH:M*arm*) || \
+.  if ${MACHINE_ARCH:M*arm*} || \
       ${MACHINE_CPU} == "aarch64"
 GALLIUM_DRIVERS+=	freedreno vc4 etnaviv tegra panfrost lima
 PLIST.arm=		yes
 .  endif
 .  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 GALLIUM_DRIVERS+=	svga iris
 DRI_DRIVERS+=		i915 i965
 PLIST.svga=		yes
 PLIST.i830=		yes
 PLIST.i915=		yes
 PLIST.i965=		yes
 PLIST.iris=		yes
 .  endif

 @@ -1,43 +1,43 @@
-@comment $NetBSD: PLIST,v 1.48 2022/07/25 09:49:06 he Exp $
+@comment $NetBSD: PLIST,v 1.49 2022/08/02 20:36:51 tnn Exp $
 ${PLIST.kms}include/EGL/egl.h
 ${PLIST.kms}include/EGL/eglext.h
 ${PLIST.kms}include/EGL/eglextchromium.h
 ${PLIST.kms}include/EGL/eglmesaext.h
 ${PLIST.kms}include/EGL/eglplatform.h
 include/GL/gl.h
 include/GL/glcorearb.h
 include/GL/glext.h
 ${PLIST.glx}include/GL/glx.h
 ${PLIST.glx}include/GL/glxext.h
 include/GL/internal/dri_interface.h
 include/GL/osmesa.h
 include/GLES/egl.h
 include/GLES/gl.h
 include/GLES/glext.h
 include/GLES/glplatform.h
 include/GLES2/gl2.h
 include/GLES2/gl2ext.h
 include/GLES2/gl2platform.h
 include/GLES3/gl3.h
 include/GLES3/gl31.h
 include/GLES3/gl32.h
 include/GLES3/gl3ext.h
 include/GLES3/gl3platform.h
 include/KHR/khrplatform.h
 ${PLIST.kms}include/gbm.h
-${PLIST.xa}${PLIST.kms}include/xa_composite.h
+${PLIST.xa}include/xa_composite.h
-${PLIST.xa}${PLIST.kms}include/xa_context.h
+${PLIST.xa}include/xa_context.h
-${PLIST.xa}${PLIST.kms}include/xa_tracker.h
+${PLIST.xa}include/xa_tracker.h
 ${PLIST.arm}lib/dri/armada-drm_dri.so
 ${PLIST.arm}lib/dri/etnaviv_dri.so
 ${PLIST.arm}lib/dri/exynos_dri.so
 ${PLIST.arm}lib/dri/hx8357d_dri.so
 ${PLIST.i830}lib/dri/i830_dri.so
 ${PLIST.i915}lib/dri/i915_dri.so
 ${PLIST.i965}lib/dri/i965_dri.so
 ${PLIST.arm}lib/dri/ili9225_dri.so
 ${PLIST.arm}lib/dri/ili9341_dri.so
 ${PLIST.arm}lib/dri/imx-dcss_dri.so
 ${PLIST.arm}lib/dri/imx-drm_dri.so
 ${PLIST.arm}lib/dri/ingenic-drm_dri.so
 ${PLIST.iris}lib/dri/iris_dri.so
 @@ -90,37 +90,37 @@ lib/libOSMesa.so
 lib/libOSMesa.so.8
 lib/libOSMesa.so.8.0.0
 ${PLIST.kms}lib/libgbm.so
 ${PLIST.kms}lib/libgbm.so.1
 ${PLIST.kms}lib/libgbm.so.1.0.0
 lib/libglapi.so
 lib/libglapi.so.0
 lib/libglapi.so.0.0.0
 ${PLIST.vulkan}${PLIST.arm}lib/libvulkan_broadcom.so
 ${PLIST.vulkan}${PLIST.arm}lib/libvulkan_freedreno.so
 ${PLIST.vulkan_intel}lib/libvulkan_intel.so
 ${PLIST.vulkan}lib/libvulkan_lvp.so
 ${PLIST.vulkan}lib/libvulkan_radeon.so
-${PLIST.xa}${PLIST.kms}lib/libxatracker.so
+${PLIST.xa}lib/libxatracker.so
-${PLIST.xa}${PLIST.kms}lib/libxatracker.so.2
+${PLIST.xa}lib/libxatracker.so.2
-${PLIST.xa}${PLIST.kms}lib/libxatracker.so.2.5.0
+${PLIST.xa}lib/libxatracker.so.2.5.0
 lib/pkgconfig/dri.pc
 ${PLIST.kms}lib/pkgconfig/egl.pc
 ${PLIST.kms}lib/pkgconfig/gbm.pc
 ${PLIST.glx}lib/pkgconfig/gl.pc
 lib/pkgconfig/glesv1_cm.pc
 lib/pkgconfig/glesv2.pc
 lib/pkgconfig/osmesa.pc
-${PLIST.xa}${PLIST.kms}lib/pkgconfig/xatracker.pc
+${PLIST.xa}lib/pkgconfig/xatracker.pc
 ${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so
 ${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1
 ${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0
 ${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0.0
 ${PLIST.r300}${PLIST.vdpau}lib/vdpau/libvdpau_r300.so
 ${PLIST.r300}${PLIST.vdpau}lib/vdpau/libvdpau_r300.so.1
 ${PLIST.r300}${PLIST.vdpau}lib/vdpau/libvdpau_r300.so.1.0
 ${PLIST.r300}${PLIST.vdpau}lib/vdpau/libvdpau_r300.so.1.0.0
 ${PLIST.r600}${PLIST.vdpau}lib/vdpau/libvdpau_r600.so
 ${PLIST.r600}${PLIST.vdpau}lib/vdpau/libvdpau_r600.so.1
 ${PLIST.r600}${PLIST.vdpau}lib/vdpau/libvdpau_r600.so.1.0
 ${PLIST.r600}${PLIST.vdpau}lib/vdpau/libvdpau_r600.so.1.0.0
 ${PLIST.radeonsi}${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so