commit 1d6c49b608ef022bcb277285e72898dabbfd6110 Author: Danny Rawlins <contact@romster.me> Date: Sun Sep 26 00:05:09 2021 +1000 vulkan-validation-layers-32: build as shared not static diff --git a/vulkan-validation-layers-32/.footprint b/vulkan-validation-layers-32/.footprint index 4ccacb5..df1b7ba 100644 --- a/vulkan-validation-layers-32/.footprint +++ b/vulkan-validation-layers-32/.footprint @@ -1,4 +1,4 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rwxr-xr-x root/root usr/lib32/libVkLayer_khronos_validation.so --rw-r--r-- root/root usr/lib32/libVkLayer_utils.a +-rwxr-xr-x root/root usr/lib32/libVkLayer_utils.so diff --git a/vulkan-validation-layers-32/.signature b/vulkan-validation-layers-32/.signature index c2c687a..b956e9f 100644 --- a/vulkan-validation-layers-32/.signature +++ b/vulkan-validation-layers-32/.signature @@ -1,7 +1,9 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXUBx56oKqn1bVjQb3lSo5+0NV1vFpyz5b74SQBNEoURxTS/4sfDyVb7xPs/HMOA/KvW1z/3XZQhKLvqyN86snws= -SHA256 (Pkgfile) = ec75305a4da465866a6224e9ebd2d076bba946da7f36683c0f3d25945c74dd70 -SHA256 (.footprint) = 42978599405114f2de06e260f58c257c766ba543b5c618e7ff6737cdc175760a +RWSwxGo/zH7eXQx9QO50JHObvU+Kva/xfGwbBPwLM0Tt8pcq1kIFhkv+ImDHdSaaYo6jKx3pInoxs1z7StE/SM64vsIPufDFIQc= +SHA256 (Pkgfile) = 8c1c270be0eda9df9cbb0a5f1d4affaf3dc5522d5bd1ec73a03d41cd6cab4eb3 +SHA256 (.footprint) = 5c3e1cb61d0d5070cc1d278ec445757e1913b70cdec30985988d48c2f6ded070 SHA256 (Vulkan-ValidationLayers-1.2.189.1.tar.gz) = d169ae71ae3ba12159df355b58f86f5635062c695d1deac9b97d5653561d517d SHA256 (SPIRV-Headers-449bc986ba6f4c5e10e32828783f9daef2a77644.tar.gz) = a8156db21c4c9d956b80b4620c6fede30d44c4f3a897434c341da8991c986288 SHA256 (robin-hood-hashing-3.11.3.tar.gz) = dcf2b7fa9ef9dd0c67102d94c28e8df3effbe1845e0ed1f31f4772ca5e857fc4 +SHA256 (add-missing-export.patch) = 6ce7222099403dea8425b1dd305b9ebc43e747c32aca2a24cfc7f67ddd34cebf +SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 diff --git a/vulkan-validation-layers-32/Pkgfile b/vulkan-validation-layers-32/Pkgfile index e17dd4c..727fca6 100644 --- a/vulkan-validation-layers-32/Pkgfile +++ b/vulkan-validation-layers-32/Pkgfile @@ -8,10 +8,12 @@ name=vulkan-validation-layers-32 version=1.2.189.1 _spirv_headers=449bc986ba6f4c5e10e32828783f9daef2a77644 _robin_hood=3.11.3 -release=1 +release=2 source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version... https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV-... - https://github.com/martinus/robin-hood-hashing/archive/$_robin_hood/robin-ho...) + https://github.com/martinus/robin-hood-hashing/archive/$_robin_hood/robin-ho... + add-missing-export.patch + fix_shared.patch) build() { @@ -22,6 +24,9 @@ build() { robin_hood/external/robin-hood-hashing cp -r $SRC/SPIRV-Headers-$_spirv_headers/* headers/external/spirv-headers cp -r $SRC/robin-hood-hashing-$_robin_hood/* robin_hood/external/robin-hood-hashing + + patch -p1 -i $SRC/add-missing-export.patch + patch -p1 -i $SRC/fix_shared.patch ) prt-get isinst ninja && PKGMK_VULKAN_VALIDATION_LAYERS+=' -G Ninja' diff --git a/vulkan-validation-layers-32/add-missing-export.patch b/vulkan-validation-layers-32/add-missing-export.patch new file mode 100644 index 0000000..7137cd4 --- /dev/null +++ b/vulkan-validation-layers-32/add-missing-export.patch @@ -0,0 +1,24 @@ +diff -up Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp.dma Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp +--- Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp.dma 2021-08-07 08:13:46.344320103 +1000 ++++ Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.cpp 2021-08-07 08:14:22.130893289 +1000 +@@ -68,7 +68,7 @@ class ConfigFile { + + static ConfigFile layer_config; + +-string GetEnvironment(const char *variable) { ++VK_LAYER_EXPORT string GetEnvironment(const char *variable) { + #if !defined(__ANDROID__) && !defined(_WIN32) + const char *output = getenv(variable); + return output == NULL ? "" : output; +diff -up Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h.dma Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h +--- Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h.dma 2021-08-07 08:14:04.352608540 +1000 ++++ Vulkan-ValidationLayers-sdk-1.2.182.0/layers/vk_layer_config.h 2021-08-07 08:14:15.237782885 +1000 +@@ -33,7 +33,7 @@ + #define SECONDARY_VK_REGISTRY_HIVE_STR "HKEY_CURRENT_USER" + #endif + +-std::string GetEnvironment(const char *variable); ++VK_LAYER_EXPORT std::string GetEnvironment(const char *variable); + + #ifdef __cplusplus + extern "C" { diff --git a/vulkan-validation-layers-32/fix_shared.patch b/vulkan-validation-layers-32/fix_shared.patch new file mode 100644 index 0000000..8082da8 --- /dev/null +++ b/vulkan-validation-layers-32/fix_shared.patch @@ -0,0 +1,12 @@ +diff -up Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt +--- Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt.dma 2019-02-13 09:20:44.590959278 +1000 ++++ Vulkan-ValidationLayers-sdk-1.1.92.0/CMakeLists.txt 2019-02-13 09:21:29.178151673 +1000 +@@ -294,7 +294,7 @@ set_target_properties(generate_helper_fi + # files directly in layers. + + add_library(VkLayer_utils +- STATIC ++ SHARED + layers/vk_layer_config.cpp + layers/vk_layer_extension_utils.cpp + layers/vk_layer_utils.cpp