emulators/snes9x: Update to 1.60

Changes since 1.59.2:

- Fixed subscreen blending with master brightness < 100%.
- Fixed NMI timing when toggling enable bit. Fixes Chou Aniki--hack removed.
- Reverted an IPL map optimization that misses a weird edge case that caused
  The Great Battle III to lock up.
- Clamp MSU1 addition to max amplitude instead of wrapping. Proper MSU1 tracks
  will not be affected by this.
- Save mipmap_input parameter with customized GLSL and slang shaders.
- Actually use mipmap_input parameter.
- Optimized subscreen math with help from Dwedit.
- Revert to measured APU clock speed instead of nominal speed. Fixes An
  American Tail.
- Fixed broken BPS patch support. (ArtiiP)
- Fixed MSU1 track restarting on load state.

libretro:
- Added ability to use Satellaview data in same directory as ROM.
- Fixed deviation from proper libretro spec.
- Added option to use the software NTSC filter. (stellarporter)

GTK:
- Added icons to the entries to clear binding assignments.
- Fixed overlap in xBRZ multithreading.
- Changed glFenceSync option to an OML_sync option that works better.
- Fixed accumulation of partial pixel data on mouse motion when we update the
  mouse position more than once per frame.
- Allow one key to be bound to many controller buttons on the same controller.
- Force menu and button icons.
- Add the view menu to right-click when SNES mouse isn't used.
- Remove unused status bar option.
- Startup background can be changed in snes9x.conf.
- Improved PortAudio driver.

Unix:
- Fixed sound output that broke with APU refactor.

3 files changed, 13 insertions, 13 deletions

diff --git a/emulators/snes9x/Makefile.common b/emulators/snes9x/Makefile.common
index e05843489fe..b7de0e17bde 100644
--- a/emulators/snes9x/Makefile.common
+++ b/emulators/snes9x/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.3 2019/03/05 12:12:31 nia Exp $
+# $NetBSD: Makefile.common,v 1.4 2019/04/25 13:06:58 nia Exp $
 
 # used by emulators/libretro-snes9x/Makefile
 # used by emulators/snes9x/Makefile
 # used by emulators/snes9x-gtk/Makefile
 
-SNES9X_VERSION=		1.59.2
+SNES9X_VERSION=		1.60
 DISTNAME=		snes9x-${SNES9X_VERSION}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_GITHUB:=snes9xgit/}
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo
index dadedc15216..c178976a37a 100644
--- a/emulators/snes9x/distinfo
+++ b/emulators/snes9x/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2019/03/05 12:12:31 nia Exp $
+$NetBSD: distinfo,v 1.24 2019/04/25 13:06:58 nia Exp $
 
-SHA1 (snes9x-1.59.2.tar.gz) = d6205269b539b62e6ae49da4261b48290b773a47
-RMD160 (snes9x-1.59.2.tar.gz) = 6ae871a66e4bb18901f8ed8cc2fcbf9aa4b809ba
-SHA512 (snes9x-1.59.2.tar.gz) = 84d2dfc12a991b77b30ba9a591d285ecd4cc5fbb418282900209db9191d61611123ffa7d715b7abeed9b891e9af88ab4c46616502523a881127e2ede008236e4
-Size (snes9x-1.59.2.tar.gz) = 2819803 bytes
+SHA1 (snes9x-1.60.tar.gz) = 96422e0257312dcbb4591ec3b9f83bef5a92e1b8
+RMD160 (snes9x-1.60.tar.gz) = c42d3f7c1fce0b6901c8f65dc07a626d9b58c873
+SHA512 (snes9x-1.60.tar.gz) = 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
+Size (snes9x-1.60.tar.gz) = 2863228 bytes
 SHA1 (patch-unix_configure) = 9df9a805141396583bceb35bea1bda157ed3ed6b
-SHA1 (patch-unix_unix.cpp) = a78882348d28f091863c75ea50e853369c8762a1
+SHA1 (patch-unix_unix.cpp) = 4ef289037fcd7a540b021ead7d906800c932e1bc
diff --git a/emulators/snes9x/patches/patch-unix_unix.cpp b/emulators/snes9x/patches/patch-unix_unix.cpp
index 525ae71a40b..5bca4ca2f16 100644
--- a/emulators/snes9x/patches/patch-unix_unix.cpp
+++ b/emulators/snes9x/patches/patch-unix_unix.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_unix.cpp,v 1.2 2019/01/04 23:34:36 nia Exp $
+$NetBSD: patch-unix_unix.cpp,v 1.3 2019/04/25 13:06:58 nia Exp $
 
 Avoid colliding with libc functions.
 
---- unix/unix.cpp.orig	2018-12-16 17:04:59.000000000 +0000
+--- unix/unix.cpp.orig	2019-04-23 18:57:18.000000000 +0000
 +++ unix/unix.cpp
 @@ -156,7 +156,7 @@ bool S9xDisplayPollButton (uint32, bool 
  bool S9xDisplayPollAxis (uint32, int16 *);
@@ -22,12 +22,12 @@ Avoid colliding with libc functions.
  {
  	long	n = 0;
  
-@@ -1324,7 +1324,7 @@ bool8 S9xOpenSoundDevice (void)
+@@ -1356,7 +1356,7 @@ bool8 S9xOpenSoundDevice (void)
  		return (FALSE);
  	}
  
--	J = log2(unixSettings.SoundFragmentSize) | (3 << 16);
-+	J = log2_l(unixSettings.SoundFragmentSize) | (3 << 16);
+-	J = log2(unixSettings.SoundFragmentSize) | (4 << 16);
++	J = log2_l(unixSettings.SoundFragmentSize) | (4 << 16);
  	if (ioctl(so.sound_fd, SNDCTL_DSP_SETFRAGMENT, &J) == -1)
  		return (FALSE);