aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2021-06-23 18:33:32 +0000
committerJan Beich <jbeich@FreeBSD.org>2021-06-23 20:11:20 +0000
commitbdcad6245f212977b7b0412b07bfd369f7990fa3 (patch)
tree7785e3ad5ee8556a2c36f4461b7803ab5d942adf
parent507dbffa521a9ca9e5a2baacc81262b9bb9da13a (diff)
downloadports-bdcad6245f212977b7b0412b07bfd369f7990fa3.tar.gz
ports-bdcad6245f212977b7b0412b07bfd369f7990fa3.zip
graphics/vulkan-tools: switch to upstream -Werror fix
-rw-r--r--graphics/vulkan-tools/Makefile3
-rw-r--r--graphics/vulkan-tools/distinfo2
-rw-r--r--graphics/vulkan-tools/files/patch-werror20
3 files changed, 5 insertions, 20 deletions
diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
index cb6575a3dba8..d1947d970637 100644
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -3,6 +3,9 @@ DISTVERSIONPREFIX= v
DISTVERSION= 1.2.182
CATEGORIES= graphics
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+= 8926213dd008.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Tools/pull/544
+
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Tools and demos for the Vulkan graphics API
diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo
index 85bca30da68d..e2a358148133 100644
--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
@@ -1,3 +1,5 @@
TIMESTAMP = 1624299185
SHA256 (KhronosGroup-Vulkan-Tools-v1.2.182_GH0.tar.gz) = 50c959851230d1daba20235167faced7b7686ebe5d9e626dfb1fe5c92fa30b9e
SIZE (KhronosGroup-Vulkan-Tools-v1.2.182_GH0.tar.gz) = 847991
+SHA256 (8926213dd008.patch) = 4e22c90a53c4f7f7623da18ba6f097a49e9a6100fb5c4fb738a98e62d445bfaf
+SIZE (8926213dd008.patch) = 1140
diff --git a/graphics/vulkan-tools/files/patch-werror b/graphics/vulkan-tools/files/patch-werror
deleted file mode 100644
index e6a979defc7c..000000000000
--- a/graphics/vulkan-tools/files/patch-werror
+++ /dev/null
@@ -1,20 +0,0 @@
-Silence Clang warnings that GCC ignores
-https://github.com/KhronosGroup/Vulkan-Tools/issues/532
-
---- cube/cube.cpp.orig 2021-06-21 18:13:05 UTC
-+++ cube/cube.cpp
-@@ -405,14 +405,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM
- #endif
-
- #if defined(VK_USE_PLATFORM_WAYLAND_KHR)
--static void handle_ping(void *data, wl_shell_surface *shell_surface, uint32_t serial) {
-- wl_shell_surface_pong(shell_surface, serial);
--}
--
--static void handle_configure(void *data, wl_shell_surface *shell_surface, uint32_t edges, int32_t width, int32_t height) {}
--
--static void handle_popup_done(void *data, wl_shell_surface *shell_surface) {}
--
- static void pointer_handle_enter(void *data, struct wl_pointer *pointer, uint32_t serial, struct wl_surface *surface, wl_fixed_t sx,
- wl_fixed_t sy) {}
-