* [gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/
@ 2020-09-15 8:44 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2020-09-15 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 71d1dfc95b4248348d2b55dd5cbe28b6c2b5856b
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 21:09:12 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 08:43:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d1dfc9
games-action/dxx-rebirth: Drop old 0.59.100
Closes: https://bugs.gentoo.org/669212
Closes: https://bugs.gentoo.org/703090
Closes: https://bugs.gentoo.org/735534
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-action/dxx-rebirth/Manifest | 8 --
.../dxx-rebirth/dxx-rebirth-0.59.100.ebuild | 108 ---------------------
.../files/dxx-rebirth-0.59.100-flags.patch | 10 --
...-rebirth-0.59.100-physfs-3-no-deprecation.patch | 30 ------
.../files/dxx-rebirth-0.59.100-sharepath.patch | 11 ---
games-action/dxx-rebirth/metadata.xml | 3 -
6 files changed, 170 deletions(-)
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index 730b013b264..1b705069b99 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,9 +1 @@
-DIST d1xr-briefings-ger.dxa 16798 BLAKE2B f5e1f4f91cb3464b3d356fab1e3993700cc19f3f2db8682f5194e59aa5d2623efa427db4135c3595534e5dac0f2589b53aac7df3610501b759407e1ead342458 SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
-DIST d1xr-hires.dxa 1426884 BLAKE2B c4d9b950353fc450c64568779bc3d2e93a46e17980c8df08a2ef06bff5b9709869fdbbaf4fb6698be994b3faae7a75036a53357743d47b728bb3ef9df126afd8 SHA512 3fc84d5610ba40ee383c1720f80513a21b4644ff8b6da4b84ebca13b11c1131deb4897ded6324b54845b6c847dfc0f16700535e16afdd7ebe83bfff042892302
-DIST d1xr-opl3-music.dxa 81503503 BLAKE2B b560597e0f08139109a6dc4ee7996c05010561686029d1fd754375278b8a11e6df0f6106c797d524e92d4998683d6e1e07b6cfc982ea3ff167a0b9ca92ba0dc2 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
-DIST d1xr-sc55-music.dxa 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dda0b8e5ae1a79ec36122a17c01e3b2a731f369d72fe0e069e1188bdaf03f82d0845b574d76b6798be33481e3b84 SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
-DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb730094cccb53298b07f2e2031935033b8db765b40fdad93fb55b157a2be07906ea45185b754e5ec7c205803cc92 SHA512 479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
-DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
-DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
DIST dxx-rebirth-0.61.0_pre20200615.tar.gz 1959226 BLAKE2B 08d66eb1599100172e2bd8dcb8e13ca11314f3b06658c36851ddc7d91897a8376899b7c33b6e7a2d7b72e93cf7f20f157994d06f880e138dc807350e4c64c517 SHA512 3470e2b9cf20268f1af5e8084f0b361d1dd5d797bee9a1d97ce5509046f79750ac214d0f34e7eef1acc4ee4ae868ad3f34d33b45ff163863333e9d8a7d758db2
-DIST dxx-rebirth_v0.59.100-src.tar.gz 1809614 BLAKE2B 6826380312fa23dbc99459db9272cf7ffb5a00a14cfdd777339633fbd943a288af00f182692ebc3078e4c39bf6b6cc9fb05cc6a533ec126b8c881eb22c465868 SHA512 dc9b7ad263e189e779756b62613d4bc62371cb5fec2176a4013395fc18c9d03ab0c9ddc5ccf2668b87e4a77b25d500bdef373126f176bfce49f73b5a98de23d7
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
deleted file mode 100644
index df217142951..00000000000
--- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils scons-utils toolchain-funcs xdg
-
-MY_P="${PN}_v${PV}-src"
-DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
-HOMEPAGE="https://www.dxx-rebirth.com/"
-SRC_URI="https://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
- opl3-musicpack? (
- descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa )
- descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) )
- sc55-musicpack? (
- descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa )
- descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) )
- l10n_de? (
- descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa )
- descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) )
- textures? (
- descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa ) )"
-
-LICENSE="DXX-Rebirth GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+data debug +descent1 +descent2 ipv6 l10n_de +music +opengl opl3-musicpack sc55-musicpack +textures"
-
-REQUIRED_USE="|| ( descent1 descent2 )
- ?? ( opl3-musicpack sc55-musicpack )
- opl3-musicpack? ( music )
- sc55-musicpack? ( music )"
-
-DEPEND="dev-games/physfs:0=[hog,mvl,zip]
- media-libs/libsdl:0=[joystick,opengl?,sound,video]
- music? ( media-libs/sdl-mixer:0= )
- opengl? (
- virtual/opengl
- virtual/glu )"
-
-RDEPEND="${DEPEND}
- data? (
- descent1? ( || ( games-action/descent1-data games-action/descent1-demodata ) )
- descent2? ( || ( games-action/descent2-data games-action/descent2-demodata ) ) )
- music? (
- !opl3-musicpack? ( !sc55-musicpack? ( media-libs/sdl-mixer:0=[midi] ) )
- opl3-musicpack? ( media-libs/sdl-mixer:0=[vorbis] )
- sc55-musicpack? ( media-libs/sdl-mixer:0=[vorbis] ) )
- !games-action/d1x-rebirth
- !games-action/d2x-rebirth"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-flags.patch # Remove hardcoded optimisation flags.
- "${FILESDIR}"/${P}-sharepath.patch # Change share path to use old d1x/d2x locations.
- "${FILESDIR}"/${P}-physfs-3-no-deprecation.patch # bug #653014
-)
-
-src_compile() {
- tc-export CXX
- escons \
- prefix="${EPREFIX}"/usr \
- d1x=$(usex descent1 1 0) \
- d2x=$(usex descent2 1 0) \
- debug=$(usex debug 1 0) \
- ipv6=$(usex ipv6 1 0) \
- opengl=$(usex opengl 1 0) \
- sdlmixer=$(usex music 1 0) \
- verbosebuild=1
-}
-
-src_install() {
- local DV PROGRAM
-
- for DV in 1 2; do
- use descent${DV} || continue
- PROGRAM=d${DV}x-rebirth
-
- docinto ${PROGRAM}
- edos2unix ${PROGRAM}/*.txt
- dodoc ${PROGRAM}/*.txt
-
- insinto /usr/share/games/d${DV}x
- use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa
- use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa
- use l10n_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa
-
- dobin ${PROGRAM}/${PROGRAM}
- make_desktop_entry ${PROGRAM} "Descent ${DV} Rebirth" ${PROGRAM}
- doicon ${PROGRAM}/${PROGRAM}.xpm
- done
-
- if use textures && use descent1; then
- insinto /usr/share/games/d1x
- doins "${DISTDIR}"/d1xr-hires.dxa
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if ! use data; then
- elog "To play the game enable USE=\"data\" or manually "
- elog "copy the files to ${EPREFIX}/usr/share/games/{d1x,d2x}."
- elog "See each game's INSTALL.txt for details."
- fi
-}
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch
deleted file mode 100644
index 75c3a64f893..00000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dxx-rebirth_v0.59.100-src/SConstruct 2016-12-12 02:47:40.000000000 +0300
-+++ dxx-rebirth_v0.59.100-src/SConstruct 2016-12-28 02:11:16.657874914 +0300
-@@ -3488,7 +3488,6 @@
- env = self.env
- user_settings = self.user_settings
-
-- env.Prepend(CXXFLAGS = ['-g', '-O2'])
- # Raspberry Pi?
- if user_settings.raspberrypi:
- rpi_vc_path = user_settings.rpi_vc_path
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch
deleted file mode 100644
index 86e94d43389..00000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8838b46e65c830e8d9ebaeaf568f186eff57d5c7 Mon Sep 17 00:00:00 2001
-From: Kp <kp@valhallalegends.com>
-Date: Sun, 22 Oct 2017 04:20:35 +0000
-Subject: [PATCH] Suppress PhysFS deprecation errors
-
-PhysFS 2.0 only offers PHYSFS_read/PHYSFS_write for I/O. PhysFS 3.0
-deprecates PHYSFS_read / PHYSFS_write and offers PHYSFS_readBytes /
-PHYSFS_writeBytes. Converting Rebirth to use the new API is somewhat
-invasive, and would require dropping support for PhysFS 2.0.
-
-For now, for compatibility with PhysFS 2.0, disable the deprecation
-errors and continue to use the older functions.
-
-Reported-by: gabeotisbenson <https://github.com/dxx-rebirth/dxx-rebirth/issues/352>
----
- SConstruct | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/SConstruct b/SConstruct
-index 560a6ef1a..78491cb1a 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -3177,6 +3177,7 @@
- def adjust_environment(self,program,env):
- env.Append(
- CXXFLAGS = ['-pthread'],
-+ CPPDEFINES = [('PHYSFS_DEPRECATED', '')],
- )
-
- def __init__(self,__program_instance=itertools.count(1)):
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch
deleted file mode 100644
index ee1b6bb9ea0..00000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dxx-rebirth_v0.59.100-src/SConstruct 2016-12-12 02:47:40.000000000 +0300
-+++ dxx-rebirth_v0.59.100-src/SConstruct 2016-12-29 19:26:58.987760410 +0300
-@@ -2875,7 +2875,7 @@
- return 'GLESv2'
- return self.default_OGLES_LIB
- def __default_DATA_DIR(self):
-- return '%s/share/games/%s' % (self.prefix, self._program.target)
-+ return '%s/share/games/%s' % (self.prefix, self._program.shortname)
- def _generic_variable(key,help,default):
- return (key, help, default)
- def __get_configure_tests(tests,_filter=lambda s: s.name[0] != '_'):
diff --git a/games-action/dxx-rebirth/metadata.xml b/games-action/dxx-rebirth/metadata.xml
index 2d1f5ab3ad7..2a9bced3f14 100644
--- a/games-action/dxx-rebirth/metadata.xml
+++ b/games-action/dxx-rebirth/metadata.xml
@@ -22,8 +22,6 @@
<use>
<flag name="d1x">Install Descent 1 resources and executable</flag>
<flag name="d2x">Install Descent 2 resources and executable</flag>
- <flag name="descent1">Install Descent 1 resources and executable (used prior to version 0.61)</flag>
- <flag name="descent2">Install Descent 2 resources and executable (used prior to version 0.61)</flag>
<flag name="data">Ensure some game levels are present; if the full game's level data is not already installed then install the playable demo data (i.e. shareware levels)</flag>
<flag name="debug">Enable various debugging code paths and sanity checks, not just output. Some of these checks date back to the retail build, and choke on some custom levels because the game was never coded to sufficiently distrust inputs</flag>
<flag name="editor">Enable level editor support</flag>
@@ -34,7 +32,6 @@
<flag name="sc55-musicpack">Include alternate version of the game's music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
<flag name="sdl2">Use libSDL2, SDL2-mixer instead of libSDL-1* and SDL-mixer-1*</flag>
<flag name="tracker">Enable support for the PHP-based multiplayer game tracker</flag>
- <flag name="textures">Include high resolution (640x480) backgrounds, briefing images and fonts (for Descent 1)</flag>
<flag name="valgrind">Include a Valgrind header in build in order to support Memcheck client requests</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/
@ 2023-03-10 7:45 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-03-10 7:45 UTC (permalink / raw
To: gentoo-commits
commit: ef781b2e02df4142141a43ee8da72738c42c67c3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 07:39:28 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 07:45:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef781b2e
games-action/dxx-rebirth: fix build w/ gcc 12
Closes: https://bugs.gentoo.org/894678
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../dxx-rebirth-0.61.0_pre20210623.ebuild | 4 ++++
.../dxx-rebirth-0.61.0_pre20210623-gcc-12.patch | 25 ++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index 853ff1d1f770..f703b0ade70e 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -162,6 +162,10 @@ 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}-gcc-12.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_pre20210623-gcc-12.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
new file mode 100644
index 000000000000..3681385976a6
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/894678
+https://github.com/dxx-rebirth/dxx-rebirth/commit/092daecb6118b3c072c71a8bea24f119e300bd49
+
+From 092daecb6118b3c072c71a8bea24f119e300bd49 Mon Sep 17 00:00:00 2001
+From: Kp <kp@valhallalegends.com>
+Date: Sat, 28 May 2022 21:04:37 +0000
+Subject: [PATCH] Use static_cast<> to convert player_marker_num to
+ game_marker_index
+
+gcc-12 rejects the list initialization syntax. Switch to static_cast<>,
+which generates equivalent code.
+
+Reported-by: dbermond <https://github.com/dxx-rebirth/dxx-rebirth/issues/638>
+--- a/similar/main/automap.cpp
++++ b/similar/main/automap.cpp
+@@ -370,7 +370,7 @@ game_marker_index convert_player_marker_index_to_game_marker_index(const game_mo
+ return static_cast<game_marker_index>((player_num * MAX_DROP_MULTI_COOP) + static_cast<unsigned>(player_marker_num));
+ if (game_mode & GM_MULTI)
+ return static_cast<game_marker_index>((player_num * MAX_DROP_MULTI_COMPETITIVE) + static_cast<unsigned>(player_marker_num));
+- return game_marker_index{player_marker_num};
++ return static_cast<game_marker_index>(player_marker_num);
+ }
+
+ unsigned d_marker_state::get_markers_per_player(const game_mode_flags game_mode, const unsigned max_numplayers)
+
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/
@ 2023-03-22 16:20 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2023-03-22 16:20 UTC (permalink / raw
To: gentoo-commits
commit: e655d87f9fdf2a3c80da8f3fb01478faad74e88d
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 15:51:26 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 16:16:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e655d87f
games-action/dxx-rebirth: fix build with scons-4.5.x
Live is only partially fixed (old snapshot needs a 2 part fix), but
imagine the PR will get merged soon enough, so not adding to 9999.
Not tested much, but seems fine with both scons-4.4.0 and 4.5.2.
Closes: https://bugs.gentoo.org/902463
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../dxx-rebirth-0.61.0_pre20210623.ebuild | 1 +
.../dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch | 51 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index 1dea43f4d04b..77aab2a2ddca 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -165,6 +165,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-gcc-12.patch
"${FILESDIR}"/${P}-gcc-12-editor.patch
+ "${FILESDIR}"/${P}-scons-4.5.patch
)
dxx_scons() {
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
new file mode 100644
index 000000000000..0adc507cada5
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/902463
+
+https://github.com/dxx-rebirth/dxx-rebirth/pull/705
+https://github.com/dxx-rebirth/dxx-rebirth/commit/189ac23f61605903eb3eaa0004d287b7bd9296bc
+--- a/SConstruct
++++ b/SConstruct
+@@ -324,3 +324,3 @@
+ def __init__(self,env,keyviews,_l=[]):
+- self.flags = {k: env.get(k, _l)[:] for k in itertools.chain.from_iterable(keyviews)}
++ self.flags = {k: env.get(k, _l).copy() for k in itertools.chain.from_iterable(keyviews)}
+ def restore(self,env):
+@@ -1493,3 +1493,3 @@
+ user_settings.max_axes_per_joystick = user_settings.max_buttons_per_joystick = user_settings.max_hats_per_joystick = 0
+- successflags['CPPDEFINES'] = CPPDEFINES = successflags.get('CPPDEFINES', [])[:]
++ successflags['CPPDEFINES'] = CPPDEFINES = successflags.get('CPPDEFINES', []).copy()
+ # use Redbook if at least one of the following applies
+@@ -4608,3 +4608,3 @@
+ for test in runtime_test_boost_tests:
+- LIBS = [] if test.nodefaultlibs else env['LIBS'][:]
++ LIBS = [] if test.nodefaultlibs else env['LIBS'].copy()
+ LIBS.append('boost_unit_test_framework')
+@@ -4850,3 +4850,3 @@
+ kwargs['CXXFLAGS'] = (env['CXXFLAGS'] or []) + ['-E']
+- kwargs['CPPDEFINES'] = (env['CPPDEFINES'] or []) + [
++ kwargs['CPPDEFINES'] = list(env['CPPDEFINES'] or []) + [
+ # Define these tokens to themselves so that
+@@ -4870,3 +4870,3 @@
+ def _apply_env_version_seq(self,env,_empty={}):
+- return _empty if self.user_settings.pch else {'CPPDEFINES' : env['CPPDEFINES'] + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
++ return _empty if self.user_settings.pch else {'CPPDEFINES' : list(env['CPPDEFINES']) + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
+ get_objects_similar_arch_ogl = DXXCommon.create_lazy_object_states_getter((LazyObjectState(sources=(
+@@ -4966,3 +4966,3 @@
+ ),
+- transform_env = (lambda self, env: {'CPPDEFINES' : env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH + env.__dxx_CPPDEFINE_git_version}),
++ transform_env = (lambda self, env: {'CPPDEFINES' : list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH + env.__dxx_CPPDEFINE_git_version}),
+ transform_target=_apply_target_name,
+@@ -4976,3 +4976,3 @@
+ ),
+- transform_env = (lambda self, env: {'CPPDEFINES' : env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH}),
++ transform_env = (lambda self, env: {'CPPDEFINES' : list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH}),
+ transform_target=_apply_target_name,
+@@ -5185,3 +5185,3 @@
+ versid_build_environ = ['CXX', 'CPPFLAGS', 'CXXFLAGS', 'LINKFLAGS']
+- versid_cppdefines = env['CPPDEFINES'][:]
++ versid_cppdefines = env['CPPDEFINES'].copy()
+ extra_version = user_settings.extra_version
+@@ -5303,3 +5303,3 @@
+ else:
+- syspath = sys.path[:]
++ syspath = sys.path.copy()
+ cocoa = 'common/arch/cocoa'
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/
@ 2023-06-25 15:18 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2023-06-25 15:18 UTC (permalink / raw
To: gentoo-commits
commit: 97b3716002195ef742d8d5305a952267474034c6
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 15:17:38 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 15:17:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97b37160
games-action/dxx-rebirth: Bump snapshot to 20230618, drop old 20210623, EAPI 8
This fixes building with GCC 13 and the sdl12-compat wrapper.
Closes: https://bugs.gentoo.org/896952
Closes: https://bugs.gentoo.org/900212
Closes: https://bugs.gentoo.org/907746
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-action/dxx-rebirth/Manifest | 2 +-
...build => dxx-rebirth-0.61.0_pre20230618.ebuild} | 36 ++++++++-------
games-action/dxx-rebirth/dxx-rebirth-9999.ebuild | 34 ++++++++-------
...-rebirth-0.61.0_pre20210623-gcc-12-editor.patch | 23 ----------
.../dxx-rebirth-0.61.0_pre20210623-gcc-12.patch | 25 -----------
.../dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch | 51 ----------------------
...x-rebirth-0.61.0_pre20230618-sdl12-compat.patch | 38 ++++++++++++++++
7 files changed, 78 insertions(+), 131 deletions(-)
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index 4e590d8f682a..69e7f50bc883 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1 +1 @@
-DIST dxx-rebirth_20210623-src.tar.xz 1340044 BLAKE2B f16a8904d777559e789d719bc0d6d2dbb7d26c1128984117b6c64a334ae589dd5806439cc51e458a583e1b6cc831dae7c51bf7bd3fbc972989b0ce4e5b932a4e SHA512 150d873fa045df6fb2f9bb70334d08eeae0cc7a639e825f1352fed28501ab9541a27bf3395fc1929bc8d76ed9126b038eed67c5a01657f43116da4663e929821
+DIST dxx-rebirth-0.61.0_pre20230618.tar.gz 2063234 BLAKE2B d602e8e92f8a494eabe3645e4c465f1f1b1bc10a0b27d4b518a617f07c90c86c903b7a6bed42085bfe992cd8533f57ac6eca2c10ee0b02d5fc677859f0d80bd3 SHA512 a0a0318169ed55ef9969fe9827d87871bec3d168fb94bed1e7d0c61ce62fdad9f57040181f2c05f9107a0f898ba4876b802e74d43028c90169eefebd2b9eb79d
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
similarity index 92%
rename from games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
rename to games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
index 77aab2a2ddca..833ffdb92ee8 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
@@ -1,29 +1,35 @@
# Copyright 2017-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..11} )
+MY_COMMIT="111f6f2f0dd8de7c2f669eb4d784a0d9e9f124f9"
+
+# Games under Gentoo are marked as 'testing' by convention
+#
+# Other architectures are reported to work, but not tested regularly by
+# the core team.
+#
+# Raspberry Pi support is tested by an outside contributor, and his
+# fixes are merged into the main source by upstream.
+#
+# Cross-compilation to Windows is also supported.
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
if [[ "${PV}" = 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth"
+ unset KEYWORDS
+elif [[ -n ${MY_COMMIT} ]]; then
+ S="${WORKDIR}/${PN}-${MY_COMMIT}"
+ SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/${MY_COMMIT} -> ${PN}-${PVR}.tar.gz"
+ unset MY_COMMIT
else
S="${WORKDIR}/${PN}_${PV##*_pre}-src"
SRC_URI="https://www.dxx-rebirth.com/download/dxx/rebirth/${PN}_${PV##*_pre}-src.tar.xz"
-
- # Games under Gentoo are marked as 'testing' by convention
- #
- # Other architectures are reported to work, but not tested regularly by
- # the core team.
- #
- # Raspberry Pi support is tested by an outside contributor, and his
- # fixes are merged into the main source by upstream.
- #
- # Cross-compilation to Windows is also supported.
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
@@ -163,9 +169,7 @@ BDEPEND="virtual/pkgconfig"
#IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis"
PATCHES=(
- "${FILESDIR}"/${P}-gcc-12.patch
- "${FILESDIR}"/${P}-gcc-12-editor.patch
- "${FILESDIR}"/${P}-scons-4.5.patch
+ "${FILESDIR}"/${P}-sdl12-compat.patch
)
dxx_scons() {
diff --git a/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
index b13187e490c0..81bd934fd3b2 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
@@ -1,31 +1,35 @@
# Copyright 2017-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..11} )
+MY_COMMIT=""
+
+# Games under Gentoo are marked as 'testing' by convention
+#
+# Other architectures are reported to work, but not tested regularly by
+# the core team.
+#
+# Raspberry Pi support is tested by an outside contributor, and his
+# fixes are merged into the main source by upstream.
+#
+# Cross-compilation to Windows is also supported.
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
if [[ "${PV}" = 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth"
-else
- MY_COMMIT=''
+ unset KEYWORDS
+elif [[ -n ${MY_COMMIT} ]]; then
S="${WORKDIR}/${PN}-${MY_COMMIT}"
SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/${MY_COMMIT} -> ${PN}-${PVR}.tar.gz"
unset MY_COMMIT
-
- # Games under Gentoo are marked as 'testing' by convention
- #
- # Other architectures are reported to work, but not tested regularly by
- # the core team.
- #
- # Raspberry Pi support is tested by an outside contributor, and his
- # fixes are merged into the main source by upstream.
- #
- # Cross-compilation to Windows is also supported.
- KEYWORDS="~amd64 ~arm64 ~x86"
+else
+ S="${WORKDIR}/${PN}_${PV##*_pre}-src"
+ SRC_URI="https://www.dxx-rebirth.com/download/dxx/rebirth/${PN}_${PV##*_pre}-src.tar.xz"
fi
DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
deleted file mode 100644
index fbb03cf8f334..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-With USE=editor and gcc12:
-
- similar/main/piggy.cpp: In function 'void d2x::piggy_new_pigfile(char*)':
- similar/main/piggy.cpp:870:62: error: '%u' directive output may be truncated writing between 1 and 10 bytes into a region of size between 7 and 19 [-Werror=format-truncation=]
-
-But the offending code is unused, so can just drop it.
-
-Backport from:
-https://github.com/dxx-rebirth/dxx-rebirth/commit/12cca97870efe419613462dc279963a77bc80d9a
---- a/similar/main/piggy.cpp
-+++ b/similar/main/piggy.cpp
-@@ -889,11 +889,8 @@ void piggy_new_pigfile(char *pigname)
- }
-
- for (fnum=0;fnum<nframes; fnum++) {
-- char tempname[20];
- int SuperX;
-
-- snprintf(tempname, sizeof(tempname), "%s#%u", basename, fnum);
--
- //SuperX = (GameBitmaps[i+fnum].bm_flags&BM_FLAG_SUPER_TRANSPARENT)?254:-1;
- SuperX = (GameBitmapFlags[i+fnum]&BM_FLAG_SUPER_TRANSPARENT)?254:-1;
- //above makes assumption that supertransparent color is 254
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
deleted file mode 100644
index 3681385976a6..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/894678
-https://github.com/dxx-rebirth/dxx-rebirth/commit/092daecb6118b3c072c71a8bea24f119e300bd49
-
-From 092daecb6118b3c072c71a8bea24f119e300bd49 Mon Sep 17 00:00:00 2001
-From: Kp <kp@valhallalegends.com>
-Date: Sat, 28 May 2022 21:04:37 +0000
-Subject: [PATCH] Use static_cast<> to convert player_marker_num to
- game_marker_index
-
-gcc-12 rejects the list initialization syntax. Switch to static_cast<>,
-which generates equivalent code.
-
-Reported-by: dbermond <https://github.com/dxx-rebirth/dxx-rebirth/issues/638>
---- a/similar/main/automap.cpp
-+++ b/similar/main/automap.cpp
-@@ -370,7 +370,7 @@ game_marker_index convert_player_marker_index_to_game_marker_index(const game_mo
- return static_cast<game_marker_index>((player_num * MAX_DROP_MULTI_COOP) + static_cast<unsigned>(player_marker_num));
- if (game_mode & GM_MULTI)
- return static_cast<game_marker_index>((player_num * MAX_DROP_MULTI_COMPETITIVE) + static_cast<unsigned>(player_marker_num));
-- return game_marker_index{player_marker_num};
-+ return static_cast<game_marker_index>(player_marker_num);
- }
-
- unsigned d_marker_state::get_markers_per_player(const game_mode_flags game_mode, const unsigned max_numplayers)
-
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
deleted file mode 100644
index 0adc507cada5..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://bugs.gentoo.org/902463
-
-https://github.com/dxx-rebirth/dxx-rebirth/pull/705
-https://github.com/dxx-rebirth/dxx-rebirth/commit/189ac23f61605903eb3eaa0004d287b7bd9296bc
---- a/SConstruct
-+++ b/SConstruct
-@@ -324,3 +324,3 @@
- def __init__(self,env,keyviews,_l=[]):
-- self.flags = {k: env.get(k, _l)[:] for k in itertools.chain.from_iterable(keyviews)}
-+ self.flags = {k: env.get(k, _l).copy() for k in itertools.chain.from_iterable(keyviews)}
- def restore(self,env):
-@@ -1493,3 +1493,3 @@
- user_settings.max_axes_per_joystick = user_settings.max_buttons_per_joystick = user_settings.max_hats_per_joystick = 0
-- successflags['CPPDEFINES'] = CPPDEFINES = successflags.get('CPPDEFINES', [])[:]
-+ successflags['CPPDEFINES'] = CPPDEFINES = successflags.get('CPPDEFINES', []).copy()
- # use Redbook if at least one of the following applies
-@@ -4608,3 +4608,3 @@
- for test in runtime_test_boost_tests:
-- LIBS = [] if test.nodefaultlibs else env['LIBS'][:]
-+ LIBS = [] if test.nodefaultlibs else env['LIBS'].copy()
- LIBS.append('boost_unit_test_framework')
-@@ -4850,3 +4850,3 @@
- kwargs['CXXFLAGS'] = (env['CXXFLAGS'] or []) + ['-E']
-- kwargs['CPPDEFINES'] = (env['CPPDEFINES'] or []) + [
-+ kwargs['CPPDEFINES'] = list(env['CPPDEFINES'] or []) + [
- # Define these tokens to themselves so that
-@@ -4870,3 +4870,3 @@
- def _apply_env_version_seq(self,env,_empty={}):
-- return _empty if self.user_settings.pch else {'CPPDEFINES' : env['CPPDEFINES'] + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
-+ return _empty if self.user_settings.pch else {'CPPDEFINES' : list(env['CPPDEFINES']) + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
- get_objects_similar_arch_ogl = DXXCommon.create_lazy_object_states_getter((LazyObjectState(sources=(
-@@ -4966,3 +4966,3 @@
- ),
-- transform_env = (lambda self, env: {'CPPDEFINES' : env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH + env.__dxx_CPPDEFINE_git_version}),
-+ transform_env = (lambda self, env: {'CPPDEFINES' : list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH + env.__dxx_CPPDEFINE_git_version}),
- transform_target=_apply_target_name,
-@@ -4976,3 +4976,3 @@
- ),
-- transform_env = (lambda self, env: {'CPPDEFINES' : env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH}),
-+ transform_env = (lambda self, env: {'CPPDEFINES' : list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH}),
- transform_target=_apply_target_name,
-@@ -5185,3 +5185,3 @@
- versid_build_environ = ['CXX', 'CPPFLAGS', 'CXXFLAGS', 'LINKFLAGS']
-- versid_cppdefines = env['CPPDEFINES'][:]
-+ versid_cppdefines = env['CPPDEFINES'].copy()
- extra_version = user_settings.extra_version
-@@ -5303,3 +5303,3 @@
- else:
-- syspath = sys.path[:]
-+ syspath = sys.path.copy()
- cocoa = 'common/arch/cocoa'
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
+
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/
@ 2023-06-25 21:39 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2023-06-25 21:39 UTC (permalink / raw
To: gentoo-commits
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 <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
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-25 21:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-15 8:44 [gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2023-03-10 7:45 Sam James
2023-03-22 16:20 Ionen Wolkens
2023-06-25 15:18 James Le Cuirot
2023-06-25 21:39 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox