desmume version bump

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

5 files changed, 105 insertions, 3 deletions

diff --git a/games-emulation/desmume/ChangeLog b/games-emulation/desmume/ChangeLog
index 0d4c9bceffff..1095794a1724 100644
--- a/games-emulation/desmume/ChangeLog
+++ b/games-emulation/desmume/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/desmume
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/ChangeLog,v 1.17 2010/01/16 18:07:07 hanno Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/ChangeLog,v 1.18 2011/11/12 21:01:35 hanno Exp $
+
+*desmume-0.9.7 (12 Nov 2011)
+
+  12 Nov 2011; Hanno Boeck <hanno@gentoo.org> +desmume-0.9.7.ebuild,
+  +files/desmume-add-missing-potfiles.diff,
+  +files/desmume-fix-gcc-warning.diff:
+  Version bump, fix for make check and gcc warnings.
 
   16 Jan 2010; Hanno Boeck <hanno@gentoo.org> desmume-0.9.5.ebuild,
   +files/desmume-0.9.5-sse2-fix.diff:
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 740a23c2eb28..c32885aad69e 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,8 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX desmume-0.9.4-gcc44.patch 339 RMD160 7f1ab5b12dc709eea63cb86754d25a00d6013367 SHA1 33cd11a8c55272f6e4dba795dcb763a9c06558f0 SHA256 820f6a07336ae6fbead0a873de0bb7f04900fb683e8146586f9d3f039730afda
 AUX desmume-0.9.5-sse2-fix.diff 290 RMD160 f800b3e07ce8747511dc14af2153cd42c88d0d47 SHA1 06c9b76de45e4c32409b9e92c746a707c9c7804c SHA256 b779250e91032a4f6f856d409edacd9a129c364a8d8bf04081deb05b564b118c
+AUX desmume-add-missing-potfiles.diff 263 RMD160 e108af244c4f3b8c47b9db9762aaf6a63b53449f SHA1 5d162b5b57b68ce0814ed74ff80daf33d78229a1 SHA256 ef5ba05ce2650fae733004990e95358620cac37e8cbcfe891eddd9dbd1ffa2e1
+AUX desmume-fix-gcc-warning.diff 1060 RMD160 fb8bd79028de8e5641dc02d1ae063c4f301864c1 SHA1 8d204c17dd41b7c5cc62f30896e16c00be37bbeb SHA256 2f09290a42667f535df78c5a7941c927dfa35aa80c5c6ed239a1dd42fa5d2b6f
 DIST desmume-0.9.4.tar.gz 1035843 RMD160 c86eab6727331a45403325facc0add968275de6d SHA1 06eb3cb9c57547d3c43e272648d176a252143e43 SHA256 5fc50e746e6c42ae64602338605b5a6890098b2819df90399908ac30ff6d9533
 DIST desmume-0.9.5.tar.gz 935073 RMD160 9eb537cde87cdba78b39480c6196f60702fcf208 SHA1 27174becda0551ec231ff18c5e95266a95825524 SHA256 a709127d52d76bf5a9411bcf0b115d74f10907fb142104b7ef01c9f8cc2e3101
+DIST desmume-0.9.7.tar.gz 1142550 RMD160 8770addf1ae5aab9b15a70de7c4b0511b245220d SHA1 18e00f675d3e6217474a6bbf3c554aade9aceee5 SHA256 0a0f7ef3cc76ff0bbc6f3df47c3689653617074ea7ffc354e9fa1240c5336523
 EBUILD desmume-0.9.4.ebuild 881 RMD160 969256c7dc413c622734748b3caa4a8f1be03e5d SHA1 640267963a9dc98e61202c6c0122375c922a59c2 SHA256 56e74ff5c9a84e0f8ff9b6f294aad9643ff2128886e25c2a94522876ded9aa07
 EBUILD desmume-0.9.5.ebuild 897 RMD160 dfaca43eaa1ebb21b6efeb263aab4f1f53fcf421 SHA1 270362f4d54d471a7123793e4e862ad8bb02b5c2 SHA256 3655e592b9a3e825fb2c5ac67dd1061f7a1efb275f85835effafb9b617e5011b
