summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2010-01-16 18:07:09 +0000
committerHanno Boeck <hanno@gentoo.org>2010-01-16 18:07:09 +0000
commitb9528ee593eeb7b1a946277892cfef5ebd471db2 (patch)
treebe33913ce6850f8c1467f3f7158488854e8bec4b /games-emulation
parentOverdue version bump, made possible since we can now easily patch gems. Conve... (diff)
downloadhistorical-b9528ee593eeb7b1a946277892cfef5ebd471db2.tar.gz
historical-b9528ee593eeb7b1a946277892cfef5ebd471db2.tar.bz2
historical-b9528ee593eeb7b1a946277892cfef5ebd471db2.zip
build fix for desmume
Package-Manager: portage-2.1.7.16/cvs/Linux x86_64
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/desmume/ChangeLog8
-rw-r--r--games-emulation/desmume/Manifest13
-rw-r--r--games-emulation/desmume/desmume-0.9.5.ebuild8
-rw-r--r--games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff11
4 files changed, 30 insertions, 10 deletions
diff --git a/games-emulation/desmume/ChangeLog b/games-emulation/desmume/ChangeLog
index 88e7f0c77c89..0d4c9bceffff 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.16 2009/12/22 01:46:04 hanno Exp $
+# 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 $
+
+ 16 Jan 2010; Hanno Boeck <hanno@gentoo.org> desmume-0.9.5.ebuild,
+ +files/desmume-0.9.5-sse2-fix.diff:
+ Build fix from upstream, see #298403.
*desmume-0.9.5 (21 Dec 2009)
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 64bbf0ed0547..e6568b29836f 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -2,16 +2,17 @@
Hash: SHA1
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
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
EBUILD desmume-0.9.4.ebuild 874 RMD160 6f11d59c6d66730f083c6b7420e70384fda3efa2 SHA1 8242339e711510c67576605dc70c043958a19879 SHA256 300fa5ea4e35c0765d038d17955ed07b2a9d6796329313e98c503ed7271c1051
-EBUILD desmume-0.9.5.ebuild 824 RMD160 6cec112ca541ff748608cbf1fac89552e2dc4b3b SHA1 8382419ea87e98d2c9c141c2116b190ac6a67a3f SHA256 e8fd269baa6f343102ed6f56f3d55cfe92b375a284194ca79cc7930aabe030e8
-MISC ChangeLog 2339 RMD160 22b416bb3ab66b8fece0de94498e6c081ed62ff4 SHA1 c58d9fae3413e50033c08fc9c9c63c91fb8fe602 SHA256 5bf50267c66883cd38b165c775d57708935844d09e7b9f4991ecb17b46832064
+EBUILD desmume-0.9.5.ebuild 884 RMD160 1f2369369648d7c262558577f638f96fe8fbc205 SHA1 340eb25c6c674c8010fd8f591afb4a98bdbbc18a SHA256 acd94ff8a096c2f957c48a4dd849cf0c70641c77922f23e7aa9d2c78bd4b0fb7
+MISC ChangeLog 2486 RMD160 4cbb5455533534396558a68c74c47a5c5c45527e SHA1 f5e62f933694bf2aea6bfd3e23f17cda83959e7a SHA256 9022cc155445a447f0536cb8da8f546741b50a3d743494193a7be8abab34cc9e
MISC metadata.xml 217 RMD160 2cee600c10e18cdf9affa5625ffb8a09a6afbd3a SHA1 c45c975e3ce6414fb9924aeb6a59801ba41371cd SHA256 7bf8a4fe5f89e7603117203f6124665523e00cec1c4ec668f265416d7e64ce00
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkswJMQACgkQr2QksT29OyD5xwCgmj4YA4/PiC3C/L2YNVjfphqO
-w9AAnj9aLI2Wt0vH5NvCpj77cjsDfPdT
-=vE4G
+iEUEARECAAYFAktSAFQACgkQr2QksT29OyBd1wCY3fGxfNJpGYXrcnkDPTiUFFZb
+pwCdFOEvQyKrQdWJgw4qCafVYgPCOq8=
+=BJz6
-----END PGP SIGNATURE-----
diff --git a/games-emulation/desmume/desmume-0.9.5.ebuild b/games-emulation/desmume/desmume-0.9.5.ebuild
index a6e5ce2829e8..609ba72a89d0 100644
--- a/games-emulation/desmume/desmume-0.9.5.ebuild
+++ b/games-emulation/desmume/desmume-0.9.5.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-emulation/desmume/desmume-0.9.5.ebuild,v 1.1 2009/12/22 01:46:04 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/desmume/desmume-0.9.5.ebuild,v 1.2 2010/01/16 18:07:07 hanno Exp $
EAPI="2"
@@ -25,6 +25,10 @@ DEPEND=">=x11-libs/gtk+-2.8.0
x11-libs/agg"
RDEPEND="${DEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-sse2-fix.diff"
+}
+
src_configure() {
egamesconf --datadir=/usr/share || die "egamesconf failed"
}
diff --git a/games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff b/games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff
new file mode 100644
index 000000000000..1f9d48ad857d
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-0.9.5-sse2-fix.diff
@@ -0,0 +1,11 @@
+--- trunk/desmume/src/matrix.h 2009/12/12 10:34:06 3145
++++ trunk/desmume/src/matrix.h 2009/12/12 16:30:55 3146
+@@ -115,7 +115,7 @@
+
+ //switched SSE2 functions
+ //-------------
+-#ifdef ENABLE_SSE
++#ifdef ENABLE_SSE2
+
+ template<int NUM>
+ FORCEINLINE void memset_u16_le(void* dst, u16 val)