forked from pool/vkquake
- updated build to use meson rather than plain Makefiles
- removed fix_maybe-uninitialized_error.patch not needed anymore - update to version 1.31.0 OBS-URL: https://build.opensuse.org/package/show/games/vkquake?expand=0&rev=40
This commit is contained in:
Martin Hauke
Git OBS Bridge
parent
c6b51b575d
commit
52bf5de6bf
@ -1,36 +0,0 @@
|
||||
From 19d76588037977f59506c18aa3d307f8f5124d0f Mon Sep 17 00:00:00 2001
|
||||
From: Axel Gneiting <axelgneiting@gmail.com>
|
||||
Date: Sat, 29 Apr 2023 17:59:07 -0700
|
||||
Subject: [PATCH] Fix warnings with GCC 13
|
||||
|
||||
Those were not actual bugs
|
||||
---
|
||||
Quake/gl_heap.c | 2 +-
|
||||
Quake/sv_phys.c | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Quake/gl_heap.c b/Quake/gl_heap.c
|
||||
index d2a0ccfa2..db55ad0b0 100644
|
||||
--- a/Quake/gl_heap.c
|
||||
+++ b/Quake/gl_heap.c
|
||||
@@ -645,7 +645,7 @@ glheapallocation_t *GL_HeapAllocate (glheap_t *heap, VkDeviceSize size, VkDevice
|
||||
|
||||
if (size < heap->segment_size)
|
||||
{
|
||||
- allocinfo_t alloc_info;
|
||||
+ ZEROED_STRUCT (allocinfo_t, alloc_info);
|
||||
const VkDeviceSize size_alignment_max = q_max (size, alignment);
|
||||
alloc_info.is_small_alloc = size_alignment_max <= heap->page_size / 2;
|
||||
if (alloc_info.is_small_alloc)
|
||||
diff --git a/Quake/sv_phys.c b/Quake/sv_phys.c
|
||||
index 3f57f53e2..f214aea22 100644
|
||||
--- a/Quake/sv_phys.c
|
||||
+++ b/Quake/sv_phys.c
|
||||
@@ -276,6 +276,7 @@ int SV_FlyMove (edict_t *ent, float time, trace_t *steptrace)
|
||||
blocked = 0;
|
||||
VectorCopy (ent->v.velocity, original_velocity);
|
||||
VectorCopy (ent->v.velocity, primal_velocity);
|
||||
+ VectorCopy (ent->v.velocity, new_velocity);
|
||||
numplanes = 0;
|
||||
|
||||
time_left = time;
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b88d3dfc869d89820766e2dd18bdadb9681adfc4c9d05e09cbbebcc17ef1d150
|
||||
size 47516278
|
||||
3
vkQuake-1.31.0.tar.gz
Normal file
3
vkQuake-1.31.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:25b821e1644145026f3e2a43d04647ca88d954e027813bd9a809442f429e15a9
|
||||
size 28379094
|
||||
@ -1,3 +1,38 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 22 14:31:43 UTC 2024 - Michael Pujos <pujos.michael@gmail.com>
|
||||
|
||||
- updated build to use meson rather than plain Makefiles
|
||||
- removed fix_maybe-uninitialized_error.patch not needed anymore
|
||||
- Update to version 1.31.0
|
||||
* Improvements
|
||||
- Support r_skyalpha
|
||||
- Added Support for JPEG and PNG texture format
|
||||
- Support demos larger than 2 GiB
|
||||
- Many performance optimizations by @andrei-drexler from Ironwail
|
||||
- Increased internal limits on the number of models, triangles,
|
||||
sounds...etc. for the most demanding mods
|
||||
- We can now play Slayers Testaments.
|
||||
- Increase chase cam target trace distance for large open maps
|
||||
- Add set and seta commands
|
||||
- Add 2+3 arg forms of the toggle command
|
||||
- Backport angled sprites code from FTEQW
|
||||
- Tweak scr_viewsize 130 (hide pause, momentarily show notices)
|
||||
- Multithreading performance improvements by @Novum and @temx
|
||||
- Library updates
|
||||
- Code cleanups
|
||||
* Fixes
|
||||
- Clear button status on map load to prevent stray fires/jumps
|
||||
- Fix Dutch angle VP_PARALLEL_UPRIGHT sprites
|
||||
- Fix potential buffer overflow in COM_Parse
|
||||
- Fix potential buffer overflow in Mod_LoadAliasFrame
|
||||
- Fix potential infinite loop in S_PaintChannels
|
||||
- Work around some collision issues by @Macil
|
||||
- Give the cvars generated from float+vector autocvars prettier
|
||||
default/initial values
|
||||
- Fix viewmodel interpolation with >10Hz animations
|
||||
- Remove annoying '... is unbound, hit F4 to set' message
|
||||
- Fix 'S_FindName: out of sfx_t' errors when switching Mods / maps
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 19 15:47:12 UTC 2024 - Carsten Ziepke <kieltux@gmail.com>
|
||||
|
||||
@ -11,7 +46,7 @@ Fri May 5 15:53:59 UTC 2023 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferr
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 18 19:13:47 UTC 2023 - Martin Hauke <mardnh@gmx.de>
|
||||
|
||||
- Update to version 1.33.1
|
||||
- Update to version 1.30.1
|
||||
* Add a workaround for AMD driver bug causing corrupted sky and
|
||||
a minor Vulkan correctness fix.
|
||||
|
||||
@ -20,7 +55,7 @@ Tue Mar 14 12:33:56 UTC 2023 - Michael Pujos <pujos.michael@gmail.com>
|
||||
|
||||
- removed patch fix-aarch64-build.patch, not needed anymore
|
||||
- requires vulkan-devel >= 1.2.162
|
||||
- Update to version 1.33.0
|
||||
- Update to version 1.30.0
|
||||
* Support for remastered models (Needs data from remastered Quake)
|
||||
* Support for dynamic lightmap shadows (requires an RT capable GPU)
|
||||
* Reworked all option menus
|
||||
|
||||
28
vkquake.spec
28
vkquake.spec
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
Name: vkquake
|
||||
Version: 1.30.1
|
||||
Version: 1.31.0
|
||||
Release: 0
|
||||
Summary: Quake 1 port using Vulkan instead of OpenGL for rendering
|
||||
License: GPL-2.0-or-later
|
||||
@ -28,13 +28,16 @@ Source: https://github.com/Novum/vkQuake/archive/refs/tags/%{version}.ta
|
||||
Source99: %{name}.changes
|
||||
Source100: appdata.xml
|
||||
Source101: %{name}.desktop
|
||||
# PATCH-FIX-UPSTREAM https://github.com/Novum/vkQuake/issues/688
|
||||
Patch1: fix_maybe-uninitialized_error.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: glslang-devel
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: spirv-tools
|
||||
# from quakedef.h "Vulkan is too old" preprocessor check
|
||||
BuildRequires: vulkan-devel >= 1.2.162
|
||||
BuildRequires: pkgconfig(flac)
|
||||
BuildRequires: pkgconfig(libmikmod)
|
||||
BuildRequires: pkgconfig(mad)
|
||||
BuildRequires: pkgconfig(opus)
|
||||
BuildRequires: pkgconfig(opusfile)
|
||||
BuildRequires: pkgconfig(sdl2)
|
||||
@ -51,7 +54,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 -n vkQuake-%{version} -p1
|
||||
%autosetup -n vkQuake-%{version}
|
||||
|
||||
# Drop pre-compiled Windows stuff
|
||||
rm Windows -fr
|
||||
@ -63,22 +66,11 @@ TIME="\"$(date -d "${modified}" "+%%R")\""
|
||||
sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" Quake/host.c
|
||||
|
||||
%build
|
||||
%make_build -C Quake \
|
||||
%if 0%{?sle_version} >= 150500 && 0%{?sle_version} < 160000 && 0%{?is_opensuse}
|
||||
CC='/usr/bin/gcc-11' \
|
||||
%endif
|
||||
STRIP=": do not strip:" \
|
||||
DO_USERDIRS=1 \
|
||||
USE_SDL2=1 \
|
||||
USE_CODEC_FLAC=1 \
|
||||
USE_CODEC_OPUS=1 \
|
||||
USE_CODEC_MIKMOD=1 \
|
||||
USE_CODEC_UMX=1 \
|
||||
USE_CODEC_MP3=0
|
||||
strip Quake/vkquake
|
||||
%meson -Ddo_userdirs=enabled
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
install -Dm755 Quake/vkquake %{buildroot}%{_bindir}/%{name}
|
||||
install -Dm755 %{_vpath_builddir}/vkquake %{buildroot}%{_bindir}/%{name}
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user