snes9x: Update to 1.59.2

Changes:

- Count clock cycles to synchronize SA1 with S-CPU properly. Based mostly on
  work by Vitor Vilela.
- Only allow instant IRQ when toggling IRQ. Fixes WWF - Wrestlemania.
- Refactored APU output code to buffer less on the client side. Removed 8-bit,
  Mono, and Reverse Stereo options.
- Consistently handle interlacing when we skip frames.
- Changed APU clock to reflect nominal values for original hardware.
- Fix C4 square instruction regression.

libretro:
- Fix multiline cheats.

GTK+:
- Switch from autotools to Meson build system.
- Readd glFinish option as alternative to glFenceSync.
- Fix size fallthrough with xBRZ filter.
- Fix loading of key bindings with spaces in them and modifier keys used alone.
- Add support for libretro ".slang" shaders to OpenGL driver.
- Use a cleaner onscreen font.
- Trap errors to allow OpenGL <= 2.1 to run again.
- Break display settings up to make it easier to access hardware accel section.

9 files changed, 63 insertions, 57 deletions

diff --git a/emulators/libretro-snes9x/distinfo b/emulators/libretro-snes9x/distinfo
index c4c29de52a5..ee4deb1b3df 100644
--- a/emulators/libretro-snes9x/distinfo
+++ b/emulators/libretro-snes9x/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2019/01/01 22:16:15 nia Exp $
+$NetBSD: distinfo,v 1.4 2019/03/05 12:12:32 nia Exp $
 
-SHA1 (snes9x-1.58.tar.gz) = c94ceb8d7b322b4bfa030b1327d815b697e4176a
-RMD160 (snes9x-1.58.tar.gz) = 51f7fe17f003998b35204046ca7d193d37980da1
-SHA512 (snes9x-1.58.tar.gz) = 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d
-Size (snes9x-1.58.tar.gz) = 2830667 bytes
+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
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index a17ba357f0e..af774c6ff3b 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2019/01/02 09:54:05 nia Exp $
+# $NetBSD: Makefile,v 1.64 2019/03/05 12:12:31 nia Exp $
 
 .include "../../emulators/snes9x/Makefile.common"
 
@@ -7,15 +7,15 @@ PKGNAME=	snes9x-gtk-${SNES9X_VERSION}
 MAINTAINER=	nia@NetBSD.org
 COMMENT=	Super Nintendo Entertainment System (SNES) emulator (GUI version)
 
-CONFIGURE_DIRS+=	gtk
-BUILD_DIRS+=		gtk
-GNU_CONFIGURE=		yes
-
-USE_TOOLS+=	autoreconf autoconf automake pkg-config
+USE_TOOLS+=	pkg-config
 USE_TOOLS+=	msgfmt xgettext msgmerge
 USE_TOOLS+=	gawk
 
-BUILD_DEPENDS+=		gettext-m4-[0-9]*:../../devel/gettext-m4
+MESON_ARGS+=	-Dsystem-zip=false
+MESON_ARGS+=	-Dportaudio=false
+
+BUILD_DEPENDS+=	gettext-m4-[0-9]*:../../devel/gettext-m4
+BUILD_DEPENDS+=	${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson
 
 .include "../../mk/oss.buildlink3.mk"
 
@@ -31,8 +31,16 @@ LIBS.SunOS+=		-lsocket -lnsl
 
 BUILDLINK_TRANSFORM+=	rm:-ldl
 
-pre-configure:
-	cd ${WRKSRC}/gtk && ./autogen.sh
+do-configure:
+	cd ${WRKSRC}/gtk && ${SETENV} ${MAKE_ENV} meson --prefix ${PREFIX} --libdir lib --mandir ${PKGMANDIR} --buildtype=plain ${MESON_ARGS} . output
+
+do-build:
+	cd ${WRKSRC}/gtk && ${SETENV} ${MAKE_ENV} ninja -C output
+
+do-install:
+	cd ${WRKSRC}/gtk && ${SETENV} ${INSTALL_ENV} ninja -C output install
+
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "options.mk"
 .include "../../converters/libiconv/buildlink3.mk"
@@ -43,5 +51,6 @@ pre-configure:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/snes9x-gtk/PLIST b/emulators/snes9x-gtk/PLIST
index 21784c2b0f0..360901c8e6e 100644
--- a/emulators/snes9x-gtk/PLIST
+++ b/emulators/snes9x-gtk/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2019/01/01 22:16:14 nia Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/03/05 12:12:31 nia Exp $
 bin/snes9x-gtk
-share/applications/snes9x.desktop
+share/applications/snes9x-gtk.desktop
 share/icons/hicolor/128x128/apps/snes9x.png
 share/icons/hicolor/16x16/apps/snes9x.png
 share/icons/hicolor/24x24/apps/snes9x.png
diff --git a/emulators/snes9x-gtk/distinfo b/emulators/snes9x-gtk/distinfo
index 4ca7f637bd5..5ffab431a53 100644
--- a/emulators/snes9x-gtk/distinfo
+++ b/emulators/snes9x-gtk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2019/01/01 22:16:14 nia Exp $
+$NetBSD: distinfo,v 1.11 2019/03/05 12:12:31 nia Exp $
 
-SHA1 (snes9x-1.58.tar.gz) = c94ceb8d7b322b4bfa030b1327d815b697e4176a
-RMD160 (snes9x-1.58.tar.gz) = 51f7fe17f003998b35204046ca7d193d37980da1
-SHA512 (snes9x-1.58.tar.gz) = 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d
-Size (snes9x-1.58.tar.gz) = 2830667 bytes
-SHA1 (patch-gtk_configure.ac) = fa992d626d0cfc8b567d648f802c3d0944310cc5
+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 (patch-shaders_shader__platform.h) = bc4acd8d3241a70ec08ea7481c5ec5c476b2c28f
diff --git a/emulators/snes9x-gtk/options.mk b/emulators/snes9x-gtk/options.mk
index 9fd03c80f08..d9380cecd84 100644
--- a/emulators/snes9x-gtk/options.mk
+++ b/emulators/snes9x-gtk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/01/01 22:16:14 nia Exp $
+# $NetBSD: options.mk,v 1.3 2019/03/05 12:12:31 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.snes9x-gtk
 PKG_SUPPORTED_OPTIONS=		alsa opengl pulseaudio
@@ -12,31 +12,33 @@ PKG_SUGGESTED_OPTIONS.Linux+=	alsa
 .if !empty(PKG_OPTIONS:Malsa)
 .include "../../audio/alsa-lib/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--without-alsa
+MESON_ARGS+=	-Dalsa=false
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk2)
 .include "../../x11/gtk2/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gtk2
