| 1 |
mr_bones_ 11/09/29 20:11:35 |
| 2 |
|
| 3 |
Modified: ChangeLog zsnes-1.51-r2.ebuild |
| 4 |
Log: |
| 5 |
fix building with newer zlib (bug #384473); add patch from rpmfusion (bug #257963) |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.48 games-emulation/zsnes/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/zsnes/ChangeLog?rev=1.48&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/zsnes/ChangeLog?rev=1.48&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/zsnes/ChangeLog?r1=1.47&r2=1.48 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v |
| 19 |
retrieving revision 1.47 |
| 20 |
retrieving revision 1.48 |
| 21 |
diff -u -r1.47 -r1.48 |
| 22 |
--- ChangeLog 14 Sep 2011 08:45:05 -0000 1.47 |
| 23 |
+++ ChangeLog 29 Sep 2011 20:11:35 -0000 1.48 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for games-emulation/zsnes |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.47 2011/09/14 08:45:05 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.48 2011/09/29 20:11:35 mr_bones_ Exp $ |
| 29 |
+ |
| 30 |
+ 29 Sep 2011; Michael Sterrett <mr_bones_@g.o> zsnes-1.51-r2.ebuild, |
| 31 |
+ +files/zsnes-1.51-buffer.patch: |
| 32 |
+ fix building with newer zlib (bug #384473); add patch from rpmfusion (bug |
| 33 |
+ #257963) |
| 34 |
|
| 35 |
14 Sep 2011; Samuli Suominen <ssuominen@g.o> zsnes-1.51-r2.ebuild, |
| 36 |
+files/zsnes-1.51-libpng15.patch: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.9 games-emulation/zsnes/zsnes-1.51-r2.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild?rev=1.9&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild?rev=1.9&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild?r1=1.8&r2=1.9 |
| 45 |
|
| 46 |
Index: zsnes-1.51-r2.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v |
| 49 |
retrieving revision 1.8 |
| 50 |
retrieving revision 1.9 |
| 51 |
diff -u -r1.8 -r1.9 |
| 52 |
--- zsnes-1.51-r2.ebuild 14 Sep 2011 08:45:05 -0000 1.8 |
| 53 |
+++ zsnes-1.51-r2.ebuild 29 Sep 2011 20:11:35 -0000 1.9 |
| 54 |
@@ -1,7 +1,8 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.8 2011/09/14 08:45:05 ssuominen Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.9 2011/09/29 20:11:35 mr_bones_ Exp $ |
| 59 |
|
| 60 |
+EAPI=2 |
| 61 |
inherit eutils autotools flag-o-matic toolchain-funcs multilib games |
| 62 |
|
| 63 |
DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly" |
| 64 |
@@ -13,7 +14,7 @@ |
| 65 |
KEYWORDS="-* amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" |
| 66 |
IUSE="ao custom-cflags opengl png" |
| 67 |
|
| 68 |
-RDEPEND="media-libs/libsdl |
| 69 |
+RDEPEND="media-libs/libsdl[audio,video] |
| 70 |
>=sys-libs/zlib-1.2.3-r1 |
| 71 |
amd64? ( >=app-emulation/emul-linux-x86-sdl-10.1 ) |
| 72 |
ao? ( media-libs/libao ) |
| 73 |
@@ -25,23 +26,25 @@ |
| 74 |
|
| 75 |
S=${WORKDIR}/${PN}_${PV//./_}/src |
| 76 |
|
| 77 |
-src_unpack() { |
| 78 |
- unpack ${A} |
| 79 |
- cd "${S}" |
| 80 |
- |
| 81 |
+src_prepare() { |
| 82 |
# Fixing compilation without libpng installed |
| 83 |
- epatch "${FILESDIR}"/${P}-libpng.patch |
| 84 |
# Fix bug #186111 |
| 85 |
- epatch "${FILESDIR}"/${P}-archopt-july-23-update.patch |
| 86 |
- epatch "${FILESDIR}"/${P}-gcc43.patch |
| 87 |
# Fix bug #214697 |
| 88 |
- epatch "${FILESDIR}"/${P}-libao-thread.patch |
| 89 |
# Fix bug #170108 |
| 90 |
- epatch "${FILESDIR}"/${P}-depbuild.patch |
| 91 |
# Fix bug #260247 |
| 92 |
- epatch "${FILESDIR}"/${P}-CC-quotes.patch |
| 93 |
# Fix compability with libpng15 wrt #378735 |
| 94 |
- epatch "${FILESDIR}"/${P}-libpng15.patch |
| 95 |
+ # Fix buffer overwrite #257963 |
| 96 |
+ epatch \ |
| 97 |
+ "${FILESDIR}"/${P}-libpng.patch \ |
| 98 |
+ "${FILESDIR}"/${P}-archopt-july-23-update.patch \ |
| 99 |
+ "${FILESDIR}"/${P}-gcc43.patch \ |
| 100 |
+ "${FILESDIR}"/${P}-libao-thread.patch \ |
| 101 |
+ "${FILESDIR}"/${P}-depbuild.patch \ |
| 102 |
+ "${FILESDIR}"/${P}-CC-quotes.patch \ |
| 103 |
+ "${FILESDIR}"/${P}-libpng15.patch \ |
| 104 |
+ "${FILESDIR}"/${P}-buffer.patch |
| 105 |
+ |
| 106 |
+ sed -i -e '67i#define OF(x) x' zip/zunzip.h || die |
| 107 |
|
| 108 |
# Remove hardcoded CFLAGS and LDFLAGS |
| 109 |
sed -i \ |
| 110 |
@@ -53,7 +56,7 @@ |
| 111 |
eautoreconf |
| 112 |
} |
| 113 |
|
| 114 |
-src_compile() { |
| 115 |
+src_configure() { |
| 116 |
tc-export CC |
| 117 |
use amd64 && multilib_toolchain_setup x86 |
| 118 |
use custom-cflags || strip-flags |
| 119 |
@@ -67,8 +70,10 @@ |
| 120 |
--disable-debug \ |
| 121 |
--disable-cpucheck \ |
| 122 |
--enable-release \ |
| 123 |
- force_arch=no \ |
| 124 |
- || die |
| 125 |
+ force_arch=no |
| 126 |
+} |
| 127 |
+ |
| 128 |
+src_compile() { |
| 129 |
emake makefile.dep || die "emake makefile.dep failed" |
| 130 |
emake || die "emake failed" |
| 131 |
} |
| 132 |
@@ -76,8 +81,9 @@ |
| 133 |
src_install() { |
| 134 |
dogamesbin zsnes || die "dogamesbin failed" |
| 135 |
newman linux/zsnes.1 zsnes.6 |
| 136 |
- dodoc ../docs/{readme.1st,*.txt,README.LINUX} |
| 137 |
- dodoc ../docs/readme.txt/* |
| 138 |
+ dodoc \ |
| 139 |
+ ../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \ |
| 140 |
+ ../docs/readme.txt/* |
| 141 |
dohtml -r ../docs/readme.htm/* |
| 142 |
make_desktop_entry zsnes ZSNES |
| 143 |
newicon icons/48x48x32.png ${PN}.png |
Archives