MesaLib: Update to 19.1.5

Bug fixes

    Bug 109630 - vkQuake flickering geometry under Intel
    Bug 110395 - Shadows are flickering in SuperTuxKart
    Bug 111113 - ANGLE BlitFramebufferTest.MultisampleDepthClear/ES3_OpenGL fails on Intel Ubuntu19.04
    Bug 111267 - [CM246] Flickering with multiple draw calls within the same graphics pipeline if a compute pipeline is present

Changes

Bas Nieuwenhuizen (4):

    radv: Do non-uniform lowering before bool lowering.
    ac/nir: Use correct cast for readfirstlane and ptrs.
    radv: Avoid binning RAVEN hangs.
    radv: Avoid VEGA/RAVEN scissor bug in binning.

Danylo Piliaiev (1):

    i965: Emit a dummy MEDIA_VFE_STATE before switching from GPGPU to 3D

Eric Engestrom (1):

    util: fix mem leak of program path

Erik Faye-Lund (2):

    gallium/dump: add missing query-type to short-list
    gallium/dump: add missing query-type to short-list

Greg V (2):

    anv: remove unused Linux-specific include
    intel/perf: use MAJOR_IN_SYSMACROS/MAJOR_IN_MKDEV

Jason Ekstrand (1):

    anv: Emit a dummy MEDIA_VFE_STATE before switching from GPGPU to 3D

Juan A. Suarez Romero (3):

    docs: add sha256 checksums for 19.1.4
    cherry-ignore: panfrost: Make ctx->job useful
    Update version to 19.1.5

Marek Olšák (2):

    radeonsi: disable SDMA image copies on dGPUs to fix corruption in games
    radeonsi: fix an assertion failure: assert(!res->b.is_shared)

Matt Turner (1):

    meson: Test for program_invocation_name

Sergii Romantsov (1):

    i965/clear: clear_value better precision

5 files changed, 17 insertions, 68 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 6a7fd71bd94..16d5f1d52d3 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.154 2019/08/24 20:39:37 nia Exp $
+# $NetBSD: Makefile,v 1.155 2019/08/26 14:01:27 nia Exp $
 
-DISTNAME=	mesa-19.1.4
+DISTNAME=	mesa-19.1.5
 PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
 CATEGORIES=	graphics x11
 MASTER_SITES=	https://mesa.freedesktop.org/archive/
@@ -27,13 +27,6 @@ PKGCONFIG_OVERRIDE+=	src/mesa/drivers/dri/dri.pc.in
 PKGCONFIG_OVERRIDE+=	src/mesa/drivers/osmesa/osmesa.pc.in
 PKGCONFIG_OVERRIDE+=	src/mesa/gl.pc.in
 
-# Replace /etc/drirc.d with ${PREFIX}/etc/drirc.d
-SUBST_CLASSES+=		drirc
-SUBST_STAGE.drirc=	pre-configure
-SUBST_MESSAGE.drirc=	Fixing hardcoded /etc/drirc.d references
-SUBST_FILES.drirc+=	src/util/xmlconfig.c
-SUBST_SED.drirc+=	-e 's|/etc|${PREFIX}/etc|g'
-
 SUBST_CLASSES+=		py
 SUBST_STAGE.py=		pre-configure
 SUBST_MESSAGE.py=	Fixing Python binary name
@@ -55,6 +48,7 @@ MESON_ARGS+=	-Dglx-read-only-text=true
 MESON_ARGS+=	-Dshared-glapi=true
 
 CPPFLAGS+=	-DHAVE_NOATEXIT
+CPPFLAGS+=	-DSYSCONFDIR=${PKG_SYSCONFDIR}
 
 BUILDLINK_TRANSFORM+=	rm:-Werror=return-type
 
