Fix reverse save/load keys by Matteo Settenvini #81980.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 160 insertions, 5 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index 328cb8757025..18a1e108f1a2 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/snes9x
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.17 2005/07/22 00:05:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.18 2005/08/27 04:51:39 vapier Exp $
+
+*snes9x-1.43-r1 (27 Aug 2005)
+
+  27 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/snes9x-1.43-key-bindings-fix.patch, +snes9x-1.43-r1.ebuild:
+  Fix reverse save/load keys by Matteo Settenvini #81980.
 
   22 Jul 2005; Mike Frysinger <vapier@gentoo.org>
   +files/snes9x-1.43-build.patch, snes9x-1.43.ebuild:
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 530ae8c1c70b..f550e8bee4ba 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -4,7 +4,8 @@ Hash: SHA1
 MD5 c30d64cc29b742b593f6e92a69c1a4a7 snes9x-1.42-r1.ebuild 1813
 MD5 72cc36a1a49aa65e6dacde3e88227ce7 snes9x-1.43.ebuild 2401
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 c977cf96d7854e2acd2381e837a6b592 ChangeLog 3590
+MD5 396e583b5e4705c480584b4aea4ebfd4 snes9x-1.43-r1.ebuild 2461
+MD5 9ab7df3590bc0529c7de25508a81ab1f ChangeLog 3799
 MD5 60e338baf6468da1d0c1fece4884553c files/snes9x-gcc3.diff 979
 MD5 95a147283e0b09db8ad3307bb3e5b305 files/snes9x-139-r1-BE-sound-fix.diff 550
 MD5 82847f439abd1f8ae87876515e60ccdf files/1.42-system-zlib.patch 2004
@@ -12,12 +13,14 @@ MD5 3c7f3eecac089063f960f627df4ac7e5 files/snes9x-1.43-build.patch 1104
 MD5 dbd6370fa28b91acc3b14b5534f87866 files/digest-snes9x-1.43 68
 MD5 5b7c3589393da0616b766b78c69aa16e files/snes9x-139-r1-Makefile-ppc.diff 779
 MD5 82847f439abd1f8ae87876515e60ccdf files/1.41.1-system-zlib.patch 2004
+MD5 dbd6370fa28b91acc3b14b5534f87866 files/digest-snes9x-1.43-r1 68
 MD5 12216340a66b7cfccf1891ca058d9335 files/nojoy.patch 507
+MD5 7785101201919ebc94bcd95e2cab6017 files/snes9x-1.43-key-bindings-fix.patch 2526
 MD5 29f4c8bf43e00e929c25d85ec4a06b70 files/digest-snes9x-1.42-r1 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDD+tZgIKl8Uu19MoRAo1GAJ48GH5qsk/2LHSRVlJ+d2ZjI5rLiQCbB0WN
