From 53c8840e83a6d237251ac84a610cedf047be45b165d42b9302bb332624a1ad2b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 24 Nov 2022 13:57:31 +0000 Subject: [PATCH] - Update to version 2017.08+git.20220909: * Fix missing includes - Drop vkmark-fix-missing-include.patch OBS-URL: https://build.opensuse.org/package/show/benchmark/vkmark?expand=0&rev=23 --- _servicedata | 2 +- vkmark-2017.08+git.20220516.obscpio | 3 -- vkmark-2017.08+git.20220909.obscpio | 3 ++ vkmark-fix-missing-include.patch | 66 ----------------------------- vkmark.changes | 7 +++ vkmark.obsinfo | 6 +-- vkmark.spec | 6 +-- 7 files changed, 16 insertions(+), 77 deletions(-) delete mode 100644 vkmark-2017.08+git.20220516.obscpio create mode 100644 vkmark-2017.08+git.20220909.obscpio delete mode 100644 vkmark-fix-missing-include.patch diff --git a/_servicedata b/_servicedata index 6c2b921..c7a3a9c 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,4 @@ git://github.com/vkmark/vkmark cf45f2faee236fd1118be2fcd27e4f2a91fc2e40 https://github.com/vkmark/vkmark - d872846e2e7c47010c11227eb713d00ccfdd35c6 \ No newline at end of file + 30d2cd37f0566589d90914501fc7c51a4e51f559 \ No newline at end of file diff --git a/vkmark-2017.08+git.20220516.obscpio b/vkmark-2017.08+git.20220516.obscpio deleted file mode 100644 index 196e742..0000000 --- a/vkmark-2017.08+git.20220516.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a03046478b3be37335e2f7c3a56cd3829bc352a4a01e25ee36fdbd2dc784ddec -size 2030092 diff --git a/vkmark-2017.08+git.20220909.obscpio b/vkmark-2017.08+git.20220909.obscpio new file mode 100644 index 0000000..82d3102 --- /dev/null +++ b/vkmark-2017.08+git.20220909.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd93d1fbc3c0ade852fb2fcb9888d6177a42dace016e8e1fad74a26bcb696e1c +size 2030092 diff --git a/vkmark-fix-missing-include.patch b/vkmark-fix-missing-include.patch deleted file mode 100644 index 9424962..0000000 --- a/vkmark-fix-missing-include.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Nuar a/src/scenes/clear_scene.h b/src/scenes/clear_scene.h ---- a/src/scenes/clear_scene.h 2022-05-16 06:07:03.000000000 -0500 -+++ b/src/scenes/clear_scene.h 2022-09-08 19:58:27.886194974 -0500 -@@ -26,6 +26,7 @@ - #include "managed_resource.h" - - #include -+#include - - class ClearScene : public Scene - { -diff -Nuar a/src/scenes/cube_scene.h b/src/scenes/cube_scene.h ---- a/src/scenes/cube_scene.h 2022-05-16 06:07:03.000000000 -0500 -+++ b/src/scenes/cube_scene.h 2022-09-08 21:28:27.850891178 -0500 -@@ -28,6 +28,7 @@ - #define GLM_FORCE_DEPTH_ZERO_TO_ONE - #include - #include -+#include - - class Mesh; - -diff -Nuar a/src/scenes/shading_scene.h b/src/scenes/shading_scene.h ---- a/src/scenes/shading_scene.h 2022-05-16 06:07:03.000000000 -0500 -+++ b/src/scenes/shading_scene.h 2022-09-08 21:25:04.926605452 -0500 -@@ -28,6 +28,7 @@ - #define GLM_FORCE_DEPTH_ZERO_TO_ONE - #include - #include -+#include - - class Mesh; - -diff -Nuar a/src/scenes/texture_scene.h b/src/scenes/texture_scene.h ---- a/src/scenes/texture_scene.h 2022-05-16 06:07:03.000000000 -0500 -+++ b/src/scenes/texture_scene.h 2022-09-08 21:27:43.270815188 -0500 -@@ -29,6 +29,7 @@ - #define GLM_FORCE_DEPTH_ZERO_TO_ONE - #include - #include -+#include - - class Mesh; - -diff -Nuar a/src/scenes/vertex_scene.h b/src/scenes/vertex_scene.h ---- a/src/scenes/vertex_scene.h 2022-05-16 06:07:03.000000000 -0500 -+++ b/src/scenes/vertex_scene.h 2022-09-08 21:26:03.666702531 -0500 -@@ -28,6 +28,7 @@ - #define GLM_FORCE_DEPTH_ZERO_TO_ONE - #include - #include -+#include - - class Mesh; - -diff -Nuar a/src/ws/swapchain_window_system.h b/src/ws/swapchain_window_system.h ---- a/src/ws/swapchain_window_system.h 2022-05-16 06:07:03.000000000 -0500 -+++ b/src/ws/swapchain_window_system.h 2022-09-08 21:22:49.954381004 -0500 -@@ -27,6 +27,7 @@ - #include "managed_resource.h" - - #include -+#include - - class NativeSystem; - diff --git a/vkmark.changes b/vkmark.changes index c97e8f1..1ec14cf 100644 --- a/vkmark.changes +++ b/vkmark.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 24 13:55:41 UTC 2022 - Martin Pluskal + +- Update to version 2017.08+git.20220909: + * Fix missing includes +- Drop vkmark-fix-missing-include.patch + ------------------------------------------------------------------- Fri Sep 9 02:29:34 UTC 2022 - malcolmlewis@opensuse.org diff --git a/vkmark.obsinfo b/vkmark.obsinfo index cbf8edd..ceb84b7 100644 --- a/vkmark.obsinfo +++ b/vkmark.obsinfo @@ -1,4 +1,4 @@ name: vkmark -version: 2017.08+git.20220516 -mtime: 1652699223 -commit: d872846e2e7c47010c11227eb713d00ccfdd35c6 +version: 2017.08+git.20220909 +mtime: 1662722968 +commit: 30d2cd37f0566589d90914501fc7c51a4e51f559 diff --git a/vkmark.spec b/vkmark.spec index 275e7fe..7c09c8b 100644 --- a/vkmark.spec +++ b/vkmark.spec @@ -18,14 +18,12 @@ Name: vkmark -Version: 2017.08+git.20220516 +Version: 2017.08+git.20220909 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-fix-missing-include.patch malcolmlewis@opensuse.org -- Add missing memory include to fix building -Patch0: vkmark-fix-missing-include.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