forked from pool/gzdoom
Accepting request 922201 from games
- Update to release 4.7.0 OBS-URL: https://build.opensuse.org/request/show/922201 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gzdoom?expand=0&rev=18
This commit is contained in:
commit
0483843cc6
27
0001-gles-look-for-libGLESv2.so.2.patch
Normal file
27
0001-gles-look-for-libGLESv2.so.2.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 0fc59ec057f8ce4ae2a92821d6edb49da9be300e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Engelhardt <jengelh@inai.de>
|
||||||
|
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;
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
|
|
||||||
size 13937864
|
|
3
g4.7.0.tar.gz
Normal file
3
g4.7.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:60549ea3597496cadec97e4f6958422c22b4cf5d6693552cf4f8deeaca53efeb
|
||||||
|
size 14070204
|
@ -29,7 +29,7 @@ Index: gzdoom-g4.4.1/src/common/platform/posix/sdl/sdlglvideo.cpp
|
|||||||
polyvsync = vsync;
|
polyvsync = vsync;
|
||||||
|
|
||||||
+ Priv::DestroyWindow();
|
+ 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);
|
polyrendertarget = SDL_CreateRenderer(Priv::window, -1, vsync ? SDL_RENDERER_PRESENTVSYNC : 0);
|
||||||
if (!polyrendertarget)
|
if (!polyrendertarget)
|
||||||
{
|
{
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 22 11:26:37 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- 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
|
||||||
|
- Add 0001-gles-look-for-libGLESv2.so.2.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jul 28 11:24:38 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
|
Wed Jul 28 11:24:38 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: gzdoom
|
Name: gzdoom
|
||||||
Version: 4.6.1
|
Version: 4.7.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
|
||||||
@ -31,6 +31,7 @@ Patch2: gzdoom-lzma.patch
|
|||||||
Patch3: gzdoom-asmjit.patch
|
Patch3: gzdoom-asmjit.patch
|
||||||
Patch4: gzdoom-sdlbug.patch
|
Patch4: gzdoom-sdlbug.patch
|
||||||
Patch5: gzdoom-vulkan.patch
|
Patch5: gzdoom-vulkan.patch
|
||||||
|
Patch6: 0001-gles-look-for-libGLESv2.so.2.patch
|
||||||
BuildRequires: cmake >= 2.8.7
|
BuildRequires: cmake >= 2.8.7
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
@ -44,7 +45,7 @@ BuildRequires: pkgconfig(flac)
|
|||||||
BuildRequires: pkgconfig(gl)
|
BuildRequires: pkgconfig(gl)
|
||||||
BuildRequires: pkgconfig(gtk+-3.0)
|
BuildRequires: pkgconfig(gtk+-3.0)
|
||||||
BuildRequires: pkgconfig(openal)
|
BuildRequires: pkgconfig(openal)
|
||||||
BuildRequires: pkgconfig(sdl2)
|
BuildRequires: pkgconfig(sdl2) >= 2.0.6
|
||||||
BuildRequires: pkgconfig(zlib)
|
BuildRequires: pkgconfig(zlib)
|
||||||
%if 0%{?sle_version} >= 150200
|
%if 0%{?sle_version} >= 150200
|
||||||
BuildRequires: glslang-devel >= 6.3
|
BuildRequires: glslang-devel >= 6.3
|
||||||
@ -75,7 +76,7 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -qn %name-g%version
|
%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
|
%if 0%{?sle_version} >= 150200
|
||||||
%patch -P 5 -p1
|
%patch -P 5 -p1
|
||||||
rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan
|
rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan
|
||||||
|
Loading…
Reference in New Issue
Block a user