git: 65d31a4d945a - 2021Q2 - graphics/vulkan-tools: unbreak vkcube-wayland on non-tiling compositors

[Jan Beich]

The branch 2021Q2 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=65d31a4d945a83555c7a34f74fdbf67d9cdd452f

commit 65d31a4d945a83555c7a34f74fdbf67d9cdd452f
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-05-15 02:32:46 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-05-15 02:51:37 +0000

    graphics/vulkan-tools: unbreak vkcube-wayland on non-tiling compositors
    
    Affects at least wayfire, labwc, plasma5-kwin.
    
    $ vkcube-wayland
    Segmentation fault
    (lldb) bt
    * thread #1, name = 'vkcube-wayland', stop reason = signal SIGSEGV: invalid address (fault address: 0x128000)
      * frame #0: 0x00000008004811f3 libc.so.7`memcpy at memmove.S:314
        frame #1: 0x00000000002097f4 vkcube-wayland`demo_update_data_buffer(demo=0x00007fffffffd258) at cube.c:894:5
        frame #2: 0x0000000000213e4f vkcube-wayland`demo_draw(demo=0x00007fffffffd258) at cube.c:1043:5
        frame #3: 0x000000000020c3fc vkcube-wayland`demo_run(demo=0x00007fffffffd258) at cube.c:2757:13
        frame #4: 0x000000000020aa16 vkcube-wayland`main(argc=1, argv=0x00007fffffffe038) at cube.c:4267:5
        frame #5: 0x0000000000208340 vkcube-wayland`_start(ap=<unavailable>, cleanup=<unavailable>) at crt1_c.c:75:7
    
    (cherry picked from commit d7da60fca5da60adf4e60b547c53fd9a53ffd27c)
---
 graphics/vulkan-tools/Makefile | 3 ++-
 graphics/vulkan-tools/distinfo | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
index ba35cecfa5b4..b53c1916391d 100644
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -2,6 +2,7 @@
 PORTNAME=	vulkan-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.174
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -26,7 +27,7 @@ OPTIONS_SLAVE=		DISPLAY
 OPTIONS_SUB=		yes
 
 WAYLAND_PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-WAYLAND_PATCHFILES=	ea2e75bea224.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Tools/issues/469
+WAYLAND_PATCHFILES=	c6adbf0af27e.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Tools/issues/469
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo
index b210bbdb69f0..6cfc782355f9 100644
--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1617052323
 SHA256 (KhronosGroup-Vulkan-Tools-v1.2.174_GH0.tar.gz) = c8b537d3a8f18550b8720a8a3c0006949e2575d547d88fa94858ab7413cee7de
 SIZE (KhronosGroup-Vulkan-Tools-v1.2.174_GH0.tar.gz) = 837918
-SHA256 (ea2e75bea224.patch) = 1a2550804a1bd7e66f5d19043dc540ffadc55a1bfe6b8734c353c0bd3a1090d1
-SIZE (ea2e75bea224.patch) = 22460
+SHA256 (c6adbf0af27e.patch) = 2df8225f1cae788347c49afb91b44bf90c154adf4c4f738ad5fa0e15c71b9b9f
+SIZE (c6adbf0af27e.patch) = 22898