commit: f7e3fb37f3159af53bdf851e812278655b512a3a
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 21:39:11 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 21:39:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e3fb37
games-action/dxx-rebirth: Bump snapshot to 20230625
My new patch was merged upstream already.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-action/dxx-rebirth/Manifest | 2 +-
...build => dxx-rebirth-0.61.0_pre20230625.ebuild} | 6 +---
...x-rebirth-0.61.0_pre20230618-sdl12-compat.patch | 38 ----------------------
3 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/games-action/dxx-rebirth/Manifest
b/games-action/dxx-rebirth/Manifest
index 69e7f50bc883..1e9f551586c4 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1 +1 @@
-DIST dxx-rebirth-0.61.0_pre20230618.tar.gz 2063234 BLAKE2B
d602e8e92f8a494eabe3645e4c465f1f1b1bc10a0b27d4b518a617f07c90c86c903b7a6bed42085bfe992cd8533f57ac6eca2c10ee0b02d5fc677859f0d80bd3
SHA512
a0a0318169ed55ef9969fe9827d87871bec3d168fb94bed1e7d0c61ce62fdad9f57040181f2c05f9107a0f898ba4876b802e74d43028c90169eefebd2b9eb79d
+DIST dxx-rebirth-0.61.0_pre20230625.tar.gz 2063234 BLAKE2B
5ca7c699e7240553c6106fc008acf08e56fbbf8eed15fa6988390b82f149f91c522bf1fcaebf463fc0923ed2b5518f71f913b17c446a04176addc8f6fa03fab7
SHA512
21a1fa46da4f4b20515e79c746bc6eac82164777c88caf6dd048f8e289f85914c1ae844f8bad6f858855172e8556649f60daa17b9ea23c2d6854e4acb777ee2a
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230625.ebuild
similarity index 98%
rename from games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
rename to games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230625.ebuild
index 833ffdb92ee8..dc93d9200327 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230625.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
-MY_COMMIT="111f6f2f0dd8de7c2f669eb4d784a0d9e9f124f9"
+MY_COMMIT="e9daf03769d8408719c1b420a133155cb700b9a2"
# Games under Gentoo are marked as 'testing' by convention
#
@@ -168,10 +168,6 @@ BDEPEND="virtual/pkgconfig"
# and therefore requires a rebuild when changed.
#IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis"
-PATCHES=(
- "${FILESDIR}"/${P}-sdl12-compat.patch
-)
-
dxx_scons() {
# Always build profile `m`. If use editor, also build profile `e`.
# Set most variables in the default anonymous profile. Only
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
deleted file mode 100644
index 4c01c8cd0dbb..000000000000
---
a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e9daf03769d8408719c1b420a133155cb700b9a2 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <[email protected]>
-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
-
