CVS commit: pkgsrc/graphics/MesaLib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr  6 10:47:10 UTC 2026

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile PLIST

Log Message:
MesaLib: put three files back to PLIST.glx like before

In the hope it fixes the macOS build


To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.52 -r1.53 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.219 pkgsrc/graphics/MesaLib/Makefile:1.220
--- pkgsrc/graphics/MesaLib/Makefile:1.219      Thu Mar 26 08:47:30 2026
+++ pkgsrc/graphics/MesaLib/Makefile    Mon Apr  6 10:47:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.219 2026/03/26 08:47:30 wiz Exp $
+# $NetBSD: Makefile,v 1.220 2026/04/06 10:47:10 wiz Exp $
 
 DISTNAME=      mesa-21.3.9
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -51,7 +51,7 @@ PLIST_VARS+=          i830 i915 i965 r100 r200 n
 PLIST_VARS+=           r300 svga nouveau iris
 
 # other features
-PLIST_VARS+=           arm drikms kms vaapi xa
+PLIST_VARS+=           arm kms vaapi xa
 
 .if ${MESALIB_SUPPORTS_DRI} == "yes"
 BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.100
@@ -73,9 +73,6 @@ MESON_ARGS+=          -Dgallium-xa=disabled
 MESON_ARGS+=           -Ddri3=false
 .  endif
 PLIST.kms=             yes
-.  if ${OPSYS} != "Darwin"
-PLIST.drikms=          yes
-.  endif
 .  if ${MACHINE_ARCH:M*arm*} || \
       ${MACHINE_CPU} == "aarch64"
 GALLIUM_DRIVERS+=      freedreno vc4 etnaviv tegra panfrost lima

Index: pkgsrc/graphics/MesaLib/PLIST
diff -u pkgsrc/graphics/MesaLib/PLIST:1.52 pkgsrc/graphics/MesaLib/PLIST:1.53
--- pkgsrc/graphics/MesaLib/PLIST:1.52  Thu Mar 26 08:47:17 2026
+++ pkgsrc/graphics/MesaLib/PLIST       Mon Apr  6 10:47:10 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.52 2026/03/26 08:47:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.53 2026/04/06 10:47:10 wiz Exp $
 ${PLIST.kms}include/EGL/egl.h
 ${PLIST.kms}include/EGL/eglext.h
 ${PLIST.kms}include/EGL/eglextchromium.h
@@ -9,7 +9,7 @@ include/GL/glcorearb.h
 include/GL/glext.h
 ${PLIST.glx}include/GL/glx.h
 ${PLIST.glx}include/GL/glxext.h
-${PLIST.drikms}include/GL/internal/dri_interface.h
+${PLIST.glx}include/GL/internal/dri_interface.h
 include/GL/osmesa.h
 include/GLES/egl.h
 include/GLES/gl.h
@@ -43,7 +43,7 @@ ${PLIST.arm}lib/dri/ingenic-drm_dri.so
 ${PLIST.iris}lib/dri/iris_dri.so
 ${PLIST.arm}lib/dri/kgsl_dri.so
 ${PLIST.arm}lib/dri/kirin_dri.so
-${PLIST.drikms}lib/dri/kms_swrast_dri.so
+${PLIST.glx}lib/dri/kms_swrast_dri.so
 ${PLIST.arm}lib/dri/lima_dri.so
 ${PLIST.arm}lib/dri/mali-dp_dri.so
 ${PLIST.arm}lib/dri/mcde_dri.so
@@ -103,7 +103,7 @@ ${PLIST.vulkan}lib/libvulkan_radeon.so
 ${PLIST.xa}lib/libxatracker.so
 ${PLIST.xa}lib/libxatracker.so.2
 ${PLIST.xa}lib/libxatracker.so.2.5.0
-${PLIST.drikms}lib/pkgconfig/dri.pc
+${PLIST.glx}lib/pkgconfig/dri.pc
 ${PLIST.kms}lib/pkgconfig/egl.pc
 ${PLIST.kms}lib/pkgconfig/gbm.pc
 ${PLIST.glx}lib/pkgconfig/gl.pc