-ZfKqEYKdlBLDOp+wgw1SV4I=
-=/PzQ
+iD8DBQFDD/FrgIKl8Uu19MoRAnKFAJ93bnp+QljF97WFz7FybnFnpVtgcwCfd1OV
+19t38n2L96LAldckNjcSDzA=
+=q4W4
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/snes9x/files/digest-snes9x-1.43-r1 b/games-emulation/snes9x/files/digest-snes9x-1.43-r1
new file mode 100644
index 000000000000..b8b43bedd773
--- /dev/null
+++ b/games-emulation/snes9x/files/digest-snes9x-1.43-r1
@@ -0,0 +1 @@
+MD5 2b86716203b6ce1dbfe0395c66bb46b5 snes9x-1.43-src.tar.gz 1016251
diff --git a/games-emulation/snes9x/files/snes9x-1.43-key-bindings-fix.patch b/games-emulation/snes9x/files/snes9x-1.43-key-bindings-fix.patch
new file mode 100644
index 000000000000..99ea776ef064
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.43-key-bindings-fix.patch
@@ -0,0 +1,49 @@
+--- snes9x-1.43-src/snes9x/unix/x11.cpp.old	2005-02-14 13:18:59.000000000 +0100
++++ snes9x-1.43-src/snes9x/unix/x11.cpp	2005-02-14 13:20:10.000000000 +0100
+@@ -1213,26 +1213,26 @@
+         // re-enable all sound channels
+         Define(TOGGLE_SOUND, 8,         Alt(XK_F12), Ctrl(XK_F12));
+         // numbered quicksaves
+-        Define(WRITE_SAVE_NUM, 0,       XK_F1);
+-        Define(WRITE_SAVE_NUM, 1,       XK_F2);
+-        Define(WRITE_SAVE_NUM, 2,       XK_F3);
+-        Define(WRITE_SAVE_NUM, 3,       XK_F4);
+-        Define(WRITE_SAVE_NUM, 4,       XK_F5);
+-        Define(WRITE_SAVE_NUM, 5,       XK_F6);
+-        Define(WRITE_SAVE_NUM, 6,       XK_F7);
+-        Define(WRITE_SAVE_NUM, 7,       XK_F8);
+-        Define(WRITE_SAVE_NUM, 8,       XK_F9);
+-        Define(WRITE_SAVE_NUM, 9,       XK_F10);
+-        Define(LOAD_SAVE_NUM, 0,       Shift(XK_F1));
+-        Define(LOAD_SAVE_NUM, 1,       Shift(XK_F2));
+-        Define(LOAD_SAVE_NUM, 2,       Shift(XK_F3));
+-        Define(LOAD_SAVE_NUM, 3,       Shift(XK_F4));
+-        Define(LOAD_SAVE_NUM, 4,       Shift(XK_F5));
+-        Define(LOAD_SAVE_NUM, 5,       Shift(XK_F6));
+-        Define(LOAD_SAVE_NUM, 6,       Shift(XK_F7));
+-        Define(LOAD_SAVE_NUM, 7,       Shift(XK_F8));
+-        Define(LOAD_SAVE_NUM, 8,       Shift(XK_F9));
+-        Define(LOAD_SAVE_NUM, 9,       Shift(XK_F10));
++        Define(LOAD_SAVE_NUM, 0,       XK_F1);
++        Define(LOAD_SAVE_NUM, 1,       XK_F2);
++        Define(LOAD_SAVE_NUM, 2,       XK_F3);
++        Define(LOAD_SAVE_NUM, 3,       XK_F4);
++        Define(LOAD_SAVE_NUM, 4,       XK_F5);
++        Define(LOAD_SAVE_NUM, 5,       XK_F6);
++        Define(LOAD_SAVE_NUM, 6,       XK_F7);
++        Define(LOAD_SAVE_NUM, 7,       XK_F8);
++        Define(LOAD_SAVE_NUM, 8,       XK_F9);
++        Define(LOAD_SAVE_NUM, 9,       XK_F10);
++        Define(WRITE_SAVE_NUM, 0,       Shift(XK_F1));
++        Define(WRITE_SAVE_NUM, 1,       Shift(XK_F2));
++        Define(WRITE_SAVE_NUM, 2,       Shift(XK_F3));
++        Define(WRITE_SAVE_NUM, 3,       Shift(XK_F4));
++        Define(WRITE_SAVE_NUM, 4,       Shift(XK_F5));
++        Define(WRITE_SAVE_NUM, 5,       Shift(XK_F6));
++        Define(WRITE_SAVE_NUM, 6,       Shift(XK_F7));
++        Define(WRITE_SAVE_NUM, 7,       Shift(XK_F8));
++        Define(WRITE_SAVE_NUM, 8,       Shift(XK_F9));
++        Define(WRITE_SAVE_NUM, 9,       Shift(XK_F10));
+         // layer toggles
+         Define(TOGGLE_LAYER,  0,       XK_1);
+         Define(TOGGLE_LAYER,  1,       XK_2);
diff --git a/games-emulation/snes9x/snes9x-1.43-r1.ebuild b/games-emulation/snes9x/snes9x-1.43-r1.ebuild
new file mode 100644
index 000000000000..b2bf42c2c16e
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.43-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.43-r1.ebuild,v 1.1 2005/08/27 04:51:39 vapier Exp $
+
+# 3dfx support (glide) is disabled because it requires
+# glide-v2 while we only provide glide-v3 in portage
+# http://bugs.gentoo.org/show_bug.cgi?id=93097
+
+inherit eutils games flag-o-matic
+
+DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
+HOMEPAGE="http://www.snes9x.com/"
+SRC_URI="http://www.lysator.liu.se/snes9x/${PV}/snes9x-${PV}-src.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="opengl X joystick zlib dga debug"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	virtual/x11
+	media-libs/libpng
+	amd64? ( emul-linux-x86-xlibs )
+	opengl? ( virtual/opengl virtual/glu )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/snes9x
+	epatch "${FILESDIR}"/nojoy.patch
+	epatch "${FILESDIR}"/${P}-key-bindings-fix.patch #81980
+	sed -i 's:png_jmpbuf:png_write_info:g' configure
+
+	rm offsets # stupid prebuilt file
+	sed -i -e 's:-lXext -lX11::' Makefile.in
+	sed -i -e '/X_LDFLAGS=/d' configure
+	cp Makefile.in{,.orig}
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	if use amd64 ; then
+		export ABI=x86
+		append-flags -m32
+		append-ldflags -m32
+	fi
+
+	local vidconf=
+	local target=
+	local vid=
+
+	mkdir mybins
+	for vid in opengl X fallback ; do
+		if [[ ${vid} != "fallback" ]] ; then
+			use ${vid} || continue
+		fi
+		cd "${S}"/snes9x
+		case ${vid} in
+#			3dfx)
+#				vidconf="--with-glide --without-opengl --without-x"
+#				target=gsnes9x;;
+			opengl)
+				vidconf="--with-opengl --without-glide --without-x"
+				target=osnes9x;;
+			fallback|X)
+				vidconf="--with-x --without-glide --without-opengl"
+				target=snes9x;;
+		esac
+		# this stuff is ugly but hey the build process sucks ;)
+		egamesconf \
+			${vidconf} \
+			$(use_with x86 assembler) \
+			$(use_with joystick) \
+			$(use_with debug debugger) \
+			$(use_with zlib) \
+			--with-screenshot \
+			$(use_with dga extensions) \
+			|| die
+		# Makefile doesnt quite support parallel builds
+		emake -j1 offsets || die "making offsets"
+		emake ${target} || die "making ${target}"
+		mv ${target} "${S}"/mybins/
+		cd "${WORKDIR}"
+		rm -r "${S}"/snes9x
+		src_unpack
+	done
+}
+
+src_install() {
+	dogamesbin mybins/* || die "dogamesbin failed"
+	dodoc faqs.txt readme.txt readme.unix snes9x/*.txt
+	prepgamesdirs
+}