vulkan-validation-layers-32: 1.2.154.0 -> 1.2.162.0

5 files changed, 22 insertions, 42 deletions

diff --git a/vulkan-validation-layers-32/.footprint b/vulkan-validation-layers-32/.footprint
index 2a6031f4..df1b7ba5 100644
--- a/vulkan-validation-layers-32/.footprint
+++ b/vulkan-validation-layers-32/.footprint
@@ -1,6 +1,4 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
-lrwxrwxrwx	root/root	usr/lib32/libVkLayer_khronos_validation.so -> libVkLayer_khronos_validation.so.1
-lrwxrwxrwx	root/root	usr/lib32/libVkLayer_khronos_validation.so.1 -> libVkLayer_khronos_validation.so.1.2.154.0
--rwxr-xr-x	root/root	usr/lib32/libVkLayer_khronos_validation.so.1.2.154.0
--rw-r--r--	root/root	usr/lib32/libVkLayer_utils.a
+-rwxr-xr-x	root/root	usr/lib32/libVkLayer_khronos_validation.so
+-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 ed5211a9..0df0356e 100644
--- a/vulkan-validation-layers-32/.signature
+++ b/vulkan-validation-layers-32/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXaykKHCGDiDt+BYwqiHd16RlnhovS2095kJ5seUK+TRDoKwXD76gmm0m303dFXe9UF38pK/zjCLd29WpwD4AUAU=
-SHA256 (Pkgfile) = 56d329a898581f1a4d464e9a3e221fed0e002a8efb017c06db87cb8ea0fbb40e
-SHA256 (.footprint) = 3898d5d29e0115f46742343316e7c9fc6476c14ef8c4bbf73ff676726f165f83
-SHA256 (Vulkan-ValidationLayers-sdk-1.2.154.0.tar.gz) = 8898ab05d0d8dec04fbba03d0ed2e79a1eb5c0382e5c89d4c737b45a6648f7f9
-SHA256 (validation-layers-soversion.patch) = 55fa92f03aa5d126db2ab75fb06ea9102019eb68437d9720a8c075a87f3baba8
+RWSwxGo/zH7eXbHtaNZPOFkcr4hewBxoEUgAMLdSECc2iV9fWQg7/ghLRNuL0x3enja+13JUxOahoTLIbR1wpFYqZHj3NNDPeA8=
+SHA256 (Pkgfile) = 636ba30a866350671ffa3bae8ca86a16bd0e094148e1dbf9a7ae1a7e65139ce6
+SHA256 (.footprint) = 5c3e1cb61d0d5070cc1d278ec445757e1913b70cdec30985988d48c2f6ded070
+SHA256 (Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz) = 80aa9e180b3900598121d7a3ea613665b99aae21bb40268ecafd82df8016c6f5
+SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0
diff --git a/vulkan-validation-layers-32/Pkgfile b/vulkan-validation-layers-32/Pkgfile
index 9170007b..cc42658b 100644
--- a/vulkan-validation-layers-32/Pkgfile
+++ b/vulkan-validation-layers-32/Pkgfile
@@ -5,13 +5,13 @@
 # Optional: wayland-32
 
 name=vulkan-validation-layers-32
-version=1.2.154.0
+version=1.2.162.0
 release=1
 source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$version/Vulkan-ValidationLayers-sdk-$version.tar.gz
-	validation-layers-soversion.patch)
+	fix_shared.patch)
 
 build() {
-	patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/validation-layers-soversion.patch
+	patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/fix_shared.patch
 
 	cmake -SVulkan-ValidationLayers-sdk-$version -Bbuild -GNinja \
 		-DCMAKE_INSTALL_PREFIX='/usr' \
@@ -21,8 +21,6 @@ build() {
 		-DBUILD_TESTS=OFF \
 		-DGLSLANG_INSTALL_DIR='/usr' \
 		-DBUILD_LAYER_SUPPORT_FILES=ON \
-		-DVKLAYERS_SOVERSION='1' \
-		-DVKLAYERS_VERSION="$version" \
 		-DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv/' \
 		-DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \
 		-DBUILD_WSI_XCB_SUPPORT=ON \
diff --git a/vulkan-validation-layers-32/fix_shared.patch b/vulkan-validation-layers-32/fix_shared.patch
new file mode 100644
index 00000000..8082da82
--- /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
diff --git a/vulkan-validation-layers-32/validation-layers-soversion.patch b/vulkan-validation-layers-32/validation-layers-soversion.patch
deleted file mode 100644
index 213cfcb7..00000000
--- a/vulkan-validation-layers-32/validation-layers-soversion.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: Vulkan-ValidationLayers-sdk-1.1.121.0/CMakeLists.txt
-===================================================================
---- Vulkan-ValidationLayers-sdk-1.1.121.0/CMakeLists.txt
-+++ Vulkan-ValidationLayers-sdk-1.1.121.0/CMakeLists.txt	2019-09-25 12:25:23.778410890 +0200
-@@ -27,6 +27,9 @@
- 
- enable_testing()
- 
-+set(VKLAYERS_VERSION "1.0.0" CACHE STRING "Build version")
-+set(VKLAYERS_SOVERSION "1" CACHE STRING "Library API version")
-+
- # User-interface declarations ----------------------------------------------------------------------------------------------------
- # This section contains variables that affect development GUIs (e.g. CMake GUI and IDEs), such as option(), folders, and variables
- # with the CACHE property.
-Index: Vulkan-ValidationLayers-sdk-1.1.121.0/layers/CMakeLists.txt
-===================================================================
---- Vulkan-ValidationLayers-sdk-1.1.121.0/layers/CMakeLists.txt
-+++ Vulkan-ValidationLayers-sdk-1.1.121.0/layers/CMakeLists.txt	2019-09-25 12:25:23.779410888 +0200
-@@ -133,6 +133,9 @@
- else(UNIX AND NOT APPLE) # i.e.: Linux
-     macro(AddVkLayer target LAYER_COMPILE_DEFINITIONS)
-         add_library(VkLayer_${target} SHARED ${ARGN})
-+        set_target_properties(VkLayer_${target} PROPERTIES
-+                              VERSION ${VKLAYERS_VERSION}
-+                              SOVERSION ${VKLAYERS_SOVERSION})
-         target_compile_definitions(VkLayer_${target} PUBLIC ${LAYER_COMPILE_DEFINITIONS})
-         target_link_libraries(VkLayer_${target} PRIVATE VkLayer_utils)
-         add_dependencies(VkLayer_${target} VkLayer_utils)