+MESON_ARGS+=	-Dgtk2=true
 .else
-CONFIGURE_ARGS+=	--without-gtk2
+MESON_ARGS+=	-Dgtk2=false
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk3)
 .include "../../x11/gtk3/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gtk3
+MESON_ARGS+=	-Dgtk3=true
 .else
-CONFIGURE_ARGS+=	--without-gtk3
+MESON_ARGS+=	-Dgtk3=false
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
 .include "../../graphics/MesaLib/buildlink3.mk"
+MESON_ARGS+=	-Dopengl=true
 .else
-CONFIGURE_ARGS+=	--without-opengl
+MESON_ARGS+=	-Dopengl=false
 .endif
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
+MESON_ARGS+=	-Dpulseaudio=true
 .else
-CONFIGURE_ARGS+=	--without-pulseaudio
+MESON_ARGS+=	-Dpulseaudio=false
 .endif
diff --git a/emulators/snes9x-gtk/patches/patch-gtk_configure.ac b/emulators/snes9x-gtk/patches/patch-gtk_configure.ac
deleted file mode 100644
index cbc41a1d417..00000000000
--- a/emulators/snes9x-gtk/patches/patch-gtk_configure.ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-gtk_configure.ac,v 1.1 2019/01/01 22:16:15 nia Exp $
-
-Attempt to fix the zlib detection.
-
---- gtk/configure.ac.orig	2018-12-16 17:04:59.000000000 +0000
-+++ gtk/configure.ac
-@@ -330,11 +330,10 @@ fi
- CFLAGS="$CFLAGS -DNETPLAY_SUPPORT -DJMA_SUPPORT"
- 
- if test yes = "$with_zlib"; then
--  AC_CHECK_HEADERS(zlib.h)
--  AC_CHECK_LIB(z, gzread, [
-+  AC_CHECK_HEADERS(zlib.h, [
-         CFLAGS="$CFLAGS -DZLIB"
-         LIBS="$LIBS -lz"
--      ], ,)
-+      ])
- fi
- 
- if test yes = "$enable_dangerous_hacks"; then
diff --git a/emulators/snes9x-gtk/patches/patch-shaders_shader__platform.h b/emulators/snes9x-gtk/patches/patch-shaders_shader__platform.h
new file mode 100644
index 00000000000..bc8068f75d6
--- /dev/null
+++ b/emulators/snes9x-gtk/patches/patch-shaders_shader__platform.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-shaders_shader__platform.h,v 1.1 2019/03/05 12:12:32 nia Exp $
+
+Include unistd for chdir.
+
+--- shaders/shader_platform.h.orig	2019-02-28 02:36:00.000000000 +0000
++++ shaders/shader_platform.h
+@@ -28,6 +28,8 @@
+ #define realpath(src, resolved) _fullpath(resolved, src, PATH_MAX)
+ #endif
+ 
++#else
++#include <unistd.h>
+ #endif
+ 
+ #endif /* __SHADER_PLATFORM_H */
diff --git a/emulators/snes9x/Makefile.common b/emulators/snes9x/Makefile.common
index 8f6d413502d..e05843489fe 100644
--- a/emulators/snes9x/Makefile.common
+++ b/emulators/snes9x/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2019/01/03 21:51:18 nia Exp $
+# $NetBSD: Makefile.common,v 1.3 2019/03/05 12:12:31 nia Exp $
 
 # used by emulators/libretro-snes9x/Makefile
 # used by emulators/snes9x/Makefile
 # used by emulators/snes9x-gtk/Makefile
 
-SNES9X_VERSION=		1.58
+SNES9X_VERSION=		1.59.2
 DISTNAME=		snes9x-${SNES9X_VERSION}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_GITHUB:=snes9xgit/}
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo
index a5528c487cf..dadedc15216 100644
--- a/emulators/snes9x/distinfo
+++ b/emulators/snes9x/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2019/01/04 23:34:36 nia Exp $
+$NetBSD: distinfo,v 1.23 2019/03/05 12:12:31 nia Exp $
 
-SHA1 (snes9x-1.58.tar.gz) = c94ceb8d7b322b4bfa030b1327d815b697e4176a
-RMD160 (snes9x-1.58.tar.gz) = 51f7fe17f003998b35204046ca7d193d37980da1
-SHA512 (snes9x-1.58.tar.gz) = 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d
-Size (snes9x-1.58.tar.gz) = 2830667 bytes
+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 (patch-unix_configure) = 9df9a805141396583bceb35bea1bda157ed3ed6b
 SHA1 (patch-unix_unix.cpp) = a78882348d28f091863c75ea50e853369c8762a1