MesaLib-dfbsd-meson: Update wip/MesaLib-dfbsd-meson to git 2019-04-10

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: MesaLib-dfbsd-meson: Update wip/MesaLib-dfbsd-meson to git 2019-04-10
From: David Shao <davshao%gmail.com@localhost>
Date: Fri, 12 Apr 2019 01:59:47 +0000
Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Thu Apr 11 18:59:47 2019 -0700
Changeset:	a74af607259db93d00a799514231f9f2522be127

Modified Files:
	MesaLib-dfbsd-meson/Makefile
	MesaLib-dfbsd-meson/PLIST
	MesaLib-dfbsd-meson/distinfo
	MesaLib-dfbsd-meson/options.mk
	MesaLib-dfbsd-meson/patches/patch-src_amd_vulkan_radv__device.c
	MesaLib-dfbsd-meson/patches/patch-src_egl_drivers_dri2_platform__x11.c
	MesaLib-dfbsd-meson/patches/patch-src_gallium_drivers_iris_iris__bufmgr.c
	MesaLib-dfbsd-meson/patches/patch-src_gallium_drivers_radeonsi_si__pipe.c
	MesaLib-dfbsd-meson/patches/patch-src_glx_glxclient.h
	MesaLib-dfbsd-meson/patches/patch-src_glx_glxcurrent.c
	MesaLib-dfbsd-meson/patches/patch-src_glx_glxext.c
	MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86-64__tls.h
	MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86__tls.h
	MesaLib-dfbsd-meson/patches/patch-src_mapi_u__current.c
	MesaLib-dfbsd-meson/patches/patch-src_mapi_u__current.h

Log Message:
MesaLib-dfbsd-meson: Update wip/MesaLib-dfbsd-meson to git 2019-04-10

Through 19.0.2 changes.

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

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

diffstat:
 MesaLib-dfbsd-meson/Makefile                       | 23 ++++-
 MesaLib-dfbsd-meson/PLIST                          |  1 +
 MesaLib-dfbsd-meson/distinfo                       | 30 +++----
 MesaLib-dfbsd-meson/options.mk                     | 99 ++++++++++++++--------
 .../patches/patch-src_amd_vulkan_radv__device.c    |  6 +-
 .../patch-src_egl_drivers_dri2_platform__x11.c     |  2 +-
 .../patch-src_gallium_drivers_iris_iris__bufmgr.c  |  6 +-
 .../patch-src_gallium_drivers_radeonsi_si__pipe.c  | 22 ++---
 .../patches/patch-src_glx_glxclient.h              |  2 +-
 .../patches/patch-src_glx_glxcurrent.c             |  4 +-
 MesaLib-dfbsd-meson/patches/patch-src_glx_glxext.c |  2 +-
 .../patches/patch-src_mapi_entry__x86-64__tls.h    |  2 +-
 .../patches/patch-src_mapi_entry__x86__tls.h       |  2 +-
 .../patches/patch-src_mapi_u__current.c            |  4 +-
 .../patches/patch-src_mapi_u__current.h            |  2 +-
 15 files changed, 129 insertions(+), 78 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index db865dadc9..63611f95b7 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -1,7 +1,28 @@
 # $NetBSD: Makefile,v 1.18 2019/02/22 15:40:35 tnn Exp $
 
+# 2019-04-10	lima: implement blit with util_blitter
+COMMIT_ID=	a155c26a66d58d9283b314dce4dd2abb71355349
+
+# 2019-04-10	docs: update calendar, and news item and link release notes for 19.0.2
+# COMMIT_ID=	4122f55574f1184e73962135123be1899b1739db
+
+# 2019-04-10	gallium/aux: Report error if loading of a pipe driver fails.
+# COMMIT_ID=	6ec9733b9f16e94dc3b3a0e6f9e88bced6955e86
+
+# 2019-04-09	bin: drop unused import from install_megadrivers.py
+# COMMIT_ID=	eb699c15750f6e927e666bdd0ef2b6d6aff8a1b9
+
+# 2019-04-08	drisw: Try harder to probe whether MIT-SHM works
+# COMMIT_ID=	52426ce4a929f7e1389baf490967fc02357b3f5e
+
+# 2019-03-31	i965: perf: update render basic configs for big core gen9/gen10
+# COMMIT_ID=	f0b472b3016c9625e1324fc7f70fc875e5926e00
+
+# 2019-03-30	iris: fix set_sampler_view
+# COMMIT_ID=	b2d651b86267f7511e3c4c35d92c0ff72e174bc
+
 # 2019-03-25	freedreno/ir3: Fix operand order for DSX/DSY
-COMMIT_ID=	c7c432738a68d543dc1b73eae895ec4dfacd92b2
+# COMMIT_ID=	c7c432738a68d543dc1b73eae895ec4dfacd92b2
 
 # 2019-03-23	spirv: Add an execution environment to the options
 # COMMIT_ID=	15012077bceda24cbf38afeda7723c47e1b0d3c3
