CVS commit: pkgsrc/graphics/MesaLib

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Jul 10 03:16:45 UTC 2023

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile features.mk

Log Message:
graphics/MesaLib/features.mk: New variable MESALIB_SUPPORTS_XA

The variables is set to "yes" if Mesa provides libxatracker, which is used
by some video drivers to make use of DRM/KMS and its 3D acceleration
capability.


To generate a diff of this commit:
cvs rdiff -u -r1.205 -r1.206 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/MesaLib/features.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib/Makefile
diff -u pkgsrc/graphics/MesaLib/Makefile:1.205 pkgsrc/graphics/MesaLib/Makefile:1.206
--- pkgsrc/graphics/MesaLib/Makefile:1.205      Thu Aug 11 05:08:38 2022
+++ pkgsrc/graphics/MesaLib/Makefile    Mon Jul 10 03:16:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.205 2022/08/11 05:08:38 gutteridge Exp $
+# $NetBSD: Makefile,v 1.206 2023/07/10 03:16:45 pho Exp $
 
 DISTNAME=      mesa-21.3.9
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -54,8 +54,7 @@ BUILDLINK_API_DEPENDS.libdrm+=        libdrm>=2
 .  endif
 MESON_ARGS+=           -Degl=true
 MESON_ARGS+=           -Dgbm=true
-.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" ||      \
-      ${MACHINE_ARCH:M*arm*} || ${MACHINE_CPU} == "aarch64"
+.  if ${_MESALIB_ARCH_SUPPORTS_XA} == "yes"
 # XA state tracker requires at least one of the following gallium drivers:
 # nouveau, freedreno, i915, svga
 MESON_ARGS+=           -Dgallium-xa=enabled

Index: pkgsrc/graphics/MesaLib/features.mk
diff -u pkgsrc/graphics/MesaLib/features.mk:1.1 pkgsrc/graphics/MesaLib/features.mk:1.2
--- pkgsrc/graphics/MesaLib/features.mk:1.1     Mon Oct 21 20:47:55 2019
+++ pkgsrc/graphics/MesaLib/features.mk Mon Jul 10 03:16:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: features.mk,v 1.1 2019/10/21 20:47:55 nia Exp $
+# $NetBSD: features.mk,v 1.2 2023/07/10 03:16:45 pho Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -12,12 +12,20 @@ MESALIB_SUPPORTS_DRI?=              yes
 
 MESALIB_SUPPORTS_DRI?=         no
 
+_MESALIB_ARCH_SUPPORTS_XA?=    no # Only for graphics/MesaLib/Makefile
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+    ${MACHINE_ARCH:M*arm*} || ${MACHINE_ARCH} == "aarch64"
+_MESALIB_ARCH_SUPPORTS_XA=     yes
+.endif
+
 .if ${X11_TYPE} == "modular"
 MESALIB_SUPPORTS_OSMESA?=      yes
 MESALIB_SUPPORTS_GLESv2?=      yes
 .  if ${MESALIB_SUPPORTS_DRI} == "yes"
 MESALIB_SUPPORTS_EGL?=         yes
-.  else
+.    if ${_MESALIB_ARCH_SUPPORTS_XA} == "yes"
+MESALIB_SUPPORTS_XA?=          yes
+.    endif
 .  endif
 .else
 .  if exists(${X11BASE}/include/EGL/egl.h)
@@ -29,8 +37,12 @@ MESALIB_SUPPORTS_OSMESA?=    yes
 .  if exists(${X11BASE}/include/GLES2/gl2.h)
 MESALIB_SUPPORTS_GLESv2?=      yes
 .  endif
+.  if exists(${X11BASE}/include/xa_tracker.h)
+MESALIB_SUPPORTS_XA?=          yes
+.  endif
 .endif
 
 MESALIB_SUPPORTS_EGL?=         no
 MESALIB_SUPPORTS_GLESv2?=      no
 MESALIB_SUPPORTS_OSMESA?=      no
+MESALIB_SUPPORTS_XA?=          no