@@ -67,21 +61,20 @@ BUILD_DEPENDS+=		${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
 # needed to build vulkan support
 BUILD_DEPENDS+=		${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
 
-pre-configure:
-	touch ${WRKSRC}/src/glx/apple_dummy.cpp
+# LLVM detection
+TOOL_DEPENDS+=		${PYPKGPREFIX}-meson>=0.51.1nb3:../../devel/py-meson
 
-DRIRC_DIR=		${PKG_SYSCONFDIR}/drirc.d
 EGDIR=			${PREFIX}/share/examples/mesa
-OWN_DIRS+=		${DRIRC_DIR}
 INSTALLATION_DIRS+=	${EGDIR}
+OWN_DIRS=		${PKG_SYSCONFDIR}/drirc.d
 CONF_FILES+=		${EGDIR}/00-mesa-defaults.conf \
-			${DRIRC_DIR}/00-mesa-defaults.conf
+			${PKG_SYSCONFDIR}/drirc.d/00-mesa-defaults.conf
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/src/util/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
+pre-configure:
+	touch ${WRKSRC}/src/glx/apple_dummy.cpp
 
-# LLVM detection
-TOOL_DEPENDS+=	${PYPKGPREFIX}-meson>=0.51.1nb3:../../devel/py-meson
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/share/drirc.d/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
 
 .include "../../devel/py-meson/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index 17bdfb1f4b4..e50ac90bbb3 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2019/08/22 17:24:01 nia Exp $
+@comment $NetBSD: PLIST,v 1.41 2019/08/26 14:01:27 nia Exp $
 ${PLIST.egl}include/EGL/egl.h
 ${PLIST.egl}include/EGL/eglext.h
 ${PLIST.egl}include/EGL/eglextchromium.h
@@ -113,5 +113,4 @@ ${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0
 ${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0.0
 ${PLIST.vulkan}share/vulkan/icd.d/intel_icd.${MACHINE_ARCH}.json
 ${PLIST.vulkan}share/vulkan/icd.d/radeon_icd.${MACHINE_ARCH}.json
-share/drirc.d/00-mesa-defaults.conf
 share/examples/mesa/00-mesa-defaults.conf
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index eb888643962..9ec6cbf0b7a 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.127 2019/08/24 20:11:19 nia Exp $
+$NetBSD: distinfo,v 1.128 2019/08/26 14:01:27 nia Exp $
 
-SHA1 (mesa-19.1.4.tar.xz) = 393053bfa41b7fc65add756713004f034c39c3ce
-RMD160 (mesa-19.1.4.tar.xz) = 1d813c4a212710bb6fa8db184b4618788851cd15
-SHA512 (mesa-19.1.4.tar.xz) = 234032d917c9b378c3f6ceb921677b64e549344c3957331810b50fd73e0dccd2f4f62e2bd39e619590f389bc58fdab10fab4b88f7c117557cbeb1dda049b9fc5
-Size (mesa-19.1.4.tar.xz) = 10938008 bytes
+SHA1 (mesa-19.1.5.tar.xz) = 7a80ac32b4da4066dd00b3dc8274682be18b35cb
+RMD160 (mesa-19.1.5.tar.xz) = f626b041b041a6b3c95ba6b62ecf8c4a038d5f87
+SHA512 (mesa-19.1.5.tar.xz) = 4d4b3733c13e5c9b3172127f2565b827dc46aab69bdc86791c457ad137a5571c51e3c3a26d5a99e11fe552829a1220028a3968f3086959e038c615f2d75675a4
+Size (mesa-19.1.5.tar.xz) = 10938452 bytes
 SHA1 (patch-meson.build) = a9fdcaa59aed9b56ff95d4153dd73064e2261c45
 SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
 SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
@@ -31,13 +31,11 @@ SHA1 (patch-src_glx_glxext.c) = 15c2c5e0c6b5095ce849fb86ad148aa05d7d907a
 SHA1 (patch-src_intel_compiler_brw__fs__bank__conflicts.cpp) = 6276d2c6846bb4dd08699921bec4e20202a17478
 SHA1 (patch-src_intel_isl_isl__tiled__memcpy.c) = 9b79991648ab4c39ae14df219135cd2b01c1b3c0
 SHA1 (patch-src_intel_perf_gen__perf.c) = 526f36d96bd9d72893764da2b9e78cb9b70de92b
-SHA1 (patch-src_intel_perf_gen__perf.h) = cbc9c8efe6ce127b8dcb9f2c733d3427f114c5c0
 SHA1 (patch-src_intel_tools_aub__mem.c) = 6a21ecb4cfbdf216474b3be16bda441bb1390350
 SHA1 (patch-src_intel_tools_aubinator__error__decode.c) = d8f636e3c3e76763a505a1dce23de0b198ad62fa
 SHA1 (patch-src_intel_vulkan_anv__allocator.c) = da5a11c95d17d6476e7141572264a215807b8cd7
 SHA1 (patch-src_intel_vulkan_anv__gem.c) = b8eb487fa704151e7c3c3b1d23973b2b0aa5922e
 SHA1 (patch-src_intel_vulkan_anv__gem__stubs.c) = ad5a4bd9fe521cf73faf2f0cf0f493a0b40f4c20
-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_u__current.c) = 38d324fcd1c28d155106ccd248edb5eb1aa9ffac
diff --git a/graphics/MesaLib/patches/patch-src_intel_perf_gen__perf.h b/graphics/MesaLib/patches/patch-src_intel_perf_gen__perf.h
deleted file mode 100644
index 7e481098b97..00000000000
--- a/graphics/MesaLib/patches/patch-src_intel_perf_gen__perf.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_intel_perf_gen__perf.h,v 1.1 2019/08/22 17:24:01 nia Exp $
-
-for major() - sysmacros.h is non-portable
-
---- src/intel/perf/gen_perf.h.orig	2019-08-07 16:39:17.000000000 +0000
-+++ src/intel/perf/gen_perf.h
-@@ -28,7 +28,9 @@
- #include <stdint.h>
- #include <string.h>
- 
-+#ifdef MAJOR_IN_SYSMACROS
- #include <sys/sysmacros.h>
-+#endif
- 
- #include "util/hash_table.h"
- #include "util/ralloc.h"
diff --git a/graphics/MesaLib/patches/patch-src_intel_vulkan_anv__queue.c b/graphics/MesaLib/patches/patch-src_intel_vulkan_anv__queue.c
deleted file mode 100644
index 08ec063ab9b..00000000000
--- a/graphics/MesaLib/patches/patch-src_intel_vulkan_anv__queue.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_intel_vulkan_anv__queue.c,v 1.1 2019/08/21 13:35:28 nia Exp $
-
-* Define ETIME if missing
-* Drop header that was never used (modified for Linux inclusion)
-
-FreeBSD Bugzilla - Bug 225415: graphics/mesa-dri: update to 18.0.0
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225415
-
---- src/intel/vulkan/anv_queue.c.orig	2018-02-09 02:17:59.000000000 +0000
-+++ src/intel/vulkan/anv_queue.c
-@@ -26,8 +26,14 @@
-  */
- 
- #include <fcntl.h>
-+#include <errno.h>
-+#ifndef ETIME
-+#define ETIME ETIMEDOUT
-+#endif
- #include <unistd.h>
-+#if defined(__linux__)
- #include <sys/eventfd.h>
-+#endif
- 
- #include "anv_private.h"
- #include "vk_util.h"