SHA256
1
0
forked from pool/gzdoom

- Update to release 4.10.0

OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=94
This commit is contained in:
Jan Engelhardt 2022-12-04 15:46:47 +00:00 committed by Git OBS Bridge
parent b828aa4e46
commit a404f45510
5 changed files with 17 additions and 68 deletions

View File

@ -1,59 +0,0 @@
From 040fafaf7260b51031e20d850aa5358c0a7bd9a7 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 5 Nov 2022 22:30:07 +0100
Subject: [PATCH] build: unbreak compilation on Linux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
gzdoom/src/d_anonstats.cpp:14:10: fatal error: i_mainwindow.h: No such file or directory
14 | #include "i_mainwindow.h"
| ^~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [src/CMakeFiles/zdoom.dir/build.make:1441: src/CMakeFiles/zdoom.dir/d_anonstats.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/Makefile2:959: src/CMakeFiles/zdoom.dir/all] Error 2
make: *** [Makefile:136: all] Error 2
gzdoom/src/d_anonstats.cpp:126:17: error: actor was not declared in this scope; did you mean AActor?
126 | actor-> return false; // no host, disable
| ^~~~~
| AActor
$ find . -name "i_mainw*"
./src/common/platform/win32/i_mainwindow.h
./src/common/platform/win32/i_mainwindow.cpp
Fixes: g4.5pre-1327-g6670bc09b
Fixes: g4.9pre-359-g082818405
---
src/d_anonstats.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/d_anonstats.cpp b/src/d_anonstats.cpp
index 1dcd05824..2e1456259 100644
--- a/src/d_anonstats.cpp
+++ b/src/d_anonstats.cpp
@@ -11,9 +11,8 @@ void D_ConfirmSendStats()
#else // !NO_SEND_STATS
-#include "i_mainwindow.h"
-
#if defined(_WIN32)
+#include "i_mainwindow.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winsock2.h>
@@ -121,7 +120,7 @@ bool I_HTTPRequest(const char* request)
bool I_HTTPRequest(const char* request)
{
if ((*sys_statshost)[0] == 0)
- actor-> return false; // no host, disable
+ return false; // no host, disable
int sockfd, portno, n;
struct sockaddr_in serv_addr;
--
2.38.0

3
g4.10.0.tar.gz Normal file
View File

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

View File

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

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Dec 4 15:39:27 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Update to release 4.10.0
* Map<K,V> and MapIterator<K,V> for ZScript
* Quaternion support for model rotations
* Improved IQM support
- Delete 0001-build-unbreak-compilation-on-Linux.patch (merged)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Nov 6 23:02:58 UTC 2022 - Jan Engelhardt <jengelh@inai.de> Sun Nov 6 23:02:58 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

View File

@ -17,18 +17,17 @@
Name: gzdoom Name: gzdoom
Version: 4.9.0 Version: 4.10.0
Release: 0 Release: 0
Summary: A DOOM source port with graphic and modding extensions Summary: A DOOM source port with graphic and modding extensions
License: GPL-3.0-only License: GPL-3.0-only
Group: Amusements/Games/3D/Shoot Group: Amusements/Games/3D/Shoot
URL: https://zdoom.org/ URL: https://zdoom.org/
#Git-Clone: https://github.com/coelckers/gzdoom #Git-Clone: https://github.com/zdoom/gzdoom
Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz Source: https://github.com/zdoom/gzdoom/archive/g%version.tar.gz
Patch1: gzdoom-waddir.patch Patch1: gzdoom-waddir.patch
Patch2: gzdoom-lzma.patch Patch2: gzdoom-lzma.patch
Patch3: 0001-build-unbreak-compilation-on-Linux.patch
Patch5: gzdoom-vulkan.patch Patch5: gzdoom-vulkan.patch
Patch6: gzdoom-discord.patch Patch6: gzdoom-discord.patch
Patch8: 0001-removed-some-32bit-only-CMake-code.patch Patch8: 0001-removed-some-32bit-only-CMake-code.patch
@ -51,7 +50,7 @@ BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
BuildRequires: glslang-devel >= 11.10 BuildRequires: glslang-devel >= 11.10
BuildRequires: pkgconfig(vulkan) >= 1.2.162 BuildRequires: pkgconfig(vulkan) >= 1.2.189
%else %else
Provides: bundled(glslang) = 11.10.0 Provides: bundled(glslang) = 11.10.0
Provides: bundled(vulkan) = 1.2.189.1 Provides: bundled(vulkan) = 1.2.189.1
@ -61,7 +60,7 @@ Provides: qzdoom = 1.3.0
Provides: zdoom = 2.8.1 Provides: zdoom = 2.8.1
Provides: bundled(gdtoa) Provides: bundled(gdtoa)
Provides: bundled(re2c) = 0.16.0 Provides: bundled(re2c) = 0.16.0
Provides: bundled(xbrz) = 1.7 Provides: bundled(xbrz) = 1.8
%description %description
GZDoom is a port (a modification) of the original Doom source code, featuring: GZDoom is a port (a modification) of the original Doom source code, featuring: