CVS commit: pkgsrc/graphics/MesaLib

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Mar  7 07:00:34 UTC 2025

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile buildlink3.mk builtin.mk distinfo
            options.mk
        pkgsrc/graphics/MesaLib/patches: patch-src_glx_glxcurrent.c

Log Message:
MesaLib: pkglint cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/graphics/MesaLib/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/MesaLib/builtin.mk
cvs rdiff -u -r1.167 -r1.168 pkgsrc/graphics/MesaLib/distinfo
cvs rdiff -u -r1.85 -r1.86 pkgsrc/graphics/MesaLib/options.mk
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c

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.214 pkgsrc/graphics/MesaLib/Makefile:1.215
--- pkgsrc/graphics/MesaLib/Makefile:1.214      Sun Mar  2 12:34:56 2025
+++ pkgsrc/graphics/MesaLib/Makefile    Fri Mar  7 07:00:33 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.214 2025/03/02 12:34:56 nia Exp $
+# $NetBSD: Makefile,v 1.215 2025/03/07 07:00:33 wiz Exp $
 
 DISTNAME=      mesa-21.3.9
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -89,7 +89,7 @@ PLIST.iris=           yes
 .  endif
 # FreeBSD lacks nouveau support (there are official binaries from Nvidia)
 .  if ${OPSYS} != "FreeBSD"
-.    if empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
+.    if !${MACHINE_PLATFORM:MNetBSD-*-powerpc}
 # nouveau not available on this platform
 PLIST.nouveau=         yes
 PLIST.nouveau_dri=     yes
@@ -97,15 +97,15 @@ GALLIUM_DRIVERS+=   nouveau
 DRI_DRIVERS+=          nouveau
 .    endif
 .  endif
-.  if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+.  if ${MACHINE_PLATFORM:MLinux-*-x86_64}
 # qemu Linux guest driver
 # XXX test this
 #GALLIUM_DRIVERS+=     virgl
 #PLIST.virgl=          yes
 .  endif
 # theoretically cross platform PCI drivers
-.  if empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && \
-      empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
+.  if !${MACHINE_PLATFORM:MNetBSD-*-*arm*} && \
+      !${MACHINE_PLATFORM:MNetBSD-*-mipsel}
 DRI_DRIVERS+=          r100 r200
 GALLIUM_DRIVERS+=      r300
 PLIST.r100=            yes

Index: pkgsrc/graphics/MesaLib/buildlink3.mk
diff -u pkgsrc/graphics/MesaLib/buildlink3.mk:1.68 pkgsrc/graphics/MesaLib/buildlink3.mk:1.69
--- pkgsrc/graphics/MesaLib/buildlink3.mk:1.68  Mon Aug 14 05:24:30 2023
+++ pkgsrc/graphics/MesaLib/buildlink3.mk       Fri Mar  7 07:00:33 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.68 2023/08/14 05:24:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.69 2025/03/07 07:00:33 wiz Exp $
 
 BUILDLINK_TREE+=       MesaLib
 
@@ -20,7 +20,7 @@ pkgbase:= MesaLib
 
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.MesaLib:Mx11)
+.if ${PKG_BUILD_OPTIONS.MesaLib:Mx11}
 .  include "../../x11/libX11/buildlink3.mk"
 .  include "../../x11/libXdamage/buildlink3.mk"
 .  include "../../x11/libXext/buildlink3.mk"

Index: pkgsrc/graphics/MesaLib/builtin.mk
diff -u pkgsrc/graphics/MesaLib/builtin.mk:1.24 pkgsrc/graphics/MesaLib/builtin.mk:1.25
--- pkgsrc/graphics/MesaLib/builtin.mk:1.24     Sat Jan 13 20:07:33 2024
+++ pkgsrc/graphics/MesaLib/builtin.mk  Fri Mar  7 07:00:33 2025
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.24 2024/01/13 20:07:33 riastradh Exp $
+# $NetBSD: builtin.mk,v 1.25 2025/03/07 07:00:33 wiz Exp $
 
 BUILTIN_PKG:=  MesaLib
 
@@ -30,7 +30,7 @@ MAKEVARS+=    IS_BUILTIN.MesaLib
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.MesaLib) && \
-    !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS])
+    ${IS_BUILTIN.MesaLib:tl} == yes
 .  if empty(PC_GL:M__nonexistent__)
 BUILTIN_VERSION.Mesa!= \
        ${SED} -n -e 's/Version: //p' ${_CROSS_DESTDIR:U:Q}${PC_GL:Q}
@@ -54,10 +54,10 @@ USE_BUILTIN.MesaLib=        no
 .  else
 USE_BUILTIN.MesaLib=   ${IS_BUILTIN.MesaLib}
 .    if defined(BUILTIN_PKG.MesaLib) && \
-        !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS])
+        ${IS_BUILTIN.MesaLib:tl} == yes
 USE_BUILTIN.MesaLib=   yes
 .      for dep in ${BUILDLINK_API_DEPENDS.MesaLib}
