Fix the include of SDL.h (bug #341239)

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

4 files changed, 46 insertions, 6 deletions

diff --git a/games-puzzle/pipewalker/ChangeLog b/games-puzzle/pipewalker/ChangeLog
index 79de48b009b2..df3ab7c846f9 100644
--- a/games-puzzle/pipewalker/ChangeLog
+++ b/games-puzzle/pipewalker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/pipewalker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pipewalker/ChangeLog,v 1.7 2010/10/15 21:38:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pipewalker/ChangeLog,v 1.8 2010/10/17 05:22:09 mr_bones_ Exp $
+
+  17 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  pipewalker-0.9.1.ebuild, +files/pipewalker-0.9.1-sdl-include.patch:
+  Fix the include of SDL.h (bug #341239)
 
 *pipewalker-0.9.1 (15 Oct 2010)
 
diff --git a/games-puzzle/pipewalker/Manifest b/games-puzzle/pipewalker/Manifest
index cbef5a83f653..1ad2ee40363d 100644
--- a/games-puzzle/pipewalker/Manifest
+++ b/games-puzzle/pipewalker/Manifest
@@ -1,6 +1,7 @@
+AUX pipewalker-0.9.1-sdl-include.patch 751 RMD160 aaea2aaf78c13954d02abc07d63aa58c7246a72c SHA1 457238b01a5646f06766ce5344a0d8b175950574 SHA256 80ff730277c7c18cbb2a6dc9ae4ecc1a277ef107d8d6f4f968a5b23ff8c12396
 DIST pipewalker-0.8.2-src.tar.gz 511806 RMD160 1767e13efd21f35b125f000d125ea7f1b8f896ab SHA1 55d7729d643ee0578e846c8a2eec8906f75b9521 SHA256 f099c106c8f8d8f301632615737b3a497576b1bdd02e4f2f802ebf8c00f27ed6
 DIST pipewalker-0.9.1-src.tar.gz 930790 RMD160 f1b3f5bb2c7618b4055de612e5e4bbda814188ed SHA1 2a01058425ce5836c967593c01f52e986b7a13ef SHA256 4ea2f698e1275e493fa262004f97385c6f4758ad05a07db7e9f731ce8ff0d8b3
 EBUILD pipewalker-0.8.2.ebuild 868 RMD160 8e143debb081349634e6875c7d5d516d437e6ffc SHA1 9c562f5c6400399385448db8475309c6f31c84ab SHA256 85c670a02b517faf32ae247cafcd8f4a92a6e83a00fb7ae7977e0550d0072afa
-EBUILD pipewalker-0.9.1.ebuild 874 RMD160 6b58131693e7fbc13f52f70ecf1297bc6d933a61 SHA1 9d1ffbbb8dce006275eb9eed29b60eea6be32ece SHA256 68f650c4cd48254ea6c77ee507c438e483ed81f605489bf93fbaf4b942178ab5
-MISC ChangeLog 1187 RMD160 23079e91b9b442d12149d81a6f7b381b994c1538 SHA1 7ba39cd3aaff2d3ea555947bfc2a7cadecfe8292 SHA256 6d12cc8ce9452024c271c9c18e27a3fefa083efb51d303d04706021cd919dd94
+EBUILD pipewalker-0.9.1.ebuild 1135 RMD160 ddbc56b43db3db93a1e70a7a306377e57502515d SHA1 36e7d2bf5addd08318fdf288b0497827b1ffb620 SHA256 cd5616eb4f88b2b73c6a66341e34c830c99512e04ca408f7f183017ad4920d08
+MISC ChangeLog 1354 RMD160 5a95c161b8cbe606fcf317ddde22ed95c8bcb0cc SHA1 0921399105c267868df235ea3c7e55bf74457b33 SHA256 70490bb4355360af57c8faff205f9f3c5b4b8d170b1d0ead48eef9c0f5aa6694
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/pipewalker/files/pipewalker-0.9.1-sdl-include.patch b/games-puzzle/pipewalker/files/pipewalker-0.9.1-sdl-include.patch
new file mode 100644
index 000000000000..8bbb66d5abbd
--- /dev/null
+++ b/games-puzzle/pipewalker/files/pipewalker-0.9.1-sdl-include.patch
@@ -0,0 +1,24 @@
+diff -ru pipewalker-0.9.1.orig/src/sound.h pipewalker-0.9.1/src/sound.h
+--- pipewalker-0.9.1.orig/src/sound.h	2010-10-08 07:09:41.000000000 -0400
++++ pipewalker-0.9.1/src/sound.h	2010-10-17 00:39:11.766744603 -0400
+@@ -21,7 +21,7 @@
+ #include "common.h"
+ 
+ #if defined PW_USE_SDL		//SDL library
+-	#include <SDL/SDL.h>
++	#include <SDL.h>
+ #endif
+ 
+ /**
+diff -ru pipewalker-0.9.1.orig/src/winmgr_sdl.cpp pipewalker-0.9.1/src/winmgr_sdl.cpp
+--- pipewalker-0.9.1.orig/src/winmgr_sdl.cpp	2010-10-11 10:04:22.000000000 -0400
++++ pipewalker-0.9.1/src/winmgr_sdl.cpp	2010-10-17 00:39:04.151383831 -0400
+@@ -26,7 +26,7 @@
+ #include "../extra/pipewalker.xpm"
+ 
+ //SDL library
+-#include <SDL/SDL.h>
++#include <SDL.h>
+ 
+ #ifdef WIN32
+ 	#include <SDL/SDL_syswm.h>
diff --git a/games-puzzle/pipewalker/pipewalker-0.9.1.ebuild b/games-puzzle/pipewalker/pipewalker-0.9.1.ebuild
index 53ace26a22bc..f82209df4189 100644
--- a/games-puzzle/pipewalker/pipewalker-0.9.1.ebuild
+++ b/games-puzzle/pipewalker/pipewalker-0.9.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pipewalker/pipewalker-0.9.1.ebuild,v 1.1 2010/10/15 21:38:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pipewalker/pipewalker-0.9.1.ebuild,v 1.2 2010/10/17 05:22:09 mr_bones_ Exp $
 
 EAPI=2
-inherit eutils games
+inherit flag-o-matic eutils games
 
 DESCRIPTION="Rotating pieces puzzle game"
 HOMEPAGE="http://pipewalker.sourceforge.net/"
@@ -14,11 +14,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl[opengl]
+DEPEND="media-libs/libsdl[opengl,video]
 	virtual/opengl
 	virtual/glu"
 
+src_prepare() {
+	# fix the include of SDL.h (bug #341239)
+	epatch "${FILESDIR}"/${P}-sdl-include.patch
+	sed -i \
+		-e '/OpenGL error:/s/0x/0x%x/' \
+		-e '/#pragma warning/d' \
+		src/common.h \
+		|| die
+}
+
 src_configure() {
+	append-flags $(sdl-config --cflags)
 	egamesconf \
 		--disable-dependency-tracking \
 		--datadir="${GAMES_DATADIR_BASE}"