From c5d873f9d97064840908d1d2d8a57b8ef7b6a8dd Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Sat, 9 Jan 2010 17:39:34 +0000 Subject: Version bump to 0.9.8083 Bug #300053 Package-Manager: portage-2.1.6.13/cvs/Linux i686 --- games-action/btanks/ChangeLog | 10 ++- games-action/btanks/Manifest | 7 +- games-action/btanks/btanks-0.8.7686.ebuild | 4 +- games-action/btanks/btanks-0.9.8083.ebuild | 57 +++++++++++++ .../btanks/files/btanks-0.9.8083-scons-blows.patch | 93 ++++++++++++++++++++++ 5 files changed, 165 insertions(+), 6 deletions(-) create mode 100644 games-action/btanks/btanks-0.9.8083.ebuild create mode 100644 games-action/btanks/files/btanks-0.9.8083-scons-blows.patch (limited to 'games-action/btanks') diff --git a/games-action/btanks/ChangeLog b/games-action/btanks/ChangeLog index 537fcaec20df..7d0a140c4f38 100644 --- a/games-action/btanks/ChangeLog +++ b/games-action/btanks/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-action/btanks -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/ChangeLog,v 1.20 2009/05/23 22:09:59 nyhm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/ChangeLog,v 1.21 2010/01/09 17:39:33 tupone Exp $ + +*btanks-0.9.8083 (09 Jan 2010) + + 09 Jan 2010; Tupone Alfredo +btanks-0.9.8083.ebuild, + +files/btanks-0.9.8083-scons-blows.patch: + Version bump to 0.9.8083 Bug #300053 by Arseny Solokha 23 May 2009; Tristan Heaven btanks-0.8.7686.ebuild, files/btanks-0.8.7686-scons-blows.patch: diff --git a/games-action/btanks/Manifest b/games-action/btanks/Manifest index b571341f59d4..792ac3390450 100644 --- a/games-action/btanks/Manifest +++ b/games-action/btanks/Manifest @@ -1,5 +1,8 @@ AUX btanks-0.8.7686-scons-blows.patch 3207 RMD160 e936718477d6a7271f2832671964d0d9835d91bf SHA1 c9c6d13b7d377c7ac4661fdddcdefa2c7a662be4 SHA256 9486214c6762b44e99cc57cc0a867affb3a6c44126f715482828717727ec92bf +AUX btanks-0.9.8083-scons-blows.patch 3146 RMD160 562ea454f0de7d70be6a7efcd74555bee07a6dfe SHA1 d766e2b97f9eabffe8aaab35a5a3b233ecdbd9c4 SHA256 792bf72825939d33fa548cf995665104df06399820fc3eb85148d8fb722e8622 DIST btanks-0.8.7686.tar.bz2 59601972 RMD160 4aba37bf06f36aa01f01a6f0b4920805c9e89c26 SHA1 912a0f1a66d60edfca47c4e86fd112d4778fb961 SHA256 5ac3f3b7aefb9f39cbefa1d108b00afb88b2aebf14681d69ed807fb49a2ed174 -EBUILD btanks-0.8.7686.ebuild 1571 RMD160 4b39d1ce70194e7bbac43b428274e7881622d7f4 SHA1 5738ec177f20b148641d0b3595af715776fd7b56 SHA256 ad52885d50ba0199ade577d4acab31a47833bd26fdded9e9cffceb1e62c114c8 -MISC ChangeLog 3585 RMD160 3f96ac515ffdc808a0ac796b004dc80ccae70e9c SHA1 a118c8a7ba496c06405d7d7be9aa9c0c3602303c SHA256 9e021890a71de4d50fe8fc98bad798462de054b551cebb1beb1559bbc8efb1fb +DIST btanks-0.9.8083.tar.bz2 28754069 RMD160 e0eaebdfea636ddeabfba230315353036e06dfcb SHA1 e3f76e7cbda0a90a606e8358c6aa686cebba02d6 SHA256 3fd2ce6a2b45f7a60c3b114fa9aff13cb3dd9fbb6a65cdc9798b76c4fa2c4341 +EBUILD btanks-0.8.7686.ebuild 1568 RMD160 994ac397ec201e3f187f93cc6225f4987ecd06f5 SHA1 29960dcb9dc4f285094ccfd4a1303c4d63835e9f SHA256 82ea82a9b51994c1a36541731491cd32a3fa07d70dbdfef7ebfdd36c50ca8ec4 +EBUILD btanks-0.9.8083.ebuild 1569 RMD160 d9b778a00d73ebf474b82d59f24d51f3c0a54932 SHA1 bb6aa1723e8514fff5b589fa3494c8537fd62266 SHA256 6d8e8be47dc477737be123444546e55f7714aa230d2ceae6396164e474b231db +MISC ChangeLog 3796 RMD160 006ddab6e88d61b360d68338563ae9fbcf591f8b SHA1 8683314e46466e27d3669a8e3acac7452d097ee8 SHA256 2e6ecc4e4df4c4ee700edec5e7c2463777351df3e1b83b65c42ad0349ac8a37a MISC metadata.xml 602 RMD160 7bcf0da779e8e1cc2a225f25cba147e7d743d671 SHA1 2a04ca616e925cb64cd5df0f4dd96e1512b4aeb0 SHA256 f2fba9fde47806ea5f4d7a16dfe1a5edd4869619118f28a30a91ec8a629cfb2c diff --git a/games-action/btanks/btanks-0.8.7686.ebuild b/games-action/btanks/btanks-0.8.7686.ebuild index 6c1482d9c8af..9fcd98d2ef0d 100644 --- a/games-action/btanks/btanks-0.8.7686.ebuild +++ b/games-action/btanks/btanks-0.8.7686.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/btanks-0.8.7686.ebuild,v 1.10 2009/11/23 01:37:57 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/btanks-0.8.7686.ebuild,v 1.11 2010/01/09 17:39:33 tupone Exp $ EAPI=2 inherit eutils games diff --git a/games-action/btanks/btanks-0.9.8083.ebuild b/games-action/btanks/btanks-0.9.8083.ebuild new file mode 100644 index 000000000000..21e4028cffee --- /dev/null +++ b/games-action/btanks/btanks-0.9.8083.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/btanks-0.9.8083.ebuild,v 1.1 2010/01/09 17:39:33 tupone Exp $ + +EAPI=2 +inherit eutils games + +DESCRIPTION="Fast 2D tank arcade game with multiplayer and split-screen modes" +HOMEPAGE="http://btanks.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-lang/lua-5.1 + media-libs/libsdl[joystick,video] + media-libs/libvorbis + virtual/opengl + dev-libs/expat + media-libs/smpeg + media-libs/sdl-image[jpeg,png] + media-libs/sdl-gfx" +DEPEND="${RDEPEND} + dev-util/scons + dev-util/pkgconfig" + +src_prepare() { + rm -rf sdlx/gfx + epatch "${FILESDIR}"/${P}-scons-blows.patch +} + +src_compile() { + local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }") + + scons \ + ${sconsopts} \ + prefix="${GAMES_PREFIX}" \ + lib_dir="$(games_get_libdir)"/${PN} \ + plugins_dir="$(games_get_libdir)"/${PN} \ + resources_dir="${GAMES_DATADIR}"/${PN} \ + || die "scons failed" +} + +src_install() { + dogamesbin build/release/engine/btanks || die "dogamesbin failed" + newgamesbin build/release/editor/bted btanksed || die "newgamesbin failed" + exeinto "$(games_get_libdir)"/${PN} + doexe build/release/*/*.so || die "doexe failed" + insinto "${GAMES_DATADIR}"/${PN} + doins -r data || die "doins failed" + newicon engine/src/bt.xpm ${PN}.xpm + make_desktop_entry ${PN} "Battle Tanks" + dodoc ChangeLog *.txt + prepgamesdirs +} diff --git a/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch b/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch new file mode 100644 index 000000000000..47ce410f0bf8 --- /dev/null +++ b/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch @@ -0,0 +1,93 @@ +--- mrt/export_base.h.old 2010-01-09 17:38:47.000000000 +0100 ++++ mrt/export_base.h 2010-01-09 17:39:23.000000000 +0100 +@@ -1,7 +1,7 @@ + #ifndef MRT_EXPORT_MACRO_H__ + #define MRT_EXPORT_MACRO_H__ + +-// Shared library support ++/* Shared library support */ + #ifdef _WINDOWS + + # pragma warning(disable:4251) /* needs to have dll-interface used by client */ +--- SConstruct.old 2010-01-09 17:43:36.000000000 +0100 ++++ SConstruct 2010-01-09 17:45:25.000000000 +0100 +@@ -50,7 +50,7 @@ + if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] + if os.environ.has_key('CFLAGS'): +- env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) ++ env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) + if os.environ.has_key('CXX'): + env['CXX'] = os.environ['CXX'] + if os.environ.has_key('CXXFLAGS'): +@@ -91,19 +91,9 @@ + #env.Append(CPPDEFINES = ['NDEBUG']) + + else: +- if env['gcc_visibility']: +- env.Append(CCFLAGS=['-fvisibility=hidden']); +- env.Append(CXXFLAGS=['-fvisibility-inlines-hidden', '-fvisibility=hidden']); +- +- if debug: +- env.Append(CCFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2']) +- env.Append(CPPFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2']) +- else: +- env.Append(CCFLAGS=['-O3']) +- env.Append(CPPFLAGS=['-O3']) + +- env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread']) +- env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread']) ++ env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread']) ++ env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread']) + + + conf_env = env.Clone() +--- sdlx/SConscript.old 2010-01-09 17:46:05.000000000 +0100 ++++ sdlx/SConscript 2010-01-09 17:46:55.000000000 +0100 +@@ -12,7 +12,7 @@ + + env.MergeFlags(sdl_cflags, sdl_libs) + +-libs = ['mrt', 'SDL', 'SDL_image'] ++libs = ['mrt', 'SDL', 'SDL_image', 'SDL_gfx'] + + if sys.platform != "win32": + c_map_env= env.Clone() +@@ -35,7 +35,6 @@ + sdlx_sources = ['cursor.cpp', 'sdl_ex.cpp', 'surface.cpp', 'system.cpp', 'joystick.cpp', + 'thread.cpp', 'mutex.cpp', 'semaphore.cpp', 'color.cpp', + c_map, 'font.cpp', 'timer.cpp', 'module.cpp', 'file_rw.cpp', +- 'gfx/SDL_rotozoom.c', + ] # 'ttf.cpp', + + if sys.platform == 'win32': +--- sdlx/surface.cpp.old 2010-01-09 17:47:33.000000000 +0100 ++++ sdlx/surface.cpp 2010-01-09 17:48:19.000000000 +0100 +@@ -425,7 +425,7 @@ + throw_sdl(("SDL_SetColorKey")); + } + +-#include "gfx/SDL_rotozoom.h" ++#include + + void Surface::rotozoom(const sdlx::Surface &src, double angle, double zoom, bool smooth) { + if (src.isNull()) +--- sdlx/wrappers/glSDL.c.old 2010-01-09 17:48:50.000000000 +0100 ++++ sdlx/wrappers/glSDL.c 2010-01-09 17:49:23.000000000 +0100 +@@ -11,8 +11,6 @@ + + #ifdef HAVE_OPENGL + +-//#define LEAK_TRACKING +- + #define DBG(x) /*error messages, warnings*/ + #define DBG2(x) /*texture allocation*/ + #define DBG3(x) /*chopping/tiling*/ +@@ -951,7 +949,6 @@ + } + gl_doublebuf = flags & SDL_DOUBLEBUF; + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, gl_doublebuf); +- //SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, gl_doublebuf ? 1: 0); + + scale = 1; + -- cgit v1.2.3-65-gdbad