From 090b234594d33779565640d201f159768697aaf06dc5d5b241e4b0a7ac6c9f13 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 20 Oct 2021 07:40:54 +0000 Subject: [PATCH 1/2] - Update to version 2017.08+git.20211008: * meson: check all deps, when enabling wayland winsys * meson: error out when no winsys is available OBS-URL: https://build.opensuse.org/package/show/benchmark/vkmark?expand=0&rev=17 --- _servicedata | 2 +- vkmark-2017.08+git.20210312.obscpio | 3 --- vkmark-2017.08+git.20211008.obscpio | 3 +++ vkmark.changes | 7 +++++++ vkmark.obsinfo | 6 +++--- vkmark.spec | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 vkmark-2017.08+git.20210312.obscpio create mode 100644 vkmark-2017.08+git.20211008.obscpio diff --git a/_servicedata b/_servicedata index 4706b2e..17bb2ee 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/vkmark/vkmark - 53abc4f660191051fba91ea30de084f412e7c68e \ No newline at end of file + cf45f2faee236fd1118be2fcd27e4f2a91fc2e40 \ No newline at end of file diff --git a/vkmark-2017.08+git.20210312.obscpio b/vkmark-2017.08+git.20210312.obscpio deleted file mode 100644 index ad9a910..0000000 --- a/vkmark-2017.08+git.20210312.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78ec95285e8d92799c8ab0daa34485f0c5ba81595203d704052af7f1220a5392 -size 1792524 diff --git a/vkmark-2017.08+git.20211008.obscpio b/vkmark-2017.08+git.20211008.obscpio new file mode 100644 index 0000000..5eec0cd --- /dev/null +++ b/vkmark-2017.08+git.20211008.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bcd4779b74257dc1d036a59b5ccbdeddd8ad9ee84e69778cbdd0488c277ae7e +size 1793036 diff --git a/vkmark.changes b/vkmark.changes index 6a308bd..496940d 100644 --- a/vkmark.changes +++ b/vkmark.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 20 07:40:41 UTC 2021 - Martin Pluskal + +- Update to version 2017.08+git.20211008: + * meson: check all deps, when enabling wayland winsys + * meson: error out when no winsys is available + ------------------------------------------------------------------- Thu Apr 22 07:23:53 UTC 2021 - Martin Pluskal diff --git a/vkmark.obsinfo b/vkmark.obsinfo index 2a996c9..ae73f75 100644 --- a/vkmark.obsinfo +++ b/vkmark.obsinfo @@ -1,5 +1,5 @@ name: vkmark -version: 2017.08+git.20210312 -mtime: 1615558568 -commit: 53abc4f660191051fba91ea30de084f412e7c68e +version: 2017.08+git.20211008 +mtime: 1633693616 +commit: cf45f2faee236fd1118be2fcd27e4f2a91fc2e40 diff --git a/vkmark.spec b/vkmark.spec index f190d97..7439455 100644 --- a/vkmark.spec +++ b/vkmark.spec @@ -18,7 +18,7 @@ Name: vkmark -Version: 2017.08+git.20210312 +Version: 2017.08+git.20211008 Release: 0 Summary: Vulkan benchmark utility License: LGPL-2.1-or-later From 1cec41abf2790cb44ac69be0e165103b48321ae9cdc66266da78494d00183cd9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 21 Dec 2021 09:37:02 +0000 Subject: [PATCH 2/2] Accepting request 941668 from home:malcolmlewis:branches:benchmark - Add vkmark-sigstksz-not-constant.patch: Temporary fix for glibc changes, (gh#vkmark/vkmark#37). OBS-URL: https://build.opensuse.org/request/show/941668 OBS-URL: https://build.opensuse.org/package/show/benchmark/vkmark?expand=0&rev=18 --- vkmark-sigstksz-not-constant.patch | 30 ++++++++++++++++++++++++++++++ vkmark.changes | 6 ++++++ vkmark.spec | 4 +++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 vkmark-sigstksz-not-constant.patch diff --git a/vkmark-sigstksz-not-constant.patch b/vkmark-sigstksz-not-constant.patch new file mode 100644 index 0000000..e47f3ea --- /dev/null +++ b/vkmark-sigstksz-not-constant.patch @@ -0,0 +1,30 @@ +diff -Nur a/tests/catch.hpp b/tests/catch.hpp +--- a/tests/catch.hpp 2021-10-08 06:46:56.000000000 -0500 ++++ b/tests/catch.hpp 2021-12-20 07:31:39.775863060 -0600 +@@ -6487,7 +6487,7 @@ + static bool isSet; + static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; + static stack_t oldSigStack; +- static char altStackMem[SIGSTKSZ]; ++ static char altStackMem[32768]; + + static void handleSignal( int sig ) { + std::string name = ""; +@@ -6507,7 +6507,7 @@ + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; +- sigStack.ss_size = SIGSTKSZ; ++ sigStack.ss_size = 32768; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = { 0 }; +@@ -6538,7 +6538,7 @@ + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; ++ char FatalConditionHandler::altStackMem[32768] = {}; + + } // namespace Catch + diff --git a/vkmark.changes b/vkmark.changes index 496940d..ca30cbc 100644 --- a/vkmark.changes +++ b/vkmark.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 20 13:32:45 UTC 2021 - malcolmlewis@opensuse.org + +- Add vkmark-sigstksz-not-constant.patch: Temporary fix for glibc + changes, (gh#vkmark/vkmark#37). + ------------------------------------------------------------------- Wed Oct 20 07:40:41 UTC 2021 - Martin Pluskal diff --git a/vkmark.spec b/vkmark.spec index 7439455..8c0de19 100644 --- a/vkmark.spec +++ b/vkmark.spec @@ -24,6 +24,8 @@ Summary: Vulkan benchmark utility License: LGPL-2.1-or-later URL: https://github.com/vkmark/vkmark Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE vkmark-sigstksz-not-constant.patch (gh#vkmark/vkmark#37) malcolmlewis@opensuse.org -- Temporary fix for glibc changes. +Patch0: vkmark-sigstksz-not-constant.patch BuildRequires: gcc-c++ BuildRequires: glm-devel BuildRequires: meson >= 0.45 @@ -44,7 +46,7 @@ BuildRequires: Mesa-libVulkan-devel An extensible Vulkan benchmarking suite with targeted, configurable scenes. %prep -%autosetup +%autosetup -p1 %build %meson