[arch-commits] Commit in lib32-vulkan-icd-loader/repos/multilib-x86_64 (3 files)

Laurent Carlier lcarlier at archlinux.org
Sun Sep 20 14:11:32 UTC 2020


    Date: Sunday, September 20, 2020 @ 14:11:32
  Author: lcarlier
Revision: 711107

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-vulkan-icd-loader/repos/multilib-x86_64/0001-Revert-loader-Return-error-if-layer-loading-failed.patch
    (from rev 711106, lib32-vulkan-icd-loader/trunk/0001-Revert-loader-Return-error-if-layer-loading-failed.patch)
  lib32-vulkan-icd-loader/repos/multilib-x86_64/PKGBUILD
    (from rev 711106, lib32-vulkan-icd-loader/trunk/PKGBUILD)
Deleted:
  lib32-vulkan-icd-loader/repos/multilib-x86_64/PKGBUILD

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

Copied: lib32-vulkan-icd-loader/repos/multilib-x86_64/0001-Revert-loader-Return-error-if-layer-loading-failed.patch (from rev 711106, lib32-vulkan-icd-loader/trunk/0001-Revert-loader-Return-error-if-layer-loading-failed.patch)
===================================================================
--- 0001-Revert-loader-Return-error-if-layer-loading-failed.patch	                        (rev 0)
+++ 0001-Revert-loader-Return-error-if-layer-loading-failed.patch	2020-09-20 14:11:32 UTC (rev 711107)
@@ -0,0 +1,30 @@
+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
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-20 14:11:26 UTC (rev 711106)
+++ PKGBUILD	2020-09-20 14:11:32 UTC (rev 711107)
@@ -1,47 +0,0 @@
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-
-pkgname=lib32-vulkan-icd-loader
-pkgver=1.2.153
-pkgrel=1
-arch=(x86_64)
-pkgdesc="Vulkan Installable Client Driver (ICD) Loader (32-bit)"
-url="https://www.khronos.org/vulkan/"
-license=('custom')
-makedepends=(cmake python lib32-libx11 lib32-libxrandr lib32-wayland vulkan-headers git)
-depends=(lib32-glibc)
-optdepends=('lib32-vulkan-driver: packaged vulkan driver')
-source=("vulkan-loader-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/v${pkgver}.tar.gz")
-sha256sums=('5fb906b2dc968f2256f2d09b093ec8cc7f19812d656c649de8ed709a6da63d4a')
-
-build() {
-  export ASFLAGS=--32
-  export CFLAGS=-m32
-  export CXXFLAGS=-m32                                                                                                                                                                                                            
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" 
-
-  cd "${srcdir}"/Vulkan-Loader*
-
-  rm -rf build ; mkdir build ; cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DVULKAN_HEADERS_INSTALL_DIR=/usr \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-    -DCMAKE_INSTALL_LIBDIR=lib32 \
-    -DCMAKE_INSTALL_DATADIR=/share \
-    -DCMAKE_SKIP_RPATH=True \
-    -DBUILD_TESTS=Off \
-    -DBUILD_WSI_XCB_SUPPORT=On \
-    -DBUILD_WSI_XLIB_SUPPORT=On \
-    -DBUILD_WSI_WAYLAND_SUPPORT=On \
-    -DCMAKE_BUILD_TYPE=Release \
-    ..
-  make
-}
-
-package() {
-  cd "${srcdir}"/Vulkan-Loader*/build
-  
-  make DESTDIR="${pkgdir}" install
-
-  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
-}

Copied: lib32-vulkan-icd-loader/repos/multilib-x86_64/PKGBUILD (from rev 711106, lib32-vulkan-icd-loader/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-09-20 14:11:32 UTC (rev 711107)
@@ -0,0 +1,56 @@
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+
+pkgname=lib32-vulkan-icd-loader
+pkgver=1.2.153
+pkgrel=2
+arch=(x86_64)
+pkgdesc="Vulkan Installable Client Driver (ICD) Loader (32-bit)"
+url="https://www.khronos.org/vulkan/"
+license=('custom')
+makedepends=(cmake python lib32-libx11 lib32-libxrandr lib32-wayland vulkan-headers git)
+depends=(lib32-glibc)
+optdepends=('lib32-vulkan-driver: packaged vulkan driver')
+source=("vulkan-loader-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/v${pkgver}.tar.gz"
+        0001-Revert-loader-Return-error-if-layer-loading-failed.patch)
+sha256sums=('5fb906b2dc968f2256f2d09b093ec8cc7f19812d656c649de8ed709a6da63d4a'
+            '0450033ffcd8970ee1d69cf97c989b48e9b675b0fb71197f5e7b39c816b9c4aa')
+
+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() {
+  export ASFLAGS=--32
+  export CFLAGS=-m32
+  export CXXFLAGS=-m32                                                                                                                                                                                                            
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" 
+
+  cd "${srcdir}"/Vulkan-Loader*
+
+  rm -rf build ; mkdir build ; cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DVULKAN_HEADERS_INSTALL_DIR=/usr \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_INSTALL_LIBDIR=lib32 \
+    -DCMAKE_INSTALL_DATADIR=/share \
+    -DCMAKE_SKIP_RPATH=True \
+    -DBUILD_TESTS=Off \
+    -DBUILD_WSI_XCB_SUPPORT=On \
+    -DBUILD_WSI_XLIB_SUPPORT=On \
+    -DBUILD_WSI_WAYLAND_SUPPORT=On \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
+  make
+}
+
+package() {
+  cd "${srcdir}"/Vulkan-Loader*/build
+  
+  make DESTDIR="${pkgdir}" install
+
+  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
+}


More information about the arch-commits mailing list