desmume gcc44 patch

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 28 insertions, 117 deletions

diff --git a/games-emulation/desmume/ChangeLog b/games-emulation/desmume/ChangeLog
index 91a9a957d1f5..2f10e5289ebf 100644
--- a/games-emulation/desmume/ChangeLog
+++ b/games-emulation/desmume/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/desmume
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/ChangeLog,v 1.13 2009/07/10 22:33:43 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/ChangeLog,v 1.14 2009/07/24 17:30:46 hanno Exp $
+
+  24 Jul 2009; Hanno Boeck <hanno@gentoo.org> desmume-0.9.4.ebuild,
+  +files/desmume-0.9.4-gcc44.patch:
+  Patch for gcc 4.4.
 
 *desmume-0.9.4 (10 Jul 2009)
 
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 9eddedb29645..b62b0b0e2f5b 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX desmume-desktop.patch 884 RMD160 3fddf0ba788aaedd78aa7a3175d2340a3d259a5c SHA1 958dd77ef774a52dda147337614354e887c68084 SHA256 76ee5f1654aa63b9c891b6945b2ca03c7d8acb4f822f4d326f8ab331a4b7f83b
-DIST desmume-0.8.tar.gz 690259 RMD160 34757edf746cc3b16089a107e933cccba3030ebf SHA1 2cd567ccd737dc90f601f711e0bee32d78aee9de SHA256 df874af3da82ad453a9e095b9a51bbc864ada211566a6184af6e0f483d447e8a
+AUX desmume-0.9.4-gcc44.patch 339 RMD160 7f1ab5b12dc709eea63cb86754d25a00d6013367 SHA1 33cd11a8c55272f6e4dba795dcb763a9c06558f0 SHA256 820f6a07336ae6fbead0a873de0bb7f04900fb683e8146586f9d3f039730afda
 DIST desmume-0.9.1.tar.gz 828627 RMD160 eda78a1f71ae46b5558aa7d173750ea503d1a126 SHA1 ea0c085299ba6d3172227748bf52ae5ad86c0663 SHA256 94c925dd21a502880cefcf190b61b5730d0775e39a6c3c57a49da1861c9f3c16
 DIST desmume-0.9.2-1.tar.gz 880368 RMD160 5fd76ca2b29711af005574a7317c8e4f936aa822 SHA1 332725eb7e26303dcd54da7163aba2d5cc3c40df SHA256 169595202f233d32a28e4dbea286ed96a98ce23cd876955e2f07fae2eaaee7d5
 DIST desmume-0.9.4.tar.gz 1035843 RMD160 c86eab6727331a45403325facc0add968275de6d SHA1 06eb3cb9c57547d3c43e272648d176a252143e43 SHA256 5fc50e746e6c42ae64602338605b5a6890098b2819df90399908ac30ff6d9533
-DIST desmume-0.9.tar.gz 785375 RMD160 d6ad6faacd7b987c9a39aabf42e196d0ad0fe9db SHA1 d7ce7c3510fe4eb3d991bdad12af224014d51ab7 SHA256 422221acdb5ce250b28b1d5258564c18e72d72df5bccac5615c8c1e67471fc24
-EBUILD desmume-0.8.ebuild 903 RMD160 4716ca1d64b15999f3cfe26c3195aee52825d100 SHA1 d7882c31ff4952ddc86530fa95d123fa3e879cf3 SHA256 c5b19f351daa7f11589dc1229d1386094af616e46618fa9b8e84e74034c93e5f
 EBUILD desmume-0.9.1.ebuild 822 RMD160 cf8ed22fa396124d99b9d7069a6a2424a7544a2b SHA1 95b959ddb50741299e38c5db1c4284bbcbb46ba5 SHA256 e4651b6d12f601424b8bced299dcad1115682adb6450a49d53df8f73269e9201
 EBUILD desmume-0.9.2_p1.ebuild 876 RMD160 9afd68e5278c73a0c469bf762317cb3f019d11e5 SHA1 39596e0e25b03450970b1f1fa1eb14f70880e97b SHA256 d6a8721e8c038094b39c5802542f4cf2bb1500f5f60b76aa1bab0d342529f0a6
-EBUILD desmume-0.9.4.ebuild 863 RMD160 99857020e6425daa0696c604f2e6d98d97c928d7 SHA1 efda82f9c9fe7bf7a26226d592f97df7f7cbfc94 SHA256 ae902e749353db737cf7d4a61ed9d0dc159685d797b2cbaec1fa6fa626de23d7
-EBUILD desmume-0.9.ebuild 800 RMD160 7fa751d1ca1bd2a4823df704c78217ed9162aea5 SHA1 7d830ea9da510cde2ac6d6286119f15070912a4d SHA256 12506567969a5fbd48c9a6d7ebd9568212c999c1ac0a137575fb7a9d316c7bd9
-MISC ChangeLog 1954 RMD160 218aed0290e3dcb277a5193fc27fec3d048d7af3 SHA1 c52f9305128212a7c1a78da97ba09360db8dd78c SHA256 4762df7786b1add3bda92fdb36f684ca328474764e835dab7a4ee31ea5722c1d
+EBUILD desmume-0.9.4.ebuild 928 RMD160 d210fa7c12a51e1471ce46f5d3eeff15d1aa5761 SHA1 afb60d3e9cc442ce4f530844c1366703cb950ed4 SHA256 0ca0b606756e46af3330526e2536d2f3ad5728621412841d87e1be696c46037c
+MISC ChangeLog 2080 RMD160 8a54318a1766e3d3f72cd9d6894ab36ae6e35f1b SHA1 0f2654185d8d0973b86e59cfdf5e1915a193417b SHA256 b1fe5140aad0ec1648d524b0a041abeaca97bddc120a04e7a1c560ac130f77d2
 MISC metadata.xml 217 RMD160 2cee600c10e18cdf9affa5625ffb8a09a6afbd3a SHA1 c45c975e3ce6414fb9924aeb6a59801ba41371cd SHA256 7bf8a4fe5f89e7603117203f6124665523e00cec1c4ec668f265416d7e64ce00
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpXwcAACgkQr2QksT29OyDPpACdEzuv7fKMFchSPwmkc9bacK+f
-eEQAn2zzz4NHL5AYGzzIB+2AwX9pJ2LX
-=9vGf
+iEYEARECAAYFAkpp78AACgkQr2QksT29OyC1YACfVa/bE67foTdTAmNfFF1Xv8yp
+PX0AnR+SPKvemhp0nULsbv2nprC7qlFB
+=aAvf
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/desmume/desmume-0.8.ebuild b/games-emulation/desmume/desmume-0.8.ebuild
deleted file mode 100644
index e5897e6a84cd..000000000000
--- a/games-emulation/desmume/desmume-0.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.8.ebuild,v 1.4 2009/01/10 22:53:48 hanno Exp $
-
-inherit games eutils
-
-DESCRIPTION="Emulator for Nintendo DS."
-HOMEPAGE="http://desmume.sourceforge.net/"
-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
-	gnome-base/libglade
-	x11-libs/gtkglext
-	virtual/opengl
-	sys-libs/zlib
-	dev-libs/zziplib
-	media-libs/libsdl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-desktop.patch"
-}
-
-src_compile() {
-	egamesconf --datadir=/usr/share || die "egamesconf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
-	dodoc AUTHORS ChangeLog README README.LIN
-	prepgamesdirs
-}
diff --git a/games-emulation/desmume/desmume-0.9.4.ebuild b/games-emulation/desmume/desmume-0.9.4.ebuild
index afcf66e0f99d..49de72d7d184 100644
--- a/games-emulation/desmume/desmume-0.9.4.ebuild
+++ b/games-emulation/desmume/desmume-0.9.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.4.ebuild,v 1.1 2009/07/10 22:33:43 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.4.ebuild,v 1.2 2009/07/24 17:30:46 hanno Exp $
 
 EAPI="2"
 
-inherit games
+inherit games eutils
 
 DESCRIPTION="Emulator for Nintendo DS."
 HOMEPAGE="http://desmume.org/"
@@ -26,6 +26,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc44.patch"
+}
+
 src_compile() {
 	egamesconf --datadir=/usr/share || die "egamesconf failed"
 	emake || die "emake failed"
diff --git a/games-emulation/desmume/desmume-0.9.ebuild b/games-emulation/desmume/desmume-0.9.ebuild
deleted file mode 100644
index cd2c17c8568c..000000000000
--- a/games-emulation/desmume/desmume-0.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.ebuild,v 1.1 2009/01/10 22:53:48 hanno Exp $
-
-inherit games
-
-DESCRIPTION="Emulator for Nintendo DS."
-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
-	gnome-base/libglade
-	x11-libs/gtkglext
-	virtual/opengl
-	sys-libs/zlib
-	dev-libs/zziplib
-	media-libs/libsdl"
-
-src_compile() {
-	egamesconf --datadir=/usr/share || die "egamesconf failed"
-	emake || die "emake 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-0.9.4-gcc44.patch b/games-emulation/desmume/files/desmume-0.9.4-gcc44.patch
new file mode 100644
index 000000000000..d95a16c8aae1
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-0.9.4-gcc44.patch
@@ -0,0 +1,11 @@
+--- desmume-0.9.4/src/texcache.h	2009-07-08 11:11:01.000000000 +0300
++++ desmume-0.9.4-gcc44/src/texcache.h	2009-07-24 20:21:16.000000000 +0300
+@@ -43,7 +43,7 @@
+ 
+ void TexCache_Reset();
+ 
+-template<TexCache_TexFormat format>
++template<TexCache_TexFormat>
+ void TexCache_SetTexture(u32 format, u32 texpal);
+ 
+ void TexCache_Invalidate();
diff --git a/games-emulation/desmume/files/desmume-desktop.patch b/games-emulation/desmume/files/desmume-desktop.patch
deleted file mode 100644
index e4430880b9ed..000000000000
--- a/games-emulation/desmume/files/desmume-desktop.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/gtk/desmume.desktop.in~	2008-09-12 13:43:42.000000000 +0200
-+++ src/gtk/desmume.desktop.in	2008-09-12 13:43:42.000000000 +0200
-@@ -1,10 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
--Version=@VERSION@
-+Version=1.0
- Type=Application
- Name=DeSmuME (Gtk)
- Comment=Nintento DS emulator
- TryExec=desmume
- Exec=desmume
--Icon=DeSmuME.xpm
--Categories=GNOME;GTK;Game;Emulator
-+Icon=DeSmuME
-+Categories=GNOME;GTK;Game;Emulator;
---- src/gtk-glade/desmume-glade.desktop.in~	2008-09-12 13:44:29.000000000 +0200
-+++ src/gtk-glade/desmume-glade.desktop.in	2008-09-12 13:44:29.000000000 +0200
-@@ -1,10 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
--Version=@VERSION@
-+Version=1.0
- Type=Application
- Name=DeSmuME (Gtk-Glade)
- Comment=Nintento DS emulator
- TryExec=desmume-glade
- Exec=desmume-glade
--Icon=DeSmuME.xpm
--Categories=GNOME;GTK;Game;Emulator
-+Icon=DeSmuME
-+Categories=GNOME;GTK;Game;Emulator;