From d9cb1e40405b4cc1d2d095770fb8fa45c8af96acfd7dbb9d5b4a52e20cd3764e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 27 Oct 2023 05:39:09 +0000 Subject: [PATCH] leap15 build OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-utility-libraries?expand=0&rev=2 --- shared.diff | 4 ++++ vulkan-utility-libraries.spec | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/shared.diff b/shared.diff index e95195f..b3f7005 100644 --- a/shared.diff +++ b/shared.diff @@ -1,3 +1,7 @@ +From: Jan Engelhardt +Date: 2023-10-27 07:34:46.251955161 +0200 + +Static libraries are a no-go in our distro. --- src/layer/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vulkan-utility-libraries.spec b/vulkan-utility-libraries.spec index a39f885..81fca49 100644 --- a/vulkan-utility-libraries.spec +++ b/vulkan-utility-libraries.spec @@ -26,7 +26,11 @@ Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/Vulkan-Utility-Libraries Source: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/refs/tags/vulkan-sdk-%version.tar.gz Patch1: shared.diff +%if 0%{?suse_version} && 0%{?suse_version} < 1599 +BuildRequires: gcc11-c++ +%else BuildRequires: c++_compiler +%endif BuildRequires: cmake >= 3.17.2 BuildRequires: pkg-config BuildRequires: vulkan-headers >= 1.3.268 @@ -64,6 +68,10 @@ This package contains the headers and build system integration. %autosetup -p1 -n Vulkan-Utility-Libraries-vulkan-sdk-%version %build +%if 0%{?suse_version} && 0%{?suse_version} < 1599 +# Need something that knows +export CC=gcc-11 CXX=g++-11 +%endif %cmake %cmake_build