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 <k...@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>
