Accepting request 986002 from benchmark

OBS-URL: https://build.opensuse.org/request/show/986002
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vkmark?expand=0&rev=9

_service

@@ -1,6 +1,6 @@
 <services>
   <service mode="disabled" name="obs_scm">
-    <param name="url">git://github.com/vkmark/vkmark</param>
+    <param name="url">https://github.com/vkmark/vkmark</param>
     <param name="scm">git</param>
     <param name="revision">master</param>
     <param name="changesgenerate">enable</param>

_servicedata

@@ -1,4 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">git://github.com/vkmark/vkmark</param>
-              <param name="changesrevision">cf45f2faee236fd1118be2fcd27e4f2a91fc2e40</param></service></servicedata>
+              <param name="changesrevision">cf45f2faee236fd1118be2fcd27e4f2a91fc2e40</param></service><service name="tar_scm">
+                <param name="url">https://github.com/vkmark/vkmark</param>
+              <param name="changesrevision">d872846e2e7c47010c11227eb713d00ccfdd35c6</param></service></servicedata>

vkmark-2017.08+git.20211008.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7bcd4779b74257dc1d036a59b5ccbdeddd8ad9ee84e69778cbdd0488c277ae7e
-size 1793036

vkmark-2017.08+git.20220516.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a03046478b3be37335e2f7c3a56cd3829bc352a4a01e25ee36fdbd2dc784ddec
+size 2030092

vkmark-sigstksz-not-constant.patch

@@ -1,30 +0,0 @@
-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 = "<unknown signal>";
-@@ -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
- 

vkmark.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jun 28 16:32:42 UTC 2022 - malcolmlewis@opensuse.org
+
+- Update to version 2017.08+git.20220516:
+  * vkutil: Fix compilation with older vulkan-hpp versions
+  * vkutil: Avoid deprecated vk::ResultValue implicit cast
+  * tests: Update catch.hpp to v2.13.9
+- Drop vkmark-sigstksz-not-constant.patch as this is upstreamed.
+
 -------------------------------------------------------------------
 Mon Dec 20 13:32:45 UTC 2021 - malcolmlewis@opensuse.org
 

vkmark.obsinfo

@@ -1,5 +1,4 @@
 name: vkmark
-version: 2017.08+git.20211008
+version: 2017.08+git.20220516
-mtime: 1633693616
+mtime: 1652699223
-commit: cf45f2faee236fd1118be2fcd27e4f2a91fc2e40
+commit: d872846e2e7c47010c11227eb713d00ccfdd35c6
-

vkmark.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package vkmark
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2018-2019 Malcolm J Lewis <malcolmlewis@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,14 +18,12 @@
 
 
 Name:           vkmark
-Version:        2017.08+git.20211008
+Version:        2017.08+git.20220516
 Release:        0
 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
@@ -46,7 +44,7 @@ BuildRequires:  Mesa-libVulkan-devel
 An extensible Vulkan benchmarking suite with targeted, configurable scenes.
 
 %prep
-%autosetup -p1
+%autosetup
 
 %build
 %meson