Update to 1.52.79. GTK port has been integrated into main

snes9x version.

Snes9x 1.52
- IMPORTANT NOTICE: The structure of savestates (also known
  as snapshots / freeze files) is incompatible with older
  versions! Snes9x 1.52 cannot read the savestates created
  by 1.51 or older.                                         (zones)
- Highly acculate SPC700 and S-DSP emulation.               (Blargg)
- Replaced APU emulation cores (SPC700 and S-DSP) with
  ones provided by Blargg's SNES_SPC library. This renders
  savestates incompatible with older versions.              (BearOso, zones)
- SPC7110 emulation.                                        (byuu, neviksti)
- Merged bsnes' SPC7110 emulation code. Note that the .rtc
  file of Far East of Eden Zero is incompatible with older
  versions.                                                 (zones)
- Removed graphics pack support. It's no more necessary.    (zones)
- Replaced S-RTC emulation code with bsnes' one to keep the
  good compatibility of .rtc files between the two
  emulators. As a result, Daikaijuu Monogatari 2 now
  outputs the .rtc file, and its .srm file is incompatible
  with older versions.                                      (zones)
- Added savestate supports for DSP-2, DSP-4, ST-010 and
  OBC1.                                                     (zones)
- Added UPS support.                                        (byuu)
- Fixed DSP-4 AI problem.                                   (Jonas Quinn)
- Fixed invalid memory accesses in C4 and OBC1 codes.       (zones)
- Fixed invalid memory accesses in BSX codes. My mistake.   (zones)
- Fixed the read value of $213e, $4210 and $4211.           (zones)
- Fixed the writing of word values at the memory boundary.  (zones)
- Fixed the bug that the unnecessary SA-1 emulation
  continues once any SA-1 games are launched.               (zones)
- Removed old color blending codes.                         (zones)
- Removed too-old Snes96 and ZSNES snapshot support.        (zones)
- Updated command-line options.                             (zones)
- Code cleaning.                                            (zones)
- GTK+ : Added a port of Snes9x to the GTK+ toolkit.        (BearOso)
- Unix : Reconstructed and simplified all the contents.
  Some features have been removed to be simple, and many
  options have changed. GTK+ port is recommended for most
  of Linux users.                                           (zones)

4 files changed, 19 insertions, 16 deletions

diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index e2696aaa665..3328cae269a 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/10/20 15:34:53 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/05 12:57:27 wiz Exp $
 #
 
-DISTNAME=	snes9x-1.51-src-gtk-78
-PKGNAME=	snes9x-gtk-1.51.78
+DISTNAME=	snes9x-1.52-src
+PKGNAME=	snes9x-gtk-1.52.79
 CATEGORIES=	emulators
 MASTER_SITES=	http://snes9x-gtk.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +13,7 @@ COMMENT=	SNES emulator with GTK frontend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/snes9x-1.51-src/gtk
+WRKSRC=		${WRKDIR}/snes9x-1.52-src/gtk
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	intltool pkg-config msgfmt
@@ -30,6 +30,7 @@ BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/gtkglext/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.10.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
diff --git a/emulators/snes9x-gtk/PLIST b/emulators/snes9x-gtk/PLIST
index 02fd61116af..a640e11f02a 100644
--- a/emulators/snes9x-gtk/PLIST
+++ b/emulators/snes9x-gtk/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2009/08/29 13:37:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/02/05 12:57:27 wiz Exp $
 bin/snes9x-gtk
 share/applications/snes9x.desktop
 share/icons/hicolor/16x16/apps/snes9x.png
+share/icons/hicolor/24x24/apps/snes9x.png
+share/icons/hicolor/32x32/apps/snes9x.png
 share/icons/hicolor/scalable/apps/snes9x.svg
diff --git a/emulators/snes9x-gtk/distinfo b/emulators/snes9x-gtk/distinfo
index e8bad2b9753..cd6893642d8 100644
--- a/emulators/snes9x-gtk/distinfo
+++ b/emulators/snes9x-gtk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2009/10/20 15:34:53 wiz Exp $
+$NetBSD: distinfo,v 1.6 2010/02/05 12:57:27 wiz Exp $
 
-SHA1 (snes9x-1.51-src-gtk-78.tar.bz2) = 7d1bde82080f34bf4f16c2012a3bbaa886c6510c
-RMD160 (snes9x-1.51-src-gtk-78.tar.bz2) = f48bdf4cf4240f8bf7bca989bd97a971fdf1bde7
-Size (snes9x-1.51-src-gtk-78.tar.bz2) = 894388 bytes
-SHA1 (patch-aa) = 90b1624c04d7640fe87078e9309ade35693fd8e9
+SHA1 (snes9x-1.52-src.tar.bz2) = fb3957b68fcede882518516094a73ec5bbed76cf
+RMD160 (snes9x-1.52-src.tar.bz2) = ec7f85058e4571d89a65a89d3f09e2e40db0cbcc
+Size (snes9x-1.52-src.tar.bz2) = 1720137 bytes
+SHA1 (patch-aa) = bb32e36bd1d0c82dc4c68c3fb280f7474d1cf493
diff --git a/emulators/snes9x-gtk/patches/patch-aa b/emulators/snes9x-gtk/patches/patch-aa
index e925c5f1826..f0f6ecf8a8e 100644
--- a/emulators/snes9x-gtk/patches/patch-aa
+++ b/emulators/snes9x-gtk/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2009/04/06 10:11:47 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2010/02/05 12:57:27 wiz Exp $
 
---- src/gtk_sound_driver_oss.cpp.orig	2009-03-13 12:34:50.000000000 +0000
+--- src/gtk_sound_driver_oss.cpp.orig	2009-11-30 22:37:11.000000000 +0000
 +++ src/gtk_sound_driver_oss.cpp
-@@ -145,7 +145,7 @@ S9xOSSSoundDriver::open_device (int mode
+@@ -125,7 +125,7 @@ S9xOSSSoundDriver::open_device (void)
      printf ("OK\n");
  
-     printf ("    --> (Frequency: %d)...", so.playback_rate);
--    if (ioctl (filedes, SNDCTL_DSP_SPEED, &so.playback_rate) < 0)
-+    if (ioctl (filedes, SNDCTL_DSP_SPEED, (void*)&so.playback_rate) < 0)
+     printf ("    --> (Frequency: %d)...", Settings.SoundPlaybackRate);
+-    if (ioctl (filedes, SNDCTL_DSP_SPEED, &Settings.SoundPlaybackRate) < 0)
++    if (ioctl (filedes, SNDCTL_DSP_SPEED, (void *)&Settings.SoundPlaybackRate) < 0)
          goto close_fail;
  
      printf ("OK\n");