version bump - upstream patch and ebuild submitted by Tristan Heaven via bug #140419

Package-Manager: portage-2.1.1_pre3

5 files changed, 171 insertions, 15 deletions

diff --git a/games-strategy/warzone2100/ChangeLog b/games-strategy/warzone2100/ChangeLog
index 0013a663289d..056044a75776 100644
--- a/games-strategy/warzone2100/ChangeLog
+++ b/games-strategy/warzone2100/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/warzone2100
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.5 2006/05/25 14:58:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.6 2006/07/19 22:57:45 mr_bones_ Exp $
+
+*warzone2100-2.0.3 (19 Jul 2006)
+
+  19 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/warzone2100-2.0.3-16bpp.patch, +warzone2100-2.0.3.ebuild:
+  version bump - upstream patch and ebuild submitted by Tristan Heaven via bug
+  #140419
 
   25 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   warzone2100-0.2.2.ebuild:
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index a881f4c87d75..2a82e24308db 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.2.2-clparse.c.patch 413 RMD160 a4ecf5017933658c711ae202e2b38e7584df7880 SHA1 1bb72bd59a8339771e61638354e02aaaea8ed73f SHA256 0fca2038a314a488fa2888687a7b6e0425eb71861c8dea51f0da6d597dfc097e
 MD5 9e76c302897e454e4f4812dc1b3322e5 files/0.2.2-clparse.c.patch 413
 RMD160 a4ecf5017933658c711ae202e2b38e7584df7880 files/0.2.2-clparse.c.patch 413
@@ -9,15 +6,24 @@ AUX warzone2100-0.2.2-headers.patch 337 RMD160 1f86479ffe0095ad3b51dd166244ca607
 MD5 b102bdfd896bca6763c9494325976068 files/warzone2100-0.2.2-headers.patch 337
 RMD160 1f86479ffe0095ad3b51dd166244ca607cdbe788 files/warzone2100-0.2.2-headers.patch 337
 SHA256 a3097586ad7aa9e810227df49ab60791fa9889c1f50f33029be8d4090c4449bc files/warzone2100-0.2.2-headers.patch 337
+AUX warzone2100-2.0.3-16bpp.patch 2675 RMD160 4cb1d04b7d0efd84a0486a423b625944344e51ae SHA1 1874c986b7ba998cee9b90dc8022c7e9b4432c4d SHA256 5d3f08e601cf06a436a6d37b0474f7026f60a408c7d4775ef259133ae498301a
+MD5 9cd6c6aad6b63c681796167287cbb4a2 files/warzone2100-2.0.3-16bpp.patch 2675
+RMD160 4cb1d04b7d0efd84a0486a423b625944344e51ae files/warzone2100-2.0.3-16bpp.patch 2675
+SHA256 5d3f08e601cf06a436a6d37b0474f7026f60a408c7d4775ef259133ae498301a files/warzone2100-2.0.3-16bpp.patch 2675
+DIST warzone-2.0.3.tar.bz2 19902273 RMD160 10fc56a2930346d41d517f4df6f3b0b9b001b183 SHA1 68bdfba90c0380178b1ce8ced0b49bd480ad1f35 SHA256 7668f6b794faad8d7ae66dbd0c7317df2521b33593f29174ab3fecb647326749
 DIST warzone2100-0.2.2.tar.bz2 31076323 RMD160 c83b57cc130d85d6ecbcf41ddf1f2c41dee06d32 SHA256 677e891a25c7caae96fc8e3226945bb5b5ffa1258a3ef9023365c03d7b47e062
 EBUILD warzone2100-0.2.2.ebuild 1641 RMD160 2dc51c157b5d6ef6787329a0ce309db6955e0bbd SHA1 5bbb01a878355350b8453cbaeb2b7595a5f63f8a SHA256 d3ade31f225cf0e48c41e0d52a0773023f7357ff71d59c45d822b04693ca3656
 MD5 5f1cb49d000c78c6fffa1b3b176bc41e warzone2100-0.2.2.ebuild 1641
 RMD160 2dc51c157b5d6ef6787329a0ce309db6955e0bbd warzone2100-0.2.2.ebuild 1641
 SHA256 d3ade31f225cf0e48c41e0d52a0773023f7357ff71d59c45d822b04693ca3656 warzone2100-0.2.2.ebuild 1641
