diff options
Diffstat (limited to 'games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch')
-rw-r--r-- | games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch new file mode 100644 index 000000000000..4c01c8cd0dbb --- /dev/null +++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch @@ -0,0 +1,38 @@ +From e9daf03769d8408719c1b420a133155cb700b9a2 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 25 Jun 2023 15:16:55 +0100 +Subject: [PATCH] Skip SDL OpenGL build check when the SDL2 wrapper is detected + +The wrapper does not define SDL_VIDEO_OPENGL in SDL_config.h. This +appears to be deliberate, although it's not entirely clear why. + + /* Don't define most of the SDL backends, under the assumption checking for these against the headers won't work anyhow. + The exception is the X11 backend; you need its define to know if you can use its syswm interface. */ + +We could check SDL2's SDL_config.h instead, but that seems awkward to +pull off. + +Closes: https://github.com/dxx-rebirth/dxx-rebirth/issues/689 +--- + SConstruct | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SConstruct b/SConstruct +index c98a22bc8..59210a802 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1586,9 +1586,11 @@ static void terminate_handler() + init_cdrom = '0' if sdl2 else 'SDL_INIT_CDROM' + error_text_opengl_mismatch = f'Rebirth configured with OpenGL enabled, but SDL{sdl2} configured with OpenGL disabled. Disable Rebirth OpenGL or install an SDL{sdl2} with OpenGL enabled.' + test_opengl = (f''' ++#if !((SDL_MAJOR_VERSION == 1) && (SDL_MINOR_VERSION == 2) && (SDL_PATCHLEVEL >= 50)) + #ifndef SDL_VIDEO_OPENGL + #error "{error_text_opengl_mismatch}" + #endif ++#endif + ''') if user_settings.opengl else '' + main = ''' + SDL_RWops *ops = reinterpret_cast<SDL_RWops *>(argv); +-- +2.40.1 + |