summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2002-10-03 20:31:12 +0000
committerMike Frysinger <vapier@gentoo.org>2002-10-03 20:31:12 +0000
commit2b2ea43b1c752f0c160e2527faacf56df3bbe4f5 (patch)
tree27bc96715802b8f28367573bcc49a136f9445ba4 /app-emulation
parentfilter CFLAGS fixes bug #8667 (diff)
downloadgentoo-2-2b2ea43b1c752f0c160e2527faacf56df3bbe4f5.tar.gz
gentoo-2-2b2ea43b1c752f0c160e2527faacf56df3bbe4f5.tar.bz2
gentoo-2-2b2ea43b1c752f0c160e2527faacf56df3bbe4f5.zip
Fix for #8717
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/snes9x/ChangeLog6
-rw-r--r--app-emulation/snes9x/files/snes9x-gcc3.diff11
-rw-r--r--app-emulation/snes9x/snes9x-139-r1.ebuild55
3 files changed, 58 insertions, 14 deletions
diff --git a/app-emulation/snes9x/ChangeLog b/app-emulation/snes9x/ChangeLog
index 93c837692bd9..e542a59a5b27 100644
--- a/app-emulation/snes9x/ChangeLog
+++ b/app-emulation/snes9x/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for app-emulation/snes9x
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/snes9x/ChangeLog,v 1.5 2002/08/06 19:05:05 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/snes9x/ChangeLog,v 1.6 2002/10/03 20:31:12 vapier Exp $
*snes-139-r1 (27 Jul 2002)
+ 03 Oct 2002; Mike Frysinger <vapier@gentoo.org> snes-139-r1.ebuild files/snes9x-gcc3.diff :
+ Fixed dependencies and made snes9x better ... #8717
+ Now you can have X or svga or glide or opengl ... X + svga is NOT required
+
06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
Added -ppc to keywords
diff --git a/app-emulation/snes9x/files/snes9x-gcc3.diff b/app-emulation/snes9x/files/snes9x-gcc3.diff
index a8f92da564ed..d65616446cff 100644
--- a/app-emulation/snes9x/files/snes9x-gcc3.diff
+++ b/app-emulation/snes9x/files/snes9x-gcc3.diff
@@ -22,3 +22,14 @@ diff -ur release.orig/unix/config.c release/unix/config.c
else
return def;
}
+--- release.orig/Makefile.linux 2002-10-03 16:04:29.000000000 -0400
++++ release/Makefile.linux 2001-09-18 02:04:07.000000000 -0400
+@@ -108,7 +108,7 @@
+
+ INCLUDES=-I/usr/X11R6/include -I/usr/local/include
+
+-OPTIMISE=-O6 -mpentium -fomit-frame-pointer -fno-exceptions
++OPTIMISE=
+
+ CCFLAGS = $(OPTIMISE) -DMITSHM \
+ -Ii386 \
diff --git a/app-emulation/snes9x/snes9x-139-r1.ebuild b/app-emulation/snes9x/snes9x-139-r1.ebuild
index a043be76fd73..e0f6e3ccd627 100644
--- a/app-emulation/snes9x/snes9x-139-r1.ebuild
+++ b/app-emulation/snes9x/snes9x-139-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/snes9x/snes9x-139-r1.ebuild,v 1.5 2002/08/06 19:05:05 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/snes9x/snes9x-139-r1.ebuild,v 1.6 2002/10/03 20:31:12 vapier Exp $
DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
HOMEPAGE="http://www.snes9x.com/"
@@ -9,23 +9,52 @@ KEYWORDS="x86 -ppc"
SLOT="0"
SRC_URI="http://www.snes9x.com/zips/s9xs${PV}.zip"
DEPEND="dev-lang/nasm
- virtual/x11
- opengl? ( virtual/opengl )
- glide? ( media-libs/glide-v3 )"
+ X? ( virtual/x11 )
+ svga? ( media-libs/svgalib )
+ opengl? ( virtual/opengl )
+ glide? ( media-libs/glide-v3 )"
RDEPEND="${DEPEND}"
-S=${WORKDIR}/release
+S="${WORKDIR}/release"
+
+pkg_setup() {
+ local mydisp
+ mydisp="`use X``use svga``use opengl``use glide`"
+ if [ -z "${mydisp}" ] ; then
+ eerror "Unable to find a display mode"
+ echo
+ eerror "You must have at least 1 of the following"
+ eerror "in your USE variable:"
+ eerror "X svga opengl glide"
+ die "unable to compile targets"
+ fi
+}
src_compile() {
patch -p1 < ${FILESDIR}/snes9x-gcc3.diff
- emake -f Makefile.linux || die
- use opengl && ( emake -f Makefile.linux OPENGL=1 clean all || die )
- use glide && ( emake -f Makefile.linux GLIDE=1 clean all || die )
+
+ #install our custom CXXFLAGS
+ mv Makefile.linux Makefile
+ cp Makefile Makefile.old
+ sed -e "s:OPTIMISE=:OPTIMISE=${CXXFLAGS}:" \
+ Makefile.old > Makefile
+
+ use X && emake snes9x
+ [ -x ${S}/snes9x ] || die "unable to compile for X"
+
+ use svga && emake ssnes9x
+ [ -x ${S}/snes9x ] || die "unable to compile for svga"
+
+ use opengl && emake osnes9x
+ [ -x ${S}/snes9x ] || die "unable to compile for opengl"
+
+ use glide && emake gsnes9x
+ [ -x ${S}/snes9x ] || die "unable to compile for glide"
}
src_install() {
- dobin snes9x ssnes9x
- use opengl && dobin osnes9x
- use glide && dobin gsnes9x
- dodoc COPYRIGHT.TXT CHANGES.TXT README.TXT PROBLEMS.TXT TODO.TXT HARDWARE.TXT
+ use X && dobin snes9x
+ use svga && dobin ssnes9x
+ use opengl && dobin osnes9x
+ use glide && dobin gsnes9x
+ dodoc {COPYRIGHT,CHANGES,README,PROBLEMS,TODO,HARDWARE,HOW2PORT}.TXT
}
-