Add patch from Andrew Savchenko to build against newer mesa versions (bug #288340)

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 25 insertions, 17 deletions

diff --git a/games-action/openastromenace/ChangeLog b/games-action/openastromenace/ChangeLog
index 3034f6bb5300..cd1e073aafa3 100644
--- a/games-action/openastromenace/ChangeLog
+++ b/games-action/openastromenace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-action/openastromenace
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/ChangeLog,v 1.7 2009/12/17 21:54:45 pacho Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/ChangeLog,v 1.8 2010/04/11 00:54:28 mr_bones_ Exp $
+
+  11 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  openastromenace-1.2.0.ebuild, +files/openastromenace-1.2.0-mesa.patch:
+  Add patch from Andrew Savchenko to build against newer mesa versions (bug
+  #288340)
 
   17 Dec 2009; Pacho Ramos <pacho@gentoo.org> openastromenace-1.2.0.ebuild:
   amd64 stable, bug 295711
diff --git a/games-action/openastromenace/Manifest b/games-action/openastromenace/Manifest
index 3f72a269c6e3..4330e4055bc5 100644
--- a/games-action/openastromenace/Manifest
+++ b/games-action/openastromenace/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openastromenace-1.2.0-cmake.patch 1018 RMD160 ee5a03b2324d23c3d0003d4ae4bfcae54a25edc8 SHA1 04a6a9d2437bacb1caf7d4ab09bda7ac2770732e SHA256 5d1eea84f7522fa5cd4e861c82a7c9bc41e03db35127499d0b43010a7346cbfb
+AUX openastromenace-1.2.0-mesa.patch 412 RMD160 a6bddd8bf4a140ad51dffea4e3eab03a20f3e8ae SHA1 dd509437072cd782a4c5e2727ef6350698beb1c1 SHA256 2e747c05a01b305b7a733683ea8cee4d98917bf18a8fb9224a21777953d0a0ce
 DIST oamenace-data-1.2.0.tar.bz2 33384465 RMD160 f8ac327a6c95d00e99f3fe8c8c2a0af1eb4cf2da SHA1 0f27e8fbce90d979118f37014a4ca4f97e2bfb4e SHA256 e55fd843b7e6331e3724dd33d160565ae3f154abc790fb95e3566f5fedcb1d3f
 DIST oamenace-lang-de-1.2.0.tar.bz2 1656853 RMD160 6814f5b167a058bf7b189953a0fa2ce71eaaf1a0 SHA1 8a3be279ca79aff7153f8f24a893b921fa8a8a6b SHA256 3c7f4b580c1491c1fe6db521477e644f5139323e3e427bf99effe2da0bd3b7bd
 DIST oamenace-lang-en-1.2.0.tar.bz2 1382975 RMD160 0f69e611588dfe18d93fcdbcd2bcb07da7f5ad2f SHA1 4fea8918b9e5212d576f97dd055dc1d6fdf0730f SHA256 7890431ca80a7456dc77b102c58f9dd9a3f6fc41574ffc4234f805e7dae79d88
 DIST oamenace-lang-ru-1.2.0.tar.bz2 2344872 RMD160 c39d8635603a0ba8b5b8c9af8c204a7995aca47f SHA1 d02891c29f94ddec71993caf077d22657005a212 SHA256 bf4231baae0b3e1f3327da249ab9bb50c226c71bf0fd12b98a05820b5646cb5d
 DIST openamenace-src-1.2.0.tar.bz2 1021718 RMD160 79aee39154051097e42caad4837ea4d31c8d94ad SHA1 135a235cc35130edd3808c88fac202c57e8aafbf SHA256 d81526228b634e7447aaa6cc20023220a542c68837afbf34f4a5a0618e3eecae
 DIST openastromenace.png 20227 RMD160 223154d3626ef0a66cc4327d74e422cf6b1011a3 SHA1 045873d293522f873bdac41a8e8f392246852bfd SHA256 d70e1e08558b6f8480fd45a71be13b854f37deeacd4d78841cf02e9d21662cd1
-EBUILD openastromenace-1.2.0.ebuild 2380 RMD160 4435d9b3a5354d2d19493dc6a3ead7a0081b0a69 SHA1 e2616274aa01976a9fcacbd4fc6c9cd87b787848 SHA256 971223e0bb9949eba47914c5a17fd70de47d270056f9904a00252c5c20ddc6ea
-MISC ChangeLog 1160 RMD160 b448681dfa4858d000b195c2f7ecad84cf271c32 SHA1 5effe2564a06f7a9ce0ae8b23a4aa9386ff0bf4d SHA256 d747b661428b732fd4b795c96e97ffbeec2f6b1f35b6e9465f27bcf94f210a33
+EBUILD openastromenace-1.2.0.ebuild 2422 RMD160 c6cc68db019ba5cea1888595003fc9164cfe6b93 SHA1 576653e1c780e4859e3093234c12ec11c5f71748 SHA256 2df7cecf432ab1a0a6647f2989fdfab52d8135d416558c879445d38711015582
+MISC ChangeLog 1380 RMD160 7bcd528021e634edf9a7b647b4fd1879a55d8abd SHA1 382a4a8d88a32f51d517f96310598363451a1ee4 SHA256 c071a443a2ec4080e7f5a3ed40475582b0f8f2a3708bff9753998bd89c0c9a00
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksqqKsACgkQCaWpQKGI+9RqZwCfZiRobgjcygyM2MZJT2yZliQF
-rgsAniR1ItyKovjqceHxxWAcH/cT2bAq
-=i418
------END PGP SIGNATURE-----
diff --git a/games-action/openastromenace/files/openastromenace-1.2.0-mesa.patch b/games-action/openastromenace/files/openastromenace-1.2.0-mesa.patch
new file mode 100644
index 000000000000..c3b7ef10c571
--- /dev/null
+++ b/games-action/openastromenace/files/openastromenace-1.2.0-mesa.patch
@@ -0,0 +1,10 @@
+--- OpenAstroMenaceSVN/AstroMenaceSource/Core/RendererInterface/RendererInterface.h.orig	2007-09-15 12:26:47.000000000 +0400
++++ OpenAstroMenaceSVN/AstroMenaceSource/Core/RendererInterface/RendererInterface.h	2009-12-01 23:21:23.551205491 +0300
+@@ -37,6 +37,7 @@
+ #include "../Base.h"
+ #include "../Math/Math.h"
+ #include "../Texture/Texture.h"
++#define PFNGLCLIENTACTIVETEXTUREPROC PFNGLACTIVETEXTUREPROC
+ 
+ 
+ 
diff --git a/games-action/openastromenace/openastromenace-1.2.0.ebuild b/games-action/openastromenace/openastromenace-1.2.0.ebuild
index ae9418e8a7fb..81c1dba37548 100644
--- a/games-action/openastromenace/openastromenace-1.2.0.ebuild
+++ b/games-action/openastromenace/openastromenace-1.2.0.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/openastromenace/openastromenace-1.2.0.ebuild,v 1.7 2009/12/17 21:54:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/openastromenace-1.2.0.ebuild,v 1.8 2010/04/11 00:54:28 mr_bones_ Exp $
 
 EAPI=2
 inherit flag-o-matic cmake-utils eutils games
@@ -32,7 +32,9 @@ DEPEND="virtual/opengl
 S=${WORKDIR}/OpenAstroMenaceSVN
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cmake.patch
+	epatch \
+		"${FILESDIR}"/${P}-cmake.patch \
+		"${FILESDIR}"/${P}-mesa.patch
 	if use linguas_en ; then
 		einfo "Picking en for language set"
 		mv ../gamelang_en.vfs ../gamelang.vfs