diff --git a/MesaLib-dfbsd-meson/PLIST b/MesaLib-dfbsd-meson/PLIST
index 03ffac3c30..265061dcab 100644
--- a/MesaLib-dfbsd-meson/PLIST
+++ b/MesaLib-dfbsd-meson/PLIST
@@ -100,6 +100,7 @@ ${PLIST.glesv1}lib/pkgconfig/glesv1_cm.pc
 ${PLIST.glesv2}lib/pkgconfig/glesv2.pc
 ${PLIST.wayland}lib/pkgconfig/wayland-egl.pc
 ${PLIST.xatracker}lib/pkgconfig/xatracker.pc
+@comment ${PLIST.vdpau}lib/vdpau/libvdpau_gallium.so
 ${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
diff --git a/MesaLib-dfbsd-meson/distinfo b/MesaLib-dfbsd-meson/distinfo
index 36287d9f5d..e1065cdfb3 100644
--- a/MesaLib-dfbsd-meson/distinfo
+++ b/MesaLib-dfbsd-meson/distinfo
@@ -1,19 +1,19 @@
 $NetBSD: distinfo,v 1.16 2019/02/22 15:40:35 tnn Exp $
 
-SHA1 (mesa-c7c432738a68d543dc1b73eae895ec4dfacd92b2.tar.xz) = d404bfdc44e9d2d27f8d5712e22d17f2f63cd95c
-RMD160 (mesa-c7c432738a68d543dc1b73eae895ec4dfacd92b2.tar.xz) = 5fc24264fd837d6704c619698bc62d27c17728aa
-SHA512 (mesa-c7c432738a68d543dc1b73eae895ec4dfacd92b2.tar.xz) = dac5ac188960777e890a3a4eb3c2fb0b5db45bd91cbf4bcbbf6bdd50f8ecc1a82acbbd00e94bb843caa4b2f8d1175757df9404940e5c788660fb14502d2d87d5
-Size (mesa-c7c432738a68d543dc1b73eae895ec4dfacd92b2.tar.xz) = 10743812 bytes
+SHA1 (mesa-a155c26a66d58d9283b314dce4dd2abb71355349.tar.xz) = e32103296b8e57da451acc250b29fcb27ebc3012
+RMD160 (mesa-a155c26a66d58d9283b314dce4dd2abb71355349.tar.xz) = 883b33ff73908dd5d0476d0884d2d585c3230c4d
+SHA512 (mesa-a155c26a66d58d9283b314dce4dd2abb71355349.tar.xz) = 1f35568be7933921ba2f5e5af88db41792947814fbf768fa78efc39dc1501526b641458a59418de3529f468ff13fff2cd54278d8a76fae2e46acd4cf1c4d0423
+Size (mesa-a155c26a66d58d9283b314dce4dd2abb71355349.tar.xz) = 10874172 bytes
 SHA1 (patch-configure.ac) = cddca44dbf1e2f447dd30a03440104920d6c24ab
 SHA1 (patch-include_GL_internal_dri__interface.h) = 76803a4ab6ff7e596900a0099dd9712093f8bc21
 SHA1 (patch-meson.build) = 3cd30902cd5af7bc860dd2984a51d9ebf051662e
 SHA1 (patch-meson__options.txt) = 171ac109444b0ce8ea37e53b72f529a4b5e5c6f6
 SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
-SHA1 (patch-src_amd_vulkan_radv__device.c) = cfa96ee44291d7d5ac62090b1fc07d66547d17a8
+SHA1 (patch-src_amd_vulkan_radv__device.c) = a7d9549147b662fca0bfff02bf8e8e543ee80fc1
 SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
 SHA1 (patch-src_compiler_builtin__type__macros.h) = 128030d0c532e5f3982dc6ebde1957fc0ca7f5d5
 SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = e18e7b1ffbc74b8acf3d9095a92c750f9d005479
-SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 49e48c31eacb79d1da357fe70eaffd2926b5280e
+SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 1b8c7689b18643777d494bbb491866ed0041155d
 SHA1 (patch-src_egl_main_eglglobals.c) = 1b723fb03c13e267b23e7cb94b2f19c2bfa03be5
 SHA1 (patch-src_gallium_auxiliary_drivers_trace_tr__dump.c) = 360e1608508a7bbb41acecd58930781038e2309e
 SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = 14f0511191ef468a39e3248d44f7dbdffa554547
@@ -21,7 +21,7 @@ SHA1 (patch-src_gallium_auxiliary_rtasm_rtasm__execmem.c) = 1c1e0f02f247cd2322f1
 SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = d878e6f3e9a0a37d4903c0d0551f9fa535635d40
 SHA1 (patch-src_gallium_drivers_freedreno_freedreno__screen.c) = d76bf52c25609d641dbf4021e81282cbdc925976
 SHA1 (patch-src_gallium_drivers_i915_i915__fpc__translate.c) = 1c69741c2c9285569c6326d8d29d5af936e1929a
-SHA1 (patch-src_gallium_drivers_iris_iris__bufmgr.c) = d6ead77d93ade4beada1625cb09c40362fb0b3f0
+SHA1 (patch-src_gallium_drivers_iris_iris__bufmgr.c) = 542b24813743290ce031cd1632e83f8255b71a32
 SHA1 (patch-src_gallium_drivers_iris_meson.build) = 9b94ae7047763cc4b1be5b39a3d9cac898e10f65
 SHA1 (patch-src_gallium_drivers_llvmpipe_lp__setup__line.c) = bc049154cbfb788855ad6675a339ef07b15cd573
 SHA1 (patch-src_gallium_drivers_llvmpipe_lp__setup__point.c) = f6a2c5940010cd93f955c969616af7a7c550fab4
@@ -33,7 +33,7 @@ SHA1 (patch-src_gallium_drivers_radeonsi_si__buffer.c) = dc2dcb0f87a01ae0162a8c5
 SHA1 (patch-src_gallium_drivers_radeonsi_si__compute__blit.c) = 65235a932809c434546db0416e69241d62cdaf06
 SHA1 (patch-src_gallium_drivers_radeonsi_si__dma__cs.c) = 3c6a2a49e40dd8f99f5f393ad6e03345111cdeb1
 SHA1 (patch-src_gallium_drivers_radeonsi_si__gfx__cs.c) = 98ca07e2cc518125e5ec8924cbadc19f4c13de56
-SHA1 (patch-src_gallium_drivers_radeonsi_si__pipe.c) = 3c6c0e7f1ed9c2cc2b04770206880a0536a09fd2
+SHA1 (patch-src_gallium_drivers_radeonsi_si__pipe.c) = 551e9076cdcead2d564bf8c6b8c75bea1733c569
 SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = ed51a57765f2349bc91fd509dc03e709241bd899
 SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987
 SHA1 (patch-src_gallium_include_pipe_p__config.h) = f4e38eac66167b619c30076bb0144dd716310967
@@ -48,9 +48,9 @@ SHA1 (patch-src_glx_apple_apple__glapi.c) = c4eea8dabf74eb03d22da4eb834b18ae3384
 SHA1 (patch-src_glx_dri__common.c) = 7f87917dbef11621a488554a49797b1407c4a5c4
 SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e
 SHA1 (patch-src_glx_dri__glx.c) = 8fd48776e9953b18bd17ba130d90ae2935e67242
-SHA1 (patch-src_glx_glxclient.h) = f0358179ae397bc8677597b0ccb9a471f40f15de
-SHA1 (patch-src_glx_glxcurrent.c) = 8b8e949eded13491c5865601253c6e7d4b06e228
-SHA1 (patch-src_glx_glxext.c) = 15c2c5e0c6b5095ce849fb86ad148aa05d7d907a
+SHA1 (patch-src_glx_glxclient.h) = 5e597362c3839f26118fe98983701f33d6047cfd
+SHA1 (patch-src_glx_glxcurrent.c) = 67142b977aadf23b0b0d3a06db3d9450e0b7f892
+SHA1 (patch-src_glx_glxext.c) = 1c044d38faebc310f49248a6b937b1bbc5a16870
 SHA1 (patch-src_intel_Makefile.tools.am) = 5253d5972b48ae3bc8d648bb9f479dcf6cbd3fab
 SHA1 (patch-src_intel_compiler_brw__fs__bank__conflicts.cpp) = 6276d2c6846bb4dd08699921bec4e20202a17478
 SHA1 (patch-src_intel_isl_isl__tiled__memcpy.c) = 265721e521d1d1e43a50cbbcffbc0f0fc47922f7
@@ -62,12 +62,12 @@ SHA1 (patch-src_intel_vulkan_anv__device.c) = 1f6ac5bcd6bf31275b93b805ee5fe6213e
 SHA1 (patch-src_intel_vulkan_anv__gem.c) = b8eb487fa704151e7c3c3b1d23973b2b0aa5922e
 SHA1 (patch-src_intel_vulkan_anv__gem__stubs.c) = 7f0a25e96624815ef0912024b52bbb512d4fa42f
 SHA1 (patch-src_intel_vulkan_anv__queue.c) = 2dbf7dfd0c77f74f510032bf8d12109f58c50a30
-SHA1 (patch-src_mapi_entry__x86-64__tls.h) = 11b7ef1da435fa17fc7025a46a123d447d6a7d07
-SHA1 (patch-src_mapi_entry__x86__tls.h) = 11c0f5302d305a77f3a1780d44a2c61f48a66273
+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_glapi_gen_gl__gentable.py) = 0b1d4ef3f78a9b3726ef7f9921608a48a5e4ac56
-SHA1 (patch-src_mapi_u__current.c) = 38d324fcd1c28d155106ccd248edb5eb1aa9ffac
-SHA1 (patch-src_mapi_u__current.h) = 465a992bd34057e9521f0a33e6f2e25cefc145ca
+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) = 7a6edf46b9364bcdb2dbe8d70a2e6a1d0610dc40
diff --git a/MesaLib-dfbsd-meson/options.mk b/MesaLib-dfbsd-meson/options.mk
index 5d0e1cf68d..3ad28454c6 100644
--- a/MesaLib-dfbsd-meson/options.mk
+++ b/MesaLib-dfbsd-meson/options.mk
@@ -15,24 +15,30 @@ PKG_SUPPORTED_OPTIONS+=		iris
 PKG_SUGGESTED_OPTIONS+=		iris
 PKG_SUPPORTED_OPTIONS+=		vulkan
 
