From d9713715eb441cb22a75413699d01089618a8e9c Mon Sep 17 00:00:00 2001 From: jbeich Date: Thu, 18 Jun 2020 20:12:51 +0000 Subject: [PATCH] devel/vulkan-tools: unbreak vkcube-wayland Sway dropped wl_shell support. Upstream had xdg-shell for some time but reverted due to being "incompatible" with Weston. * thread #1, name = 'vkcube-wayland', stop reason = signal SIGSEGV: invalid address (fault address: 0x0) frame #0: 0x00000008002625a3 libwayland-client.so.0`wl_proxy_marshal_constructor(proxy=0x0000000000000000, opcode=0, interface=0x00000000002152b8) at wayland-client.c:830:41 827 va_list ap; 828 829 va_start(ap, interface); -> 830 wl_argument_from_va_list(proxy->object.interface->methods[opcode].signature, 831 args, WL_CLOSURE_MAX_ARGS, ap); 832 va_end(ap); 833 (lldb) bt * thread #1, name = 'vkcube-wayland', stop reason = signal SIGSEGV: invalid address (fault address: 0x0) * frame #0: 0x00000008002625a3 libwayland-client.so.0`wl_proxy_marshal_constructor(proxy=0x0000000000000000, opcode=0, interface=0x00000000002152b8) at wayland-client.c:830:41 frame #1: 0x000000000020e822 vkcube-wayland`wl_shell_get_shell_surface(wl_shell=0x0000000000000000, surface=0x0000000800a22090) at wayland-client-protocol.h:2926:7 frame #2: 0x000000000020a503 vkcube-wayland`demo_create_window(demo=0x00007fffffffd330) at cube.c:2759:27 frame #3: 0x0000000000209ef2 vkcube-wayland`main(argc=1, argv=0x00007fffffffe0e0) at cube.c:3990:5 frame #4: 0x00000000002076ef vkcube-wayland`_start(ap=, cleanup=) at crt1_c.c:75:7 --- devel/vulkan-tools/Makefile | 7 +++++-- devel/vulkan-tools/distinfo | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/devel/vulkan-tools/Makefile b/devel/vulkan-tools/Makefile index 99fe57e3e8d2..75d6e0b0afa6 100644 --- a/devel/vulkan-tools/Makefile +++ b/devel/vulkan-tools/Makefile @@ -3,7 +3,7 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= sdk- DISTVERSION= 1.2.135.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel graphics MAINTAINER= greg@unrelenting.technology @@ -33,7 +33,10 @@ WAYLAND_DESC= Build Wayland WSI (Window System Integration) support XCB_DESC= Build XCB WSI (Window System Integration) support XLIB_DESC= Build Xlib WSI (Window System Integration) support -WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto +WAYLAND_PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +WAYLAND_PATCHFILES= 6f6e3371c92a.patch:-p1 +WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ + wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT diff --git a/devel/vulkan-tools/distinfo b/devel/vulkan-tools/distinfo index d8342a8a6a8b..d9aa220c14ec 100644 --- a/devel/vulkan-tools/distinfo +++ b/devel/vulkan-tools/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1589481709 SHA256 (KhronosGroup-Vulkan-Tools-sdk-1.2.135.0_GH0.tar.gz) = 83add7b6390ab1eb9b71106b50d7f5ae6afb74374762f0028afc9fdef5380c83 SIZE (KhronosGroup-Vulkan-Tools-sdk-1.2.135.0_GH0.tar.gz) = 710085 +SHA256 (6f6e3371c92a.patch) = 98ee52a6378ece93e0f2ae738677c25e2874b3615a9a1e194814ba8321dd37fb +SIZE (6f6e3371c92a.patch) = 22365