commit: 4b6330276c6204988e56992c99234d468c8ec7d0 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Jul 21 05:05:39 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Jul 21 05:37:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b633027
games-fps/xonotic: drop 0.8.2 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-fps/xonotic/Manifest | 1 - games-fps/xonotic/files/xonotic-0.8.2-gcc-11.patch | 41 -------- games-fps/xonotic/xonotic-0.8.2.ebuild | 116 --------------------- 3 files changed, 158 deletions(-) diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest index e854cb4d25f8..1e1cdbcaa3e9 100644 --- a/games-fps/xonotic/Manifest +++ b/games-fps/xonotic/Manifest @@ -1,2 +1 @@ -DIST xonotic-0.8.2.zip 991045679 BLAKE2B 3005473da954492bb7387f9e0e13c2415e638877fa8b83e14872f3b04ed0fc21b82e18f51aa6c68e8bf02d09d4a73f290cbcaebdfa8c0a12ceb6582309baee8a SHA512 0787fcf326827ae0292e5917c7ff2c7fd79947209d4b62e7f83b8b828bec15b575da304e0631f9f163c9b0bd93bed13616e142398ff08cbdaaea890a939dfca5 DIST xonotic-0.8.5.zip 1228561792 BLAKE2B 3f1391ff6522c8f6b7b4f717aecd6ffe852142d70e7cffff9cb5a602a69142c59850636cc1450aade5ae39088354170b819f696427ba8829bf7c375029f2430a SHA512 4ffc4b73eeb5f580d178a98419d5b44cbff0c56e356a62baa729b5b7a6c3d43b2b425b123428c9b1bf3f4718eaf61bcf5d62914521cc061c7563a253440c807e diff --git a/games-fps/xonotic/files/xonotic-0.8.2-gcc-11.patch b/games-fps/xonotic/files/xonotic-0.8.2-gcc-11.patch deleted file mode 100644 index f6a9569e0163..000000000000 --- a/games-fps/xonotic/files/xonotic-0.8.2-gcc-11.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/788616 - -Attach alignment annotation to strict, not it's typedef alias. ---- a/source/darkplaces/dpsoftrast.c -+++ b/source/darkplaces/dpsoftrast.c -@@ -177,7 +177,7 @@ typedef ALIGN(struct DPSOFTRAST_State_Triangle_s - float w[3]; - ALIGN(float attribs[DPSOFTRAST_ARRAY_TOTAL][3][4]); - } --DPSOFTRAST_State_Triangle); -+) DPSOFTRAST_State_Triangle; - - #define DPSOFTRAST_CALCATTRIB(triangle, span, data, slope, arrayindex) { \ - slope = _mm_load_ps((triangle)->attribs[arrayindex][0]); \ -@@ -209,7 +209,7 @@ typedef ALIGN(struct DPSOFTRAST_State_Span_s - int depthbase; // depthbuffer value at x (add depthslope*startx to get first pixel's depthbuffer value) - int depthslope; // depthbuffer value pixel delta - } --DPSOFTRAST_State_Span); -+) DPSOFTRAST_State_Span; - - #define DPSOFTRAST_DRAW_MAXSPANS 1024 - #define DPSOFTRAST_DRAW_MAXTRIANGLES 128 -@@ -300,7 +300,7 @@ typedef ALIGN(struct DPSOFTRAST_State_Thread_s - DPSOFTRAST_State_Triangle triangles[DPSOFTRAST_DRAW_MAXTRIANGLES]; - unsigned char pixelmaskarray[DPSOFTRAST_DRAW_MAXSPANLENGTH+4]; // LordHavoc: padded to allow some termination bytes - } --DPSOFTRAST_State_Thread); -+) DPSOFTRAST_State_Thread; - - typedef ALIGN(struct DPSOFTRAST_State_s - { -@@ -358,7 +358,7 @@ typedef ALIGN(struct DPSOFTRAST_State_s - - DPSOFTRAST_State_Command_Pool commandpool; - } --DPSOFTRAST_State); -+) DPSOFTRAST_State; - - DPSOFTRAST_State dpsoftrast; - diff --git a/games-fps/xonotic/xonotic-0.8.2.ebuild b/games-fps/xonotic/xonotic-0.8.2.ebuild deleted file mode 100644 index 98e1317eb329..000000000000 --- a/games-fps/xonotic/xonotic-0.8.2.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop check-reqs toolchain-funcs - -MY_PN="${PN^}" -DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine" -HOMEPAGE="https://www.xonotic.org/"; -SRC_URI="https://dl.xonotic.org/${P}.zip"; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="alsa debug dedicated doc ode sdl" - -UIRDEPEND=" - media-libs/libogg - media-libs/libtheora - media-libs/libvorbis - media-libs/libmodplug - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXpm - x11-libs/libXext - x11-libs/libXdmcp - x11-libs/libXxf86dga - x11-libs/libXxf86vm - virtual/opengl - media-libs/freetype:2 - alsa? ( media-libs/alsa-lib ) - ode? ( dev-games/ode[double-precision] ) - sdl? ( media-libs/libsdl2[X,sound,joystick,opengl,video,alsa?] )" -UIDEPEND=" - x11-base/xorg-proto" -RDEPEND=" - sys-libs/zlib - virtual/jpeg:0 - media-libs/libpng:0 - net-misc/curl - ~dev-libs/d0_blind_id-1.0 - !dedicated? ( ${UIRDEPEND} )" -DEPEND="${RDEPEND} - !dedicated? ( ${UIDEPEND} )" -BDEPEND="app-arch/unzip" - -PATCHES=("${FILESDIR}"/${P}-gcc-11.patch) - -DOCS="Docs/*.txt" - -CHECKREQS_DISK_BUILD="1200M" -CHECKREQS_DISK_USR="950M" - -S="${WORKDIR}/${MY_PN}" - -pkg_pretend() { - check-reqs_pkg_pretend -} - -pkg_setup() { - check-reqs_pkg_setup -} - -src_prepare() { - default - - sed -i \ - -e "/^EXE_/s|darkplaces|${PN}|" \ - -e "s|-O3|${CFLAGS}|" \ - -e "/-lm/s|$| ${LDFLAGS}|" \ - -e '/^STRIP/s|strip|true|' \ - source/darkplaces/makefile.inc || die - - if ! use alsa; then - sed -i \ - -e "/DEFAULT_SNDAPI/s|ALSA|OSS|" \ - source/darkplaces/makefile || die - fi -} - -src_compile() { - local t="$(usex debug debug release)" - local i - - tc-export CC CXX LD AR RANLIB - - # use a for-loop wrt bug 473352 - for i in sv-${t} $(usex !dedicated "cl-${t} $(usex sdl "sdl-${t}" "")" "") ; do - emake \ - -C source/darkplaces \ - DP_LINK_ODE=$(usex ode shared no) \ - DP_FS_BASEDIR="/usr/share/${PN}" \ - ${i} - done -} - -src_install() { - if ! use dedicated; then - dobin source/darkplaces/${PN}-glx - newicon misc/logos/${PN}_icon.svg ${PN}.svg - make_desktop_entry ${PN}-glx "${MY_PN} (GLX)" - - if use sdl; then - dobin source/darkplaces/${PN}-sdl - make_desktop_entry ${PN}-sdl "${MY_PN} (SDL)" - fi - fi - dobin source/darkplaces/${PN}-dedicated - - use doc && local HTML_DOCS=( Docs/htmlfiles Docs/faq.html ) - einstalldocs - - insinto "/usr/share/${PN}" - doins -r key_0.d0pk server data -}
