From fc2bc92913d10c3ef99d151d375ffadae4a5e0db025d08b48538d346c931e69b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 28 Sep 2020 22:04:09 +0000 Subject: [PATCH 1/3] - Update to release 1.2.154 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-loader?expand=0&rev=68 --- ...Return-error-if-layer-loading-failed.patch | 28 ------------------- v1.2.153.tar.gz | 3 -- v1.2.154.tar.gz | 3 ++ vulkan-loader.changes | 8 ++++++ vulkan-loader.spec | 4 +-- 5 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 0001-Revert-loader-Return-error-if-layer-loading-failed.patch delete mode 100644 v1.2.153.tar.gz create mode 100644 v1.2.154.tar.gz diff --git a/0001-Revert-loader-Return-error-if-layer-loading-failed.patch b/0001-Revert-loader-Return-error-if-layer-loading-failed.patch deleted file mode 100644 index 79b37aa..0000000 --- a/0001-Revert-loader-Return-error-if-layer-loading-failed.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8fdc320b442c45f25044826715058ce3569f3ae1 Mon Sep 17 00:00:00 2001 -From: Charles Giessen -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. ---- - 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 - diff --git a/v1.2.153.tar.gz b/v1.2.153.tar.gz deleted file mode 100644 index 15085b0..0000000 --- a/v1.2.153.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fb906b2dc968f2256f2d09b093ec8cc7f19812d656c649de8ed709a6da63d4a -size 1416357 diff --git a/v1.2.154.tar.gz b/v1.2.154.tar.gz new file mode 100644 index 0000000..2f6242d --- /dev/null +++ b/v1.2.154.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a92cee981032be16149603c1b602214f80f5f2d823c7b552b0c7dbb907d667f +size 1417349 diff --git a/vulkan-loader.changes b/vulkan-loader.changes index 7397b08..bc5c5ae 100644 --- a/vulkan-loader.changes +++ b/vulkan-loader.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 28 22:02:51 UTC 2020 - Jan Engelhardt + +- Update to release 1.2.154 + * Revert loader error characteristics to 1.2.152 +- Drop 0001-Revert-loader-Return-error-if-layer-loading-failed.patch + (merged) + ------------------------------------------------------------------- Wed Sep 23 19:46:21 UTC 2020 - Michał Rostecki diff --git a/vulkan-loader.spec b/vulkan-loader.spec index dc7b19e..dd37f7e 100644 --- a/vulkan-loader.spec +++ b/vulkan-loader.spec @@ -16,9 +16,10 @@ # +# Only pick versions released as /^sdk-.*/ tags %define lname libvulkan1 Name: vulkan-loader -Version: 1.2.153 +Version: 1.2.154 Release: 0 Summary: Reference ICD loader for Vulkan License: Apache-2.0 @@ -26,7 +27,6 @@ Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/Vulkan-Loader Source: https://github.com/KhronosGroup/Vulkan-Loader/archive/v%version.tar.gz Source9: baselibs.conf -Patch0: 0001-Revert-loader-Return-error-if-layer-loading-failed.patch BuildRequires: cmake >= 3.4 BuildRequires: gcc-c++ >= 4.8 BuildRequires: pkgconfig From cfb98aadfdc76494e4ec4d3d20b0ef0012c861c02ada39414a70b15891c36d9a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 3 Oct 2020 16:55:23 +0000 Subject: [PATCH 2/3] Updating link to change in openSUSE:Factory/vulkan-loader revision 28.0 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-loader?expand=0&rev=dba7a5506fb7a5792d56522d74946a8e --- ...Return-error-if-layer-loading-failed.patch | 28 +++++++++++++++++++ vulkan-loader.spec | 1 + 2 files changed, 29 insertions(+) create mode 100644 0001-Revert-loader-Return-error-if-layer-loading-failed.patch diff --git a/0001-Revert-loader-Return-error-if-layer-loading-failed.patch b/0001-Revert-loader-Return-error-if-layer-loading-failed.patch new file mode 100644 index 0000000..79b37aa --- /dev/null +++ b/0001-Revert-loader-Return-error-if-layer-loading-failed.patch @@ -0,0 +1,28 @@ +From 8fdc320b442c45f25044826715058ce3569f3ae1 Mon Sep 17 00:00:00 2001 +From: Charles Giessen +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. +--- + 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 + diff --git a/vulkan-loader.spec b/vulkan-loader.spec index dd37f7e..0f58f2f 100644 --- a/vulkan-loader.spec +++ b/vulkan-loader.spec @@ -27,6 +27,7 @@ Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/Vulkan-Loader Source: https://github.com/KhronosGroup/Vulkan-Loader/archive/v%version.tar.gz Source9: baselibs.conf +Patch0: 0001-Revert-loader-Return-error-if-layer-loading-failed.patch BuildRequires: cmake >= 3.4 BuildRequires: gcc-c++ >= 4.8 BuildRequires: pkgconfig From 9b731f0aa6d0bd260c4700b7c875e0b4a4619cbc348f14efec894f8f18491d88 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 3 Oct 2020 16:55:23 +0000 Subject: [PATCH 3/3] Accepting request 836404 from X11:Wayland baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/836404 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-loader?expand=0&rev=69 --- ...Return-error-if-layer-loading-failed.patch | 28 ------------------- vulkan-loader.spec | 1 - 2 files changed, 29 deletions(-) delete mode 100644 0001-Revert-loader-Return-error-if-layer-loading-failed.patch diff --git a/0001-Revert-loader-Return-error-if-layer-loading-failed.patch b/0001-Revert-loader-Return-error-if-layer-loading-failed.patch deleted file mode 100644 index 79b37aa..0000000 --- a/0001-Revert-loader-Return-error-if-layer-loading-failed.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8fdc320b442c45f25044826715058ce3569f3ae1 Mon Sep 17 00:00:00 2001 -From: Charles Giessen -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. ---- - 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 - diff --git a/vulkan-loader.spec b/vulkan-loader.spec index 0f58f2f..dd37f7e 100644 --- a/vulkan-loader.spec +++ b/vulkan-loader.spec @@ -27,7 +27,6 @@ Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/Vulkan-Loader Source: https://github.com/KhronosGroup/Vulkan-Loader/archive/v%version.tar.gz Source9: baselibs.conf -Patch0: 0001-Revert-loader-Return-error-if-layer-loading-failed.patch BuildRequires: cmake >= 3.4 BuildRequires: gcc-c++ >= 4.8 BuildRequires: pkgconfig