daftaupe/opt
1
0
Fork 0
forked from ports/opt
Code Pull Requests Activity

vulkan-validation-layers: 1.3.236.0 -> 1.3.239.0

Browse Source
This commit is contained in:
Tim Biermann 2023-02-25 15:01:07 +01:00
parent 40e0afc4b0
commit fc1db8c864
7 changed files with 33 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vulkan-validation-layers/.footprint
View File

@ -15,6 +15,7 @@ drwxr-xr-x root/root usr/include/vulkan/
-rw-r--r-- root/root usr/include/vulkan/vk_layer_dispatch_table.h
-rw-r--r-- root/root usr/include/vulkan/vk_layer_extension_utils.cpp
-rw-r--r-- root/root usr/include/vulkan/vk_layer_extension_utils.h
-rw-r--r-- root/root usr/include/vulkan/vk_layer_logging.cpp
-rw-r--r-- root/root usr/include/vulkan/vk_layer_logging.h
-rw-r--r-- root/root usr/include/vulkan/vk_layer_utils.cpp
-rw-r--r-- root/root usr/include/vulkan/vk_layer_utils.h

10
vulkan-validation-layers/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/VDftPryFrez8SC7wQu/LbuwZ0IvQBCSEHFSCnxgXhenvZLb43w1OYRBH7ThsAN+u/QSHQPFTcfC85bSmOHS+gI=
SHA256 (Pkgfile) = 91daea9a54c5c886a68466f13978286c8cac62c2f8816077ccbaa0edf6518c8f
SHA256 (.footprint) = 51ebca3b8fe18fac97ff3a25aaecc184ed19ee027c33ebd6e53ff70025aeb22a
SHA256 (Vulkan-ValidationLayers-sdk-1.3.236.0.tar.gz) = 68f2cf70b1960f85e931ef56935e6ceda1beeb214f8fa319e6b95128b02b485a
SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0
RWSE3ohX2g5d/S5gWsKb9fPqgei7OxNruux+v2EyAzq8Ug+97fHQTQdX8+4KCbbJcxVOKTiPt32DHW+DHeex0w4Oa1pbpvR5AgQ=
SHA256 (Pkgfile) = 4b8263febc3e1f532ee93f63f5f63968a9ee6660952b43e56131a80fb8275295
SHA256 (.footprint) = 517b456f3c12ec3e2a7eebc27009d74ff33fdee4919db2a1612ae188655b7352
SHA256 (Vulkan-ValidationLayers-sdk-1.3.239.0.tar.gz) = 7aa7fb46e25e5ef0144d29c92122b631dc7c7c6804a6339f195b368ad53328e4
SHA256 (vulkan-layers-1.3.239-Build-shared-libs.patch) = c2dc16b469150e66d11543385108a20a7f65fd16ef34f9245800b2927dccf274

10
vulkan-validation-layers/Pkgfile
View File