-.        if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
+.        if ${USE_BUILTIN.MesaLib:tl} == yes
 USE_BUILTIN.MesaLib!=                                                  \
        if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib}; then \
                ${ECHO} yes;                                            \
@@ -77,9 +77,9 @@ MAKEVARS+=    USE_BUILTIN.MesaLib
 ### solely to determine whether a built-in implementation exists.
 ###
 CHECK_BUILTIN.MesaLib?=        no
-.if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO])
+.if ${CHECK_BUILTIN.MesaLib:tl} == no
 
-.  if !empty(USE_BUILTIN.MesaLib:M[nN][oO])
+.  if ${USE_BUILTIN.MesaLib:tl} == no
 .    include "../../mk/pthread.buildlink3.mk"
 .    include "../../mk/pthread.builtin.mk"
 BUILTIN_PKG:=  MesaLib

Index: pkgsrc/graphics/MesaLib/distinfo
diff -u pkgsrc/graphics/MesaLib/distinfo:1.167 pkgsrc/graphics/MesaLib/distinfo:1.168
--- pkgsrc/graphics/MesaLib/distinfo:1.167      Fri Mar  7 06:56:20 2025
+++ pkgsrc/graphics/MesaLib/distinfo    Fri Mar  7 07:00:33 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.167 2025/03/07 06:56:20 wiz Exp $
+$NetBSD: distinfo,v 1.168 2025/03/07 07:00:33 wiz Exp $
 
 BLAKE2s (mesa-21.3.9.tar.xz) = e948a37881a088c0df4df880e3d1218b874ed5a8cac951a109249b3648519472
 SHA512 (mesa-21.3.9.tar.xz) = 4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684
@@ -22,7 +22,7 @@ SHA1 (patch-src_glx_dri__common.c) = 7fa
 SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e
 SHA1 (patch-src_glx_glx__pbuffer.c) = 92844cfa08dc33047326ecc818d77e8d48f03303
 SHA1 (patch-src_glx_glxclient.h) = 7b59d5632e35aa945ad77cd5d1d2fc2e7711e82b
-SHA1 (patch-src_glx_glxcurrent.c) = 38de869a62f3c20b44a0e6cbd3046953f4f2542d
+SHA1 (patch-src_glx_glxcurrent.c) = 04b6a302ce0231ae9b62cb127644551eb75c062c
 SHA1 (patch-src_glx_glxext.c) = 1eacf9062b5926ea6c756e769bf6eebc7671ccba
 SHA1 (patch-src_intel_compiler_brw__fs__bank__conflicts.cpp) = 6276d2c6846bb4dd08699921bec4e20202a17478
 SHA1 (patch-src_intel_tools_aubinator__error__decode.c) = d8f636e3c3e76763a505a1dce23de0b198ad62fa

Index: pkgsrc/graphics/MesaLib/options.mk
diff -u pkgsrc/graphics/MesaLib/options.mk:1.85 pkgsrc/graphics/MesaLib/options.mk:1.86
--- pkgsrc/graphics/MesaLib/options.mk:1.85     Wed Jul 19 18:32:49 2023
+++ pkgsrc/graphics/MesaLib/options.mk  Fri Mar  7 07:00:33 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.85 2023/07/19 18:32:49 tnn Exp $
+# $NetBSD: options.mk,v 1.86 2025/03/07 07:00:33 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 
@@ -88,7 +88,7 @@ MESON_ARGS+=          -Dllvm=disabled
 #
 # Vulkan support - experimental
 #
-PLIST_VARS+=            vulkan vulkan_intel
+PLIST_VARS+=           vulkan vulkan_intel
 .if !empty(PKG_OPTIONS:Mvulkan)
 VULKAN_DRIVERS+=       amd
 VULKAN_DRIVERS+=       swrast

Index: pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c
diff -u pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c:1.6 pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c:1.7
--- pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c:1.6      Tue Jul 18 19:33:31 2023
+++ pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c  Fri Mar  7 07:00:33 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_glx_glxcurrent.c,v 1.6 2023/07/18 19:33:31 ryoon Exp $
+$NetBSD: patch-src_glx_glxcurrent.c,v 1.7 2025/03/07 07:00:33 wiz Exp $
 
 NetBSD only supports zero-initialized initial-exec tls variables in conjuction
 with dlopen(3) at the moment.
 
 --- src/glx/glxcurrent.c.orig  2021-08-04 18:49:29.150474000 +0000
 +++ src/glx/glxcurrent.c
-@@ -76,7 +90,11 @@ _X_HIDDEN pthread_mutex_t __glXmutex = P
+@@ -76,7 +76,11 @@ _X_HIDDEN pthread_mutex_t __glXmutex = P
   * \b never be \c NULL.  This is important!  Because of this
   * \c __glXGetCurrentContext can be implemented as trivial macro.
   */