diff --git a/0001-Drop-wayland-client.h-include.patch b/0001-Drop-wayland-client.h-include.patch deleted file mode 100644 index d15fd14..0000000 --- a/0001-Drop-wayland-client.h-include.patch +++ /dev/null @@ -1,73 +0,0 @@ -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/sdk-1.3.224.0.tar.gz b/sdk-1.3.224.0.tar.gz deleted file mode 100644 index 022ae8c..0000000 --- a/sdk-1.3.224.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ccdfa47cea58a080957481fb6c35908d005d04cc5dd1778150dc0c651ccea077 -size 1521365 diff --git a/sdk-1.3.231.0.tar.gz b/sdk-1.3.231.0.tar.gz new file mode 100644 index 0000000..30017fa --- /dev/null +++ b/sdk-1.3.231.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7c185dedf7753d58e7b59913dd4b77006a6ed91fae598c5961f77d85b183da0 +size 1691630 diff --git a/vulkan-headers.changes b/vulkan-headers.changes index ddf26fe..3a1b5ee 100644 --- a/vulkan-headers.changes +++ b/vulkan-headers.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 24 19:10:42 UTC 2022 - Jan Engelhardt + +- Update to release SDK-1.3.231.0 + * No changelog was provided + (but do take a look in vulkan- +- Drop 0001-Drop-wayland-client.h-include.patch (merged upstream) + ------------------------------------------------------------------- Mon Aug 22 22:38:14 UTC 2022 - Jan Engelhardt diff --git a/vulkan-headers.spec b/vulkan-headers.spec index e80e4a2..9c3328c 100644 --- a/vulkan-headers.spec +++ b/vulkan-headers.spec @@ -21,14 +21,13 @@ # Consider only updating the sources in lockstep. # Name: vulkan-headers -Version: 1.3.224.0 +Version: 1.3.231.0 Release: 0 Summary: Vulkan C and C++ API header files 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/refs/tags/sdk-%version.tar.gz -Patch1: 0001-Drop-wayland-client.h-include.patch BuildRequires: cmake >= 2.8.11 BuildArch: noarch Requires: pkgconfig(wayland-client)