diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /games-action/armagetronad |
reinit the tree, so we can have metadata
Diffstat (limited to 'games-action/armagetronad')
-rw-r--r-- | games-action/armagetronad/Manifest | 6 | ||||
-rw-r--r-- | games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild | 71 | ||||
-rw-r--r-- | games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch | 222 | ||||
-rw-r--r-- | games-action/armagetronad/metadata.xml | 11 |
4 files changed, 310 insertions, 0 deletions
diff --git a/games-action/armagetronad/Manifest b/games-action/armagetronad/Manifest new file mode 100644 index 000000000000..c27b8dd411e4 --- /dev/null +++ b/games-action/armagetronad/Manifest @@ -0,0 +1,6 @@ +AUX armagetronad-0.2.8.3.3-gcc6.patch 6419 SHA256 37d1632aafc10405607c28e35be826d3680a2d5f02844f22c9fb4a2fa1cc11f9 SHA512 ff56e2388b56736fddd1a4fba94914a3d327c11b25675a45f930b1ceab215cd197563194aa6485571ba5ee7c4ed6e2644da9f81f70cc686201a8efbed9149a44 WHIRLPOOL 2121a59a1199924cdd24a705b0dbd64202425b912fff59252e9b73dfe9faae5a3f59cdb0e206b776e280de426848d553bc7f70dbda0debc88ff33dd79bbb8954 +DIST armagetronad-0.2.8.3.3.src.tar.bz2 1857868 SHA256 ddf2d781b134392e9667f17e0319ae2117c20e6eb7738e3cacd701f3608ea5e8 SHA512 05dd7db10efdac0e681133d07384b0e3c2edea328433f1d906e36b5f70960bf502df8d496967981b6bd67e1a119af9a5bbd71b0c824f790921deb3165165dc3f WHIRLPOOL 731b3e8d8647948e016e4dbfa3733f666838d0b4e47f997e149b947741d3b566d9aa1492dc570064e0005c92b0c04f4c74ad4a0278ff7018b028d9c431af135d +EBUILD armagetronad-0.2.8.3.3-r1.ebuild 1483 SHA256 2a9021e887b3cd1cc234b5c3b1932913af248d324dc2b983eee292fe85ea2655 SHA512 5899f409c1d761cece818ee314d7af36db9e7221f508076abb13c738138e2e003cd2b443ef6ffbb250eff03847bfe9907f2faa0a5d774661cef7505314952815 WHIRLPOOL 3affec05c5323766d4e521594c1e0538a1efb394916b4c66c6c1b76c1629805bf7405b56e0182f0613e35aa287cc68298292b19116b310d283ddf44cb8ac2314 +MISC ChangeLog 3575 SHA256 6ec87dce0132d641ce6b1dd9a6f69a0c24e5638cfdf283a62934c9daf630d675 SHA512 782b3120aaefc04e59069957624959469dbaec1710341c617a4e61e85d4d8376caf79374cadf1c15ffb96cad5db239caccef65fb8c0369e7509099ed12230eef WHIRLPOOL 69f886d01f7d28f6b15d0fa5ba48dfad0044d8a731996eaf60474c1da2552c1707b34a66af93d378317c5833a06c07b86b15220aa6cc2bb876feb21be6c35af8 +MISC ChangeLog-2015 892 SHA256 d6c76f15935c6095c7a3dd2aa7f71e93ba667e749f12e7e7afbfaf4cd4ac3a57 SHA512 ffb2f246907f010ee1ed760b4aea0e667ca2dd8e3a0d1e403299ea7538260ade921955d48158a14af87a4942e5131de1a8a600887c8114d8d61a8d4a9ffca950 WHIRLPOOL 58b8922d097a45ffa414ede2ad6d629789dc18696d1b60724e7a4e64b4cccda25bec75c8dd4a39748fec08670f1e4bf92213cbe1b4cea60ecef324906c1b9ea1 +MISC metadata.xml 333 SHA256 f4208adff17bdb0920d2c0cdcc1c3d004344d67364e979296867c74e07a8020f SHA512 ead9b44190ac80607b29eb37c771f7ce041cdde47e1e8203201d0e616ea78377312101dbf1ed6a508c64a884980506c96cf77dbd8a4d05f0a69ecd807fc40ead WHIRLPOOL 028e5ea73e2646689cf0661fafa341a925ea5a9d93dab619a0e3854c042adda3ef848a041645ad111b5ef8060528b9b06475bc0c1aa79d567fd387ecbe2c8c63 diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild new file mode 100644 index 000000000000..ae1515f218f4 --- /dev/null +++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils gnome2-utils + +DESCRIPTION="Fast-paced 3D lightcycle game based on Tron" +HOMEPAGE="http://armagetronad.org/" +SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/armagetronad-${PV}.src.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="dedicated sound" + +RDEPEND=" + dev-libs/libxml2 + !dedicated? ( + media-libs/libpng:0 + media-libs/libsdl[X,opengl,video] + media-libs/sdl-image[jpeg,png] + virtual/glu + virtual/opengl + sound? ( + media-libs/libsdl[sound] + media-libs/sdl-mixer + ) + )" +DEPEND=${RDEPEND} + +PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) + +src_prepare() { + default + sed -i -e 's#aa_docdir=.*$#aa_docdir=${docdir}#' configure || die +} + +src_configure() { + # --enable-games just messes up paths + econf \ + --docdir=/usr/share/doc/${PF} \ + $(use_enable dedicated) \ + $(use_enable sound music) \ + --disable-sysinstall \ + --disable-useradd \ + --disable-uninstall \ + --disable-games +} + +src_install() { + # FIXME: is the -j1 needed? https://bugs.gentoo.org/588104 + emake -j1 DESTDIR="${D}" install + einstalldocs + + # misplaced desktop-file/icons + rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop + doicon -s 48 desktop/icons/large/armagetronad.png + make_desktop_entry ${PN} +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch b/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch new file mode 100644 index 000000000000..0cd6e5bc1d67 --- /dev/null +++ b/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch @@ -0,0 +1,222 @@ +Bug: https://bugs.gentoo.org/show_bug.cgi?id=617768 +Commit: https://sourceforge.net/p/armagetronad/code/10845/ + +--- a/src/engine/eNetGameObject.cpp ++++ b/src/engine/eNetGameObject.cpp +@@ -85,7 +85,7 @@ + eNetGameObject::eNetGameObject(eGrid *grid, const eCoord &pos,const eCoord &dir, + ePlayerNetID* p,bool autodelete) + :eGameObject(grid, pos,dir,NULL,autodelete), +-nNetObject(p->Owner()),player(p){ ++ nNetObject(Owner(p)),player(p){ + lastClientsideAction=0; + if (sn_GetNetState()!=nCLIENT) + RequestSync(); +@@ -205,7 +205,7 @@ + + void eNetGameObject::SetPlayer(ePlayerNetID* a_player) + { +- tASSERT( !a_player || Owner() == player->Owner() ); ++ tASSERT( !a_player || Owner() == Owner(player) ); + player = a_player; + if ( laggometerSmooth == 0 && sn_GetNetState() != nCLIENT ) + laggometerSmooth = laggometer = se_GetPing( player ); +--- a/src/engine/ePlayer.cpp ++++ b/src/engine/ePlayer.cpp +@@ -56,6 +56,7 @@ + #include "nConfig.h" + #include "nNetwork.h" + #include <time.h> ++#include <climits> + + int se_lastSaidMaxEntries = 8; + +@@ -1689,9 +1690,9 @@ + // foo (Red Team) --> Blue Team: some message here + eTeam *senderTeam = sender->CurrentTeam(); + console << tColoredString::ColorString(1,1,.5) << " ("; +- console << *senderTeam; ++ console << senderTeam; + console << tColoredString::ColorString(1,1,.5) << ") --> "; +- console << *team; ++ console << team; + } + + console << tColoredString::ColorString(1,1,.5) << ": "; +@@ -1923,7 +1924,7 @@ + else { + eTeam *senderTeam = sender->CurrentTeam(); + say << tColoredString::ColorString(1,1,.5) << " ("; +- say << *team; ++ say << team; + say << tColoredString::ColorString(1,1,.5) << " ) --> "; + say << senderTeam; + } +@@ -3941,7 +3942,7 @@ + sg_ClampPingCharity( ::pingCharity ); + } + +-static int IMPOSSIBLY_LOW_SCORE=(-1 << 31); ++static int IMPOSSIBLY_LOW_SCORE=INT_MIN; + + static nSpamProtectionSettings se_chatSpamSettings( 1.0f, "SPAM_PROTECTION_CHAT", tOutput("$spam_protection") ); + +--- a/src/engine/eTeam.cpp ++++ b/src/engine/eTeam.cpp +@@ -31,20 +31,21 @@ + #include "nConfig.h" + + #include <set> ++#include <climits> + +-tString & operator << ( tString &s, const eTeam & team) ++tString & operator << ( tString &s, const eTeam * team) + { +- if ( !(&team) ) ++ if ( !team ) + return s << tOutput("$player_spectator_message"); + else +- return s << team.GetColoredName(); ++ return s << team->GetColoredName(); + } +-std::ostream & operator << ( std::ostream &s, const eTeam & team) ++std::ostream & operator << ( std::ostream &s, const eTeam * team) + { +- if ( !(&team) ) ++ if ( !team ) + return s << tOutput("$player_spectator_message"); + else +- return s << team.GetColoredName(); ++ return s << team->GetColoredName(); + } + + #define TEAMCOLORS 8 +@@ -75,7 +76,7 @@ + // static tList<eTeam> se_ColoredTeams; + static eTeam * se_ColoredTeams[TEAMCOLORS]={0,0,0,0,0,0,0,0}; + +-static int IMPOSSIBLY_LOW_SCORE=(-1 << 31); ++static int IMPOSSIBLY_LOW_SCORE=INT_MIN; + + // class that creates config items for one team + // TEAM_(NAME|RED|GREEN|BLUE)_X +--- a/src/engine/eTeam.h ++++ b/src/engine/eTeam.h +@@ -32,8 +32,8 @@ + #include "nNetObject.h" + #include "tList.h" + +-tString & operator << ( tString&, const eTeam&); +-std::ostream & operator << ( std::ostream&, const eTeam&); ++tString & operator << ( tString&, const eTeam*); ++std::ostream & operator << ( std::ostream&, const eTeam*); + + template<class T> class nConfItem; + +--- a/src/network/nNetObject.h ++++ b/src/network/nNetObject.h +@@ -128,7 +128,16 @@ + + virtual void Dump( tConsole& con ); // dumps object stats + ++ static unsigned short ID(nNetObject const *pThis) ++ { ++ if (pThis) ++ return pThis->id; ++ else ++ return 0; ++ } ++ + unsigned short ID() const{ ++ tASSERT(this); + if (this) + return id; + else +@@ -135,7 +144,16 @@ + return 0; + } + ++ static unsigned short Owner(nNetObject const *pThis) ++ { ++ if (pThis) ++ return pThis->owner; ++ else ++ return ::sn_myNetID; ++ } ++ + unsigned short Owner() const{ ++ tASSERT(this); + if (this) + return owner; + else +--- a/src/tools/tLocale.cpp ++++ b/src/tools/tLocale.cpp +@@ -731,6 +731,13 @@ + + // and a special implementation for the locales and strings: + tOutput& operator << (tOutput &o, const char *locale){ ++ return o.AddString(locale); ++} ++ ++tOutput & tOutput::AddString(char const * locale) ++{ ++ tOutput & o = *this; ++ + int len = strlen(locale); + if (len == 0) + return o; +--- a/src/tools/tLocale.h ++++ b/src/tools/tLocale.h +@@ -81,7 +81,7 @@ + + tOutputItemBase *anchor; + +- tOutput& operator << (const tOutput &o); ++ // tOutput& operator << (const tOutput &o); + public: + tOutput(); + ~tOutput(); +@@ -91,6 +91,7 @@ + void AddLiteral(const char *); // adds a language independent string + void AddLocale(const char *); // adds a language dependant string + void AddSpace(); // adds a simple space ++ tOutput & AddString(char const * pString); // checks the string, delegates to correct Add...()-Function + + // set a template parameter at this position of the output string + tOutput & SetTemplateParameter(int num, const char *parameter); +@@ -113,7 +114,7 @@ + + SetTemplateParameter(1, template1); + +- *this << identifier; ++ AddString(identifier); + } + + template< class T1, class T2 > +@@ -125,7 +126,7 @@ + SetTemplateParameter(1, template1); + SetTemplateParameter(2, template2); + +- *this << identifier; ++ AddString(identifier); + } + + template< class T1, class T2, class T3 > +@@ -138,7 +139,7 @@ + SetTemplateParameter(2, template2); + SetTemplateParameter(3, template3); + +- *this << identifier; ++ AddString(identifier); + } + + template< class T1, class T2, class T3, class T4 > +@@ -152,7 +153,7 @@ + SetTemplateParameter(3, template3); + SetTemplateParameter(4, template4); + +- *this << identifier; ++ AddString(identifier); + } + + tOutput(const tOutput &o); // copy constructor diff --git a/games-action/armagetronad/metadata.xml b/games-action/armagetronad/metadata.xml new file mode 100644 index 000000000000..0a249e335798 --- /dev/null +++ b/games-action/armagetronad/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + <upstream> + <remote-id type="launchpad">armagetronad</remote-id> + </upstream> +</pkgmetadata> |