diff --git a/_service b/_service index 177670e..059c46f 100644 --- a/_service +++ b/_service @@ -1,14 +1,16 @@ - + git://github.com/vkmark/vkmark git + master enable vkmark 2017.08+git.%cd - + + *.tar xz - + diff --git a/vkmark-2017.08+git.20180530.tar.xz b/vkmark-2017.08+git.20180530.tar.xz deleted file mode 100644 index 1bac71a..0000000 --- a/vkmark-2017.08+git.20180530.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62dec7c09ba6b2944a96fa3cdb3a661f56828f2767c7233266373bc853e1865c -size 586720 diff --git a/vkmark-2017.08+git.20191115.obscpio b/vkmark-2017.08+git.20191115.obscpio new file mode 100644 index 0000000..b43f055 --- /dev/null +++ b/vkmark-2017.08+git.20191115.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:178951979a31c068d787ab6a400172b26b3e1c4937518adde9484a7d050639f2 +size 1777164 diff --git a/vkmark-skip-glm-dep-check.patch b/vkmark-skip-glm-dep-check.patch deleted file mode 100644 index 261af78..0000000 --- a/vkmark-skip-glm-dep-check.patch +++ /dev/null @@ -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 - ) diff --git a/vkmark.changes b/vkmark.changes index bc013de..54b9d84 100644 --- a/vkmark.changes +++ b/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 diff --git a/vkmark.obsinfo b/vkmark.obsinfo new file mode 100644 index 0000000..ea12458 --- /dev/null +++ b/vkmark.obsinfo @@ -0,0 +1,5 @@ +name: vkmark +version: 2017.08+git.20191115 +mtime: 1573809650 +commit: 54f29c885b2c2c9f6a083cdfd171dcc814c2a306 + diff --git a/vkmark.spec b/vkmark.spec index d18c559..0b3a5a2 100644 --- a/vkmark.spec +++ b/vkmark.spec @@ -1,8 +1,8 @@ # # spec file for package vkmark # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2018 Malcolm J Lewis +# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2018-2019 Malcolm J Lewis # # 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 -%patch0 -p1 +%autosetup %build %meson