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

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

Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Fri Apr 19 17:39:10 2019 -0700
Changeset:	1e8db302fe3aa371e06bb40a97b603bde9910d91

Modified Files:
	MesaLib-dfbsd-meson/Makefile
	MesaLib-dfbsd-meson/distinfo
	MesaLib-dfbsd-meson/patches/patch-include_GL_internal_dri__interface.h

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

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

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

diffstat:
 MesaLib-dfbsd-meson/Makefile                                   |  5 ++++-
 MesaLib-dfbsd-meson/distinfo                                   | 10 +++++-----
 .../patches/patch-include_GL_internal_dri__interface.h         | 10 +++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index 6260905ce4..eeb6571022 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -1,7 +1,10 @@
 # $NetBSD: Makefile,v 1.19 2019/04/11 15:52:08 maya Exp $
 
+# 2019-04-18	iris: Be less aggressive at postdraw work skipping
+COMMIT_ID=	a913fbf124e201a8bf53fe8385619a71a6e9594b
+
 # 2019-04-17	Add no_aos_sampling GALLIVM_PERF option
-COMMIT_ID=	829f278ad0042b0bb5026b10e7393fa3e11498b2
+# COMMIT_ID=	829f278ad0042b0bb5026b10e7393fa3e11498b2
 
 # 2019-04-17	gallivm: fix saturated signed add / sub with llvm 9
 # COMMIT_ID=	dded2edf8bedb9a5bafd7788e52dc8e714527186
diff --git a/MesaLib-dfbsd-meson/distinfo b/MesaLib-dfbsd-meson/distinfo
index 046217cec7..c9ea5b3be6 100644
--- a/MesaLib-dfbsd-meson/distinfo
+++ b/MesaLib-dfbsd-meson/distinfo
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.16 2019/02/22 15:40:35 tnn Exp $
 
-SHA1 (mesa-829f278ad0042b0bb5026b10e7393fa3e11498b2.tar.xz) = 392341257c672f0c118481e23bbc32badf5f1813
-RMD160 (mesa-829f278ad0042b0bb5026b10e7393fa3e11498b2.tar.xz) = 28eb2bdf011b1107c24c1d297fa04bf0c1edbfb1
-SHA512 (mesa-829f278ad0042b0bb5026b10e7393fa3e11498b2.tar.xz) = 6f616c3e71544289d6543f3232b0f2f9ce7e25f1cb1954de46e5000ae843bc567fdbc1b3f4c09ff9688c09f18bb42f45b1ef5f6553e7fa88153d961ea7af54c0
-Size (mesa-829f278ad0042b0bb5026b10e7393fa3e11498b2.tar.xz) = 10796708 bytes
-SHA1 (patch-include_GL_internal_dri__interface.h) = 76803a4ab6ff7e596900a0099dd9712093f8bc21
+SHA1 (mesa-a913fbf124e201a8bf53fe8385619a71a6e9594b.tar.xz) = 4ea50694a29326a7b3a5db3445f1e028721c64e2
+RMD160 (mesa-a913fbf124e201a8bf53fe8385619a71a6e9594b.tar.xz) = 4e62373a98544da01fdff90ff70b31ae98448f80
+SHA512 (mesa-a913fbf124e201a8bf53fe8385619a71a6e9594b.tar.xz) = 4a06fe86c3b82320ae47e20e16c70d7092e2a4d129a155b138f79aabd2f7c084e602f17c233622956ee8beda2f97bc1657921675b5e007a64deb97407bd09285
+Size (mesa-a913fbf124e201a8bf53fe8385619a71a6e9594b.tar.xz) = 10806256 bytes
+SHA1 (patch-include_GL_internal_dri__interface.h) = ed567949ae44f7477738138347cf9648b9a8d634
 SHA1 (patch-meson.build) = 3cd30902cd5af7bc860dd2984a51d9ebf051662e
 SHA1 (patch-meson__options.txt) = 171ac109444b0ce8ea37e53b72f529a4b5e5c6f6
 SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
diff --git a/MesaLib-dfbsd-meson/patches/patch-include_GL_internal_dri__interface.h b/MesaLib-dfbsd-meson/patches/patch-include_GL_internal_dri__interface.h
index a33da634c8..11359697e9 100644
--- a/MesaLib-dfbsd-meson/patches/patch-include_GL_internal_dri__interface.h
+++ b/MesaLib-dfbsd-meson/patches/patch-include_GL_internal_dri__interface.h
@@ -5,9 +5,11 @@ From FreeBSD ports graphics/mesa-dri 17.2.4.
 GCC on 9.x doesn't allow types to be overwritten, these types are defined
 in drm.h also, which causes build issues in xorg-server.
 
---- include/GL/internal/dri_interface.h.orig	2019-02-27 03:56:56.000000000 +0000
+From NetBSD xsrc: prevent re-definitions from drm.h
+
+--- include/GL/internal/dri_interface.h.orig	2019-04-17 22:16:19.000000000 +0000
 +++ include/GL/internal/dri_interface.h
-@@ -40,6 +40,9 @@
+@@ -40,13 +40,19 @@
  #ifndef DRI_INTERFACE_H
  #define DRI_INTERFACE_H
  
@@ -17,10 +19,12 @@ in drm.h also, which causes build issues in xorg-server.
  #ifdef HAVE_LIBDRM
  #include <drm.h>
  #else
-@@ -47,6 +50,7 @@ typedef unsigned int drm_context_t;
++#if !defined(_DRM_H_) || !defined(STRICT_XSRC_NETBSD)
+ typedef unsigned int drm_context_t;
  typedef unsigned int drm_drawable_t;
  typedef struct drm_clip_rect drm_clip_rect_t;
  #endif
++#endif
 +#endif /* __FreeBSD__ || __DragonFly__ */
  
  #include <GL/gl.h>