diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-11-22 12:36:31 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-26 13:24:58 +0100 |
| commit | 18347c209ff661918e8a34571e24870f3b817d9c (patch) | |
| tree | a9956df3e511d7eb89e085ec8e61def929bd4cd4 | |
| parent | d86ff92a4403241b22e7647a629b6c5fa76d95be (diff) | |
do not require Vulkan devel package for Skia
I don't see why this should use libvulkan.so, using libvulkan.so.1
should do as well, and quite possibly any future libvulkan.so.2
could be binary-incompatible anyway.
Change-Id: I46be40da7fbfdcb59c947e6d088820e580cf4c44
| -rw-r--r-- | external/skia/UnpackedTarball_skia.mk | 1 | ||||
| -rw-r--r-- | external/skia/libvulkan-name.patch.1 | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index aabb1149a3ae..1d2da19c2b5b 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -20,6 +20,7 @@ skia_patches := \ fix-shader-locale.patch.1 \ no-trace-resources-on-exit.patch.1 \ fix-alpha-difference-copy.patch.1 \ + libvulkan-name.patch.1 \ share-grcontext.patch.1 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/external/skia/libvulkan-name.patch.1 b/external/skia/libvulkan-name.patch.1 new file mode 100644 index 000000000000..265d8daa11df --- /dev/null +++ b/external/skia/libvulkan-name.patch.1 @@ -0,0 +1,13 @@ +diff --git a/tools/gpu/vk/VkTestUtils.cpp b/tools/gpu/vk/VkTestUtils.cpp +index 5b7e8c29ae..1580136b5c 100644 +--- a/tools/gpu/vk/VkTestUtils.cpp ++++ b/tools/gpu/vk/VkTestUtils.cpp +@@ -13,7 +13,7 @@ + #if defined _WIN32 + #define SK_GPU_TOOLS_VK_LIBRARY_NAME "vulkan-1.dll" + #else +- #define SK_GPU_TOOLS_VK_LIBRARY_NAME "libvulkan.so" ++ #define SK_GPU_TOOLS_VK_LIBRARY_NAME "libvulkan.so.1" + #endif + #endif + |