[packages/gemrb] up to 0.9.3
atler
atler at pld-linux.org
Fri Aug 2 20:02:17 CEST 2024
commit 0b2aa7bb82e909b89064e47ffb88cbd2dc7f1d61
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Aug 2 19:44:19 2024 +0200
up to 0.9.3
gemrb-config_file.patch | 29 +++----------------
gemrb-gles.patch | 75 -------------------------------------------------
gemrb.spec | 19 ++++++-------
3 files changed, 13 insertions(+), 110 deletions(-)
---
diff --git a/gemrb.spec b/gemrb.spec
index d04b9fa..e2344b4 100644
--- a/gemrb.spec
+++ b/gemrb.spec
@@ -1,33 +1,32 @@
#
# Conditional build:
-%bcond_with gles # build GLES backend
+%bcond_with gles # build GLES backend (broken)
Summary: Emulator of BioWare's Infinity game engine
Summary(pl.UTF-8): Emulator silnika gier Infinity firmy BioWare
Name: gemrb
-Version: 0.8.7
+Version: 0.9.3
Release: 0.1
License: GPL v2+
Group: Applications/Emulators
Source0: https://downloads.sourceforge.net/gemrb/%{name}-%{version}-sources.tar.gz
-# Source0-md5: d1bf1dd8ca03ce9649b52240d363f357
+# Source0-md5: c64c502ae714ed7ff8b3057cd8937a01
Patch0: %{name}-config_file.patch
-Patch1: %{name}-gles.patch
URL: http://gemrb.sourceforge.net/
BuildRequires: OpenAL-devel
%{!?with_gles:BuildRequires: OpenGL-devel}
%{?with_gles:BuildRequires: OpenGLESv2-devel}
BuildRequires: SDL2-devel
BuildRequires: SDL2_mixer-devel
-BuildRequires: cmake >= 3.1
+BuildRequires: cmake >= 3.19
BuildRequires: freetype-devel
%{!?with_gles:BuildRequires: glew-devel}
BuildRequires: libpng-devel
-BuildRequires: libstdc++-devel >= 6:4.8.1
+BuildRequires: libstdc++-devel >= 6:5
BuildRequires: libvorbis-devel
BuildRequires: pkgconfig
-BuildRequires: python-devel >= 1:2.3.0
-BuildRequires: python-modules
+BuildRequires: python3-devel
+BuildRequires: python3-modules
BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: vlc-devel
BuildRequires: zlib-devel
@@ -50,9 +49,8 @@ Linux/Unix, MacOS i Windows. Silnik posiada kilka ulepszeń.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%{__sed} -i -e '1s,/usr/bin/python$,%{__python},' admin/extend2da.py
+%{__sed} -i -e '1s,/usr/bin/python$,%{__python3},' admin/extend2da.py
%build
install -d build
@@ -108,3 +106,4 @@ rm -rf $RPM_BUILD_ROOT
%{_desktopdir}/gemrb.desktop
%{_iconsdir}/hicolor/scalable/apps/gemrb.svg
%{_pixmapsdir}/gemrb.png
+%{_datadir}/metainfo/org.gemrb.gemrb.metainfo.xml
diff --git a/gemrb-config_file.patch b/gemrb-config_file.patch
index 0fe71ed..8e9bf7c 100644
--- a/gemrb-config_file.patch
+++ b/gemrb-config_file.patch
@@ -1,32 +1,11 @@
--- gemrb-0.8.7/gemrb/GemRB.cfg.sample.in.orig 2021-04-23 12:11:03.909680837 +0200
+++ gemrb-0.8.7/gemrb/GemRB.cfg.sample.in 2021-04-23 12:16:48.730617624 +0200
-@@ -157,7 +157,7 @@
- # Remember, EE versions are not supported! #
- #####################################################
-
--GamePath=/mnt/windows/Programmi/Black Isle/BGII - SoA/
-+GamePath=./
- # only set these if the folders are not in your GamePath
- #CD1=/mnt/windows/Programmi/Black Isle/BGII - SoA/
- #CD2=/mnt/windows/Programmi/Black Isle/BGII - SoA/CD2/
@@ -173,7 +173,7 @@
- # Cache directory. #
- #####################################################
+ #PluginsPath=@DEFAULT_PLUGINS_DIR@
+ # This is the path where GemRB will store cached files, enter the full path.
-CachePath=@DEFAULT_CACHE_DIR@
+CachePath=~/.cache/gemrb
- #####################################################
- # GemRB Save Path [String] #
-@@ -200,10 +200,7 @@
- #####################################################
-
- # preconfigured path
--#GemRBPath=@DATA_DIR@
--
--# path for official binaries
--GemRBPath=.
-+GemRBPath=@DATA_DIR@
-
- #####################################################
- # GemRB GUI Scripts Path [String] #
+ # The path where GemRB looks for non-BAM fonts (eg. TTF)
+ #CustomFontPath=
diff --git a/gemrb-gles.patch b/gemrb-gles.patch
deleted file mode 100644
index 63726cf..0000000
--- a/gemrb-gles.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From df493a7da7251eb5ea33b62a65580d09b440dd74 Mon Sep 17 00:00:00 2001
-From: cmitu <31816814+cmitu at users.noreply.github.com>
-Date: Wed, 2 Sep 2020 04:27:00 +0100
-Subject: [PATCH] add OpenGL shaders versioning for GLSL compatibility
-
-The GL context initialization in 'GLVideoDriver' requests OpenGL (ES) 2.0 from SDL2,
-but SDL2 doesn't guarantee the context returned will have the same version [1].
-
-To avoid any compatibility issues with a superior GLSL version, add the GLSL version to the shader code,
-depending on the GL context requested (non-ES vs. ES).
- * when expecting an OpenGL 2.0 context, set version to 110
- * when expecting an OpenGL ES 2.0 context, set version to 100
-
-[1] - https://wiki.libsdl.org/SDL_GLattr#OpenGL
----
- gemrb/plugins/SDLVideo/GLSLProgram.cpp | 10 ++++++++--
- gemrb/plugins/SDLVideo/SDL20GLVideo.cpp | 8 +++++---
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/gemrb/plugins/SDLVideo/GLSLProgram.cpp b/gemrb/plugins/SDLVideo/GLSLProgram.cpp
-index 1d5ec51633..34f141002b 100644
---- a/gemrb/plugins/SDLVideo/GLSLProgram.cpp
-+++ b/gemrb/plugins/SDLVideo/GLSLProgram.cpp
-@@ -102,10 +102,16 @@ GLSLProgram* GLSLProgram::CreateFromFiles(std::string vertexSourceFileName, std:
- return GLSLProgram::Create(vertexContent, fragmentContent);
- }
-
--GLuint GLSLProgram::buildShader(GLenum type, std::string source)
-+GLuint GLSLProgram::buildShader(GLenum type, const std::string source)
- {
-+ std::string shader_source = source;
-+#ifdef USE_GL
-+ shader_source.insert(0, "#version 110\n");
-+#else
-+ shader_source.insert(0, "#version 100\n");
-+#endif
- GLuint id = glCreateShader(type);
-- const char* src = source.c_str();
-+ const char* src = shader_source.c_str();
- glShaderSource(id, 1, &src, 0);
- glCompileShader(id);
- GLint result = GL_FALSE;
-diff --git a/gemrb/plugins/SDLVideo/SDL20GLVideo.cpp b/gemrb/plugins/SDLVideo/SDL20GLVideo.cpp
-index b28738317e..62eb361238 100644
---- a/gemrb/plugins/SDLVideo/SDL20GLVideo.cpp
-+++ b/gemrb/plugins/SDLVideo/SDL20GLVideo.cpp
-@@ -66,23 +66,25 @@ int GLVideoDriver::CreateDisplay(int w, int h, int bpp, bool fs, const char* tit
- window = SDL_CreateWindow(title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, winFlags);
- if (window == NULL)
- {
-- Log(ERROR, "SDL 2 GL Driver", "couldnt create window:%s", SDL_GetError());
-+ Log(ERROR, "SDL 2 GL Driver", "Unable to create window:%s", SDL_GetError());
- return GEM_ERROR;
- }
-
- context = SDL_GL_CreateContext(window);
- if (context == NULL)
- {
-- Log(ERROR, "SDL 2 GL Driver", "couldnt create GL context:%s", SDL_GetError());
-+ Log(ERROR, "SDL 2 GL Driver", "Unable to create GL context:%s", SDL_GetError());
- return GEM_ERROR;
- }
- SDL_GL_MakeCurrent(window, context);
-+ Log(MESSAGE, "SDL 2 GL Driver", "OpenGL version: %s, renderer: %s, vendor: %s", glGetString(GL_VERSION), glGetString(GL_RENDERER), glGetString(GL_VENDOR));
-+ Log(MESSAGE, "SDL 2 GL Driver", " GLSL version: %s", glGetString(GL_SHADING_LANGUAGE_VERSION));
-
- renderer = SDL_CreateRenderer(window, -1, 0);
-
- if (renderer == NULL)
- {
-- Log(ERROR, "SDL 2 GL Driver", "couldnt create renderer:%s", SDL_GetError());
-+ Log(ERROR, "SDL 2 GL Driver", "Unable to create renderer:%s", SDL_GetError());
- return GEM_ERROR;
- }
- SDL_RenderSetLogicalSize(renderer, width, height);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gemrb.git/commitdiff/0b2aa7bb82e909b89064e47ffb88cbd2dc7f1d61
More information about the pld-cvs-commit
mailing list