Update to 0.35.

Changes:

0.35     [CORE]    Support for Genecyst patch files / Game Genie
         [CORE]    Support for AVI uncompressed and MJPEG output
         [68000]   Re-added busy wait removal that got lost
         [SOUND]   Added configurable single-pole low-pass filter
         [CORE]    Added autoconf/automake version checks
         [VDP]     Fix FIFO busy flag (Nicholas Van Veen)
         [SOUND]   Various further endian improvements from Bastien Nocera
                   and andi@fischlustig.de (Debian)
         [SOUND]   Various BSD compatibility improvements from
                   Alistair Crooks and Michael Core (NetBSD)
         [UI]      SDL Joystick support from Matthew N. Dodd (FreeBSD)
         [68000]   Do pre-decrement with two reads (Steve Snake)
         [68000]   Make TAS not write (Steve Snake) fixes Gargoyles, Ex Mutant
         [68000]   Re-write ABCD,etc based on info from Bart Trzynadlowski
         [68000]   Implement missing BTST op-code (fixes NHL Hockey 94)

6 files changed, 35 insertions, 66 deletions

diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 44d70ce67ac..ae959fd874c 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:14:40 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/01/31 23:58:33 xtraeme Exp $
 #
 
-DISTNAME=	generator-0.34
-PKGREVISION=	6
+DISTNAME=	generator-0.35
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.squish.net/generator/files/
 
@@ -11,10 +10,11 @@ HOMEPAGE=	http://www.sqish.net/generator/
 COMMENT=	Sega Mega drive genesis emulator
 
 USE_BUILDLINK3=		yes
-USE_X11=		# defined
-GNU_CONFIGURE=		# defined
+USE_X11=		yes
+GNU_CONFIGURE=		yes
 
 .if (${MACHINE_ARCH} == "i386")
+BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
 CONFIGURE_ARGS+=	--with-gtk --with-raze
 .else
 CONFIGURE_ARGS+=	--with-gtk --with-cmz80
diff --git a/emulators/generator/distinfo b/emulators/generator/distinfo
index b9fcb4d710d..241103b079a 100644
--- a/emulators/generator/distinfo
+++ b/emulators/generator/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.4 2004/02/13 23:41:28 kristerw Exp $
+$NetBSD: distinfo,v 1.5 2005/01/31 23:58:33 xtraeme Exp $
 
-SHA1 (generator-0.34.tar.gz) = abf57875c60f63c9ffb97894f4ce9c638f60054f
-Size (generator-0.34.tar.gz) = 442852 bytes
-SHA1 (patch-aa) = 0878709485d884c1e4956b5ac4659024e31ef3ac
-SHA1 (patch-ac) = 418547b9c791824822a8eac3b1964dccb5ba39ce
-SHA1 (patch-ad) = c6e79f872595a427a08c34d802f19495c6985022
-SHA1 (patch-ae) = 94d920ea543b3ddbda01f3a143880a45e2a23fbe
+SHA1 (generator-0.35.tar.gz) = a61138579efd97028d3a69c54c3c6fcd0a3d74ab
+Size (generator-0.35.tar.gz) = 469541 bytes
+SHA1 (patch-ac) = 7467437c39f7df56a261a330d8f021c0d9c0381b
+SHA1 (patch-ae) = 4e689421fe66aa7f635191e9f0100cd98daf8a76
 SHA1 (patch-af) = ef1c72b6da1ae93209a13b6836d5a85f66ffa51c
diff --git a/emulators/generator/patches/patch-aa b/emulators/generator/patches/patch-aa
deleted file mode 100644
index 8a49c098622..00000000000
--- a/emulators/generator/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/09 19:08:39 agc Exp $
-
---- main/gensoundp-unix.c	2002/05/09 19:02:00	1.1
-+++ main/gensoundp-unix.c	2002/05/09 19:02:56
-@@ -22,9 +22,15 @@
- #  include "fm.h"
- #endif
- 
-+#if defined(__NetBSD__)
-+#include <soundcard.h>
-+
-+#define SOUND_DEVICE "/dev/sound"
-+#else
- #include <sys/soundcard.h>
- 
- #define SOUND_DEVICE "/dev/dsp"
-+#endif
- 
- /*** variables externed ***/
- 
diff --git a/emulators/generator/patches/patch-ac b/emulators/generator/patches/patch-ac
index da77458717f..fe74976e436 100644
--- a/emulators/generator/patches/patch-ac
+++ b/emulators/generator/patches/patch-ac
@@ -1,21 +1,20 @@
-$NetBSD: patch-ac,v 1.1 2002/11/19 20:54:21 agc Exp $
+$NetBSD: patch-ac,v 1.2 2005/01/31 23:58:33 xtraeme Exp $
 
