| 1 |
nyhm 08/05/02 13:52:31 |
| 2 |
|
| 3 |
Modified: zsnes-1.51-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix building with gcc-4.3 |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 games-emulation/zsnes/zsnes-1.51-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r1.ebuild?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r1.ebuild?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r1.ebuild?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: zsnes-1.51-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r1.ebuild,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- zsnes-1.51-r1.ebuild 29 Feb 2008 19:08:22 -0000 1.6 |
| 22 |
+++ zsnes-1.51-r1.ebuild 2 May 2008 13:52:31 -0000 1.7 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r1.ebuild,v 1.6 2008/02/29 19:08:22 carlo Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r1.ebuild,v 1.7 2008/05/02 13:52:31 nyhm Exp $ |
| 28 |
|
| 29 |
-inherit eutils autotools flag-o-matic toolchain-funcs games |
| 30 |
+inherit eutils autotools flag-o-matic toolchain-funcs multilib games |
| 31 |
|
| 32 |
DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly" |
| 33 |
HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/" |
| 34 |
@@ -33,41 +33,33 @@ |
| 35 |
epatch "${FILESDIR}"/${P}-libpng.patch |
| 36 |
# Fix bug #186111 |
| 37 |
epatch "${FILESDIR}"/${P}-archopt-july-23-update.patch |
| 38 |
+ epatch "${FILESDIR}"/${P}-gcc43.patch |
| 39 |
|
| 40 |
# Remove hardcoded CFLAGS and LDFLAGS |
| 41 |
- if use custom-cflags; then |
| 42 |
- sed -i -e '/^\s*CFLAGS=.* -fomit-frame-pointer /d' \ |
| 43 |
- configure.in || die |
| 44 |
- append-flags -fomit-frame-pointer -D__RELEASE__ |
| 45 |
- else |
| 46 |
- strip-flags |
| 47 |
- fi |
| 48 |
sed -i \ |
| 49 |
- -e 's:^\s*STRIP="-s":STRIP="":' \ |
| 50 |
- -e 's:^\s*CFLAGS=.* -I\/usr\/local\/include .*$:CFLAGS="${CFLAGS} -I.":' \ |
| 51 |
- -e '/^\s*LDFLAGS=.* -L\/usr\/local\/lib /d' \ |
| 52 |
- configure.in || die |
| 53 |
- |
| 54 |
+ -e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \ |
| 55 |
+ -e '/^LDFLAGS=.*local/d' \ |
| 56 |
+ -e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \ |
| 57 |
+ configure.in \ |
| 58 |
+ || die "sed failed" |
| 59 |
eautoreconf |
| 60 |
} |
| 61 |
|
| 62 |
src_compile() { |
| 63 |
tc-export CC |
| 64 |
- |
| 65 |
use amd64 && multilib_toolchain_setup x86 |
| 66 |
- |
| 67 |
- local myconf="" |
| 68 |
- use custom-cflags && myconf="--disable-cpucheck force_arch=no" |
| 69 |
+ use custom-cflags || strip-flags |
| 70 |
|
| 71 |
egamesconf \ |
| 72 |
$(use_enable ao libao) \ |
| 73 |
$(use_enable png libpng) \ |
| 74 |
$(use_enable opengl) \ |
| 75 |
--disable-debug \ |
| 76 |
+ --disable-cpucheck \ |
| 77 |
--enable-release \ |
| 78 |
- ${myconf} \ |
| 79 |
+ force_arch=no \ |
| 80 |
|| die |
| 81 |
- emake makefile.dep || die "emake failed" |
| 82 |
+ emake makefile.dep || die "emake makefile.dep failed" |
| 83 |
emake || die "emake failed" |
| 84 |
} |
| 85 |
|
| 86 |
@@ -77,7 +69,7 @@ |
| 87 |
dodoc ../docs/{readme.1st,*.txt,README.LINUX} |
| 88 |
dodoc ../docs/readme.txt/* |
| 89 |
dohtml -r ../docs/readme.htm/* |
| 90 |
- make_desktop_entry zsnes ZSNES zsnes |
| 91 |
+ make_desktop_entry zsnes ZSNES |
| 92 |
newicon icons/48x48x32.png ${PN}.png |
| 93 |
prepgamesdirs |
| 94 |
} |
| 95 |
|
| 96 |
|
| 97 |
|
| 98 |
1.37 games-emulation/zsnes/ChangeLog |
| 99 |
|
| 100 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/zsnes/ChangeLog?rev=1.37&view=markup |
| 101 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/zsnes/ChangeLog?rev=1.37&content-type=text/plain |
| 102 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-emulation/zsnes/ChangeLog?r1=1.36&r2=1.37 |
| 103 |
|
| 104 |
Index: ChangeLog |
| 105 |
=================================================================== |
| 106 |
RCS file: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v |
| 107 |
retrieving revision 1.36 |
| 108 |
retrieving revision 1.37 |
| 109 |
diff -u -r1.36 -r1.37 |
| 110 |
--- ChangeLog 29 Feb 2008 19:08:22 -0000 1.36 |
| 111 |
+++ ChangeLog 2 May 2008 13:52:31 -0000 1.37 |
| 112 |
@@ -1,6 +1,10 @@ |
| 113 |
# ChangeLog for games-emulation/zsnes |
| 114 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 115 |
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.36 2008/02/29 19:08:22 carlo Exp $ |
| 116 |
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.37 2008/05/02 13:52:31 nyhm Exp $ |
| 117 |
+ |
| 118 |
+ 02 May 2008; Tristan Heaven <nyhm@g.o> |
| 119 |
+ +files/zsnes-1.51-gcc43.patch, zsnes-1.51-r1.ebuild: |
| 120 |
+ Fix building with gcc-4.3 |
| 121 |
|
| 122 |
29 Feb 2008; Carsten Lohrke <carlo@g.o> zsnes-1.51-r1.ebuild: |
| 123 |
Remove icon extension from desktop entry to match Icon Theme Specification. |
| 124 |
|
| 125 |
|
| 126 |
|
| 127 |
-- |
| 128 |
gentoo-commits@l.g.o mailing list |
Archives