CVS commit: pkgsrc/graphics/MesaLib

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov 30 11:02:39 UTC 2019

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile PLIST

Log Message:
MesaLib: Attempt to fix PLIST for darwin

throw a bunch of variables into one big KMS variable


To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.45 -r1.46 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.176 pkgsrc/graphics/MesaLib/Makefile:1.177
--- pkgsrc/graphics/MesaLib/Makefile:1.176      Thu Nov 14 13:07:41 2019
+++ pkgsrc/graphics/MesaLib/Makefile    Sat Nov 30 11:02:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.176 2019/11/14 13:07:41 nia Exp $
+# $NetBSD: Makefile,v 1.177 2019/11/30 11:02:39 nia Exp $
 
 DISTNAME=      mesa-19.2.4
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -43,7 +43,7 @@ PLIST_VARS+=          i915 i965 r100 r200 nouvea
 PLIST_VARS+=           r300 svga nouveau vc4 lima panfrost
 
 # other features
-PLIST_VARS+=           egl gbm vaapi xatracker
+PLIST_VARS+=           kms vaapi
 
 .if ${MESALIB_SUPPORTS_DRI} == "yes"
 BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.81
@@ -52,9 +52,7 @@ MESA_PLATFORMS+=      drm
 MESON_ARGS+=           -Degl=true
 MESON_ARGS+=           -Dgbm=true
 MESON_ARGS+=           -Dgallium-xa=true
-PLIST.egl=             yes
-PLIST.gbm=             yes
-PLIST.xatracker=       yes
+PLIST.kms=             yes
 .  include "../../multimedia/libva/available.mk"
 .  if ${VAAPI_AVAILABLE} == "yes"
 MESON_ARGS+=           -Dgallium-va=true

Index: pkgsrc/graphics/MesaLib/PLIST
diff -u pkgsrc/graphics/MesaLib/PLIST:1.45 pkgsrc/graphics/MesaLib/PLIST:1.46
--- pkgsrc/graphics/MesaLib/PLIST:1.45  Mon Oct 28 13:20:33 2019
+++ pkgsrc/graphics/MesaLib/PLIST       Sat Nov 30 11:02:39 2019
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.45 2019/10/28 13:20:33 nia Exp $
-${PLIST.egl}include/EGL/egl.h
-${PLIST.egl}include/EGL/eglext.h
-${PLIST.egl}include/EGL/eglextchromium.h
-${PLIST.egl}include/EGL/eglmesaext.h
-${PLIST.egl}include/EGL/eglplatform.h
+@comment $NetBSD: PLIST,v 1.46 2019/11/30 11:02:39 nia 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
@@ -24,13 +24,13 @@ include/GLES3/gl32.h
 include/GLES3/gl3ext.h
 include/GLES3/gl3platform.h
 include/KHR/khrplatform.h
-${PLIST.gbm}include/gbm.h
-${PLIST.xatracker}include/xa_composite.h
-${PLIST.xatracker}include/xa_context.h
-${PLIST.xatracker}include/xa_tracker.h
+${PLIST.kms}include/gbm.h
+${PLIST.kms}include/xa_composite.h
+${PLIST.kms}include/xa_context.h
+${PLIST.kms}include/xa_tracker.h
 ${PLIST.i915}lib/dri/i915_dri.so
 ${PLIST.i965}lib/dri/i965_dri.so
-lib/dri/kms_swrast_dri.so
+${PLIST.kms}lib/dri/kms_swrast_dri.so
 ${PLIST.lima}lib/dri/lima_dri.so
 ${PLIST.nouveau}lib/dri/nouveau_dri.so
 ${PLIST.nouveau}${PLIST.vaapi}lib/dri/nouveau_drv_video.so
@@ -46,9 +46,9 @@ ${PLIST.r600}${PLIST.vaapi}lib/dri/radeo
 lib/dri/swrast_dri.so
 ${PLIST.vc4}lib/dri/vc4_dri.so
 ${PLIST.svga}lib/dri/vmwgfx_dri.so
-${PLIST.egl}lib/libEGL.so
-${PLIST.egl}lib/libEGL.so.1
-${PLIST.egl}lib/libEGL.so.1.0.0
+${PLIST.kms}lib/libEGL.so
+${PLIST.kms}lib/libEGL.so.1
+${PLIST.kms}lib/libEGL.so.1.0.0
 ${PLIST.glx}lib/libGL.so
 ${PLIST.glx}lib/libGL.so.1
 ${PLIST.glx}lib/libGL.so.${GLVER}
@@ -61,23 +61,23 @@ lib/libGLESv2.so.2.0.0
 lib/libOSMesa.so
 lib/libOSMesa.so.8
 lib/libOSMesa.so.8.0.0
-${PLIST.gbm}lib/libgbm.so
-${PLIST.gbm}lib/libgbm.so.1
-${PLIST.gbm}lib/libgbm.so.1.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.xatracker}lib/libxatracker.so
-${PLIST.xatracker}lib/libxatracker.so.2
-${PLIST.xatracker}lib/libxatracker.so.2.5.0
+${PLIST.kms}lib/libxatracker.so
+${PLIST.kms}lib/libxatracker.so.2
+${PLIST.kms}lib/libxatracker.so.2.5.0
 lib/pkgconfig/dri.pc
-${PLIST.egl}lib/pkgconfig/egl.pc
-${PLIST.gbm}lib/pkgconfig/gbm.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.xatracker}lib/pkgconfig/xatracker.pc
+${PLIST.kms}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