+PKG_SUPPORTED_OPTIONS+=		test_dri3_enable
 PKG_SUPPORTED_OPTIONS+=		no_render_node
 PKG_SUPPORTED_OPTIONS+=		use_clock_nanosleep_os_time
 PKG_SUPPORTED_OPTIONS+=		use_pthread_getcpuclockid
-PKG_SUPPORTED_OPTIONS+=		no_cs_queue
-PKG_SUPPORTED_OPTIONS+=		revert_threaded_context
-PKG_SUPPORTED_OPTIONS+=		revert_copy_clear
+
 PKG_SUPPORTED_OPTIONS+=		revert_i965_softpin
 PKG_SUPPORTED_OPTIONS+=		revert_sdma_uploader
 PKG_SUPPORTED_OPTIONS+=		require_36_gen4
-PKG_SUPPORTED_OPTIONS+=		invert_atomic_add_unless
+
+PKG_SUPPORTED_OPTIONS+=		no_cs_queue
+PKG_SUPPORTED_OPTIONS+=		revert_threaded_context
+PKG_SUPPORTED_OPTIONS+=		revert_copy_clear
 PKG_SUPPORTED_OPTIONS+=		physmem_netbsd
 PKG_SUPPORTED_OPTIONS+=		setaffinity_np_netbsd
