From c6cf7623fede5c25d98a5ded1f03736751cc708105225ea693aa66cd4fe2ba5d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 12 Jul 2022 19:13:40 +0000 Subject: [PATCH] - Add 0001-Drop-wayland-client.h-include.patch OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-headers?expand=0&rev=85 --- 0001-Drop-wayland-client.h-include.patch | 73 ++++++++++++++++++++++++ vulkan-headers.changes | 5 ++ vulkan-headers.spec | 3 +- 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 0001-Drop-wayland-client.h-include.patch diff --git a/0001-Drop-wayland-client.h-include.patch b/0001-Drop-wayland-client.h-include.patch new file mode 100644 index 0000000..d15fd14 --- /dev/null +++ b/0001-Drop-wayland-client.h-include.patch @@ -0,0 +1,73 @@ +From 898bd798e823e7708e4dbeb07955ae2ee17f925a Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 12 Jul 2022 17:10:18 +0200 +Subject: [PATCH] Drop wayland-client.h include +Upstream: not sent +References: https://build.opensuse.org/package/show/X11:Wayland/vulkan-loader comment from 2022-07-12 + +wayland-client may be located outside the default search paths of the compiler +toolchain. In other words, *any* user of wayland-client must use `pkg-config +wayland-client --cflags` for compilation, and, later, `pkg-config +wayland-client --libs` for linking. + +A Vulkan program that defines -DVK_USE_PLATFORM_WAYLAND_KHR would, in +the general case, also call at least some Wayland functions. The +build scripts for that program would have to employ `pkg-config +wayland-client --cflags --libs` in any case, based simply on the use +of said Wayland functions. + +Now, there is a corner case wherein the program defines +VK_USE_PLATFORM_*, but does not make use of Wayland functions +directly: + + echo "#define VK_USE_PLATFORM_WAYLAND_KHR + #include + int main() {return 0;}" | gcc -x c - + +"Should `pkg-config` be required for this?" + +One opinion is that the use of -DVK_USE_PLATFORM_WAYLAND_KHR is so +explicitly willful that `pkg-config` is required. + +Another stance is that, since no Wayland header and no Wayland +functions were directly used by the program, the program itself +should not have to use `pkg-config`; responsibility to satisfy the +"#include " in vulkan.h would then fall to +vulkan.pc, which would have to pull in wayland-client.pc. That on the +other hand would pull in wayland for everyone, which is bad. + +Either way, I found the following option: Delete the include for +which you would need wayland's -I flags. This works because we can +just add forward declaration like "struct wl_display;" to +vulkan_wayland.h. But we don't even need that. C (and C++) seem to be +fine with undeclared names, e.g. + + //no "struct T;" + struct S { struct T *t; } + void f(struct T *t) {} + +so I guess it's the solution, for now. + +Keep in mind that, as soon as a program uses Wayland functions (directly; not +indirectly through vulkan), it needs to #include anyway on +its own, and then the pkg-config case from the first paragraph applies. + +--- + include/vulkan/vulkan.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h +index 004fa70..3510ac9 100644 +--- a/include/vulkan/vulkan.h ++++ b/include/vulkan/vulkan.h +@@ -38,7 +38,6 @@ + + + #ifdef VK_USE_PLATFORM_WAYLAND_KHR +-#include + #include "vulkan_wayland.h" + #endif + +-- +2.36.1 + diff --git a/vulkan-headers.changes b/vulkan-headers.changes index 6d5cefa..10a9af1 100644 --- a/vulkan-headers.changes +++ b/vulkan-headers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 12 19:00:36 UTC 2022 - Jan Engelhardt + +- Add 0001-Drop-wayland-client.h-include.patch + ------------------------------------------------------------------- Tue Jun 14 18:27:29 UTC 2022 - Jan Engelhardt diff --git a/vulkan-headers.spec b/vulkan-headers.spec index 983185a..c3f3cde 100644 --- a/vulkan-headers.spec +++ b/vulkan-headers.spec @@ -28,6 +28,7 @@ License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/Vulkan-Headers Source: https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-%version.tar.gz +Patch1: 0001-Drop-wayland-client.h-include.patch BuildRequires: cmake >= 2.8.11 BuildArch: noarch Requires: pkgconfig(wayland-client) @@ -45,7 +46,7 @@ This package contains the development headers for packages wanting to make use of Vulkan. %prep -%autosetup -n Vulkan-Headers-sdk-%version +%autosetup -n Vulkan-Headers-sdk-%version -p1 %build %cmake \