[packages/scummvm] fix sdl version detection with recent sdl2 releases

atler atler at pld-linux.org
Sun Sep 11 23:14:50 CEST 2022


commit 079ffb334a3ccae08b276bb6f2e4535841ea1023
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Sep 11 23:13:39 2022 +0200

    fix sdl version detection with recent sdl2 releases

 scummvm.spec |  2 ++
 sdl2.patch   | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
---
diff --git a/scummvm.spec b/scummvm.spec
index b6c487c..ee32bb0 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -31,6 +31,7 @@ Source2:	%{name}.desktop
 Patch0:		%{name}-wx-config.patch
 Patch1:		dwarf-debug.patch
 Patch2:		fluidsynth-printf-attr.patch
+Patch3:		sdl2.patch
 URL:		http://scummvm.org/
 BuildRequires:	SDL2-devel
 BuildRequires:	SDL2_net-devel
@@ -1131,6 +1132,7 @@ cd scummvm-tools-%{version_tools}
 %patch0 -p2
 cd ..
 %patch2 -p1
+%patch3 -p1
 
 %{__sed} -i -e 's:"plugins":"%{_libdir}/scummvm":' base/plugins.cpp
 
diff --git a/sdl2.patch b/sdl2.patch
new file mode 100644
index 0000000..34877c9
--- /dev/null
+++ b/sdl2.patch
@@ -0,0 +1,20 @@
+--- scummvm-2.5.1/configure.orig	2022-09-11 22:50:44.875895176 +0200
++++ scummvm-2.5.1/configure	2022-09-11 23:12:09.358791198 +0200
+@@ -3840,7 +3840,7 @@
+ 	append_var INCLUDES "$SDL_CFLAGS"
+ 	append_var LIBS "$SDL_LIBS"
+ 	case $_sdlversion in
+-		2.0.*)
++		2.*)
+ 			add_line_to_config_mk "USE_SDL2 = 1"
+ 			_sdlMajorVersionNumber=2
+ 			;;
+@@ -5368,7 +5368,7 @@
+ 					_opengl_mode=gl
+ 					;;
+ 
+-				2.0.*)
++				2.*)
+ 					# SDL2 supports both OpenGL + OpenGL ES contexts.
+ 					# However, Mac OS X only allows OpenGL context creation at
+ 					# this time, thus we limit us to OpenGL on that platform.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/scummvm.git/commitdiff/079ffb334a3ccae08b276bb6f2e4535841ea1023



More information about the pld-cvs-commit mailing list