version bump

6 files changed, 137 insertions, 3 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index f546a8af85ab..ec208ef2906d 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/snes9x
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.2 2003/09/10 16:03:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.3 2003/10/03 20:48:05 vapier Exp $
+
+*snes9x-1.41.1 (03 Oct 2003)
+
+  03 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage #25935.
 
 *snes9x-139-r1 (20 Feb 2003)
 
diff --git a/games-emulation/snes9x/files/1.41.1-system-zlib.patch b/games-emulation/snes9x/files/1.41.1-system-zlib.patch
new file mode 100644
index 000000000000..62703d8b153b
--- /dev/null
+++ b/games-emulation/snes9x/files/1.41.1-system-zlib.patch
@@ -0,0 +1,57 @@
+--- Makefile.in.orig	2003-08-13 00:44:11.999413120 -0400
++++ Makefile.in	2003-08-13 00:44:57.784452736 -0400
+@@ -74,8 +74,6 @@
+         CHEATS.O cheats2.o data.o unix/unix.o unix/config.o GLOBALS.O \
+ 	$(SPC7110OBJ) $(OBC1OBJ) $(SETAOBJ) $(KREEDOBJ)
+ 
+-OBJECTS += ../zlib/libz.a
+-
+ ifdef GUI
+ GUIOBJS = unix/snes9x_gui.o unix/moc_snes9x_gui.o
+ GUILIBS = -L$(QTDIR)/lib -lqt
+@@ -132,7 +130,7 @@
+ CC = @CC@
+ NASM = @NASM@
+ 
+-INCLUDES = -I../zlib @XINCLUDES@
++INCLUDES = @XINCLUDES@
+ 
+ OPTIMISE = @OPTIMIZE@
+ 
+@@ -170,7 +168,7 @@
+ CFLAGS=$(CCFLAGS)
+ 
+ .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj .O .CPP .C .ASM
+-LDLIBS = -L/usr/X11R6/lib -L../zlib
++LDLIBS = -L/usr/X11R6/lib
+ 
+ ifdef GLIDE
+ all: offsets gsnes9x
+@@ -206,22 +204,19 @@
+ 	$(CCC) $(INCLUDES) -o $@ offsets.o
+ 	./offsets >i386/offsets.h
+ 
+-../zlib/libz.a:
+-	cd ../zlib && sh ./configure && make
+-
+-snes9x: $(OBJECTS) ../zlib/libz.a unix/x11.o $(AIDOOBJS) $(GUIOBJS)
++snes9x: $(OBJECTS)  unix/x11.o $(AIDOOBJS) $(GUIOBJS)
+ 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(GUILIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lz -lm
+ 
+-ssnes9x: $(OBJECTS) ../zlib/libz.a unix/svga.o 
++ssnes9x: $(OBJECTS)  unix/svga.o 
+ 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl -lz $(EXTRALIBS) -lm
+ 
+-gsnes9x: $(OBJECTS) ../zlib/libz.a $(GLIDEOBJS)
++gsnes9x: $(OBJECTS)  $(GLIDEOBJS)
+ 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) $(LDLIBS) -lglide -lz $(EXTRALIBS) -lm
+ 
+-ggisnes9x: $(OBJECTS) ../zlib/libz.a unix/ggi.o
++ggisnes9x: $(OBJECTS)  unix/ggi.o
+ 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/ggi.o $(LDLIBS) -lggi -lz $(EXTRALIBS) -lm
+ 
+-osnes9x: $(OBJECTS) ../zlib/libz.a unix/x11.o $(OPENGLOBJS)
++osnes9x: $(OBJECTS)  unix/x11.o $(OPENGLOBJS)
+ 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/x11.o $(OPENGLOBJS) $(LDLIBS) $(OPENGLLIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lz -lm
+ 
+ s9xserver: $(SERVER_OBJECTS)
diff --git a/games-emulation/snes9x/files/digest-snes9x-139-r1 b/games-emulation/snes9x/files/digest-snes9x-1.39-r1
index 7436413f1239..7436413f1239 100644
--- a/games-emulation/snes9x/files/digest-snes9x-139-r1
+++ b/games-emulation/snes9x/files/digest-snes9x-1.39-r1
diff --git a/games-emulation/snes9x/files/digest-snes9x-1.41.1 b/games-emulation/snes9x/files/digest-snes9x-1.41.1
new file mode 100644
index 000000000000..e577b8754dc8
--- /dev/null
+++ b/games-emulation/snes9x/files/digest-snes9x-1.41.1
@@ -0,0 +1 @@
+MD5 9b3f0a07484379a8d276c08ab1bbdb87 snes9x-1.41-1-src.tar.gz 997469
diff --git a/games-emulation/snes9x/snes9x-139-r1.ebuild b/games-emulation/snes9x/snes9x-1.39-r1.ebuild
index 45a1e3d9cf80..7102a237a95b 100644
--- a/games-emulation/snes9x/snes9x-139-r1.ebuild
+++ b/games-emulation/snes9x/snes9x-1.39-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-139-r1.ebuild,v 1.1 2003/09/09 16:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.39-r1.ebuild,v 1.1 2003/10/03 20:48:05 vapier Exp $
 
 DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
 HOMEPAGE="http://www.snes9x.com/"
-SRC_URI="http://www.snes9x.com/zips/s9xs${PV}.zip"
+SRC_URI="http://www.snes9x.com/zips/s9xs${PV/.}.zip"
 
 LICENSE="as-is"
 KEYWORDS="x86 ~ppc"
diff --git a/games-emulation/snes9x/snes9x-1.41.1.ebuild b/games-emulation/snes9x/snes9x-1.41.1.ebuild
new file mode 100644
index 000000000000..9508ecdb8586
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.41.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.41.1.ebuild,v 1.1 2003/10/03 20:48:05 vapier Exp $
+
+inherit games
+
+MY_PV=1.41-1
+DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
+HOMEPAGE="http://www.snes9x.com/"
+SRC_URI="http://www.lysator.liu.se/snes9x/snes9x-${MY_PV}-src.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE="3dfx opengl X" # svga ggi
+
+RDEPEND="sys-libs/zlib
+	virtual/x11
+	opengl? ( virtual/opengl )"
+#	X? ( virtual/x11 )
+#	svga? ( media-libs/svgalib )
+#	3dfx? ( media-libs/glide-v3 )
+#	ggi? ( media-libs/libggi )
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}-${MY_PV}-src
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/snes9x
+	epatch ${FILESDIR}/${PV}-system-zlib.patch
+}
+
+src_compile() {
+	mkdir mybins
+	cd snes9x
+	local vidconf=
+	local target=
+	for vid in 3dfx opengl X ; do
+		[ `use ${vid}` ] || continue
+		case ${vid} in
+			3dfx)
+				vidconf="--with-glide --without-opengl --without-x"
+				target=gnes9x;;
+			opengl)
+				vidconf="--with-opengl --without-glide --without-x"
+				target=osnes9x;;
+			X)
+				vidconf="--with-x --without-glide --without-opengl"
+				target=snes9x;;
+		esac
+		# this stuff is ugly but hey the build process sucks ;)
+		egamesconf \
+			`use_with joystick` \
+			${vidconf} \
+			`use_with x86 assembler` \
+			|| die
+		emake ${target} || die "making ${target}"
+		mv ${target} ${S}/mybins/
+		cd ${WORKDIR}
+		src_unpack
+	done
+}
+
+src_install() {
+	dodoc README.TXT README.UNIX
+	dogamesbin mybins/*
+	dodoc snes9x/{CHANGES,PROBLEMS,HARDWARE}.TXT
+	prepgamesdirs
+}