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-action/gltron/Manifest | 8 ++++ .../gltron/files/gltron-0.70-configure.patch | 24 ++++++++++ games-action/gltron/files/gltron-0.70-debian.patch | 35 ++++++++++++++ games-action/gltron/files/gltron-0.70-gcc49.patch | 13 +++++ .../gltron/files/gltron-0.70-prototypes.patch | 24 ++++++++++ games-action/gltron/gltron-0.70-r2.ebuild | 55 ++++++++++++++++++++++ games-action/gltron/metadata.xml | 11 +++++ 7 files changed, 170 insertions(+) create mode 100644 games-action/gltron/Manifest create mode 100644 games-action/gltron/files/gltron-0.70-configure.patch create mode 100644 games-action/gltron/files/gltron-0.70-debian.patch create mode 100644 games-action/gltron/files/gltron-0.70-gcc49.patch create mode 100644 games-action/gltron/files/gltron-0.70-prototypes.patch create mode 100644 games-action/gltron/gltron-0.70-r2.ebuild create mode 100644 games-action/gltron/metadata.xml (limited to 'games-action/gltron') diff --git a/games-action/gltron/Manifest b/games-action/gltron/Manifest new file mode 100644 index 000000000000..a40cd40f4707 --- /dev/null +++ b/games-action/gltron/Manifest @@ -0,0 +1,8 @@ +AUX gltron-0.70-configure.patch 622 BLAKE2B 668ad864c79d338a4d3b2fe541961ad5dcb8c7d520ffbaf6fafec6cb663d9e8f27be1ccc2d7c8b29d591908a8ed2b49aba9c7c691445a58c52a8129b0f90a85a SHA512 c883589e1b54a98685bde729633077bae22834713d19d2b49ef0d9de57fa136a9808dbb491233902181feda4b522cc6fafe8ebbe09827e7bc3fe232c931cb5ba +AUX gltron-0.70-debian.patch 885 BLAKE2B d837bd1dc32b1b9e9ad07acee573b6bec3f1eae4a244400da099f818349b2825710e87776d93817c08edf85af326c3f344ae447871448469e6822a086dbffd80 SHA512 1b3017735a48a0ff7fa837d777cda3dd50336520b7131d2c25a8be63940d1372e60d51fe96aae42c9b2c6c34810da9127d6a3f69d6a1cc8a4ff5aa480435727a +AUX gltron-0.70-gcc49.patch 259 BLAKE2B 288d09fb2933a253ec2749ddff5170d4f1181f8f3f37420647be3d9f4c9b824c6be8d0f94cae25780415dd3a8068402d4fc0d3948a9ccf4e4886212d65d2488b SHA512 bd02b07edf56c3f2e6cb2b22e840dd7a8a6e83b1752580df5f20faadc9b8fb489822733c63ef26476af59a12413e902a547cd3bec893abacabc354379a3b952c +AUX gltron-0.70-prototypes.patch 629 BLAKE2B 0fbaf68a5bd481be42b7eb389875a017b82421bc0d913beff254a377bb058960d5aad63e53133e867062b5f2280d4449ea0993b82da782b2ebb32586110b080c SHA512 54db68b1d16be029db3314f11da25ee3d3ef1ed4197a702e8d12e753bf1a842268c129784d3d8706347281005a00607572e191fac5215060c1554b69cfee20e5 +DIST gltron-0.70-source.tar.gz 2182440 BLAKE2B ad58f6bca17f7eda1c2daadc395d6f1333926ed389d1a2f362fc5b27b37c4ce144cea7dcad4ec2abeee9197d3e944b71b1e903d5b79dfad5a4b26125a5461233 SHA512 297708a145d995bfd186f1745ffa674ab44238e8c2fb627245de3c1602f578afdd9223fae696107769b3b29da476cd9623ee37183618bfb13a9a9cfa59e41bf2 +DIST gltron.png 7570 BLAKE2B 30e71b3ebb269228e264bdd6dc45c08d25ffd8cba3f91fb36129820f8b79c40073b22a0d202d4d440d1f27106edfeb3723c2963178a6d9084af274015796ac8e SHA512 d83eb90b4d070d4dc5e93bf90cf81629b6a8bb200ca5e2963b757e282aeae62288560a6ded6159a170c301f0119592ac743a15ab604a6ba98a4ee93d00c02d0a +EBUILD gltron-0.70-r2.ebuild 1096 BLAKE2B 24fc37385be111fedb32a1755f775df603a32ba48f7ec7eef2bc49816b2d0cbc5956134226eecc9ecc645b42946e42301b032ca804785168639e22a2325436dd SHA512 82fa2317d66aeb083829978ce5d01f3194ebcb22de0690045c652ede47c315c329c41f528cc0ddc57bb3336c228305245cddfce27d485263756b84baa39cbbee +MISC metadata.xml 329 BLAKE2B 1e70d0e1f5bb709921a826cdef9fb7bd7c600e91d3f9310efb77712eaa2e878a7b39d048e9c4785d9101d60d8be02ef83dc214f9f08e3e1e01f220b8b4531425 SHA512 118d8a5ce83c678a0a0e73b0a3932a24cffd2fef16949dfa986f16e34cad89929f9d0daed1db9945af0f515e9b5da7961cb9a61b19ea1846ed085fa414a24f80 diff --git a/games-action/gltron/files/gltron-0.70-configure.patch b/games-action/gltron/files/gltron-0.70-configure.patch new file mode 100644 index 000000000000..5bdef979a57f --- /dev/null +++ b/games-action/gltron/files/gltron-0.70-configure.patch @@ -0,0 +1,24 @@ +configure.in is written poorly so it just stomps all over CFLAGS + +--- a/configure ++++ b/configure +@@ -2805,7 +2805,7 @@ + RANLIB="$ac_cv_prog_RANLIB" + fi + +-CFLAGS="-DSEPARATOR=\"'/'\"" ++CFLAGS="$CFLAGS -DSEPARATOR=\"'/'\"" + + # Check whether --enable-warn or --disable-warn was given. + if test "${enable_warn+set}" = set; then +@@ -2852,10 +2852,6 @@ + else + enable_optimize=s + fi; +-if test "x$enable_optimize" ; then +- CFLAGS="$CFLAGS -O$enable_optimize" +- CXXFLAGS="$CXXFLAGS -O$enable_optimize" +-fi + + # Check whether --with-sdl-prefix or --without-sdl-prefix was given. + if test "${with_sdl_prefix+set}" = set; then diff --git a/games-action/gltron/files/gltron-0.70-debian.patch b/games-action/gltron/files/gltron-0.70-debian.patch new file mode 100644 index 000000000000..4e25618ce9b6 --- /dev/null +++ b/games-action/gltron/files/gltron-0.70-debian.patch @@ -0,0 +1,35 @@ +Ripped from Debian patchset 6 + +--- a/src/include/game/game_data.h ++++ b/src/include/game/game_data.h +@@ -71,7 +71,7 @@ + typedef struct AI { + int active; + int tdiff; +- long lasttime; ++ unsigned int lasttime; + segment2 left, right, front, backleft; + } AI; + +--- a/src/include/video/fonttex.h ++++ b/src/include/video/fonttex.h +@@ -10,7 +10,7 @@ + int lower; /* lowest ascii character (normally: 32) */ + int upper; /* highest ascii character (normally: 126) */ + +- int *texID; ++ unsigned int *texID; + + char *fontname; + char *bitmapname; +--- a/src/video/trail.c ++++ b/src/video/trail.c +@@ -19,7 +19,7 @@ + n[1] = s->vStart.v[1] - s->vDirection.v[0]; + tmp[0] = eye[0] - s->vStart.v[0]; + tmp[1] = eye[1] - s->vStart.v[1]; +- if(n[0] == n[1] == 0) return length(tmp); ++ if(n[0] == 0 && n[1] == 0) return length(tmp); + return abs(scalarprod2(n, tmp) / length(n)); + } + diff --git a/games-action/gltron/files/gltron-0.70-gcc49.patch b/games-action/gltron/files/gltron-0.70-gcc49.patch new file mode 100644 index 000000000000..4a1d5cbe1e1e --- /dev/null +++ b/games-action/gltron/files/gltron-0.70-gcc49.patch @@ -0,0 +1,13 @@ +--- 1/lua/src/lib/liolib.c ++++ 1/lua/src/lib/liolib.c +@@ -6,9 +6,9 @@ + */ + + ++#define __USE_MISC /* for mkstemp() */ + #include + #include +-#define __USE_MISC /* for mkstemp() */ + #include + #include + #include diff --git a/games-action/gltron/files/gltron-0.70-prototypes.patch b/games-action/gltron/files/gltron-0.70-prototypes.patch new file mode 100644 index 000000000000..621963aeb689 --- /dev/null +++ b/games-action/gltron/files/gltron-0.70-prototypes.patch @@ -0,0 +1,24 @@ +scripting.h declares these params as const so make sure they're the same. + +--- a/nebu/scripting/scripting.c ++++ b/nebu/scripting/scripting.c +@@ -169,16 +169,16 @@ + return status; + } + +-void scripting_RunFile(char *name) { ++void scripting_RunFile(const char *name) { + lua_dofile(L, name); + } + +-void scripting_Run(char *command) { ++void scripting_Run(const char *command) { + /* fprintf(stderr, "[command] %s\n", command); */ + lua_dostring(L, command); + } + +-void scripting_RunFormat(char *format, ... ) { ++void scripting_RunFormat(const char *format, ... ) { + char buf[4096]; + va_list ap; + va_start(ap, format); diff --git a/games-action/gltron/gltron-0.70-r2.ebuild b/games-action/gltron/gltron-0.70-r2.ebuild new file mode 100644 index 000000000000..dc47e0b51cab --- /dev/null +++ b/games-action/gltron/gltron-0.70-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils + +DESCRIPTION="3d tron, just like the movie" +HOMEPAGE="http://gltron.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz + mirror://gentoo/${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + media-libs/libmikmod + media-libs/libpng:0 + media-libs/libsdl[sound,video] + media-libs/sdl-mixer[vorbis] + media-libs/sdl-sound[vorbis,mikmod] + media-libs/smpeg + virtual/opengl" + +RDEPEND=${DEPEND} + +PATCHES=( + "${FILESDIR}"/${P}-configure.patch + "${FILESDIR}"/${P}-debian.patch + "${FILESDIR}"/${P}-gcc49.patch + "${FILESDIR}"/${P}-prototypes.patch +) + +src_prepare() { + default + sed -i \ + -e '/^gltron_LINK/s/$/ $(LDFLAGS)/' \ + Makefile.in || die +} + +src_configure() { + # warn/debug/profile just modify CFLAGS, they aren't + # real options, so don't utilize USE flags here + econf \ + --disable-warn \ + --disable-debug \ + --disable-profile +} + +src_install() { + default + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} GLtron +} diff --git a/games-action/gltron/metadata.xml b/games-action/gltron/metadata.xml new file mode 100644 index 000000000000..0612306374d9 --- /dev/null +++ b/games-action/gltron/metadata.xml @@ -0,0 +1,11 @@ + + + + + games@gentoo.org + Gentoo Games Project + + + gltron + + -- cgit v1.2.3