From fb33948442e8e9eaa560a17072fd21638ac52d8f030035fb5fbc5d9df6f430c2 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Tue, 14 Mar 2023 20:29:18 +0000 Subject: [PATCH] Accepting request 1071513 from home:bobbie424242:branches:games - removed patch fix-aarch64-build.patch, not needed anymore - requires vulkan-devel >= 1.2.162 - Update to version 1.33.0 * Support for remastered models (Needs data from remastered Quake) * Support for dynamic lightmap shadows (requires an RT capable GPU) * Reworked all option menus * Support for modern HUD style * Transparency sorting (thanks @temx) * Dynamic lights are now computed in world instead of texel space for more consistent light sizes * New GPU memory allocator * Improved level load times OBS-URL: https://build.opensuse.org/request/show/1071513 OBS-URL: https://build.opensuse.org/package/show/games/vkquake?expand=0&rev=33 --- fix-aarch64-build.patch | 31 ------------------------------- vkQuake-1.22.3.tar.gz | 3 --- vkQuake-1.30.0.tar.gz | 3 +++ vkquake.changes | 15 +++++++++++++++ vkquake.spec | 10 +++++----- 5 files changed, 23 insertions(+), 39 deletions(-) delete mode 100644 fix-aarch64-build.patch delete mode 100644 vkQuake-1.22.3.tar.gz create mode 100644 vkQuake-1.30.0.tar.gz diff --git a/fix-aarch64-build.patch b/fix-aarch64-build.patch deleted file mode 100644 index 04b8b8d..0000000 --- a/fix-aarch64-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a4298dcf0a56ddcdd7d81493ffa91fc3db109e0c Mon Sep 17 00:00:00 2001 -From: Axel Gneiting -Date: Mon, 12 Dec 2022 10:56:35 -0800 -Subject: [PATCH] Linux ARM compile fixes - ---- - Quake/r_brush.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Quake/r_brush.c b/Quake/r_brush.c -index f416226e..b259b045 100644 ---- a/Quake/r_brush.c -+++ b/Quake/r_brush.c -@@ -2211,7 +2211,7 @@ void R_AccumulateLightmap (byte *lightmap, unsigned scale, int texels) - while (size >= 8) - { - uint8x8_t lm_uint_8x8 = vld1_u8 (lightmap); -- uint16x8_t lm_uint_16x8 = vmovl_s8 (lm_uint_8x8); -+ uint16x8_t lm_uint_16x8 = vmovl_u8 (lm_uint_8x8); - - uint32x4_t lm_old_low_4x32bit = vld1q_u32 (bl); - uint16x4_t lm_uint_low_16x4 = vget_low_u16 (lm_uint_16x8); -@@ -2279,7 +2279,7 @@ void R_StoreLightmap (byte *dest, int width, int height, int stride) - uint16x4_t lm_shifted_16x4_masked = vset_lane_u16 (0xFF, lm_shifted_16x4, 3); - uint16x8_t lm_shifted_16x8 = vcombine_u16 (lm_shifted_16x4_masked, vcreate_u16 (0)); - uint8x8_t lm_shifted_saturated_8x8 = vqmovn_u16 (lm_shifted_16x8); -- uint32x2_t lm_shifted_saturated_32x2 = vreinterpret_s32_u8 (lm_shifted_saturated_8x8); -+ uint32x2_t lm_shifted_saturated_32x2 = vreinterpret_u32_u8 (lm_shifted_saturated_8x8); - ((uint32_t *)dest)[i] = vget_lane_u32 (lm_shifted_saturated_32x2, 0); - src += 3; - } diff --git a/vkQuake-1.22.3.tar.gz b/vkQuake-1.22.3.tar.gz deleted file mode 100644 index b3a24b1..0000000 --- a/vkQuake-1.22.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e0bcf9bb82a2c514f1474fa74ef1d63502c780331e44634e31a5b5902be8a85 -size 47717524 diff --git a/vkQuake-1.30.0.tar.gz b/vkQuake-1.30.0.tar.gz new file mode 100644 index 0000000..0be73a2 --- /dev/null +++ b/vkQuake-1.30.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:073c8f0f734d0c2404e3ad77e9c8be56048b7569b147a1a0e5b292bf964a9a60 +size 47516157 diff --git a/vkquake.changes b/vkquake.changes index 4e639e3..10de351 100644 --- a/vkquake.changes +++ b/vkquake.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Mar 14 12:33:56 UTC 2023 - Michael Pujos + +- removed patch fix-aarch64-build.patch, not needed anymore +- requires vulkan-devel >= 1.2.162 +- Update to version 1.33.0 + * Support for remastered models (Needs data from remastered Quake) + * Support for dynamic lightmap shadows (requires an RT capable GPU) + * Reworked all option menus + * Support for modern HUD style + * Transparency sorting (thanks @temx) + * Dynamic lights are now computed in world instead of texel space for more consistent light sizes + * New GPU memory allocator + * Improved level load times + ------------------------------------------------------------------- Mon Dec 12 11:15:37 UTC 2022 - Michael Pujos diff --git a/vkquake.spec b/vkquake.spec index 219bd45..5f7d189 100644 --- a/vkquake.spec +++ b/vkquake.spec @@ -1,7 +1,7 @@ # # spec file for package vkquake # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2017 Luke Jones # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: vkquake -Version: 1.22.3 +Version: 1.30.0 Release: 0 Summary: Quake 1 port using Vulkan instead of OpenGL for rendering License: GPL-2.0-or-later @@ -28,9 +28,9 @@ Source: https://github.com/Novum/vkQuake/archive/refs/tags/%{version}.ta Source99: %{name}.changes Source100: appdata.xml Source101: %{name}.desktop -Patch0: fix-aarch64-build.patch +BuildRequires: glslang-devel BuildRequires: pkgconfig -BuildRequires: vulkan-devel +BuildRequires: vulkan-devel >= 1.2.162 BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(libmikmod) BuildRequires: pkgconfig(opus) @@ -43,7 +43,7 @@ vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering. It is ba Game data must be placed in ~/.vkquake/id1 . %prep -%autosetup -p1 -n vkQuake-%{version} +%autosetup -n vkQuake-%{version} %if 0%{?sle_version} < 150200 sed -i 's#vulkan_core.h#vulkan.h#' Quake/quakedef.h