Add dev support for building for native amd64 #104049.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 97 insertions, 9 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index 18a1e108f1a2..22912a3fa4af 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,10 @@
 # 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.18 2005/08/27 04:51:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.19 2005/08/28 21:17:10 vapier Exp $
+
+  28 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/snes9x-1.43-porting.patch, snes9x-1.43-r1.ebuild:
+  Add dev support for building for native amd64 #104049.
 
 *snes9x-1.43-r1 (27 Aug 2005)
 
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index f550e8bee4ba..34cdf9ed2362 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -4,8 +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 396e583b5e4705c480584b4aea4ebfd4 snes9x-1.43-r1.ebuild 2461
-MD5 9ab7df3590bc0529c7de25508a81ab1f ChangeLog 3799
+MD5 e9ff20a4642a2c1a9f7fef34d7e96668 snes9x-1.43-r1.ebuild 2534
+MD5 a547427db5161125e25145484c1d3ce6 ChangeLog 3966
 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
@@ -14,13 +14,14 @@ 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 48de604e869ca1513f6265f5739d97b1 files/snes9x-1.43-porting.patch 1903
 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/FrgIKl8Uu19MoRAnKFAJ93bnp+QljF97WFz7FybnFnpVtgcwCfd1OV
-19t38n2L96LAldckNjcSDzA=
-=q4W4
+iD8DBQFDEinogIKl8Uu19MoRAiq/AJ9w85gTfbuYnwWN4ILOUovAj9XG7wCff5ke
+KbxhPRGgX8ULBrteNizRQEk=
+=qiUL
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/snes9x/files/snes9x-1.43-porting.patch b/games-emulation/snes9x/files/snes9x-1.43-porting.patch
new file mode 100644
index 000000000000..33d03bbc46e5
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.43-porting.patch
@@ -0,0 +1,81 @@
+http://www.snes9x.com/phpbb2/viewtopic.php?p=12712
+http://bugs.gentoo.org/104049
+
+--- snes9x/configure.in
++++ snes9x/configure.in
+@@ -585,6 +585,19 @@
+   SYSDEFINES="$SYSDEFINES"' -DHAVE_SYS_IOCTL_H'
+ ])
+ 
++AC_CHECK_HEADER(endian.h, [
++  SYSDEFINES="$SYSDEFINES"' -DHAVE_ENDIAN_H'
++])
++AC_CHECK_HEADER(sys/endian.h, [
++  SYSDEFINES="$SYSDEFINES"' -DHAVE_SYS_ENDIAN_H'
++])
++AC_CHECK_HEADER(machine/endian.h, [
++  SYSDEFINES="$SYSDEFINES"' -DHAVE_MACHINE_ENDIAN_H'
++])
++AC_CHECK_HEADER(sys/isa_defs.h, [
++  SYSDEFINES="$SYSDEFINES"' -DHAVE_SYS_ISA_DEFS_H'
++])
++
+ AC_CHECK_HEADERS(unistd.h sys/socket.h winsock.h winsock2.h WS2tcpip.h)
+ 
+ 
+--- snes9x/port.h.orig	2005-08-28 16:57:03.000000000 -0400
++++ snes9x/port.h	2005-08-28 17:11:59.000000000 -0400
+@@ -110,6 +110,19 @@
+ 
+ #include <sys/types.h>
+ 
++#if defined(HAVE_ENDIAN_H)
++# include <endian.h>
++#endif
++#if defined(HAVE_SYS_ENDIAN_H)
++# include <sys/endian.h>
++#endif
++#if defined(HAVE_MACHINE_ENDIAN_H)
++# include <machine/endian.h>
++#endif
++#if defined(HAVE_SYS_ISA_DEFS_H)
++# include <sys/isa_defs.h>
++#endif
++
+ /* #define PIXEL_FORMAT RGB565 */
+ #define GFX_MULTI_FORMAT
+ 
+@@ -265,12 +278,27 @@
+ #define SIG_PF void(*)(int)
+ #endif
+ 
+-#if defined(__i386__) || defined(__i486__) || defined(__i586__) || \
+-    defined(__WIN32__) || defined(__alpha__)
+-#define LSB_FIRST
+-#define FAST_LSB_WORD_ACCESS
+-#else
+-#define MSB_FIRST
++#if defined(BYTE_ORDER)
++# if BYTE_ORDER == LITTLE_ENDIAN
++#  define LSB_FIRST
++# else
++#  define MSB_FIRST
++# endif
++#elif defined(WORDS_LITTLENDIAN)
++# define LSB_FIRST
++#elif defined(WORDS_BIGENDIAN)
++# define MSB_FIRST
++#else
++# if defined(__i386__) || defined(__i486__) || defined(__i586__) || \
++    defined(__WIN32__) || defined(__alpha__) || defined(__x86_64__)
++#  define LSB_FIRST
++# else
++#  define MSB_FIRST
++# endif
++#endif
++
++#if defined(LSB_FIRST)
++# define FAST_LSB_WORD_ACCESS
+ #endif
+ 
+ #ifdef __sun
diff --git a/games-emulation/snes9x/snes9x-1.43-r1.ebuild b/games-emulation/snes9x/snes9x-1.43-r1.ebuild
index b2bf42c2c16e..7c81c1e1cee5 100644
--- a/games-emulation/snes9x/snes9x-1.43-r1.ebuild
+++ b/games-emulation/snes9x/snes9x-1.43-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.43-r1.ebuild,v 1.2 2005/08/28 21:17:10 vapier Exp $
 
 # 3dfx support (glide) is disabled because it requires
 # glide-v2 while we only provide glide-v3 in portage
@@ -31,18 +31,20 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"/snes9x
 	epatch "${FILESDIR}"/nojoy.patch
+	epatch "${FILESDIR}"/${P}-porting.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
+
+	autoconf || die
 }
 
 src_compile() {
-	if use amd64 ; then
+	if use amd64 && [[ -z ${NATIVE_AMD64_BUILD_PLZ} ]] ; then
 		export ABI=x86
 		append-flags -m32
 		append-ldflags -m32