-Remove -malign-double from configuration options - causes problems in
-at least the stat structure - from Christian Biere
-
---- configure	2002/11/19 20:37:03	1.1
-+++ configure	2002/11/19 20:37:35
-@@ -1581,13 +1581,6 @@
+--- configure.orig	2005-02-01 00:40:15.000000000 +0100
++++ configure	2005-02-01 00:40:29.000000000 +0100
+@@ -1919,15 +1919,6 @@
  echo "${ECHO_T}Turning on gcc 3 optimisations" >&6
          CFLAGS="$CFLAGS -minline-all-stringops -fno-math-errno"
        fi
 -      case $target_cpu in
--        i?86) echo "$as_me:1585: result: Turning on pentium optimisations" >&5
+-        i?86) echo "$as_me:$LINENO: result: Turning on pentium optimisations" >&5
 -echo "${ECHO_T}Turning on pentium optimisations" >&6
--              CFLAGS="$CFLAGS -march=pentium -malign-double -malign-loops=5"
+-              # cannot do malign-double as we link to other libraries and it
+-              # would break binary compatibility
+-              CFLAGS="$CFLAGS -march=pentium -malign-loops=5"
 -              CFLAGS="$CFLAGS -malign-jumps=5 -malign-functions=5"
 -              ;;
 -      esac
      else
-       { echo "$as_me:1592: WARNING: You did not opt for gcc optimisations!" >&5
+       { echo "$as_me:$LINENO: WARNING: You did not opt for gcc optimisations!" >&5
  echo "$as_me: WARNING: You did not opt for gcc optimisations!" >&2;}
diff --git a/emulators/generator/patches/patch-ad b/emulators/generator/patches/patch-ad
deleted file mode 100644
index a653910472a..00000000000
--- a/emulators/generator/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/11/19 20:54:21 agc Exp $
-
-Remove -malign-double from configuration options - causes problems in
-at least the stat structure - from Christian Biere
-
---- configure.in	2002/11/19 20:37:03	1.1
-+++ configure.in	2002/11/19 20:37:57
-@@ -123,12 +123,6 @@
-         AC_MSG_RESULT(Turning on gcc 3 optimisations)
-         CFLAGS="$CFLAGS -minline-all-stringops -fno-math-errno"
-       fi
--      case $target_cpu in
--        i?86) AC_MSG_RESULT(Turning on pentium optimisations)
--              CFLAGS="$CFLAGS -march=pentium -malign-double -malign-loops=5"
--              CFLAGS="$CFLAGS -malign-jumps=5 -malign-functions=5"
--              ;;
--      esac
-     else
-       AC_MSG_WARN(You did not opt for gcc optimisations!)
-       optimum=no
diff --git a/emulators/generator/patches/patch-ae b/emulators/generator/patches/patch-ae
index d6c222cf2db..16573fb052a 100644
--- a/emulators/generator/patches/patch-ae
+++ b/emulators/generator/patches/patch-ae
@@ -1,8 +1,20 @@
-$NetBSD: patch-ae,v 1.1 2004/02/13 23:41:28 kristerw Exp $
+$NetBSD: patch-ae,v 1.2 2005/01/31 23:58:33 xtraeme Exp $
 
---- hdr/generator.h.orig	2004-02-14 00:23:16.000000000 +0100
-+++ hdr/generator.h	2004-02-14 00:23:46.000000000 +0100
-@@ -185,11 +185,11 @@
+--- hdr/generator.h.orig	2003-05-04 20:50:43.000000000 +0200
++++ hdr/generator.h	2005-02-01 00:46:44.000000000 +0100
+@@ -21,6 +21,11 @@
+   #include <machine/endian.h>
+   #define SWAP16(x) bswap_16((x))
+   #define SWAP32(x) bswap_32((x))
++#elif defined(__NetBSD__)
++  #include <sys/types.h>
++  #include <machine/endian.h>
++  #define SWAP16(x) bswap16((x))
++  #define SWAP32(x) bswap32((x))
+ #else
+   #define SWAP16(y) (( ((y)>>8) & 0x00ff) | (( ((y)<<8) & 0xff00)))
+   #define SWAP32(y) (( ((y)>>24) & 0x000000ff) | \
+@@ -221,11 +226,11 @@
  #  define LOG_DEBUG3(x)   /* ui_log_debug3 ## x */
  #  define LOG_DEBUG2(x)   /* ui_log_debug2 ## x */
  #  define LOG_DEBUG1(x)   /* ui_log_debug1 ## x */