@ -6,14 +6,14 @@
name=vulkan-validation-layers
_name=Vulkan-ValidationLayers-sdk
version=1.3.236.0
version=1.3.239.0
_version=sdk-$version
release=1
source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/$_version/$_name-$version.tar.gz
fix_shared.patch)
vulkan-layers-1.3.239-Build-shared-libs.patch)
build() {
patch -d $_name-$version -p1 -i $SRC/fix_shared.patch
patch -d $_name-$version -p1 -i $SRC/vulkan-layers-1.3.239-Build-shared-libs.patch
prt-get isinst wayland || PKGMK_VULKAN_VALIDATION_LAYERS+=' -D BUILD_WSI_WAYLAND_SUPPORT=OFF'
@ -22,12 +22,12 @@ build() {
-D CMAKE_INSTALL_LIBDIR=lib \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -ffat-lto-objects" \
-D CMAKE_SKIP_RPATH=ON \
-D SPIRV_HEADERS_INSTALL_DIR=/usr \
-D VULKAN_HEADERS_INSTALL_DIR=/usr \
-D BUILD_TESTS=OFF \
-D BUILD_LAYER_SUPPORT_FILES=ON \
-D VulkanRegistry_DIR=/usr/share/vulkan/registry \
-D USE_ROBIN_HOOD_HASHING=ON \
-D BUILD_TESTS=OFF \
-Wno-dev
cmake --build build

12
vulkan-validation-layers/fix_shared.patch
View File

@ -1,12 +0,0 @@
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

12
vulkan-validation-layers/known_good.py.in
View File

@ -1,12 +0,0 @@
#!/usr/bin/python3
import json
with open('@SRC@/scripts/known_good.json', 'r') as myfile:
data=myfile.read()
obj = json.loads(data)
print (str(obj['repos'][0]['name']) + ': ' + str(obj['repos'][0]['commit']))
print (str(obj['repos'][1]['name']) + ': ' + str(obj['repos'][1]['commit']))
print (str(obj['repos'][2]['name']) + ': ' + str(obj['repos'][2]['commit']))

90
vulkan-validation-layers/vulkan-layers-1.3.204-Fix-dependency-detection.patch
View File

@ -1,90 +0,0 @@
From 534810e26e0be782b2c702a97bf726af250b8cd6 Mon Sep 17 00:00:00 2001
From: Jeremy Gebben <jeremyg@lunarg.com>
Date: Thu, 17 Feb 2022 15:26:25 -0700
Subject: [PATCH] build: Handle many permutations of SPIRV-Headers locations
If the SPIRV-Headers package is not found, fall back to looking for
headers in SPIRV_HEADERS_INSTALL_DIR or SPIRV_HEADERS_INCLUDE_DIR.
Fixes #3765
---
CMakeLists.txt | 19 ++++++++++++++++---
layers/CMakeLists.txt | 7 +------
tests/CMakeLists.txt | 6 +++---
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4ca786ca07..58a966f03d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,10 +256,23 @@ if (USE_ROBIN_HOOD_HASHING)
endif()
endif()
-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "")
if(BUILD_LAYERS OR BUILD_TESTS)
- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
- find_package(SPIRV-Headers REQUIRED CONFIG)
+ find_package(SPIRV-Headers CONFIG QUIET)
+ if(SPIRV-Headers_FOUND)
+ # pefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed'
+ # version of SPIRV-Headers, the package will be found.
+ get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
+ elseif(SPIRV_HEADERS_INCLUDE_DIR)
+ # This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory
+ if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h")
+ message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}")
+ endif()
+ elseif(SPIRV_HEADERS_INSTALL_DIR)
+ # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers
+ if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h")
+ message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}")
+ endif()
+ set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include")
endif()
endif()
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 6edcf6eb5ab..59e294a0793 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -309,12 +309,7 @@ if(BUILD_LAYERS)
if (USE_ROBIN_HOOD_HASHING)
target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR})
endif()
- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers)
- else()
- target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
- endif()
-
+ target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2b98d109b7f..780c0538486 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
# ~~~
-# Copyright (c) 2014-2021 Valve Corporation
-# Copyright (c) 2014-2021 LunarG, Inc.
+# Copyright (c) 2014-2022 Valve Corporation
+# Copyright (c) 2014-2022 LunarG, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -149,11 +149,11 @@ if (NOT MSVC)
target_compile_options(vk_layer_validation_tests PRIVATE "-Wno-sign-compare")
endif()
+target_include_directories(vk_layer_validation_tests PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
# Specify target_link_libraries
target_link_libraries(vk_layer_validation_tests
PRIVATE VkLayer_utils
${GLSLANG_LIBRARIES}
- SPIRV-Headers::SPIRV-Headers
SPIRV-Tools-static SPIRV-Tools-opt
GTest::gtest GTest::gtest_main)

22
vulkan-validation-layers/vulkan-layers-1.3.239-Build-shared-libs.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 640ac8471..19caed0ed 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -23,7 +23,7 @@
# https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/4640
add_compile_definitions(XXH_NO_LONG_LONG)
-add_library(VkLayer_utils STATIC)
+add_library(VkLayer_utils SHARED)
target_sources(VkLayer_utils PRIVATE
generated/vk_format_utils.h
generated/vk_format_utils.cpp
@@ -158,7 +158,7 @@ else()
message(NOTICE "VulkanVL_generated_source target requires python 3")
endif()
-add_library(VkLayer_khronos_validation MODULE)
+add_library(VkLayer_khronos_validation SHARED)
target_sources(VkLayer_khronos_validation PRIVATE
generated/best_practices.cpp