MesaLib-dfbsd-meson: Update to wip/MesaLib-dfbsd-meson git 2019-05-08

[David Shao <davshao%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Wed May 8 23:53:03 2019 -0700
Changeset:	05536599acc6675cbdec40eb6238795b303cc55c

Modified Files:
	MesaLib-dfbsd-meson/Makefile
	MesaLib-dfbsd-meson/distinfo
	MesaLib-dfbsd-meson/options.mk
	MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86__tsd.h
Removed Files:
	MesaLib-dfbsd-meson/patches/patch-src_gallium_auxiliary_rtasm_rtasm__execmem.c
	MesaLib-dfbsd-meson/patches/patch-src_mapi_u__execmem.c
	MesaLib-dfbsd-meson/patches/patch-src_mesa_main_execmem.c

Log Message:
MesaLib-dfbsd-meson: Update to wip/MesaLib-dfbsd-meson git 2019-05-08

Post 19.1.0 branch.  Time to start testing the future.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=05536599acc6675cbdec40eb6238795b303cc55c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 MesaLib-dfbsd-meson/Makefile                       | 11 ++++++-
 MesaLib-dfbsd-meson/distinfo                       | 13 ++++----
 MesaLib-dfbsd-meson/options.mk                     | 10 -------
 ...ch-src_gallium_auxiliary_rtasm_rtasm__execmem.c | 35 ----------------------
 .../patches/patch-src_mapi_entry__x86__tsd.h       |  9 ++++++
 .../patches/patch-src_mapi_u__execmem.c            | 30 -------------------
 .../patches/patch-src_mesa_main_execmem.c          | 26 ----------------
 7 files changed, 24 insertions(+), 110 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index 0b56442d3f..d5bb481de5 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -1,7 +1,16 @@
 # $NetBSD: Makefile,v 1.20 2019/04/25 07:32:56 maya Exp $
 
+# 2019-05-08	iris: Reorganise execbuf to have a single point of failure
+COMMIT_ID=	8b8125646991fb7e923821bafea9bec3ba355b42
+
+# 2019-05-08	kmsro: add _dri.so to two of the kmsro drivers.
+# COMMIT_ID=	0a42d5b98bc3083e20475eb1ecea20f9b876269d
+
+# 2019-05-07	Revert "glx: Fix synthetic error generation in __glXSendError"
+# COMMIT_ID=	a01b393c397c846345f03f76f1167dd667e0ee96
+
 # 2019-05-04	panfrost/midgard: iabs cannot run on mul
-COMMIT_ID=	68238732462bb044282ffbeb6cb08b96c7ff7805
+# COMMIT_ID=	68238732462bb044282ffbeb6cb08b96c7ff7805
 
 # 2019-05-03	st/va: check resource_get_info nullity in vlVaDeriveImage
 # COMMIT_ID=	8cd71f399e73c5d87e9162cc74da76e317a9f41f
diff --git a/MesaLib-dfbsd-meson/distinfo b/MesaLib-dfbsd-meson/distinfo
index 35cd11bbce..b7b4c4388c 100644
--- a/MesaLib-dfbsd-meson/distinfo
+++ b/MesaLib-dfbsd-meson/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.17 2019/05/01 19:31:45 maya Exp $
 
-SHA1 (mesa-68238732462bb044282ffbeb6cb08b96c7ff7805.tar.xz) = ed5949581787d96a4b77675607fc16a7f37a901f
-RMD160 (mesa-68238732462bb044282ffbeb6cb08b96c7ff7805.tar.xz) = 15a68b830821dbee6c7f8ff5d320a024f3234dce
-SHA512 (mesa-68238732462bb044282ffbeb6cb08b96c7ff7805.tar.xz) = f4d851103a8661ead3f7dae34806fa9451c805ea672a5277f45e4c67ae8501a1ddf570033909569d0173f74a44c42193157da377fe1ccc6d8b9db767622af294
-Size (mesa-68238732462bb044282ffbeb6cb08b96c7ff7805.tar.xz) = 10876624 bytes
+SHA1 (mesa-8b8125646991fb7e923821bafea9bec3ba355b42.tar.xz) = c3929bfdf335887b65cd04029d42fb845d04c7c0
+RMD160 (mesa-8b8125646991fb7e923821bafea9bec3ba355b42.tar.xz) = 09def334aac017c9ca8a70307c206424932762c5
+SHA512 (mesa-8b8125646991fb7e923821bafea9bec3ba355b42.tar.xz) = 537657391576b1352b8da973706daac9548df2f3ed0af17fc49bfe1979c9fcff5a66efadaf65aabc0175bdf351b90e381f2a46f2b08a714abb3227820bff48f7
+Size (mesa-8b8125646991fb7e923821bafea9bec3ba355b42.tar.xz) = 11006600 bytes
 SHA1 (patch-include_GL_internal_dri__interface.h) = ed567949ae44f7477738138347cf9648b9a8d634
 SHA1 (patch-meson.build) = 3cd30902cd5af7bc860dd2984a51d9ebf051662e
 SHA1 (patch-meson__options.txt) = 171ac109444b0ce8ea37e53b72f529a4b5e5c6f6
@@ -17,7 +17,6 @@ SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 1b8c7689b18643777d494bbb4918
 SHA1 (patch-src_egl_main_eglglobals.c) = c8db1469859d448635f96a0eac1a936104cd0fdd
 SHA1 (patch-src_gallium_auxiliary_drivers_trace_tr__dump.c) = 360e1608508a7bbb41acecd58930781038e2309e
 SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = 14f0511191ef468a39e3248d44f7dbdffa554547
-SHA1 (patch-src_gallium_auxiliary_rtasm_rtasm__execmem.c) = 1c1e0f02f247cd2322f19f10e67d61cf56e65487
 SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = d878e6f3e9a0a37d4903c0d0551f9fa535635d40
 SHA1 (patch-src_gallium_drivers_freedreno_freedreno__screen.c) = b19e93b1612d6eacccf35260110db9402eb4edca
 SHA1 (patch-src_gallium_drivers_iris_meson.build) = 31f0afab5212860917fe78e2b282a730187502ef
@@ -55,17 +54,15 @@ SHA1 (patch-src_intel_vulkan_anv__gem__stubs.c) = ad5a4bd9fe521cf73faf2f0cf0f493
 SHA1 (patch-src_intel_vulkan_anv__queue.c) = 2dbf7dfd0c77f74f510032bf8d12109f58c50a30
 SHA1 (patch-src_mapi_entry__x86-64__tls.h) = a0cbe5c8412fa626926ade0c72c6bc13b1ab4f36
 SHA1 (patch-src_mapi_entry__x86__tls.h) = 740312f64e4848164482f44642859aecc7025853
-SHA1 (patch-src_mapi_entry__x86__tsd.h) = aeb27a8dddfcc07404ff1750f118a8b1acdbf44d
+SHA1 (patch-src_mapi_entry__x86__tsd.h) = 52d0197fb7b84382147aca98f8cccf24892a9df3
 SHA1 (patch-src_mapi_glapi_gen_gl__gentable.py) = 0b1d4ef3f78a9b3726ef7f9921608a48a5e4ac56
 SHA1 (patch-src_mapi_u__current.c) = bee667c667bb1bd6e3b0f774d6ad6da5b7f0546d
 SHA1 (patch-src_mapi_u__current.h) = 13e91936db8d468c4f4744eb5cc01ad879b53539
-SHA1 (patch-src_mapi_u__execmem.c) = 3b448405aeea0b17cfa58e8fe66708467b6eeb8a
 SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = fb9324dcbc8ffbc00bee6aedcc38db2e94b24f9d
 SHA1 (patch-src_mesa_drivers_dri_i965_brw__bufmgr.c) = ad0fc0cacf59dde38d18f9ceb93411105cdd6c89
 SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 1b5de370add6984fb44968c055b7d8d5a54417dd
 SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = 4c0ca7dec2398a15f77b643d0f86af41ca202be3
 SHA1 (patch-src_mesa_main_context.c) = 441026b8f073fd90f2586dfb306482feed6c6834
-SHA1 (patch-src_mesa_main_execmem.c) = 4a0a790e648e63907454b78318c7edbecc11d02c
 SHA1 (patch-src_mesa_main_extensions.c) = 2f48bdb1176c2878bb33bcfab7556172b50a987e
 SHA1 (patch-src_mesa_main_macros.h) = c5dceaa8dc02a58e5b2273d82e3fe1cc12e327d3
 SHA1 (patch-src_mesa_main_shader__query.cpp) = 3f9c31645d87855759def11344dee16af23c7be3
diff --git a/MesaLib-dfbsd-meson/options.mk b/MesaLib-dfbsd-meson/options.mk
index c4c8da4e79..7f80b2ca17 100644
--- a/MesaLib-dfbsd-meson/options.mk
+++ b/MesaLib-dfbsd-meson/options.mk
@@ -36,7 +36,6 @@ PKG_SUPPORTED_OPTIONS+=		no_getprogramname
 PKG_SUPPORTED_OPTIONS+=		strict_xsrc_netbsd
 
 PKG_SUPPORTED_OPTIONS+=		x86_tsd_openbsd
-PKG_SUPPORTED_OPTIONS+=		disable_wx_memory
 PKG_SUPPORTED_OPTIONS+=		no_linear_alloc_destructor
 
 PKG_SUGGESTED_OPTIONS+=		xvmc
@@ -145,11 +144,6 @@ PKG_SUGGESTED_OPTIONS+=		revert_copy_clear
 PKG_SUGGESTED_OPTIONS+=		x86_tsd_openbsd
 .endif
 
-# Disable code for init_heap for fear of W^X violation
-.if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+=		disable_wx_memory
-.endif
-
 .if ${OPSYS} == "OpenBSD"
 PKG_SUGGESTED_OPTIONS+=		no_linear_alloc_destructor
 .endif
@@ -534,10 +528,6 @@ CPPFLAGS+=	-DSTRICT_XSRC_NETBSD
 CPPFLAGS+=	-DX86_TSD_OPENBSD
 .endif
 
-.if !empty(PKG_OPTIONS:Mdisable_wx_memory)
-CPPFLAGS+=	-DDISABLE_WX_MEMORY
-.endif
-
 .if !empty(PKG_OPTIONS:Mno_linear_alloc_destructor)
 CPPFLAGS+=	-DNO_LINEAR_ALLOC_DESTRUCTOR
 .endif
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_gallium_auxiliary_rtasm_rtasm__execmem.c b/MesaLib-dfbsd-meson/patches/patch-src_gallium_auxiliary_rtasm_rtasm__execmem.c
deleted file mode 100644
index 61e6b3e912..0000000000
--- a/MesaLib-dfbsd-meson/patches/patch-src_gallium_auxiliary_rtasm_rtasm__execmem.c
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-Option from OpenBSD Xenocara
-
-Disable the code that allocates W|X memory.  There is fallback code that
-gets used if allocating W|X memory fails, which is probably a bit slower.
-However, that is much better than commit a W^X violation which currently
-gets you killed.
-
---- src/gallium/auxiliary/rtasm/rtasm_execmem.c.orig	2019-03-15 01:02:19.000000000 +0000
-+++ src/gallium/auxiliary/rtasm/rtasm_execmem.c
-@@ -68,6 +68,15 @@ static mtx_t exec_mutex = _MTX_INITIALIZ
- static struct mem_block *exec_heap = NULL;
- static unsigned char *exec_mem = NULL;
- 
-+#if defined(DISABLE_WX_MEMORY)
-+
-+static int
-+init_heap(void)
-+{
-+   return 0;
-+}
-+
-+#else /* !DISABLE_WX_MEMORY */
- 
- static int
- init_heap(void)
-@@ -83,6 +92,7 @@ init_heap(void)
-    return (exec_mem != MAP_FAILED);
- }
- 
-+#endif /* DISABLE_WX_MEMORY */
- 
- void *
- rtasm_exec_malloc(size_t size)
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86__tsd.h b/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86__tsd.h
index 85b434e3f9..96e0232156 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86__tsd.h
+++ b/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86__tsd.h
@@ -1,5 +1,14 @@
 $NetBSD$
 