+PKG_SUPPORTED_OPTIONS+=		no_initial_exec_nonnull
 PKG_SUPPORTED_OPTIONS+=		strict_xsrc_netbsd
+
 PKG_SUPPORTED_OPTIONS+=		x86_tsd_openbsd
 PKG_SUPPORTED_OPTIONS+=		so_name_openbsd
 PKG_SUPPORTED_OPTIONS+=		disable_wx_memory
 PKG_SUPPORTED_OPTIONS+=		no_linear_alloc_destructor
 
+PKG_SUPPORTED_OPTIONS+=		invert_atomic_add_unless
+
 # PKG_SUGGESTED_OPTIONS+=		xvmc
 PKG_SUGGESTED_OPTIONS+=		vdpau vaapi
 
@@ -43,7 +49,10 @@ PKG_SUGGESTED_OPTIONS+=		glesv1 glesv2
 .endif
 
 PKG_SUGGESTED_OPTIONS+=		xa
-PKG_SUGGESTED_OPTIONS+=		noatexit
+
+# .if ${OPSYS} == "NetBSD"
+# PKG_SUGGESTED_OPTIONS+=		noatexit
+# .endif
 
 # The LLVM option enables JIT accelerated software rendering and
 # is also required to support the latest RADEON GPUs, so enable it
@@ -72,8 +81,12 @@ PKG_SUGGESTED_OPTIONS+=		dri
 PKG_SUGGESTED_OPTIONS+=		glx-tls
 .endif
 
+.if ${OPSYS} == "DragonFly"
+PKG_SUGGESTED_OPTIONS+=		test_dri3_enable
+.endif
+
 # Revert patch removing support for no dedicated render nodes
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 PKG_SUGGESTED_OPTIONS+=		no_render_node
 .endif
 
@@ -87,12 +100,6 @@ PKG_SUGGESTED_OPTIONS+=		use_clock_nanosleep_os_time
 PKG_SUGGESTED_OPTIONS+=		use_pthread_getcpuclockid
 .endif
 
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=		no_cs_queue
-PKG_SUGGESTED_OPTIONS+=		revert_threaded_context
-PKG_SUGGESTED_OPTIONS+=		revert_copy_clear
-.endif
-
 .if ${OPSYS} == "DragonFly"
 PKG_SUGGESTED_OPTIONS+=		revert_i965_softpin
 PKG_SUGGESTED_OPTIONS+=		revert_sdma_uploader
@@ -103,10 +110,11 @@ PKG_SUGGESTED_OPTIONS+=		revert_sdma_uploader
 PKG_SUGGESTED_OPTIONS+=		require_36_gen4
 .endif
 
-# Causes segfault in mpv on DragonFly intel EagleLake machine
-# .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-# PKG_SUGGESTED_OPTIONS+=		invert_atomic_add_unless
-# .endif
+.if ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+=		no_cs_queue
+PKG_SUGGESTED_OPTIONS+=		revert_threaded_context
+PKG_SUGGESTED_OPTIONS+=		revert_copy_clear
+.endif
 
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=		physmem_netbsd
@@ -117,7 +125,11 @@ PKG_SUGGESTED_OPTIONS+=		setaffinity_np_netbsd
 .endif
 
 .if ${OPSYS} == "NetBSD"
-# PKG_SUGGESTED_OPTIONS+=		strict_xsrc_netbsd
+PKG_SUGGESTED_OPTIONS+=		no_initial_exec_nonnull
+.endif
+
+.if ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+=		strict_xsrc_netbsd
 .endif
 
 # OpenBSD xenocara tsd dispatch assembly for entry_x86_tsd.h
@@ -131,14 +143,19 @@ PKG_SUGGESTED_OPTIONS+=		so_name_openbsd
 .endif
 
 # Disable code for init_heap for fear of W^X violation
