MesaLib: Update to 19.2.2

New features

     * None

Bug fixes

     * Vulkan version of "Middle-earth: Shadow of Mordor" has graphics
       glitches on RADV driver (part 2)
     * Vulkan version of "Middle-earth: Shadow of Mordor" has graphics
       glitches on RADV driver
     * [amdgpu][Navi][llvm] Minimap problem in Nier Automata
     * Black ground in Dirt 4
     * Superbibles examples crashing Mesa drivers (radeonsi) and causing
       gpu reset
     * [CTS] dEQP-VK.graphicsfuzz.write-red-in-loop-nest crashes
     * mesa and libglvnd install the same headers
     * Regression: Doom (2016) crashes on Mesa 19.2 and above and Radeon
       380 with Vulkan (worked on Mesa 19.1)
     * Rocket League displays corruption when the game starts

Changes

       Alan Coopersmith (6):
     * c99_compat.h: Don't try to use 'restrict' in C++ code
     * util: Make Solaris implemention of p_atomic_add work with gcc
     * util: Workaround lack of flock on Solaris
     * util: Solaris has linux-style pthread_setname_np
     * meson: recognize "sunos" as the system name for Solaris
     * intel/common: include unistd.h for ioctl() prototype on Solaris
       Alejandro Piñeiro (1):
     * v3d: take into account prim_counts_offset
       Bas Nieuwenhuizen (3):
     * radv: Disallow sparse shared images.
     * nir/dead_cf: Remove dead control flow after infinite loops.
     * radv: Fix single stage constant flush with merged shaders.
       Clément Guérin (1):
     * radeonsi: enable zerovram for Rocket League
       Connor Abbott (2):
     * nir/sink: Rewrite loop handling logic
     * nir/sink: Don't sink load_ubo to outside of its defining loop
       Dylan Baker (1):
     * docs: Add SHA256 sum for 19.2.1
       Eric Engestrom (7):
     * GL: drop symbols mangling support
     * meson: rename `glvnd_missing_pc_files` to `not
       glvnd_has_headers_and_pc_files`
     * meson: move a couple of include installs around
     * meson: split headers one per line
     * meson: split Mesa headers as a separate installation
     * meson: skip installation of GLVND-provided headers
     * util/u_atomic: fix return type of p_atomic_{inc,dec}_return() and
       p_atomic_{cmp,}xchg()
       Ian Romanick (2):
     * nir/search: Fix possible NULL dereference in is_fsign
     * intel/vec4: Don't try both sources as immediates for DPH
       James Xiong (1):
     * iris: finish aux import on get_param
       Kenneth Graunke (2):
     * iris: Properly unreference extra VBOs for draw parameters
     * iris: Implement the Gen < 9 tessellation quads workaround
       Lepton Wu (1):
     * egl/android: Remove our own reference to buffers.
       Lionel Landwerlin (3):
     * etnaviv: remove variable from global namespace
     * anv: fix vkUpdateDescriptorSets with inline uniform blocks
     * anv: fix memory leak on device destroy
       Lucas Stach (3):
     * etnaviv: fix vertex buffer state emission for single stream GPUs
     * rbug: fix transmitted texture sizes
     * rbug: unwrap index buffer resource
       Pierre-Eric Pelloux-Prayer (1):
     * mesa: fix invalid target error handling for teximage
       Roland Scheidegger (1):
     * gallivm: Fix saturated signed psub/padd intrinsics on llvm 8
       Samuel Pitoiset (6):
     * drirc: enable vk_x11_override_min_image_count for DOOM
     * radv: bump minTexelBufferOffsetAlignment to 4
     * radv: fix DCC fast clear code for intensity formats
     * Revert "radv: do not emit PKT3_CONTEXT_CONTROL with AMDGPU 3.6.0+"
     * radv: fix DCC fast clear code for intensity formats (correctly)
     * radv: fix updating bound fast ds clear values with different
       aspects
       Timothy Arceri (1):
     * glsl: fix crash compiling bindless samplers inside unnamed UBOs

5 files changed, 9 insertions, 63 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 57fa5c72b9b..92b563b402b 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.172 2019/10/21 20:47:55 nia Exp $
+# $NetBSD: Makefile,v 1.173 2019/10/28 13:20:33 nia Exp $
 
-DISTNAME=	mesa-19.2.1
+DISTNAME=	mesa-19.2.2
 PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
 CATEGORIES=	graphics
 MASTER_SITES=	https://mesa.freedesktop.org/archive/
@@ -15,13 +15,7 @@ USE_TOOLS+=	bison flex pkg-config xgettext
 USE_LANGUAGES=	c99 c++
 USE_LIBTOOL=	yes
 
-SUBST_CLASSES+=		py
-SUBST_STAGE.py=		pre-configure
-SUBST_MESSAGE.py=	Fixing Python binary name
-SUBST_FILES.py+=	meson.build
-SUBST_VARS.py+=		PYTHONBIN
-
-CFLAGS.SunOS+=		-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
+CFLAGS.SunOS+=		-D_POSIX_PTHREAD_SEMANTICS
 CXXFLAGS.SunOS+=	-Drestrict=__restrict__
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index 803768de2d3..1ba3c173d12 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,15 +1,13 @@
-@comment $NetBSD: PLIST,v 1.44 2019/10/21 20:30:43 nia Exp $
+@comment $NetBSD: PLIST,v 1.45 2019/10/28 13:20:33 nia Exp $
 ${PLIST.egl}include/EGL/egl.h
 ${PLIST.egl}include/EGL/eglext.h
 ${PLIST.egl}include/EGL/eglextchromium.h
 ${PLIST.egl}include/EGL/eglmesaext.h
 ${PLIST.egl}include/EGL/eglplatform.h
 include/GL/gl.h
