CVS commit: pkgsrc/graphics/MesaLib

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jul 18 19:33:31 UTC 2023

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

Log Message:
MesaLib: Restrict elf-tls option for NetBSD 10.99.4 or later

* elf-tls option is disable by default for NetBSD.
* Remove problematic workaround for older NetBSD.
  Already removed in xsrc.


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 pkgsrc/graphics/MesaLib/distinfo
cvs rdiff -u -r1.83 -r1.84 pkgsrc/graphics/MesaLib/options.mk
cvs rdiff -u -r1.5 -r1.6 \
    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/distinfo
diff -u pkgsrc/graphics/MesaLib/distinfo:1.165 pkgsrc/graphics/MesaLib/distinfo:1.166
--- pkgsrc/graphics/MesaLib/distinfo:1.165      Fri Jul 14 06:27:52 2023
+++ pkgsrc/graphics/MesaLib/distinfo    Tue Jul 18 19:33:31 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.165 2023/07/14 06:27:52 pho Exp $
+$NetBSD: distinfo,v 1.166 2023/07/18 19:33:31 ryoon 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) = bc844ab6bfe32c0a322ff0fc2c1405b67b90b64a
+SHA1 (patch-src_glx_glxcurrent.c) = 38de869a62f3c20b44a0e6cbd3046953f4f2542d
 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.83 pkgsrc/graphics/MesaLib/options.mk:1.84
--- pkgsrc/graphics/MesaLib/options.mk:1.83     Sun Mar 13 15:50:05 2022
+++ pkgsrc/graphics/MesaLib/options.mk  Tue Jul 18 19:33:31 2023
@@ -1,10 +1,13 @@
-# $NetBSD: options.mk,v 1.83 2022/03/13 15:50:05 tnn Exp $
+# $NetBSD: options.mk,v 1.84 2023/07/18 19:33:31 ryoon Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 
 .include "features.mk"
 
-PKG_SUPPORTED_OPTIONS+=                elf-tls llvm vulkan x11
+PKG_SUPPORTED_OPTIONS+=                llvm vulkan x11
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 109904
+PKG_SUPPORTED_OPTIONS+=                elf-tls
+.endif
 
 .if ${MESALIB_SUPPORTS_DRI} == "yes"
 PKG_SUPPORTED_OPTIONS+=                wayland

Index: pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c
diff -u pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c:1.5 pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c:1.6
--- pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c:1.5      Sun Mar 13 15:50:05 2022
+++ pkgsrc/graphics/MesaLib/patches/patch-src_glx_glxcurrent.c  Tue Jul 18 19:33:31 2023
@@ -1,33 +1,10 @@
-$NetBSD: patch-src_glx_glxcurrent.c,v 1.5 2022/03/13 15:50:05 tnn Exp $
-
-Interim fix for toolchain/50277.
+$NetBSD: patch-src_glx_glxcurrent.c,v 1.6 2023/07/18 19:33:31 ryoon 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
-@@ -40,6 +40,20 @@
- #include "glx_error.h"
- 
- /*
-+ * MASSIVE KLUDGE!
-+ * We need these to not be extern in libGL.so because of
-+ * PR toolchain/50277
-+ */
-+#if defined(USE_ELF_TLS) && defined(__NetBSD__)
-+#define u_current_table _glapi_tls_Dispatch
-+#define u_current_context _glapi_tls_Context
-+_X_EXPORT __thread struct _glapi_table *u_current_table
-+    __attribute__((tls_model("initial-exec"))) = NULL;
-+_X_EXPORT __thread void * u_current_context
-+    __attribute__((tls_model("initial-exec")));
-+#endif
-+
-+/*
- ** We setup some dummy structures here so that the API can be used
- ** even if no context is current.
- */
 @@ -76,7 +90,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.