-.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
-# PKG_SUGGESTED_OPTIONS+=		disable_wx_memory
+.if ${OPSYS} == "OpenBSD"
+PKG_SUGGESTED_OPTIONS+=		disable_wx_memory
 .endif
 
-.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
-# PKG_SUGGESTED_OPTIONS+=		no_linear_alloc_destructor
+.if ${OPSYS} == "OpenBSD"
+PKG_SUGGESTED_OPTIONS+=		no_linear_alloc_destructor
 .endif
 
+# Causes segfault in mpv on DragonFly intel EagleLake machine
+# .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+# PKG_SUGGESTED_OPTIONS+=		invert_atomic_add_unless
+# .endif
+
 .include "../../mk/bsd.options.mk"
 
 # gallium
@@ -344,6 +361,7 @@ MESON_ARGS+=	-Dplatforms=x11,drm
 .if ${VAAPI_AVAILABLE} == "yes"
 PLIST.vaapi=	yes
 .include "../../multimedia/libva/buildlink3.mk"
+MESON_ARGS+=	-Dgallium-va=true
 .else
 MESON_ARGS+=	-Dgallium-va=false
 .endif
@@ -353,8 +371,9 @@ MESON_ARGS+=	-Dgallium-va=false
 .if ${VDPAU_AVAILABLE} == "yes"
 PLIST.vdpau=	yes
 .include "../../multimedia/libvdpau/buildlink3.mk"
+MESON_ARGS+=	-Dgallium-vdpau=true
 .else
-MESON_ARGS+=	-Dgallium-vapau=false
+MESON_ARGS+=	-Dgallium-vdpau=false
 .endif
 .endif # vdpau
 
@@ -455,6 +474,10 @@ MESON_ARGS+=		-Dgallium-xvmc=false
 CPPFLAGS+=	-DHAVE_NOATEXIT
 .endif
 
+.if !empty(PKG_OPTIONS:Mtest_dri3_enable)
+CPPFLAGS+=	-DTEST_DRI3_ENABLE
+.endif
+
 .if !empty(PKG_OPTIONS:Mno_render_node)
 CPPFLAGS+=	-DNO_RENDER_NODE
 .endif
@@ -467,18 +490,6 @@ CPPFLAGS+=	-DUSE_CLOCK_NANOSLEEP_OS_TIME
 CPPFLAGS+=	-DUSE_PTHREAD_GETCPUCLOCKID
 .endif
 
-.if !empty(PKG_OPTIONS:Mno_cs_queue)
-CPPFLAGS+=	-DNO_CS_QUEUE
-.endif
-
-.if !empty(PKG_OPTIONS:Mrevert_threaded_context)
-CPPFLAGS+=	-DREVERT_THREADED_CONTEXT
-.endif
-
-.if !empty(PKG_OPTIONS:Mrevert_copy_clear)
-CPPFLAGS+=	-DREVERT_COPY_CLEAR
-.endif
-
 .if !empty(PKG_OPTIONS:Mrevert_i965_softpin)
 CPPFLAGS+=	-DREVERT_I965_SOFTPIN
 .endif
@@ -491,8 +502,16 @@ CPPFLAGS+=	-DREVERT_SDMA_UPLOADER
 CPPFLAGS+=	-DREQUIRE_36_GEN4
 .endif
 
-.if !empty(PKG_OPTIONS:Minvert_atomic_add_unless)
-CPPFLAGS+=	-DINVERT_ATOMIC_ADD_UNLESS
+.if !empty(PKG_OPTIONS:Mno_cs_queue)
+CPPFLAGS+=	-DNO_CS_QUEUE
+.endif
+
+.if !empty(PKG_OPTIONS:Mrevert_threaded_context)
+CPPFLAGS+=	-DREVERT_THREADED_CONTEXT
+.endif
+
+.if !empty(PKG_OPTIONS:Mrevert_copy_clear)
+CPPFLAGS+=	-DREVERT_COPY_CLEAR
 .endif
 
 .if !empty(PKG_OPTIONS:Mphysmem_netbsd)
@@ -503,6 +522,10 @@ CPPFLAGS+=	-DPHYSMEM_NETBSD
 CPPFLAGS+=	-DSETAFFINITY_NP_NETBSD
 .endif
 
+.if !empty(PKG_OPTIONS:Mno_initial_exec_nonnull)
+CPPFLAGS+=	-DNO_INITIAL_EXEC_NONNULL
+.endif
+
 .if !empty(PKG_OPTIONS:Mstrict_xsrc_netbsd)
 CPPFLAGS+=	-DSTRICT_XSRC_NETBSD
 .endif
@@ -522,3 +545,7 @@ CPPFLAGS+=	-DDISABLE_WX_MEMORY
 .if !empty(PKG_OPTIONS:Mno_linear_alloc_destructor)
 CPPFLAGS+=	-DNO_LINEAR_ALLOC_DESTRUCTOR
 .endif
