commit 52bf1d015556acf91e9d85651989868b7fa50705 Author: Tim Biermann <tbier@posteo.de> Date: Sun Mar 20 07:15:29 2022 +0100 vkmark: 20200521 -> 20220318; new dependency wayland-protocols diff --git a/vkmark/.signature b/vkmark/.signature index 99e17f047..ace009ff8 100644 --- a/vkmark/.signature +++ b/vkmark/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32fw0zPFEnY8GcB25tT2Brze7lB8+EXTcSb9wxJDx8Z9sAlB3tIgzqMGHOvyf3cD8fqJmHF2QkUf4nXWKkzBHww= -SHA256 (Pkgfile) = a42b9ef479a9fcdcea8849dedac57d23103aab44183abec3fb7d3965ee46c681 +RWSagIOpLGJF32ZkpNZgRjub503wsRSQJW5/dLeXQPOTGZ7WCEIrxe66azNEyQXtgVk7GqipX4nRkgBh1n9GJnljKUtV4GPahQg= +SHA256 (Pkgfile) = 11369fefe2b8d7263b5694f01ac03c0d7a380995ece4ae624c5f24497bc556a1 SHA256 (.footprint) = 1f1ea88f2b363f129d4141051c015df6ab23a10f9e173365540489ce281bf735 -SHA256 (vkmark-20200521.tar.gz) = a8b4f5d86d8a6328528500fa9e13908e4a4c0df331084a08dab5515630efec02 +SHA256 (vkmark-20220318.tar.gz) = e59e1e557a579244de8e97adb1afbc4d6766577bbd6dbf4dc292716f87eeb981 +SHA256 (38.patch) = ac9641daf0db4e8008edad29bc1ba62ed32f2238ff64b48e34e32e2cd71c2f9d diff --git a/vkmark/38.patch b/vkmark/38.patch new file mode 100644 index 000000000..5ee1c2c0b --- /dev/null +++ b/vkmark/38.patch @@ -0,0 +1,48 @@ +From adc225892c6514077fbfeabb6aadef4d7a4ef016 Mon Sep 17 00:00:00 2001 +From: Joel Winarske <joel.winarske@gmail.com> +Date: Sun, 7 Nov 2021 09:28:35 -0800 +Subject: [PATCH] signal.h no longer defines SIGSTKSIZ as a static number. + +Signed-off-by: Joel Winarske <joel.winarske@gmail.com> +--- + tests/catch.hpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/catch.hpp b/tests/catch.hpp +index f7681f4..d7a64a9 100644 +--- a/tests/catch.hpp ++++ b/tests/catch.hpp +@@ -6487,7 +6487,7 @@ namespace Catch { + static bool isSet; + static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; + static stack_t oldSigStack; +- static char altStackMem[SIGSTKSZ]; ++ static void *altStackMem; + + static void handleSignal( int sig ) { + std::string name = "<unknown signal>"; +@@ -6506,6 +6506,7 @@ namespace Catch { + FatalConditionHandler() { + isSet = true; + stack_t sigStack; ++ altStackMem = new char [SIGSTKSZ](); + sigStack.ss_sp = altStackMem; + sigStack.ss_size = SIGSTKSZ; + sigStack.ss_flags = 0; +@@ -6521,6 +6522,7 @@ namespace Catch { + + ~FatalConditionHandler() { + reset(); ++ delete altStackMem; + } + static void reset() { + if( isSet ) { +@@ -6538,7 +6540,7 @@ namespace Catch { + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; ++ void *FatalConditionHandler::altStackMem = nullptr; + + } // namespace Catch + diff --git a/vkmark/Pkgfile b/vkmark/Pkgfile index ef77f8cf2..d53a2903d 100644 --- a/vkmark/Pkgfile +++ b/vkmark/Pkgfile @@ -1,18 +1,25 @@ # Description: vkmark is an extensible Vulkan benchmarking suite with targeted, configurable scenes # URL: https://github.com/vkmark/vkmark # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: assimp glm meson ninja vulkan-loader +# Depends on: assimp glm meson ninja wayland-protocols vulkan-loader +# Optional: xorg-xcb-util-wm name=vkmark -version=20200521 +version=20220318 release=1 -_commit=e8c0720f3251e50aa8e777f44e3c2406dceb919c -source=(https://github.com/vkmark/vkmark/archive/$_commit/$name-$version.tar.gz) +_commit=cf45f2faee236fd1118be2fcd27e4f2a91fc2e40 +source=(https://github.com/vkmark/vkmark/archive/$_commit/$name-$version.tar.gz + 38.patch) build() { + patch -Np1 -d $name-$_commit -i $SRC/38.patch + meson setup $name-$_commit build \ --prefix=/usr \ - --buildtype=plain + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true meson compile -C build DESTDIR=$PKG meson install -C build }