CVS commit: pkgsrc/graphics/MesaLib

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Wed Jan  8 19:17:40 UTC 2025

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile PLIST

Log Message:
Fix compiling graphics/MesaLib on Darwin without X11


To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.49 -r1.50 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.211 pkgsrc/graphics/MesaLib/Makefile:1.212
--- pkgsrc/graphics/MesaLib/Makefile:1.211      Wed Apr 10 10:12:01 2024
+++ pkgsrc/graphics/MesaLib/Makefile    Wed Jan  8 19:17:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.211 2024/04/10 10:12:01 wiz Exp $
+# $NetBSD: Makefile,v 1.212 2025/01/08 19:17:40 js Exp $
 
 DISTNAME=      mesa-21.3.9
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -185,7 +185,7 @@ PKGCONFIG_OVERRIDE+=                output/meson-priva
 
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/share/drirc.d/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
-.if ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin" && !empty(PKG_OPTIONS:Mx11)
        install_name_tool -id ${PREFIX}/lib/dri/swrast_dri.so \
            ${DESTDIR}${PREFIX}/lib/dri/swrast_dri.so
 .endif

Index: pkgsrc/graphics/MesaLib/PLIST
diff -u pkgsrc/graphics/MesaLib/PLIST:1.49 pkgsrc/graphics/MesaLib/PLIST:1.50
--- pkgsrc/graphics/MesaLib/PLIST:1.49  Tue Aug  2 20:36:51 2022
+++ pkgsrc/graphics/MesaLib/PLIST       Wed Jan  8 19:17:40 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.49 2022/08/02 20:36:51 tnn Exp $
+@comment $NetBSD: PLIST,v 1.50 2025/01/08 19:17:40 js 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
-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
@@ -70,7 +70,7 @@ ${PLIST.arm}lib/dri/st7586_dri.so
 ${PLIST.arm}lib/dri/st7735r_dri.so
 ${PLIST.arm}lib/dri/stm_dri.so
 ${PLIST.arm}lib/dri/sun4i-drm_dri.so
-lib/dri/swrast_dri.so
+${PLIST.glx}lib/dri/swrast_dri.so
 ${PLIST.arm}lib/dri/tegra_dri.so
 ${PLIST.arm}lib/dri/vc4_dri.so
 ${PLIST.svga}lib/dri/vmwgfx_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
-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