diff --git a/vulkan-loader/.footprint b/vulkan-loader/.footprint index 2ccf3e2d8..0ceac72e9 100644 --- a/vulkan-loader/.footprint +++ b/vulkan-loader/.footprint @@ -1,7 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libvulkan.so -> libvulkan.so.1 -lrwxrwxrwx root/root usr/lib/libvulkan.so.1 -> libvulkan.so.1.2.174 --rwxr-xr-x root/root usr/lib/libvulkan.so.1.2.174 +lrwxrwxrwx root/root usr/lib/libvulkan.so.1 -> libvulkan.so.1.2.175 +-rwxr-xr-x root/root usr/lib/libvulkan.so.1.2.175 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/vulkan.pc diff --git a/vulkan-loader/.signature b/vulkan-loader/.signature index 9a4295d24..fc156053a 100644 --- a/vulkan-loader/.signature +++ b/vulkan-loader/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/b52tlwXs4DxbpcmHXF1heJy08ysAsNzmvc8NvZZkh03TUZhDWz+SkwKxxHxFkZK1OKepN6HsTLSqci404PsVA0= -SHA256 (Pkgfile) = e2497c228863ddea3e0f3c57e1721b5e31809315287ab77832a1902e8df34ba9 -SHA256 (.footprint) = 6f3e447aa4cda128719757b9db5c24bff7d80d4061eb344f83ab677da14b6d8d +RWSE3ohX2g5d/bwObMvswDX6ZlALjBg6+9nG7lT4SIvr0MMvkyUPGM29Fn8ZZsf/pTRqaBHyAMQMARVBG729evUlLZVzwyV0zQE= +SHA256 (Pkgfile) = f0c39cc06306631d5374653d0013d9e3d835f48e2442c1e04277bee765f4280e +SHA256 (.footprint) = d1b00446134c67abdaea345e67ab501c31e517947a9272e6e86915c1dbd4ac4a SHA256 (Vulkan-Loader-1.2.174.tar.gz) = c39a660da13450cb5e2d1dc571749d0e9a4f831998b20a7ad9fc7f2c99e1bb0b +SHA256 (verfix.patch) = 19c25bfcaf063bc1601ee4613328925b1724ca37c158ac96e50149e4b88a1c0a diff --git a/vulkan-loader/Pkgfile b/vulkan-loader/Pkgfile index 15ccc0339..78c1d124d 100644 --- a/vulkan-loader/Pkgfile +++ b/vulkan-loader/Pkgfile @@ -5,13 +5,17 @@ name=vulkan-loader version=1.2.174 -release=1 -source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/v$version/Vulkan-Loader-$version.tar.gz) +release=2 +source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/v$version/Vulkan-Loader-$version.tar.gz + verfix.patch) build() { prt-get isinst ninja && PKGMK_VULKAN_LOADER+=' -G Ninja' prt-get isinst wayland || PKGMK_VULKAN_LOADER+=' -D BUILD_WSI_WAYLAND_SUPPORT=OFF' + # Fix version in .pc file + patch -d Vulkan-Loader-$version -p1 -i $SRC/verfix.patch + cmake -S Vulkan-Loader-$version -B build $PKGMK_VULKAN_LOADER \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ diff --git a/vulkan-loader/verfix.patch b/vulkan-loader/verfix.patch new file mode 100644 index 000000000..d731e3e47 --- /dev/null +++ b/vulkan-loader/verfix.patch @@ -0,0 +1,28 @@ +diff -u -r Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake Vulkan-Loader-1.2.174-verfix/cmake/FindVulkanHeaders.cmake +--- Vulkan-Loader-1.2.174/cmake/FindVulkanHeaders.cmake 2021-03-29 20:05:47.000000000 +0000 ++++ Vulkan-Loader-1.2.174-verfix/cmake/FindVulkanHeaders.cmake 2021-04-16 14:08:29.582548243 +0000 +@@ -114,19 +114,19 @@ + file(STRINGS + ${VulkanHeaders_main_header} + VulkanHeaders_lines +- REGEX "^#define (VK_API_VERSION.*VK_MAKE_VERSION|VK_HEADER_VERSION)") ++ REGEX "^#define (VK_API_VERSION.*VK_MAKE_API_VERSION|VK_HEADER_VERSION)") + + foreach(VulkanHeaders_line ${VulkanHeaders_lines}) + + # First, handle the case where we have a major/minor version + # Format is: +- # #define VK_API_VERSION_X_Y VK_MAKE_VERSION(X, Y, 0) ++ # #define VK_API_VERSION_X_Y VK_MAKE_API_VERSION(0, X, Y, 0) + # We grab the major version (X) and minor version (Y) out of the parentheses +- string(REGEX MATCH "VK_MAKE_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line}) ++ string(REGEX MATCH "VK_MAKE_API_VERSION\\(.*\\)" VulkanHeaders_out ${VulkanHeaders_line}) + string(REGEX MATCHALL "[0-9]+" VulkanHeaders_MAJOR_MINOR "${VulkanHeaders_out}") + if (VulkanHeaders_MAJOR_MINOR) +- list (GET VulkanHeaders_MAJOR_MINOR 0 VulkanHeaders_cur_major) +- list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_minor) ++ list (GET VulkanHeaders_MAJOR_MINOR 1 VulkanHeaders_cur_major) ++ list (GET VulkanHeaders_MAJOR_MINOR 2 VulkanHeaders_cur_minor) + if (${VulkanHeaders_cur_major} GREATER ${VulkanHeaders_VERSION_MAJOR}) + set(VulkanHeaders_VERSION_MAJOR ${VulkanHeaders_cur_major}) + set(VulkanHeaders_VERSION_MINOR ${VulkanHeaders_cur_minor})