From c17cfd09f3fffd4f29c197d884d6368509c5f26452db7953e8df466145dad99c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Feb 2024 10:32:39 +0000 Subject: [PATCH] - Add more Conflict markers against libvolk. OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-volk?expand=0&rev=5 --- vulkan-volk.changes | 5 +++++ vulkan-volk.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/vulkan-volk.changes b/vulkan-volk.changes index f86c93f..7d82bfb 100644 --- a/vulkan-volk.changes +++ b/vulkan-volk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 10:23:31 UTC 2024 - Jan Engelhardt + +- Add more Conflict markers against libvolk. + ------------------------------------------------------------------- Fri Jan 19 11:00:52 UTC 2024 - Jan Engelhardt diff --git a/vulkan-volk.spec b/vulkan-volk.spec index 38bc212..decd64d 100644 --- a/vulkan-volk.spec +++ b/vulkan-volk.spec @@ -25,8 +25,8 @@ Group: Development/Libraries/C and C++ URL: https://github.com/zeux/volk Source: https://github.com/zeux/volk/archive/refs/tags/vulkan-sdk-%version.tar.gz Patch1: shared.diff -BuildRequires: cmake BuildRequires: c_compiler +BuildRequires: cmake BuildRequires: python3-base BuildRequires: pkgconfig(vulkan) @@ -36,6 +36,7 @@ A meta loader for Vulkan. %package -n libvolk Summary: Meta loader for the Vulkan API Group: System/Libraries +Conflicts: volk-devel %description -n libvolk volk is a meta loader for Vulkan. It loads entrypoints required to @@ -48,6 +49,9 @@ increase performance by skipping loader dispatch overhead. Summary: Headers for the Vulkan meta loader Group: Development/Libraries/C and C++ Requires: libvolk = %version-%release +# -lvolk is logically ambiguous, so block this package mix even +# if the filesets do not overlap at all times. +# https://github.com/zeux/volk/issues/166 Conflicts: volk-devel %description devel