From ee2fa2a671b98832e9ce6724fbf16cb86b3ed7f29d885ef96cdc68c1dfeae33e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 20 Oct 2021 22:10:35 +0000 Subject: [PATCH] - Update to release 4.7.1 OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=60 --- 0001-gles-look-for-libGLESv2.so.2.patch | 27 ------------------------- g4.7.0.tar.gz | 3 --- g4.7.1.tar.gz | 3 +++ gzdoom.changes | 10 +++++++++ gzdoom.spec | 5 ++--- 5 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 0001-gles-look-for-libGLESv2.so.2.patch delete mode 100644 g4.7.0.tar.gz create mode 100644 g4.7.1.tar.gz diff --git a/0001-gles-look-for-libGLESv2.so.2.patch b/0001-gles-look-for-libGLESv2.so.2.patch deleted file mode 100644 index 0204011..0000000 --- a/0001-gles-look-for-libGLESv2.so.2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0fc59ec057f8ce4ae2a92821d6edb49da9be300e Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Wed, 22 Sep 2021 14:41:30 +0200 -Subject: [PATCH] gles: look for libGLESv2.so.2 -References: https://github.com/coelckers/gzdoom/pull/1464 - -Distros do not have the .so files at all times, because those are -counted as development and not runtime. ---- - src/common/rendering/gles/gles_system.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: gzdoom-g4.7.0/src/common/rendering/gles/gles_system.cpp -=================================================================== ---- gzdoom-g4.7.0.orig/src/common/rendering/gles/gles_system.cpp -+++ gzdoom-g4.7.0/src/common/rendering/gles/gles_system.cpp -@@ -32,6 +32,10 @@ static void* LoadGLES2Proc(const char* n - { - glesLib = dlopen("libGLESv2.so", flags); - } -+ if(!glesLib) -+ { -+ glesLib = dlopen("libGLESv2.so.2", flags); -+ } - } - - void * ret = NULL; diff --git a/g4.7.0.tar.gz b/g4.7.0.tar.gz deleted file mode 100644 index f2dcfee..0000000 --- a/g4.7.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60549ea3597496cadec97e4f6958422c22b4cf5d6693552cf4f8deeaca53efeb -size 14070204 diff --git a/g4.7.1.tar.gz b/g4.7.1.tar.gz new file mode 100644 index 0000000..89f1432 --- /dev/null +++ b/g4.7.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:454257582be0576501eef1efc99fe7ea70f1c4d7993549db3cbc709ce75fc102 +size 19562412 diff --git a/gzdoom.changes b/gzdoom.changes index 10b7495..f847d4b 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 20 21:47:30 UTC 2021 - Jan Engelhardt + +- Update to release 4.7.1 + * Allow map markers to scale relative to automap zoom. + * Add cvars to control automap line alpha and thickness. + * Resolved a VM abort upon morphing while the tome of power is + active. +- Remove 0001-gles-look-for-libGLESv2.so.2.patch (merged) + ------------------------------------------------------------------- Wed Sep 22 11:26:37 UTC 2021 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index a92564f..7441a5d 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -17,7 +17,7 @@ Name: gzdoom -Version: 4.7.0 +Version: 4.7.1 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only @@ -31,7 +31,6 @@ Patch2: gzdoom-lzma.patch Patch3: gzdoom-asmjit.patch Patch4: gzdoom-sdlbug.patch Patch5: gzdoom-vulkan.patch -Patch6: 0001-gles-look-for-libGLESv2.so.2.patch BuildRequires: cmake >= 2.8.7 BuildRequires: gcc-c++ BuildRequires: libjpeg-devel @@ -76,7 +75,7 @@ GZDoom is a port (a modification) of the original Doom source code, featuring: %prep %setup -qn %name-g%version -%patch -P 1 -P 2 -P 3 -P 4 -P 6 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -p1 %if 0%{?sle_version} >= 150200 %patch -P 5 -p1 rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan