SHA256
1
0
forked from pool/vkquake

Accepting request 1042464 from home:bobbie424242:branches:games

- added patch fix-aarch64-build.patch
- Update to version 1.22.3
  * Mouse support in menus
  * Support for binding weapons in controls menu
- Update to version 1.22.1
  * Fix potential crashes on vid_restart
  * Fix validation error complaining that VK_FORMAT_R32_UINT doesn't
    support linear sampling
- Update to version 1.22.0
  * GPU driven rendering (r_indirect) - much better performance in
    certain scenes (thanks @temx)
  * Windows installer, detects existing Quake installations
  * vkquake.pak is embedded into the executable, external file no longer
    used
  * Configuration is now saved to vkQuake.cfg instead of config.cfg
  * Demo seek support (arrow keys seek 10s, shift+arrows seek 30s,
    seek command bindable to function keys: bind F1 "seek -3")
  * Demo recording is no longer interrupted when loading savegames
  * fastload command loads savegame without reloading level
    (bind F6 "save quick"; bind F9 "fastload quick")
  * Underwater sound filter (snd_waterfx 0 to disable)
  * viewsize 130 for clean screenshots (+/- keys to quickly select)
  * Built-in zooming support (togglezoom, +zoom/-zoom, zoom_fov, zoom_speed)
  * Model .scale support for mods/maps
  * Lightstyles no longer saturate at 2x brightness
  * CPU/GPU optimizations for maps with very large geometry/lightmap
    footprints
  * Fixed pitch-black entities in some Arcane Dimension levels
  * r_speeds works again, r_showbboxes shows edict numbers
  * Various other bug fixes

OBS-URL: https://build.opensuse.org/request/show/1042464
OBS-URL: https://build.opensuse.org/package/show/games/vkquake?expand=0&rev=31
This commit is contained in:
Martin Hauke 2022-12-12 21:44:57 +00:00 committed by Git OBS Bridge
parent 7130455f00
commit 71730cbb66
5 changed files with 70 additions and 8 deletions

31
fix-aarch64-build.patch Normal file
View File

@ -0,0 +1,31 @@
From a4298dcf0a56ddcdd7d81493ffa91fc3db109e0c Mon Sep 17 00:00:00 2001
From: Axel Gneiting <axelgneiting@gmail.com>
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;
}

View File

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

3
vkQuake-1.22.3.tar.gz Normal file
View File

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

View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Mon Dec 12 11:15:37 UTC 2022 - Michael Pujos <pujos.michael@gmail.com>
- added patch fix-aarch64-build.patch
- Update to version 1.22.3
* Mouse support in menus
* Support for binding weapons in controls menu
- Update to version 1.22.1
* Fix potential crashes on vid_restart
* Fix validation error complaining that VK_FORMAT_R32_UINT doesn't
support linear sampling
- Update to version 1.22.0
* GPU driven rendering (r_indirect) - much better performance in
certain scenes (thanks @temx)
* Windows installer, detects existing Quake installations
* vkquake.pak is embedded into the executable, external file no longer
used
* Configuration is now saved to vkQuake.cfg instead of config.cfg
* Demo seek support (arrow keys seek 10s, shift+arrows seek 30s,
seek command bindable to function keys: bind F1 "seek -3")
* Demo recording is no longer interrupted when loading savegames
* fastload command loads savegame without reloading level
(bind F6 "save quick"; bind F9 "fastload quick")
* Underwater sound filter (snd_waterfx 0 to disable)
* viewsize 130 for clean screenshots (+/- keys to quickly select)
* Built-in zooming support (togglezoom, +zoom/-zoom, zoom_fov, zoom_speed)
* Model .scale support for mods/maps
* Lightstyles no longer saturate at 2x brightness
* CPU/GPU optimizations for maps with very large geometry/lightmap
footprints
* Fixed pitch-black entities in some Arcane Dimension levels
* r_speeds works again, r_showbboxes shows edict numbers
* Various other bug fixes
-------------------------------------------------------------------
Sat Aug 13 14:21:37 UTC 2022 - Michael Pujos <pujos.michael@gmail.com>

View File

@ -18,7 +18,7 @@
Name: vkquake
Version: 1.20.3
Version: 1.22.3
Release: 0
Summary: Quake 1 port using Vulkan instead of OpenGL for rendering
License: GPL-2.0-or-later
@ -28,6 +28,7 @@ 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: pkgconfig
BuildRequires: vulkan-devel
BuildRequires: pkgconfig(flac)
@ -67,12 +68,10 @@ sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" Quake/host.c
USE_CODEC_MIKMOD=1 \
USE_CODEC_UMX=1 \
USE_CODEC_MP3=0
%make_build -C Misc/vq_pak
strip Quake/vkquake
%install
install -Dm755 Quake/vkquake %{buildroot}%{_bindir}/%{name}
install -Dm644 Misc/vq_pak/vkquake.pak %{buildroot}%{_datadir}/games/%{name}/%{name}.pak
install -D -p -m 644 Misc/vkQuake_512.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -D -p -m 644 %{SOURCE100} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
install -D -p -m 644 %{SOURCE101} %{buildroot}%{_datadir}/applications/%{name}.desktop
@ -80,11 +79,9 @@ install -D -p -m 644 %{SOURCE101} %{buildroot}%{_datadir}/applications/%{name}.d
%files
%license LICENSE.txt
%doc readme.md Misc/fitzquake080.txt Misc/fitzquake080sdl.txt Misc/fitzquake085.txt
%dir %{_datadir}/games/%{name}/
%{_bindir}/%{name}
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/games/%{name}/%{name}.pak
%{_datadir}/pixmaps/%{name}.png
%changelog