-include/GL/gl_mangle.h
 include/GL/glcorearb.h
 include/GL/glext.h
 ${PLIST.glx}include/GL/glx.h
-${PLIST.glx}include/GL/glx_mangle.h
 ${PLIST.glx}include/GL/glxext.h
 include/GL/internal/dri_interface.h
 include/GL/osmesa.h
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 33edb245d93..9e446f59a47 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.136 2019/10/21 12:07:32 jperkin Exp $
+$NetBSD: distinfo,v 1.137 2019/10/28 13:20:33 nia Exp $
 
-SHA1 (mesa-19.2.1.tar.xz) = 8ba7cb66799d5372923651f193f84d498b35c9a5
-RMD160 (mesa-19.2.1.tar.xz) = a3f068b71b138aae24cefd5c3cb044a5975b9aa2
-SHA512 (mesa-19.2.1.tar.xz) = decd74976fe866bf67fac4ae55a62d8e33ad24278dd58effe533e7d258b249f0ead848360e7e71444265184c6d9d9b04361caf0c6df99504e33599e7a0cd6c5d
-Size (mesa-19.2.1.tar.xz) = 11468492 bytes
-SHA1 (patch-meson.build) = 9e1ebd7bb6941baedeb79e420f762a0941c68688
+SHA1 (mesa-19.2.2.tar.xz) = 6ddc41e71d894dd406a3ca482f1cfda44566a5f8
+RMD160 (mesa-19.2.2.tar.xz) = 10a5761ecb3f9dc1157ad2516abb48cc91e9d4e1
+SHA512 (mesa-19.2.2.tar.xz) = a3269052c2dfb5404180d1aebd68f5b9b0cc136d634ba89fed3f60fcc9b279072e09ee2db9b485375d39e886209053841df920c9d0b975e0de2825e3da4164a5
+Size (mesa-19.2.2.tar.xz) = 11456352 bytes
 SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
 SHA1 (patch-src_compiler_builtin__type__macros.h) = e4868011711fb89a293580a12eb603b8e7162336
 SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4
@@ -38,7 +37,6 @@ SHA1 (patch-src_mesa_main_macros.h) = c5dceaa8dc02a58e5b2273d82e3fe1cc12e327d3
 SHA1 (patch-src_mesa_main_shader__query.cpp) = 3f9c31645d87855759def11344dee16af23c7be3
 SHA1 (patch-src_mesa_x86_common__x86.c) = f8c4b93443ef66d017f6aa114b877565b30f2598
 SHA1 (patch-src_util_build__id.c) = 7a9547bbda9d2fb9f0018ccf27b70b59e497aa2c
-SHA1 (patch-src_util_disk__cache.c) = cc0b29780dba5d5b5e43c0798336f16a1f0008de
 SHA1 (patch-src_util_ralloc.c) = d311bfd9ed7e673d72e050668d351c1e6552cdc8
 SHA1 (patch-src_util_strndup.h) = 73f49694ca48ad6b9a9d8346c5b84fddec2463bd
 SHA1 (patch-src_util_u__atomic.h) = 31d4514538ef5ee53012695eb5c66134aaec981e
diff --git a/graphics/MesaLib/patches/patch-meson.build b/graphics/MesaLib/patches/patch-meson.build
deleted file mode 100644
index 3319ed5d899..00000000000
--- a/graphics/MesaLib/patches/patch-meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-meson.build,v 1.3 2019/10/21 12:07:32 jperkin Exp $
-
-Fix DRM build on SunOS.
-
---- meson.build.orig	2019-10-09 16:51:59.000000000 +0000
-+++ meson.build
-@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gl
- # Only build shared_glapi if at least one OpenGL API is enabled
- with_shared_glapi = get_option('shared-glapi') and with_any_opengl
- 
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system())
-+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
- 
- dri_drivers = get_option('dri-drivers')
- if dri_drivers.contains('auto')
diff --git a/graphics/MesaLib/patches/patch-src_util_disk__cache.c b/graphics/MesaLib/patches/patch-src_util_disk__cache.c
deleted file mode 100644
index 61bb4fcb7c6..00000000000
--- a/graphics/MesaLib/patches/patch-src_util_disk__cache.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_util_disk__cache.c,v 1.1 2019/08/21 13:35:28 nia Exp $
-
-Use fcntl() on SunOS.
-
---- src/util/disk_cache.c.orig	2018-09-07 21:18:07.000000000 +0000
-+++ src/util/disk_cache.c
-@@ -857,6 +857,9 @@ cache_put(void *job, int thread_index)
-    unsigned i = 0;
-    char *filename = NULL, *filename_tmp = NULL;
-    struct disk_cache_put_job *dc_job = (struct disk_cache_put_job *) job;
-+#ifdef __sun
-+   struct flock lock = {0};
-+#endif
- 
-    filename = get_cache_file(dc_job->cache, dc_job->key);
-    if (filename == NULL)
-@@ -895,7 +898,12 @@ cache_put(void *job, int thread_index)
-     * open with the flock held. So just let that file be responsible
-     * for writing the file.
-     */
-+#ifdef __sun
-+   lock.l_type = F_WRLCK;
-+   err = fcntl(fd, F_SETLK, &lock);
-+#else
-    err = flock(fd, LOCK_EX | LOCK_NB);
-+#endif
-    if (err == -1)
-       goto done;
-