[arch-commits] Commit in vulkan-icd-loader/trunk (2 files)

[Laurent Carlier]

    Date: Tuesday, November 3, 2020 @ 09:23:23
  Author: lcarlier
Revision: 399198

upgpkg: vulkan-icd-loader 1.2.158-1: upstream update 1.2.158

Modified:
  vulkan-icd-loader/trunk/PKGBUILD
Deleted:
  vulkan-icd-loader/trunk/0001-Revert-loader-Return-error-if-layer-loading-failed.patch

---------------------------------------------------------------+
 0001-Revert-loader-Return-error-if-layer-loading-failed.patch |   30 ----------
 PKGBUILD                                                      |   17 +----
 2 files changed, 4 insertions(+), 43 deletions(-)

Deleted: 0001-Revert-loader-Return-error-if-layer-loading-failed.patch
===================================================================
--- 0001-Revert-loader-Return-error-if-layer-loading-failed.patch	2020-11-03 09:20:30 UTC (rev 399197)
+++ 0001-Revert-loader-Return-error-if-layer-loading-failed.patch	2020-11-03 09:23:23 UTC (rev 399198)
@@ -1,30 +0,0 @@
-From 8fdc320b442c45f25044826715058ce3569f3ae1 Mon Sep 17 00:00:00 2001
-From: Charles Giessen <charles at lunarg.com>
-Date: Thu, 17 Sep 2020 16:31:16 -0600
-Subject: [PATCH] Revert "loader: Return error if layer loading failed"
-
-This reverts commit 49648d8fb398ac7d3d8e159939de060b8e759ecf.
-Many layers were relying on silently failing to allow 32/64 bit versions
-to work on linux. A later commit will properly check for failing layers.
-
-Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
----
- loader/loader.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/loader/loader.c b/loader/loader.c
-index dd7f7d5b7..4d8865e13 100644
---- a/loader/loader.c
-+++ b/loader/loader.c
-@@ -5942,7 +5942,7 @@ VkResult loader_create_instance_chain(const VkInstanceCreateInfo *pCreateInfo, c
- 
-             lib_handle = loaderOpenLayerFile(inst, "instance", layer_prop);
-             if (!lib_handle) {
--                return VK_ERROR_LAYER_NOT_PRESENT;
-+                continue;
-             }
- 
-             if (NULL == layer_prop->functions.negotiate_layer_interface) {
--- 
-2.28.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-03 09:20:30 UTC (rev 399197)
+++ PKGBUILD	2020-11-03 09:23:23 UTC (rev 399198)
@@ -1,8 +1,8 @@
 # Maintainer: Laurent Carlier <lordheavym at gmail.com>
 
 pkgname=vulkan-icd-loader
-pkgver=1.2.153
-pkgrel=2
+pkgver=1.2.158
+pkgrel=1
 arch=(x86_64)
 pkgdesc="Vulkan Installable Client Driver (ICD) Loader"
 url="https://www.khronos.org/vulkan/"
@@ -10,11 +10,9 @@
 makedepends=(cmake python-lxml libx11 libxrandr wayland vulkan-headers git)
 depends=(glibc)
 optdepends=('vulkan-driver: packaged vulkan driver') # vulkan-driver: vulkan-intel/vulkan-radeon/nvidia-utils/....
-source=("https://github.com/KhronosGroup/Vulkan-Loader/archive/v${pkgver}.tar.gz"
-        0001-Revert-loader-Return-error-if-layer-loading-failed.patch)
+source=("https://github.com/KhronosGroup/Vulkan-Loader/archive/v${pkgver}.tar.gz")
 #source=("git+https://github.com/KhronosGroup/Vulkan-Loader.git#commit=8df99b31f01ef1ef7fb17082dd577e77f20cb050")
-sha256sums=('5fb906b2dc968f2256f2d09b093ec8cc7f19812d656c649de8ed709a6da63d4a'
-            '0450033ffcd8970ee1d69cf97c989b48e9b675b0fb71197f5e7b39c816b9c4aa')
+sha256sums=('dc9e6a0b5296edb962d3dc168a257cbc1759e1d28afb8b4061a1bc5cb0fa7ede')
 
 #pkgver() {
 #  cd "${srcdir}"/Vulkan-Loader*
@@ -22,13 +20,6 @@
 #  echo 1.1.106+$(git rev-list --count HEAD)+$(git rev-parse --short HEAD)
 #}
 
-prepare() {
-  cd "${srcdir}"/Vulkan-Loader*
-
-  # https://github.com/ValveSoftware/steam-for-linux/issues/7368
-  patch -Np1 -i ../0001-Revert-loader-Return-error-if-layer-loading-failed.patch
-}
-
 build() {
   cd "${srcdir}"/Vulkan-Loader*