CVS commit: pkgsrc/graphics/MesaLib

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug  2 20:36:51 UTC 2022

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile PLIST

Log Message:
MesaLib: fix PLIST.xa; PLIST_VARS should not be conditionally assigned


To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/graphics/MesaLib/PLIST

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.201 pkgsrc/graphics/MesaLib/Makefile:1.202
--- pkgsrc/graphics/MesaLib/Makefile:1.201      Mon Jul 25 09:49:06 2022
+++ pkgsrc/graphics/MesaLib/Makefile    Tue Aug  2 20:36:51 2022
@@ -1,4 +1,4 @@
-# $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/}
@@ -43,7 +43,7 @@ PLIST_VARS+=          i830 i915 i965 r100 r200 n
 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
@@ -53,18 +53,20 @@ BUILDLINK_API_DEPENDS.libdrm+=      libdrm>=2
 .  endif
 MESON_ARGS+=           -Degl=true
 MESON_ARGS+=           -Dgbm=true
-PLIST_VARS+=           xa
-.  if empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
+.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" ||      \
+      ${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

Index: pkgsrc/graphics/MesaLib/PLIST
diff -u pkgsrc/graphics/MesaLib/PLIST:1.48 pkgsrc/graphics/MesaLib/PLIST:1.49
--- pkgsrc/graphics/MesaLib/PLIST:1.48  Mon Jul 25 09:49:06 2022
+++ pkgsrc/graphics/MesaLib/PLIST       Tue Aug  2 20:36:51 2022
@@ -1,4 +1,4 @@
-@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
@@ -25,9 +25,9 @@ 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}${PLIST.kms}include/xa_context.h
-${PLIST.xa}${PLIST.kms}include/xa_tracker.h
+${PLIST.xa}include/xa_composite.h
+${PLIST.xa}include/xa_context.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
@@ -100,9 +100,9 @@ ${PLIST.vulkan}${PLIST.arm}lib/libvulkan
 ${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}${PLIST.kms}lib/libxatracker.so.2
-${PLIST.xa}${PLIST.kms}lib/libxatracker.so.2.5.0
+${PLIST.xa}lib/libxatracker.so
+${PLIST.xa}lib/libxatracker.so.2
+${PLIST.xa}lib/libxatracker.so.2.5.0
 lib/pkgconfig/dri.pc
 ${PLIST.kms}lib/pkgconfig/egl.pc
 ${PLIST.kms}lib/pkgconfig/gbm.pc
@@ -110,7 +110,7 @@ ${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