+From OpenBSD xenocara
+
+Make similiar changes to the i386 tsd dispatch assembly as libglvnd to
+avoid a text relocation fixing the build with lld.
+
+This time store the address of the GOT in ebx as required before calling
+the PLT stub and change .balign value to match X86_ENTRY_SIZE as suggested
+by naddy.
+
 --- src/mapi/entry_x86_tsd.h.orig	2019-03-06 23:05:20.000000000 +0000
 +++ src/mapi/entry_x86_tsd.h
 @@ -31,18 +31,51 @@
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__execmem.c b/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__execmem.c
deleted file mode 100644
index c5daf8ca39..0000000000
--- a/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__execmem.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-Option from OpenBSD xenocara
-
-2016-07-25
-
-Disable the code that allocates W|X memory.  There is fallback code that
-gets used if allocating W|X memory fails, which is probably a bit slower.
-However, that is much better than commit a W^X violation which currently
-gets you killed.
-
---- src/mapi/u_execmem.c.orig	2019-03-23 16:29:21.000000000 +0000
-+++ src/mapi/u_execmem.c
-@@ -45,8 +45,15 @@ static unsigned int head = 0;
- 
- static unsigned char *exec_mem = (unsigned char *)0;
- 
-+#if defined(DISABLE_WX_MEMORY)
- 
--#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__)
-+static int
-+init_map(void)
-+{
-+   return 0;
-+}
-+
-+#elif defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__)
- 
- #include <unistd.h>
- #include <sys/mman.h>
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_mesa_main_execmem.c b/MesaLib-dfbsd-meson/patches/patch-src_mesa_main_execmem.c
deleted file mode 100644
index 4ed100a404..0000000000
--- a/MesaLib-dfbsd-meson/patches/patch-src_mesa_main_execmem.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
---- src/mesa/main/execmem.c.orig	2019-03-23 16:29:21.000000000 +0000
-+++ src/mesa/main/execmem.c
-@@ -37,7 +37,20 @@
- #include "c11/threads.h"
- 
- 
--#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__)
-+#if defined(DISABLE_WX_MEMORY)
-+
-+void *
-+_mesa_exec_malloc(GLuint size)
-+{
-+   return NULL;
-+}
-+
-+void
-+_mesa_exec_free(void *addr)
-+{
-+}
-+
-+#elif defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__)
- 
- /*
-  * Allocate a large block of memory which can hold code then dole it out