From 4cf5fa9f4ca903509170a668f46829f5c271d481d7255c42c63f004a9bb4bd68 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 22 Sep 2021 13:15:25 +0000 Subject: [PATCH 1/2] - Update to release 4.7.0 OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=58 --- 0001-gles-look-for-libGLESv2.so.2.patch | 27 +++++++++++++++++++++++++ g4.6.1.tar.gz | 3 --- g4.7.0.tar.gz | 3 +++ gzdoom-sdlbug.patch | 2 +- gzdoom.changes | 10 +++++++++ gzdoom.spec | 7 ++++--- 6 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 0001-gles-look-for-libGLESv2.so.2.patch delete mode 100644 g4.6.1.tar.gz create mode 100644 g4.7.0.tar.gz diff --git a/0001-gles-look-for-libGLESv2.so.2.patch b/0001-gles-look-for-libGLESv2.so.2.patch new file mode 100644 index 0000000..0204011 --- /dev/null +++ b/0001-gles-look-for-libGLESv2.so.2.patch @@ -0,0 +1,27 @@ +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.6.1.tar.gz b/g4.6.1.tar.gz deleted file mode 100644 index 456033b..0000000 --- a/g4.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7 -size 13937864 diff --git a/g4.7.0.tar.gz b/g4.7.0.tar.gz new file mode 100644 index 0000000..f2dcfee --- /dev/null +++ b/g4.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60549ea3597496cadec97e4f6958422c22b4cf5d6693552cf4f8deeaca53efeb +size 14070204 diff --git a/gzdoom-sdlbug.patch b/gzdoom-sdlbug.patch index a6ddd73..645576d 100644 --- a/gzdoom-sdlbug.patch +++ b/gzdoom-sdlbug.patch @@ -29,7 +29,7 @@ Index: gzdoom-g4.4.1/src/common/platform/posix/sdl/sdlglvideo.cpp polyvsync = vsync; + Priv::DestroyWindow(); -+ Priv::CreateWindow(Priv::VulkanWindowFlag | (Priv::softpolyEnabled ? SDL_WINDOW_HIDDEN : 0)); ++ Priv::CreateWindow(SDL_WINDOW_VULKAN | (Priv::softpolyEnabled ? SDL_WINDOW_HIDDEN : 0)); polyrendertarget = SDL_CreateRenderer(Priv::window, -1, vsync ? SDL_RENDERER_PRESENTVSYNC : 0); if (!polyrendertarget) { diff --git a/gzdoom.changes b/gzdoom.changes index 015781a..01a5dc6 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Sep 22 11:26:37 UTC 2021 - Jan Engelhardt + +- Update to release 4.7.0 + * GLES2 backend + * Widescreen graphics for Strife + * MBF21 support (beta) + * DEHEXTRA works properly now + * Various enhancements and fixes for ZScript + ------------------------------------------------------------------- Wed Jul 28 11:24:38 UTC 2021 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index 261f6db..a92564f 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -17,7 +17,7 @@ Name: gzdoom -Version: 4.6.1 +Version: 4.7.0 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only @@ -31,6 +31,7 @@ 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 @@ -44,7 +45,7 @@ BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(openal) -BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(sdl2) >= 2.0.6 BuildRequires: pkgconfig(zlib) %if 0%{?sle_version} >= 150200 BuildRequires: glslang-devel >= 6.3 @@ -75,7 +76,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 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 6 -p1 %if 0%{?sle_version} >= 150200 %patch -P 5 -p1 rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan From e62f17c2814b9c91ce6c44b1a06734e04899ded82d211f2cbb178f9277581e89 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 29 Sep 2021 14:32:39 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=59 --- gzdoom.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/gzdoom.changes b/gzdoom.changes index 01a5dc6..10b7495 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -7,6 +7,7 @@ Wed Sep 22 11:26:37 UTC 2021 - Jan Engelhardt * MBF21 support (beta) * DEHEXTRA works properly now * Various enhancements and fixes for ZScript +- Add 0001-gles-look-for-libGLESv2.so.2.patch ------------------------------------------------------------------- Wed Jul 28 11:24:38 UTC 2021 - Jan Engelhardt