+
+.if !empty(PKG_OPTIONS:Minvert_atomic_add_unless)
+CPPFLAGS+=	-DINVERT_ATOMIC_ADD_UNLESS
+.endif
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_amd_vulkan_radv__device.c b/MesaLib-dfbsd-meson/patches/patch-src_amd_vulkan_radv__device.c
index 979589f425..2d4f20d41b 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_amd_vulkan_radv__device.c
+++ b/MesaLib-dfbsd-meson/patches/patch-src_amd_vulkan_radv__device.c
@@ -4,11 +4,11 @@ From graphics/mesa-dri: update to 18.3.1
 
 https://reviews.freebsd.org/D17872
 
---- src/amd/vulkan/radv_device.c.orig	2019-03-22 20:39:14.000000000 +0000
+--- src/amd/vulkan/radv_device.c.orig	2019-03-30 17:05:31.000000000 +0000
 +++ src/amd/vulkan/radv_device.c
-@@ -50,6 +50,14 @@
+@@ -49,6 +49,14 @@
+ #include "util/debug.h"
  #include "util/mesa-sha1.h"
- #include "compiler/glsl_types.h"
  
 +#ifndef CLOCK_MONOTONIC_RAW
 +# ifdef CLOCK_MONOTONIC_FAST
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_egl_drivers_dri2_platform__x11.c b/MesaLib-dfbsd-meson/patches/patch-src_egl_drivers_dri2_platform__x11.c
index 51335d375f..4d7c77b551 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_egl_drivers_dri2_platform__x11.c
+++ b/MesaLib-dfbsd-meson/patches/patch-src_egl_drivers_dri2_platform__x11.c
@@ -46,7 +46,7 @@ without DRI3 support.
     if (!disp->Options.ForceSoftware) {
  #ifdef HAVE_DRI3
 -      if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
-+#if ((defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(__DRM_NEXT__)) || defined(__DragonFly__) || defined(__NetBSD__)
++#if ((defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(__DRM_NEXT__)) || defined(TEST_DRI3_ENABLE)
 +      if (env_var_as_boolean("LIBGL_DRI3_ENABLE", false))
 +#endif
 +      if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false)) {
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_gallium_drivers_iris_iris__bufmgr.c b/MesaLib-dfbsd-meson/patches/patch-src_gallium_drivers_iris_iris__bufmgr.c
index 35d19a9a3e..0ce9c94909 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_gallium_drivers_iris_iris__bufmgr.c
+++ b/MesaLib-dfbsd-meson/patches/patch-src_gallium_drivers_iris_iris__bufmgr.c
@@ -5,7 +5,9 @@ an Intel integrated graphics IvyBridge machine on DragonFly.
 libdrm atomic_add_unless() may reverse return value meaning
 https://bugs.freedesktop.org/show_bug.cgi?id=100077
 
---- src/gallium/drivers/iris/iris_bufmgr.c.orig	2019-03-05 16:06:50.000000000 +0000
+This does not seem the correct choice in mesa3d.
+
+--- src/gallium/drivers/iris/iris_bufmgr.c.orig	2019-03-30 17:05:31.000000000 +0000
 +++ src/gallium/drivers/iris/iris_bufmgr.c
 @@ -114,7 +114,11 @@ atomic_add_unless(int *v, int add, int u
     c = p_atomic_read(v);
@@ -18,4 +20,4 @@ https://bugs.freedesktop.org/show_bug.cgi?id=100077
 +#endif
  }
  
- /**
+ static const char *
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_gallium_drivers_radeonsi_si__pipe.c b/MesaLib-dfbsd-meson/patches/patch-src_gallium_drivers_radeonsi_si__pipe.c
index 5ce046baaa..e396259296 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_gallium_drivers_radeonsi_si__pipe.c
+++ b/MesaLib-dfbsd-meson/patches/patch-src_gallium_drivers_radeonsi_si__pipe.c
@@ -18,9 +18,9 @@ radeonsi: use SDMA for uploading data through const_uploader
 
 https://cgit.freedesktop.org/mesa/mesa/commit/?id=edbd2c1ff559cde1d9e22a9fb9059747782a72a7
 
---- src/gallium/drivers/radeonsi/si_pipe.c.orig	2019-02-28 21:26:15.000000000 +0000
+--- src/gallium/drivers/radeonsi/si_pipe.c.orig	2019-04-08 23:50:24.000000000 +0000
 +++ src/gallium/drivers/radeonsi/si_pipe.c
-@@ -197,10 +197,12 @@ static void si_destroy_context(struct pi
+@@ -198,10 +198,12 @@ static void si_destroy_context(struct pi
  		sctx->b.delete_vs_state(&sctx->b, sctx->vs_blit_color_layered);
  	if (sctx->vs_blit_texcoord)
  		sctx->b.delete_vs_state(&sctx->b, sctx->vs_blit_texcoord);
@@ -33,7 +33,7 @@ https://cgit.freedesktop.org/mesa/mesa/commit/?id=edbd2c1ff559cde1d9e22a9fb90597
  	if (sctx->cs_copy_image)
  		sctx->b.delete_compute_state(&sctx->b, sctx->cs_copy_image);
  	if (sctx->cs_copy_image_1d_array)
-@@ -378,7 +380,11 @@ static void si_set_context_param(struct
+@@ -381,7 +383,11 @@ static void si_set_context_param(struct 
  }
  
  static struct pipe_context *si_create_context(struct pipe_screen *screen,
@@ -45,7 +45,7 @@ https://cgit.freedesktop.org/mesa/mesa/commit/?id=edbd2c1ff559cde1d9e22a9fb90597
  {
  	struct si_context *sctx = CALLOC_STRUCT(si_context);
  	struct si_screen* sscreen = (struct si_screen *)screen;
-@@ -396,7 +402,11 @@ static struct pipe_context *si_create_co
+@@ -399,7 +405,11 @@ static struct pipe_context *si_create_co
  		sscreen->record_llvm_ir = true; /* racy but not critical */
  
  	sctx->b.screen = screen; /* this must be set first */
@@ -57,7 +57,7 @@ https://cgit.freedesktop.org/mesa/mesa/commit/?id=edbd2c1ff559cde1d9e22a9fb90597
  	sctx->b.destroy = si_destroy_context;
  	sctx->screen = sscreen; /* Easy accessing of screen/winsys. */
  	sctx->is_debug = (flags & PIPE_CONTEXT_DEBUG) != 0;
-@@ -454,8 +464,13 @@ static struct pipe_context *si_create_co
+@@ -457,8 +467,13 @@ static struct pipe_context *si_create_co
  						   sctx, stop_exec_on_failure);
  	}
  
@@ -71,7 +71,7 @@ https://cgit.freedesktop.org/mesa/mesa/commit/?id=edbd2c1ff559cde1d9e22a9fb90597
  						 0, PIPE_USAGE_DEFAULT,
  						 SI_RESOURCE_FLAG_32BIT |
  						 (use_sdma_upload ?
-@@ -647,6 +662,7 @@ fail:
+@@ -650,6 +665,7 @@ fail:
  	return NULL;
  }
  
@@ -79,7 +79,7 @@ https://cgit.freedesktop.org/mesa/mesa/commit/?id=edbd2c1ff559cde1d9e22a9fb90597
  static struct pipe_context *si_pipe_create_context(struct pipe_screen *screen,
  						   void *priv, unsigned flags)
  {
-@@ -677,6 +693,7 @@ static struct pipe_context *si_pipe_crea
+@@ -680,6 +696,7 @@ static struct pipe_context *si_pipe_crea
  				       sscreen->info.drm_major >= 3 ? si_create_fence : NULL,
  				       &((struct si_context*)ctx)->tc);
  }
@@ -87,7 +87,7 @@ https://cgit.freedesktop.org/mesa/mesa/commit/?id=edbd2c1ff559cde1d9e22a9fb90597
  
  /*
   * pipe_screen
-@@ -874,7 +891,11 @@ struct pipe_screen *radeonsi_screen_crea
+@@ -903,7 +920,11 @@ struct pipe_screen *radeonsi_screen_crea
  						       debug_options, 0);
  
  	/* Set functions first. */
@@ -97,9 +97,9 @@ https://cgit.freedesktop.org/mesa/mesa/commit/?id=edbd2c1ff559cde1d9e22a9fb90597
  	sscreen->b.context_create = si_pipe_create_context;
 +#endif
  	sscreen->b.destroy = si_destroy_screen;
- 
- 	si_init_screen_get_functions(sscreen);
-@@ -1144,7 +1165,11 @@ struct pipe_screen *radeonsi_screen_crea
+ 	sscreen->b.set_max_shader_compiler_threads =
+ 		si_set_max_shader_compiler_threads;
+@@ -1177,7 +1198,11 @@ struct pipe_screen *radeonsi_screen_crea
  		si_init_compiler(sscreen, &sscreen->compiler_lowp[i]);
  
  	/* Create the auxiliary context. This must be done last. */
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_glx_glxclient.h b/MesaLib-dfbsd-meson/patches/patch-src_glx_glxclient.h
index 0f308a50b0..55908db8b8 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_glx_glxclient.h
+++ b/MesaLib-dfbsd-meson/patches/patch-src_glx_glxclient.h
@@ -9,7 +9,7 @@ with dlopen(3) at the moment.
  extern __thread void *__glX_tls_Context
     __attribute__ ((tls_model("initial-exec")));
  
-+#if defined(__NetBSD__)
++#if defined(NO_INITIAL_EXEC_NONNULL)
 +#  define __glXGetCurrentContext() (likely(__glX_tls_Context) ? __glX_tls_Context : (void*)&dummyContext)
 +#else
  #  define __glXGetCurrentContext() __glX_tls_Context
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_glx_glxcurrent.c b/MesaLib-dfbsd-meson/patches/patch-src_glx_glxcurrent.c
index fcbe07312b..adaacdd206 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_glx_glxcurrent.c
+++ b/MesaLib-dfbsd-meson/patches/patch-src_glx_glxcurrent.c
@@ -15,7 +15,7 @@ with dlopen(3) at the moment.
 + * We need these to not be extern in libGL.so because of
 + * PR toolchain/50277
 + */
