diff options
| author |   Daniel Goller <morfic@gentoo.org> | 2005-04-24 19:55:58 +0000 |
|---|---|---|
| committer | Daniel Goller <morfic@gentoo.org> | 2005-04-24 19:55:58 +0000 |
| commit | 58aa615066451704d647399dbad8f1a10c85ee86 (patch) | |
| tree | 246c0e8127c614796912f4efa1bcee6111dac306 | |
| parent | Fixed vcd dependency (bug #90176), fixes doc installation, adds patch for wma... (diff) | |
| download | historical-58aa615066451704d647399dbad8f1a10c85ee86.tar.gz historical-58aa615066451704d647399dbad8f1a10c85ee86.tar.bz2 historical-58aa615066451704d647399dbad8f1a10c85ee86.zip | |
amd64 fixes
Package-Manager: portage-2.0.51.19
| -rw-r--r-- | games-emulation/mupen64/ChangeLog | 5 | ||||
| -rw-r--r-- | games-emulation/mupen64/Manifest | 10 | ||||
| -rw-r--r-- | games-emulation/mupen64/mupen64-0.4-r2.ebuild | 16 |
3 files changed, 19 insertions, 12 deletions
diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog index 2684ebff22f5..b323a70485a4 100644 --- a/games-emulation/mupen64/ChangeLog +++ b/games-emulation/mupen64/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-emulation/mupen64 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.14 2005/04/24 00:35:19 morfic Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.15 2005/04/24 19:55:58 morfic Exp $ + + 24 Apr 2005; Daniel Goller <morfic@gentoo.org> mupen64-0.4-r2.ebuild: + amd64 fixes 23 Apr 2005; Daniel Goller <morfic@gentoo.org> files/mupen64-gtk2-makefile.patch, files/mupen64-makefiles.patch, diff --git a/games-emulation/mupen64/Manifest b/games-emulation/mupen64/Manifest index da539324389a..a3b95d51f534 100644 --- a/games-emulation/mupen64/Manifest +++ b/games-emulation/mupen64/Manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 4aac7be521bf4c0be4acd11ba5306b19 mupen64-0.4-r2.ebuild 2644 -MD5 ed5a2624da63ccc98119084e957dbcbb ChangeLog 2842 +MD5 c57a9b31ccd8cd784cf49dd0c6df7abe mupen64-0.4-r2.ebuild 2778 +MD5 19603457e0526b6b4da66fdac786b97f ChangeLog 2929 MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247 MD5 e2b006764c1bac03ac2667ad60a66101 files/0.3-gcc3.patch 3662 MD5 c9949136ca13fb53bdbe8cdcf0374ead files/mupen64-gtk2-makefile.patch 4845 @@ -19,7 +19,7 @@ MD5 8a58a3ce196f2d69b21339244722e957 files/mupen64-makefiles.patch 2052 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCaukrUpKYMelfdYERAk/dAJ4p5FWSFl2Km5rWeuH/GBXfj1h/XACeLn0n -PmzlfqOcyamiExSgvSc21GU= -=HpGc +iD8DBQFCa/h5UpKYMelfdYERAmw3AJ9CSiOXOID0DPjyAolLtuJyWy0qdQCfSJ1q +uAuxtRRjZI0l4JlxOiLFnxQ= +=MwaC -----END PGP SIGNATURE----- diff --git a/games-emulation/mupen64/mupen64-0.4-r2.ebuild b/games-emulation/mupen64/mupen64-0.4-r2.ebuild index 8fd48594b03c..b39fb89c69ed 100644 --- a/games-emulation/mupen64/mupen64-0.4-r2.ebuild +++ b/games-emulation/mupen64/mupen64-0.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4-r2.ebuild,v 1.2 2005/04/24 00:35:19 morfic Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4-r2.ebuild,v 1.3 2005/04/24 19:55:58 morfic Exp $ inherit games gcc eutils libtool @@ -35,14 +35,18 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${PN}-makefiles.patch" - epatch "${FILESDIR}/${PN}-confdir.patch" + epatch "${FILESDIR}/${PN}-makefiles.patch" || die "patch failed" + epatch "${FILESDIR}/${PN}-confdir.patch" || die "patch failed" # gtk2 breaks some configuration dialogs (bug 56195 #35) - use gtk2 && epatch "${FILESDIR}/${PN}-gtk2-makefile.patch" - use avi && epatch "${FILESDIR}/${PN}-gentoo-avi.patch" + if use gtk2; then + epatch "${FILESDIR}/${PN}-gtk2-makefile.patch" || die "patch failed" + fi + if use avi; then + epatch "${FILESDIR}/${PN}-gentoo-avi.patch" || die "patch failed" + fi if ! use asm ; then - epatch "${FILESDIR}/${PN}-noasm.patch" + epatch "${FILESDIR}/${PN}-noasm.patch" || die "patch failed" fi sed -i \ -e "s:CFLAGS.*=\(.*\):CFLAGS=\1 -fPIC ${CFLAGS}:" \ |