Accepting request 750739 from benchmark

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

_service

@@ -1,14 +1,16 @@
 <services>
-  <service mode="disabled" name="tar_scm">
+  <service mode="disabled" name="obs_scm">
     <param name="url">git://github.com/vkmark/vkmark</param>
     <param name="scm">git</param>
+    <param name="revision">master</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">vkmark</param>
     <param name="versionformat">2017.08+git.%cd</param>
   </service>
-  <service mode="disabled" name="recompress">
+  <service mode="buildtime" name="tar" />
+  <service mode="buildtime" name="recompress">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
-  <service mode="disabled" name="set_version"/>
+  <service mode="disabled" name="set_version" />
 </services>

vkmark-2017.08+git.20180530.tar.xz

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

vkmark-2017.08+git.20191115.obscpio

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

vkmark-skip-glm-dep-check.patch

@@ -1,24 +0,0 @@
-diff -Naur a/meson.build b/meson.build
---- a/meson.build	2018-05-30 07:13:47.000000000 -0500
-+++ b/meson.build	2018-11-13 08:23:40.706757813 -0600
-@@ -17,7 +17,7 @@
- 
- vulkan_dep = cpp.find_library('vulkan')
- dl_dep = cpp.find_library('dl')
--glm_dep = dependency('glm')
-+
- assimp_dep = dependency('assimp')
- 
- xcb_dep = dependency('xcb', required : get_option('xcb') == 'true')
-diff -Naur a/src/meson.build b/src/meson.build
---- a/src/meson.build	2018-05-30 07:13:47.000000000 -0500
-+++ b/src/meson.build	2018-11-13 08:27:23.081524932 -0600
-@@ -52,7 +52,7 @@
-     'vkmark',
-     files('main.cpp') + vkutil_sources + scene_sources,
-     link_with: vkmark_core,
--    dependencies : [vulkan_dep, glm_dep, dl_dep],
-+    dependencies : [vulkan_dep, dl_dep],
-     link_args: ['-Wl,--dynamic-list=' + join_paths([meson.current_source_dir(), 'dynamic.list'])],
-     install : true
-     )

vkmark.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sun Nov 24 22:53:15 UTC 2019 - malcolmlewis@opensuse.org
+
+- Update to version 2017.08+git.20191115:
+  * ci: Add build and test github workflow.
+  * Fix build against glm-0.9.9.6.
+  * build: Specify meson version as 0.45.
+  * kms: Check the result of the vkCreateDmaBufImageINTEL call.
+  * kms: Add kms-atomic window system option.
+  * kms: Add atomic modesetting support.
+  * kms: Simplify creation of ManagedResource objects.
+  * scenes: Use vkutil::map_memory.
+  * vkutil: Add map_memory helper function.
+  * scenes: Use vkutil::SemaphoreBuilder.
+- Drop vkmark-skip-glm-dep-check.patch as this has been upstreamed.
+
 -------------------------------------------------------------------
 Tue Nov  5 07:48:56 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
 

vkmark.obsinfo

@@ -0,0 +1,5 @@
+name: vkmark
+version: 2017.08+git.20191115
+mtime: 1573809650
+commit: 54f29c885b2c2c9f6a083cdfd171dcc814c2a306
+

vkmark.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package vkmark
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
-# Copyright (c) 2018 Malcolm J Lewis <malcolmlewis@opensuse.org>
+# Copyright (c) 2018-2019 Malcolm J Lewis <malcolmlewis@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,12 @@
 
 
 Name:           vkmark
-Version:        2017.08+git.20180530
+Version:        2017.08+git.20191115
 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-skip-glm-dep-check.patch malcolmlewis@opensuse.org -- No pc file present in development package, so check fails.
-Patch0:         vkmark-skip-glm-dep-check.patch
 BuildRequires:  gcc-c++
 BuildRequires:  glm-devel
 BuildRequires:  meson
@@ -36,14 +34,13 @@ BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb-icccm)
-ExcludeArch:    %arm %ix86
+ExcludeArch:    %{arm} %{ix86}
 
 %description
 An extensible Vulkan benchmarking suite with targeted, configurable scenes.
 
 %prep
-%setup -q
+%autosetup
-%patch0 -p1
 
 %build
 %meson