From 78a081ae98809a2f15e0b4307753dd76fc2edcef Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Fri, 6 May 2011 18:21:27 +0000 Subject: version bump Package-Manager: portage-2.1.9.42/cvs/Linux i686 --- games-arcade/criticalmass/ChangeLog | 18 +++- games-arcade/criticalmass/Manifest | 7 +- .../criticalmass/criticalmass-1.0.2.ebuild | 41 +++++++++ .../files/criticalmass-1.0.2-gcc43.patch | 101 +++++++++++++++++++++ .../files/criticalmass-1.0.2-libpng14.patch | 11 +++ .../files/criticalmass-1.0.2-system_curl.patch | 33 +++++++ 6 files changed, 208 insertions(+), 3 deletions(-) create mode 100644 games-arcade/criticalmass/criticalmass-1.0.2.ebuild create mode 100644 games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch create mode 100644 games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch create mode 100644 games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch (limited to 'games-arcade') diff --git a/games-arcade/criticalmass/ChangeLog b/games-arcade/criticalmass/ChangeLog index 8e0ad7e2bf3d..df379bc681a7 100644 --- a/games-arcade/criticalmass/ChangeLog +++ b/games-arcade/criticalmass/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for games-arcade/criticalmass -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.19 2010/10/15 12:36:01 ranger Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.20 2011/05/06 18:21:27 mr_bones_ Exp $ + + 06 May 2011; Michael Sterrett + +criticalmass-1.0.2.ebuild, +files/criticalmass-1.0.2-gcc43.patch, + +files/criticalmass-1.0.2-libpng14.patch, + +files/criticalmass-1.0.2-system_curl.patch: + version bump + +*criticalmass-1.0.2 (06 May 2011) + + 06 May 2011; Michael Sterrett + +criticalmass-1.0.2.ebuild, +files/criticalmass-1.0.2-gcc43.patch, + +files/criticalmass-1.0.2-libpng14.patch, + +files/criticalmass-1.0.2-system_curl.patch: + version bump 15 Oct 2010; Brent Baude criticalmass-1.0.0-r1.ebuild: stable ppc, bug 313911 diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest index 846afcf81e93..3099d066ebd8 100644 --- a/games-arcade/criticalmass/Manifest +++ b/games-arcade/criticalmass/Manifest @@ -1,7 +1,12 @@ AUX criticalmass-1.0.0-gcc43.patch 3150 RMD160 b7071775f419ceecd2b138d8a1009697c819a090 SHA1 9ad1a20872759453a2fdf6bd3c7ce80df5121f72 SHA256 a7f74c031aa03fa2a4dd522b4c289f7b992e045b498e71700aed88aea397459c AUX criticalmass-1.0.0-libpng14.patch 445 RMD160 a50541521001c8f14f8ccdab54b53baba3f8c5b2 SHA1 5ec3fe2e2e575f51b4576c502da3a3658d7099c9 SHA256 7f20895eceb0caafb3bd7315b99080731647677c7b938e512625b3b9885dfaf3 AUX criticalmass-1.0.0-system_curl.patch 964 RMD160 31f28f327e78142404ff9d1daee845af1bf5f6fa SHA1 cbaa1ea3a8c98e65c99f05e5a973a938c48f21c2 SHA256 0fc918bea78df003ba37370a83fc349bfec6d191959c0d443c1e33df96be409d +AUX criticalmass-1.0.2-gcc43.patch 3150 RMD160 b7071775f419ceecd2b138d8a1009697c819a090 SHA1 9ad1a20872759453a2fdf6bd3c7ce80df5121f72 SHA256 a7f74c031aa03fa2a4dd522b4c289f7b992e045b498e71700aed88aea397459c +AUX criticalmass-1.0.2-libpng14.patch 445 RMD160 a50541521001c8f14f8ccdab54b53baba3f8c5b2 SHA1 5ec3fe2e2e575f51b4576c502da3a3658d7099c9 SHA256 7f20895eceb0caafb3bd7315b99080731647677c7b938e512625b3b9885dfaf3 +AUX criticalmass-1.0.2-system_curl.patch 964 RMD160 31f28f327e78142404ff9d1daee845af1bf5f6fa SHA1 cbaa1ea3a8c98e65c99f05e5a973a938c48f21c2 SHA256 0fc918bea78df003ba37370a83fc349bfec6d191959c0d443c1e33df96be409d DIST CriticalMass-1.0.0.tar.bz2 5092549 RMD160 33c7b60f1cb3cf6e887fe4bbc99928b17f97c047 SHA1 ce0de4fa9259f0586f8dfa7ee96978da21e57335 SHA256 94cedac39f9279faa63f6ce4098f2a778a8c8f9013ba8dd7d5b85766739e0858 +DIST CriticalMass-1.0.2.tar.bz2 5122126 RMD160 6c0b6988f6a52c4b19fbca2525b1daec0202693d SHA1 d2d1f35183e9fbed76fd8da2a948745a4c89f20b SHA256 846db2d30d39e559612328594084a7aef980169948b2cfaee9fddec8ffdef724 EBUILD criticalmass-1.0.0-r1.ebuild 1043 RMD160 7bd52904b93cd11143bcbcc76d02b2420cd51636 SHA1 28451791557041a15a156a144ebbeb26e32e8d56 SHA256 5d367b85776ae1650af517077af9eacb8df59d864625c4b1816af721d03cc65f -MISC ChangeLog 3749 RMD160 8fd56c65fe9d6db21799304e7bb430a6f6f22843 SHA1 cf1e274ff6d411cdddf4da2ff1bc02167d260c2b SHA256 ed51144577051eb73921c5d19036cd3c148b3df17d39cd66a8bba274a26e4f3c +EBUILD criticalmass-1.0.2.ebuild 1023 RMD160 3015ab7be1e58f64675b00b77d3700496573a9ca SHA1 04c81af9e13838a7599124c79bd8cedea6fc8552 SHA256 eaf4db8e181833c1d013b25d60779c88c7ec364154535f106eb709838225d3c7 +MISC ChangeLog 4249 RMD160 36ee86d6197ff175ca31167576a04ea4a3586775 SHA1 03d5555f5b363082bf8355b1bd2a4d8643c53b26 SHA256 ed31834ca3a70a4fee70d1f131ab89580ae4d0d24596c63ae2020ad6f0000e04 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2.ebuild new file mode 100644 index 000000000000..63c454c13860 --- /dev/null +++ b/games-arcade/criticalmass/criticalmass-1.0.2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/criticalmass-1.0.2.ebuild,v 1.1 2011/05/06 18:21:27 mr_bones_ Exp $ + +EAPI=2 +inherit autotools eutils games + +DESCRIPTION="SDL/OpenGL space shoot'em up game" +HOMEPAGE="http://criticalmass.sourceforge.net/" +SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="media-libs/sdl-mixer + media-libs/sdl-image[png] + media-libs/libpng + virtual/opengl + net-misc/curl" + +S=${WORKDIR}/CriticalMass-${PV} + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-system_curl.patch \ + "${FILESDIR}"/${P}-libpng14.patch + rm -rf curl + eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install || die + rm -f "${D}${GAMES_BINDIR}/Packer" + dohtml Readme.html + dodoc TODO + newicon critter.png ${PN}.png + make_desktop_entry critter "Critical Mass" + prepgamesdirs +} diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch new file mode 100644 index 000000000000..e57c11f5af28 --- /dev/null +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch @@ -0,0 +1,101 @@ +--- CriticalMass-1.0.0.orig/tinyxml/tinyxml.cpp 2003-03-03 03:34:58.000000000 +0100 ++++ CriticalMass-1.0.0/tinyxml/tinyxml.cpp 2008-04-18 19:40:35.000000000 +0200 +@@ -21,10 +21,12 @@ + distribution. + */ + + #include "tinyxml.h" + ++#include ++ + + TiXmlNode::TiXmlNode( NodeType _type ) + { + parent = 0; + type = _type; +--- CriticalMass-1.0.0.orig/tinyxml/tinyxml.h 2003-03-03 03:34:58.000000000 +0100 ++++ CriticalMass-1.0.0/tinyxml/tinyxml.h 2008-04-18 19:40:35.000000000 +0200 +@@ -28,10 +28,11 @@ + #ifdef _MSC_VER + #pragma warning( disable : 4530 ) + #pragma warning( disable : 4786 ) + #endif + ++#include + #include + #include + #include + + class TiXmlDocument; +--- CriticalMass-1.0.0.orig/tinyxml/tinyxmlparser.cpp 2003-03-03 03:34:58.000000000 +0100 ++++ CriticalMass-1.0.0/tinyxml/tinyxmlparser.cpp 2008-04-18 19:40:35.000000000 +0200 +@@ -23,10 +23,12 @@ + + + #include "tinyxml.h" + #include + ++#include ++ + const char* TiXmlBase::SkipWhiteSpace( const char* p ) + { + while ( p && *p && + ( isspace( *p ) || *p == '\n' || *p == '\r' ) ) + p++; +--- CriticalMass-1.0.0.orig/utils/ResourceManager.cpp 2005-01-02 03:59:29.000000000 +0100 ++++ CriticalMass-1.0.0/utils/ResourceManager.cpp 2008-04-18 19:40:35.000000000 +0200 +@@ -20,10 +20,12 @@ + #include + #include + #include + #include + ++#include ++ + #ifdef WIN32 + const char PATH_SEPERATOR = '\\'; + #else + const char PATH_SEPERATOR = '/'; + #endif +--- CriticalMass-1.0.0.orig/utils/Value.hpp 2004-12-18 03:41:24.000000000 +0100 ++++ CriticalMass-1.0.0/utils/Value.hpp 2008-04-18 19:40:35.000000000 +0200 +@@ -13,10 +13,11 @@ + // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details + // + #ifndef _Value_hpp_ + #define _Value_hpp_ + ++#include + #include + #include + + #include + +--- CriticalMass-1.0.0.orig/utils/zStreamBufferImplZLib.cpp 2005-07-31 22:06:14.000000000 +0200 ++++ CriticalMass-1.0.0/utils/zStreamBufferImplZLib.cpp 2008-04-18 19:40:35.000000000 +0200 +@@ -10,10 +10,11 @@ + // + // This program is distributed in the hope that it will be useful, but WITHOUT + // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details + // ++#include + #include + #include + + bool ziStreamBufferImplZLib::init( void) + { +--- CriticalMass-1.0.0.orig/utils/zStream.cpp 2005-07-31 22:06:14.000000000 +0200 ++++ CriticalMass-1.0.0/utils/zStream.cpp 2008-04-18 19:40:35.000000000 +0200 +@@ -10,10 +10,11 @@ + // + // This program is distributed in the hope that it will be useful, but WITHOUT + // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details + // ++#include + #include + #include + #include + #include + #include diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch new file mode 100644 index 000000000000..882869b43a14 --- /dev/null +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch @@ -0,0 +1,11 @@ +--- configure.in ++++ configure.in +@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then + else + LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS" + CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include" +- AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed)) ++ AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed)) + AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed)) + if test "x$TARGET" = xUNIX; then + if test "x$enable_dyngl" = xoff; then diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch new file mode 100644 index 000000000000..02307ad7d8fc --- /dev/null +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch @@ -0,0 +1,33 @@ +--- configure.in ++++ configure.in +@@ -115,8 +115,6 @@ fi + AC_CHECK_LIB(m, sin,, + AC_MSG_ERROR(libm is needed)) + +-AC_CONFIG_SUBDIRS(curl) +- + AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile) + + echo "Configuration: +--- game/Makefile.am ++++ game/Makefile.am +@@ -41,7 +41,7 @@ critter_SOURCES = \ + main.cpp + + LDADD = \ +- ../curl/lib/libcurl.a \ ++ -lcurl \ + ../utils/libutils.a \ + ../utilssdl/libutilssdl.a \ + ../utilsgl/libutilsgl.a \ +--- Makefile.am ++++ Makefile.am +@@ -4,7 +4,7 @@ + AUTOMAKE_OPTIONS = 1.4 + + ## Any directories that you want built and installed should go here. +-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game ++SUBDIRS = tinyxml utils utilssdl utilsgl tools data game + + ## Any directories you want a part of the distribution should be listed + ## here, as well as have a Makefile generated at the end of configure.in -- cgit v1.2.3-65-gdbad