-MISC ChangeLog 2486 RMD160 4cbb5455533534396558a68c74c47a5c5c45527e SHA1 f5e62f933694bf2aea6bfd3e23f17cda83959e7a SHA256 9022cc155445a447f0536cb8da8f546741b50a3d743494193a7be8abab34cc9e
+EBUILD desmume-0.9.7.ebuild 1135 RMD160 e5ddfd9617c65728cbc1953394d12cf8a297fa77 SHA1 cf35f06d8db1870e63f665f9a8cfe37f3e26d3e0 SHA256 4d656550489088c0a44694ef83c56976ff01636686cba5c3e3d6d6db271ef53a
+MISC ChangeLog 2722 RMD160 5ea2e5aa0de351317fffe7785da43b7460c16b50 SHA1 600a35781596f17736275ecb41b6ab8bd56106e9 SHA256 70231c8d93fdbec05bba28e9410b1edff60e29190a22f4d14bf11ea2570f7c44
 MISC metadata.xml 217 RMD160 2cee600c10e18cdf9affa5625ffb8a09a6afbd3a SHA1 c45c975e3ce6414fb9924aeb6a59801ba41371cd SHA256 7bf8a4fe5f89e7603117203f6124665523e00cec1c4ec668f265416d7e64ce00
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOvt62AAoJEKWIAHK7tR5C6S4P/RUx1KcRJe+Le++P32Q/uu+y
+zAxCIJBVHvBoEIYNvNiTSPxhVIhxVdubteM9fYX3/HOPEy/xiNLCUD08Lz3rFSWt
+LQs7+BcqQpWisEHaTyDzYpiLE1c78KkH1LQi+IVlcTw6B/I6eK3AITnuvHejNG1i
+6lPeZptpzB+Gk64txcryh32ydegGH2E93VFtpWRXR83YsawdheilHn+w9izqgN/9
+wf7S/qpJCurCDte5NQnnEuhZIBNulZ0IUFRtSUgnenL0QmnQCPYG/aVJR87slwyg
+XeFAbVHd6R+MoJH5HyUALxANL0qtQFzcTU1bZVGFpFvg06EY/BXLlw/swFPFoE8T
+56joYDwCcj2YDqT0cf5dDR5/8ul1J2XAssL5HSeOf247+XLvi8OYMKul0DnpIq3s
+57GTgmx8IcsUPvUFDzYI0ubDDEo1xlYpTMnIaEo7w5VdGbf3FCRFtCbf98e/0KzP
+PYg8DLHDedG+mw6/RklS+vdHlb8xp9Xqsj8EUVcmxs2PZ8w4161toOi5iRy8Y33w
+Kj+wFWEPQWHLgITbl1uEgaew+rWJ+qbbG9D38y8pZCkNHicVWk753MlYPmFx+7Fr
+Oqt1tEAsOY7h6b364PxZ2idyXZqFvQz2dSzr02nf5HXGB4DlOI8q7IV7zwNXeUg1
+ieCN70rkGihoR3+SMytt
+=1s0a
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/desmume/desmume-0.9.7.ebuild b/games-emulation/desmume/desmume-0.9.7.ebuild
new file mode 100644
index 000000000000..4c65d14541a4
--- /dev/null
+++ b/games-emulation/desmume/desmume-0.9.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.7.ebuild,v 1.1 2011/11/12 21:01:35 hanno Exp $
+
+EAPI="2"
+
+inherit eutils games
+
+DESCRIPTION="Nintendo DS emulator"
+HOMEPAGE="http://desmume.org/"
+SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/gtk+-2.8.0:2
+	gnome-base/libglade
+	x11-libs/gtkglext
+	virtual/opengl
+	sys-libs/zlib
+	dev-libs/zziplib
+	media-libs/libsdl[joystick]
+	x11-libs/agg"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# https://sourceforge.net/tracker/?func=detail&aid=3436660&group_id=164579&atid=832291
+	epatch "${FILESDIR}/desmume-add-missing-potfiles.diff"
+	# https://sourceforge.net/tracker/?func=detail&aid=3436995&group_id=164579&atid=832291
+	epatch "${FILESDIR}/desmume-fix-gcc-warning.diff"
+}
+
+src_configure() {
+	egamesconf --datadir=/usr/share || die "egamesconf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake failed"
+	dodoc AUTHORS ChangeLog README README.LIN
+	prepgamesdirs
+}
diff --git a/games-emulation/desmume/files/desmume-add-missing-potfiles.diff b/games-emulation/desmume/files/desmume-add-missing-potfiles.diff
new file mode 100644
index 000000000000..7ce2f8758086
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-add-missing-potfiles.diff
@@ -0,0 +1,6 @@
+--- desmume-0.9.7/po/POTFILES.skip	2011-01-27 11:27:00.000000000 +0100
++++ desmume-0.9.7-1/po/POTFILES.skip	2011-11-11 21:10:30.550725740 +0100
+@@ -1,2 +1,3 @@
+ src/wx/PadSimple/GUI/ConfigDlg.cpp
+ src/wxdlg/wxdlg3dViewer.cpp
++src/wxdlg/wxcontrolsconfigdialog.cpp
diff --git a/games-emulation/desmume/files/desmume-fix-gcc-warning.diff b/games-emulation/desmume/files/desmume-fix-gcc-warning.diff
new file mode 100644
index 000000000000..409640264c7a
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-fix-gcc-warning.diff
@@ -0,0 +1,22 @@
+--- desmume-0.9.7/src/GPU.cpp	2011-01-27 11:27:00.000000000 +0100
++++ desmume-0.9.7-fix-warning/src/GPU.cpp	2011-11-11 21:17:10.826721602 +0100
+@@ -1184,16 +1184,16 @@
+ 	case BGType_AffineExt_256x1:
+ 		// 256 colors 
+ 		pal = MMU.ARM9_VMEM + gpu->core * 0x400;
+-		apply_rot_fun<rot_256_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], NULL, pal);
++		apply_rot_fun<rot_256_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], 0, pal);
+ 		return;
+ 	case BGType_AffineExt_Direct:
+ 		// direct colors / BMP
+-		apply_rot_fun<rot_BMP_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], NULL, NULL);
++		apply_rot_fun<rot_BMP_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_ram[num], 0, NULL);
+ 		return;
+ 	case BGType_Large8bpp:
+ 		// large screen 256 colors
+ 		pal = MMU.ARM9_VMEM + gpu->core * 0x400;
+-		apply_rot_fun<rot_256_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_large_ram[num], NULL, pal);
++		apply_rot_fun<rot_256_map<MOSAIC> >(gpu,X,Y,PA,PB,PC,PD,LG, gpu->BG_bmp_large_ram[num], 0, pal);
+ 		return;
+ 	default: break;
+ 	}