-MISC ChangeLog 1150 RMD160 c4448bb56e3fc3da76917cc5cce9f82eb9067ac8 SHA1 4aefbb83d214ccde1702bac019a6d417b09b94a8 SHA256 eed81be40bf9e126382d9811d26a7760630db97aebb0f34b9f2aabbce399e212
-MD5 f1235fa2f7e6d7ec43a9c75c85f1a40f ChangeLog 1150
-RMD160 c4448bb56e3fc3da76917cc5cce9f82eb9067ac8 ChangeLog 1150
-SHA256 eed81be40bf9e126382d9811d26a7760630db97aebb0f34b9f2aabbce399e212 ChangeLog 1150
+EBUILD warzone2100-2.0.3.ebuild 1432 RMD160 89fc9d071cde8574979ce3ba3ec148a07149aadf SHA1 ccd21ec6a8dbef62892c496be5ade29ac92bc837 SHA256 a7bfbef0e69f4cd6f96e835caf10e1f5af43b157806e7038b58f11eca66c9e8f
+MD5 f518b4cf9a1ac83f0e059d99e516226c warzone2100-2.0.3.ebuild 1432
+RMD160 89fc9d071cde8574979ce3ba3ec148a07149aadf warzone2100-2.0.3.ebuild 1432
+SHA256 a7bfbef0e69f4cd6f96e835caf10e1f5af43b157806e7038b58f11eca66c9e8f warzone2100-2.0.3.ebuild 1432
+MISC ChangeLog 1397 RMD160 3e8efa314831b3f4d7741091d25ffd355d82ee91 SHA1 6ba3a898f4c0ea87bf3654562ea07fe0de184d81 SHA256 1f8eb6f9484079e602c3b760ed8a386aa04cc950d5c10c4d184c19a95ccb0607
+MD5 5fe51466365936e668b53dce869f64e1 ChangeLog 1397
+RMD160 3e8efa314831b3f4d7741091d25ffd355d82ee91 ChangeLog 1397
+SHA256 1f8eb6f9484079e602c3b760ed8a386aa04cc950d5c10c4d184c19a95ccb0607 ChangeLog 1397
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -25,10 +31,6 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 79dfa0cc5175e1a4d0c20da4fa536890 files/digest-warzone2100-0.2.2 262
 RMD160 d159adf132267de6b5b88375fbc9955e8f039c41 files/digest-warzone2100-0.2.2 262
 SHA256 551dfb079f4d6d09240e48c94a779fde4c279015dab577d223c9697ea0ae2b4e files/digest-warzone2100-0.2.2 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEdcWukT4lNIS36YERAsnzAJ4kKGfQXf6BwpyhyBkVl98Ch5lHOACeNYdv
