From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- games-simulation/cannonsmash/Manifest | 8 +++ .../cannonsmash/cannonsmash-0.6.6-r1.ebuild | 71 ++++++++++++++++++++++ .../files/cannonsmash-0.6.6-flags.patch | 21 +++++++ .../files/cannonsmash-0.6.6-gcc41.patch | 22 +++++++ .../files/cannonsmash-0.6.6-sizeof-cast.patch | 11 ++++ .../files/cannonsmash-0.6.6-x-inc.patch | 18 ++++++ games-simulation/cannonsmash/metadata.xml | 11 ++++ 7 files changed, 162 insertions(+) create mode 100644 games-simulation/cannonsmash/Manifest create mode 100644 games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild create mode 100644 games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch create mode 100644 games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch create mode 100644 games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch create mode 100644 games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch create mode 100644 games-simulation/cannonsmash/metadata.xml (limited to 'games-simulation/cannonsmash') diff --git a/games-simulation/cannonsmash/Manifest b/games-simulation/cannonsmash/Manifest new file mode 100644 index 000000000000..c7b4c1f1960b --- /dev/null +++ b/games-simulation/cannonsmash/Manifest @@ -0,0 +1,8 @@ +AUX cannonsmash-0.6.6-flags.patch 524 BLAKE2B 5a85b73b59c1dcbc097df325e2b94701cef5629bd929c3c22f43fe65d259c22cdf5949b82a14e2e87f190952ce554947b465403e058aa3564a27f6ef1c5bff38 SHA512 38f6edfc9f6c434496ae9b5f45fa7f42df8c8156bd7507efce7d9d5c0f6950b3178200d863b6d75552caf1a0206fd75b61328ce4ca96eb59d84b7006f5b44fb6 +AUX cannonsmash-0.6.6-gcc41.patch 594 BLAKE2B 392ceebbba587580c9ddc8511c7139aa68d0c881f372c362ef0c068119060f593462b999514340d81075bbecc1d0a11c617c0ab4ec8ac2180350bd9cfd046a1e SHA512 a9bbadb4d6ff279eb368be17ff6326b2ddcdcd3231ace4fe2a4368bd82ece6cd11cbcf6c2464ad9e79d41ad099e66b8c4ab5efea4995bdd7beabfefb5b92c3ca +AUX cannonsmash-0.6.6-sizeof-cast.patch 362 BLAKE2B 1a7dbf4c921497c2209c078e9453f6ff1106f4a3baca52e57f1778022763a7f8f79259f443f88d74c0b412aef223fd948c93e0c79158df25bea2cf6cbcc0209e SHA512 9e38b5ef20529587dbcf86ecd4712e9e4b751ec4fd2d735f3924a03afbcd56345f738b65e37525e90e1717117160dd175e0bacdb2cf39dfa8b2d5d09690ffdc4 +AUX cannonsmash-0.6.6-x-inc.patch 309 BLAKE2B efcd58b83b9433065efbde3aa4356b48b8fb0bba4462fb2e92c28368e3610c995060ffc0dd7a76d5ef994341e154716c1d5b3b09869396314002e04029479767 SHA512 d6f6139014782eee11965595e0ea61e53a773be3be5edcaba2ebc602983b9dd2f0178298c34507ebf722a868c0f43535adae519cbebdd2a7e3da730e4f54c0ab +DIST csmash-0.6.6.tar.gz 1989943 BLAKE2B 723b7accd9a899f6d80df07573f8583684606c6b5bf8f11753902f4db196a9a2738cd11899e0a3b4e5637b04553173d75701edbed6e2d800b7b18edb82b2a10f SHA512 e8406eb17adf6c6cc4454b7d0a432ad1b071e1f72d9867fd46e458ade2d1dc1e927a7f2a336c80988b97051b9d188c3027dd8207f89f7e1fa60e1d0a6a5e8916 +DIST danslatristesse2-48.ogg 1070787 BLAKE2B 91bb5b552a45349d6b34d459f2d5071498b6def76c9b7e7ce1538c29af762698708d4ad6fe780e087f14b6ca42dad258c8ed2a7cd368027a5080aab52d02575a SHA512 5cbc457d511bdc736f3b359a8ddd3a514bd0d14418f2dbd68409394baadfcd9fd7630b228e4e9654b14b513e158e9a46b67bc58c5c04bfe382ee6e624dd16834 +EBUILD cannonsmash-0.6.6-r1.ebuild 1401 BLAKE2B dd927348ecc38a65865bb53769886b571c5c8543b4fc9f8f1e7ee5c2e8048c38a4ba0e12b7bb643abe9948c278781ee4f04356cd81f4fa690f4ef74322dc5e1d SHA512 d73328460d50c06230d130e8a18cabae84335f748cfe2116257eac522852e6254072eaff232aa4d7b00328a8d57b3731052c9fd903ff718b3a52db302424a638 +MISC metadata.xml 334 BLAKE2B 7143d65b7fa8567c3598adc245e6a6f8148074d8775f23c06eff18b0e94cb3e570c3c483a1c44df49f148c6150271172150dcf870873e4fb796be0d08c718663 SHA512 feb36e586e7e460e47a342dccf7cc812319860809033b31a8597c8df12f7c09e725af4e5536933a50341e22e921009557600801bcf64d9bf13e88b24d4b53e34 diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild new file mode 100644 index 000000000000..8da30598da0c --- /dev/null +++ b/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit desktop + +MY_OGG=danslatristesse2-48.ogg +DESCRIPTION="3D tabletennis game" +HOMEPAGE="http://cannonsmash.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/csmash-${PV}.tar.gz + vorbis? ( http://nan.p.utmc.or.jp/${MY_OGG} )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="vorbis nls" + +RDEPEND=" + virtual/opengl + virtual/glu + media-libs/libsdl[sound,video] + media-libs/sdl-mixer[vorbis?] + media-libs/sdl-image[jpeg,png] + x11-libs/gtk+:2 + nls? ( virtual/libintl ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +S="${WORKDIR}/csmash-${PV}" + +src_unpack() { + unpack csmash-${PV}.tar.gz +} + +src_prepare() { + default + eapply \ + "${FILESDIR}"/${P}-x-inc.patch \ + "${FILESDIR}"/${P}-sizeof-cast.patch \ + "${FILESDIR}"/${P}-gcc41.patch \ + "${FILESDIR}"/${P}-flags.patch + if use vorbis ; then + sed -i \ + -e "s:${MY_OGG}:/usr/share/csmash/games/${MY_OGG}:" ttinc.h \ + || die "sed failed" + fi +} + +src_configure() { + econf \ + $(use_enable nls) \ + --datadir="/usr/share" +} + +src_compile() { + emake \ + localedir="/usr/share" +} + +src_install() { + default + if use vorbis ; then + insinto /usr/share/games/csmash + doins "${DISTDIR}"/${MY_OGG} + fi + newicon win32/orange.ico ${PN}.ico + make_desktop_entry csmash "Cannon Smash" /usr/share/pixmaps/${PN}.ico +} diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch new file mode 100644 index 000000000000..c7b3b561d2d1 --- /dev/null +++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch @@ -0,0 +1,21 @@ +--- a/configure.old 2010-10-18 15:05:02.000000000 +0200 ++++ b/configure 2010-10-18 15:05:31.000000000 +0200 +@@ -5516,12 +5516,12 @@ + + + if test "x$x_includes" != "x"; then +- CFLAGS="-I $x_includes" +-else +- CFLAGS="" +-fi +-LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir" +-CXXFLAGS="$CFLAGS -Wall" ++ CFLAGS="${CFLAGS} -I $x_includes" ++else ++ CFLAGS="${CFLAGS}" ++fi ++LDFLAGS="${LDFLAGS} -L/usr/local/lib -L$x_libraries -L$libdir" ++CXXFLAGS="${CXXFLAGS} -Wall" + + + echo "$as_me:$LINENO: checking for main in -lXmu" >&5 diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch new file mode 100644 index 000000000000..6602c2f09304 --- /dev/null +++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch @@ -0,0 +1,22 @@ +--- a/BallView.h.old 2006-04-11 00:10:37.000000000 +0200 ++++ b/BallView.h 2006-04-11 00:10:53.000000000 +0200 +@@ -32,7 +32,7 @@ + + static GLuint m_number[10]; + private: +- void BallView::DrawTargetCircle(); ++ void DrawTargetCircle(); + GLUquadricObj *m_quad; + + void DrawBall(); +--- a/matrix.old 2006-04-11 00:13:18.000000000 +0200 ++++ b/matrix 2006-04-11 00:19:34.000000000 +0200 +@@ -42,7 +42,7 @@ + + /* __BEGIN__BEGIN__ */ + //__NAMESPACE_BEGIN(ese); +-#if (!defined __GNUG__) || (__GNUC__ == 3) ++#if (!defined __GNUG__) || (__GNUC__ >= 3) + template + void swap(T& a, T& b) + { diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch new file mode 100644 index 000000000000..ead10c90400b --- /dev/null +++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch @@ -0,0 +1,11 @@ +Don't typecast otherwise C++ will fail to match on some arches. + +http://bugs.gentoo.org/84187 + +--- a/loadparts.cpp ++++ b/loadparts.cpp +@@ -247,3 +247,3 @@ + // concat next line(s) +- int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1); ++ int bufsize = clamp((size_t)0, sizeof(line)-l, sizeof(line)-1); + fgets(&line[l-2], bufsize, fp); diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch new file mode 100644 index 000000000000..e56b51e0b92a --- /dev/null +++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch @@ -0,0 +1,18 @@ +Patch by Jason Bucata. +http://bugs.gentoo.org/84187 + +--- a/configure ++++ b/configure +@@ -5515,7 +5515,11 @@ + fi + + +-CFLAGS="-I $x_includes" ++if test "x$x_includes" != "x"; then ++ CFLAGS="-I $x_includes" ++else ++ CFLAGS="" ++fi + LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir" + CXXFLAGS="$CFLAGS -Wall" + diff --git a/games-simulation/cannonsmash/metadata.xml b/games-simulation/cannonsmash/metadata.xml new file mode 100644 index 000000000000..a7e14e54406d --- /dev/null +++ b/games-simulation/cannonsmash/metadata.xml @@ -0,0 +1,11 @@ + + + + + games@gentoo.org + Gentoo Games Project + + + cannonsmash + + -- cgit v1.2.3