-+#if defined(GLX_USE_TLS) && defined(__NetBSD__)
++#if defined(GLX_USE_TLS) && defined(NO_INITIAL_EXEC_NONNULL)
 +_X_EXPORT __thread struct _glapi_table * _glapi_tls_Dispatch
 +    __attribute__((tls_model("initial-exec"))) = NULL;
 +_X_EXPORT __thread void * _glapi_tls_Context
@@ -30,7 +30,7 @@ with dlopen(3) at the moment.
   * \c __glXGetCurrentContext can be implemented as trivial macro.
   */
  __thread void *__glX_tls_Context __attribute__ ((tls_model("initial-exec")))
-+#if defined(__NetBSD__)
++#if defined(NO_INITIAL_EXEC_NONNULL)
 +   = NULL; /* non-zero initializers not supported with dlopen */
 +#else
     = &dummyContext;
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_glx_glxext.c b/MesaLib-dfbsd-meson/patches/patch-src_glx_glxext.c
index 1ce9e9b86e..af8f679e4d 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_glx_glxext.c
+++ b/MesaLib-dfbsd-meson/patches/patch-src_glx_glxext.c
@@ -35,7 +35,7 @@ $NetBSD: patch-src_glx_glxext.c,v 1.1 2018/10/07 23:49:31 ryoon Exp $
     if (glx_direct && glx_accel) {
  #if defined(HAVE_DRI3)
 -      if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
-+#if ((defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(__DRM_NEXT__)) || defined(__DragonFly__) || defined(__NetBSD__)
++#if ((defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(__DRM_NEXT__)) || defined(TEST_DRI3_ENABLE)
 +      if (env_var_as_boolean("LIBGL_DRI3_ENABLE", false))
 +#endif
 +      if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false)) {
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86-64__tls.h b/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86-64__tls.h
index e97d2c480a..44ac37d49d 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86-64__tls.h
+++ b/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86-64__tls.h
@@ -14,7 +14,7 @@ es1api and es2api are not going to be patched for NetBSD.
  
  #ifndef __ILP32__
  
-+#if defined(__NetBSD__) && defined(MAPI_MODE_GLAPI)
++#if defined(NO_INITIAL_EXEC_NONNULL) && defined(MAPI_MODE_GLAPI)
  #define STUB_ASM_CODE(slot)                              \
     "movq " ENTRY_CURRENT_TABLE "@GOTTPOFF(%rip), %rax\n\t"  \
     "movq %fs:(%rax), %r11\n\t"                           \
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86__tls.h b/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86__tls.h
index d49dd05e30..4671b9e42d 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86__tls.h
+++ b/MesaLib-dfbsd-meson/patches/patch-src_mapi_entry__x86__tls.h
@@ -14,7 +14,7 @@ es1api and es2api are not going to be patched for NetBSD.
     ".balign 16\n"                \
     func ":"
  
-+#if defined(__NetBSD__) && defined(MAPI_MODE_GLAPI)
++#if defined(NO_INITIAL_EXEC_NONNULL) && defined(MAPI_MODE_GLAPI)
 +extern const mapi_func table_noop_array[];
  #define STUB_ASM_CODE(slot)      \
     "call x86_current_tls\n\t"    \
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__current.c b/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__current.c
index b4fcb36097..27f505d9ad 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__current.c
+++ b/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__current.c
@@ -9,7 +9,7 @@ with dlopen(3) at the moment.
  
  __thread struct _glapi_table *u_current_table
      __attribute__((tls_model("initial-exec")))
-+#if defined(__NetBSD__)
++#if defined(NO_INITIAL_EXEC_NONNULL)
 +    = NULL; /* non-zero initializers not supported with dlopen */
 +#else
      = (struct _glapi_table *) table_noop_array;
@@ -21,7 +21,7 @@ with dlopen(3) at the moment.
  u_current_get_table_internal(void)
  {
  #if defined(GLX_USE_TLS)
-+#  if defined(__NetBSD__)
++#  if defined(NO_INITIAL_EXEC_NONNULL)
 +   return (likely(u_current_table) ? u_current_table : (struct _glapi_table *) table_noop_array);
 +#  else
     return u_current_table;
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__current.h b/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__current.h
index 4e17195c30..8b393394a4 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__current.h
+++ b/MesaLib-dfbsd-meson/patches/patch-src_mapi_u__current.h
@@ -10,7 +10,7 @@ with dlopen(3) at the moment.
  u_current_get_table(void)
  {
 -#ifdef GLX_USE_TLS
-+#if defined(GLX_USE_TLS) && !defined(__NetBSD__)
++#if defined(GLX_USE_TLS) && !defined(NO_INITIAL_EXEC_NONNULL)
     return u_current_table;
  #else
     return (likely(u_current_table) ?
Prev by Date: gdb: Move plist entries to PLIST.common
Next by Date: modular-xorg-server-dfbsd-meson: Update wip/modular-xorg-server-dfbsd-meson to git 2019-04-04
Previous by Thread: gdb: Move plist entries to PLIST.common
Next by Thread: modular-xorg-server-dfbsd-meson: Update wip/modular-xorg-server-dfbsd-meson to git 2019-04-04
Indexes:
Home | Main Index | Thread Index | Old Index