-tFkD5yXa7p5FbimLwKvnKYo=
-=EE4J
------END PGP SIGNATURE-----
+MD5 b756f2f4d0b02feea142229b0c10a68f files/digest-warzone2100-2.0.3 250
+RMD160 47c7888d4ca1210730ccdfcafed47c8d144c3b18 files/digest-warzone2100-2.0.3 250
+SHA256 63078ece554515dfd5aca9a1ba558b91be9c804c498371691fbc352a93858ef8 files/digest-warzone2100-2.0.3 250
diff --git a/games-strategy/warzone2100/files/digest-warzone2100-2.0.3 b/games-strategy/warzone2100/files/digest-warzone2100-2.0.3
new file mode 100644
index 000000000000..cabf660b4cc0
--- /dev/null
+++ b/games-strategy/warzone2100/files/digest-warzone2100-2.0.3
@@ -0,0 +1,3 @@
+MD5 2396e0def69e5e48902448d04944927a warzone-2.0.3.tar.bz2 19902273
+RMD160 10fc56a2930346d41d517f4df6f3b0b9b001b183 warzone-2.0.3.tar.bz2 19902273
+SHA256 7668f6b794faad8d7ae66dbd0c7317df2521b33593f29174ab3fecb647326749 warzone-2.0.3.tar.bz2 19902273
diff --git a/games-strategy/warzone2100/files/warzone2100-2.0.3-16bpp.patch b/games-strategy/warzone2100/files/warzone2100-2.0.3-16bpp.patch
new file mode 100644
index 000000000000..70877b31e208
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-2.0.3-16bpp.patch
@@ -0,0 +1,77 @@
+--- /trunk/lib/ivis_opengl/screen.c	2006/07/17 22:21:13	116
++++ trunk/lib/ivis_opengl/screen.c	2006/07/19 21:26:09	117
+@@ -131,7 +131,7 @@
+ 	/* Store the screen information */
+ 	screenWidth = width;
+ 	screenHeight = height;
+-	screenDepth = 24;
++	screenDepth = 32;
+ 
+ 	/* store vidmem flag */
+ 	g_bVidMem = bVidMem;
+@@ -168,14 +168,42 @@
+ 				video_flags |= SDL_HWACCEL;
+ 			}
+ 
+-			SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 8 );
+-			SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 8 );
+-			SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 8 );
+-			SDL_GL_SetAttribute( SDL_GL_ALPHA_SIZE, 8 );
+-			SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
+-			SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, 8 );
++			bpp = SDL_VideoModeOK(width, height, screenDepth, video_flags);
++			if (!bpp) {
++				debug( LOG_ERROR, "Error: Video mode %dx%d@%dbpp is not supported!\n", width, height, screenDepth );
++				return FALSE;
++			}
++			switch ( bpp )
++			{
++				case 32:
++				case 24:
++					SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 8 );
++					SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 8 );
++					SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 8 );
++					SDL_GL_SetAttribute( SDL_GL_ALPHA_SIZE, 8 );
++					SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
++					SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, 8 );
++					break;
++				case 16:
++					debug( LOG_ERROR, "Warning: Using colour depth of %i instead of %i.", bpp, screenDepth );
++					debug( LOG_ERROR, "         You will experience graphics glitches!" );
++					SDL_GL_SetAttribute( SDL_GL_RED_SIZE, 5 );
++					SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, 6 );
++					SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, 5 );
++					SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16 );
++					SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, 8 );
++					break;
++				case 8:
++					debug( LOG_ERROR, "Error: You don't want to play Warzone with a bit depth of %i, do you?", bpp );
++					exit( 1 );
++					break;
++				default:
++					debug( LOG_ERROR, "Error: Weird bit depth: %i", bpp );
++					exit( 1 );
++					break;
++			}
+ 
+-    			// Set the double buffer OpenGL attribute.
++			// Set the double buffer OpenGL attribute.
+ 			SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+ 		}
+ 
+@@ -186,15 +214,6 @@
+ 			screenMode = SCREEN_WINDOWED;
+ 		}
+ 
+-		bpp = SDL_VideoModeOK(width, height, screenDepth, video_flags);
+-		if (!bpp) {
+-			printf("Error: Video mode %dx%d@%dbpp is not supported!\n", width, height, screenDepth);
+-			return FALSE;
+-		}
+-		if (bpp != screenDepth) {
+-			debug(LOG_3D, "Warning: Using colour depth of %d instead of %d.",
+-            bpp, screenDepth);
+-		}
+ 		screen = SDL_SetVideoMode(width, height, bpp, video_flags);
+ 		if (!screen) {
+ 			printf("Error: SDL_SetVideoMode failed (%s).\n", SDL_GetError());
diff --git a/games-strategy/warzone2100/warzone2100-2.0.3.ebuild b/games-strategy/warzone2100/warzone2100-2.0.3.ebuild
new file mode 100644
index 000000000000..edf2fb3ceced
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-2.0.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.0.3.ebuild,v 1.1 2006/07/19 22:57:45 mr_bones_ Exp $
+
+inherit eutils versionator games
+
+MY_PV="$(get_version_component_range -2 ${PV})"
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="http://home.gna.org/warzone/"
+SRC_URI="http://download.gna.org/warzone/releases/${MY_PV}/warzone-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-games/physfs
+	media-libs/jpeg
+	media-libs/libogg
+	media-libs/libpng
+	media-libs/libsdl
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl-net
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	app-arch/zip"
+
+S=${WORKDIR}/warzone-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e 's/-m32 //' \
+		configure \
+		|| die "sed failed"
+	epatch "${FILESDIR}/${P}-16bpp.patch"
+}
+
+src_compile() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--with-ogg \
+		--without-mp3 \
+		|| die "egamesconf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	doicon debian/${PN}.png
+	domenu debian/warzone.desktop
+
+	dodoc AUTHORS CHANGELOG README TODO
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	ewarn "Currently, attempting to use uppercase letters in save game names"
+	ewarn "will cause a crash."
+}