Tue Mar 5 12:12:32 2019 UTC ()
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.


(nia)
diff -r1.3 -r1.4 pkgsrc/emulators/libretro-snes9x/distinfo
diff -r1.2 -r1.3 pkgsrc/emulators/snes9x/Makefile.common
diff -r1.22 -r1.23 pkgsrc/emulators/snes9x/distinfo
diff -r1.63 -r1.64 pkgsrc/emulators/snes9x-gtk/Makefile
diff -r1.5 -r1.6 pkgsrc/emulators/snes9x-gtk/PLIST
diff -r1.10 -r1.11 pkgsrc/emulators/snes9x-gtk/distinfo
diff -r1.2 -r1.3 pkgsrc/emulators/snes9x-gtk/options.mk
diff -r1.1 -r0 pkgsrc/emulators/snes9x-gtk/patches/patch-gtk_configure.ac
diff -r0 -r1.1 pkgsrc/emulators/snes9x-gtk/patches/patch-shaders_shader__platform.h
cvs diff -r1.3 -r1.4 pkgsrc/emulators/libretro-snes9x/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-snes9x/distinfo 2019/01/01 22:16:15 1.3
+++ pkgsrc/emulators/libretro-snes9x/distinfo 2019/03/05 12:12:32 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.3 2019/01/01 22:16:15 nia Exp $ 1$NetBSD: distinfo,v 1.4 2019/03/05 12:12:32 nia Exp $
2 2
3SHA1 (snes9x-1.58.tar.gz) = c94ceb8d7b322b4bfa030b1327d815b697e4176a 3SHA1 (snes9x-1.59.2.tar.gz) = d6205269b539b62e6ae49da4261b48290b773a47
4RMD160 (snes9x-1.58.tar.gz) = 51f7fe17f003998b35204046ca7d193d37980da1 4RMD160 (snes9x-1.59.2.tar.gz) = 6ae871a66e4bb18901f8ed8cc2fcbf9aa4b809ba
5SHA512 (snes9x-1.58.tar.gz) = 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d 5SHA512 (snes9x-1.59.2.tar.gz) = 84d2dfc12a991b77b30ba9a591d285ecd4cc5fbb418282900209db9191d61611123ffa7d715b7abeed9b891e9af88ab4c46616502523a881127e2ede008236e4
6Size (snes9x-1.58.tar.gz) = 2830667 bytes 6Size (snes9x-1.59.2.tar.gz) = 2819803 bytes
cvs diff -r1.2 -r1.3 pkgsrc/emulators/snes9x/Makefile.common (expand / switch to unified diff)

--- pkgsrc/emulators/snes9x/Makefile.common 2019/01/03 21:51:18 1.2
+++ pkgsrc/emulators/snes9x/Makefile.common 2019/03/05 12:12:31 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile.common,v 1.2 2019/01/03 21:51:18 nia Exp $ 1# $NetBSD: Makefile.common,v 1.3 2019/03/05 12:12:31 nia Exp $
2 2
3# used by emulators/libretro-snes9x/Makefile 3# used by emulators/libretro-snes9x/Makefile
4# used by emulators/snes9x/Makefile 4# used by emulators/snes9x/Makefile
5# used by emulators/snes9x-gtk/Makefile 5# used by emulators/snes9x-gtk/Makefile
6 6
7SNES9X_VERSION= 1.58 7SNES9X_VERSION= 1.59.2
8DISTNAME= snes9x-${SNES9X_VERSION} 8DISTNAME= snes9x-${SNES9X_VERSION}
9CATEGORIES= emulators 9CATEGORIES= emulators
10MASTER_SITES= ${MASTER_SITE_GITHUB:=snes9xgit/} 10MASTER_SITES= ${MASTER_SITE_GITHUB:=snes9xgit/}
11GITHUB_PROJECT= snes9x 11GITHUB_PROJECT= snes9x
12GITHUB_TAG= ${SNES9X_VERSION} 12GITHUB_TAG= ${SNES9X_VERSION}
13 13
14HOMEPAGE= http://www.snes9x.com/ 14HOMEPAGE= http://www.snes9x.com/
15LICENSE= snes9x-license 15LICENSE= snes9x-license
16 16
17EXTRACT_USING= bsdtar 17EXTRACT_USING= bsdtar
18USE_LANGUAGES= c c++11 18USE_LANGUAGES= c c++11
cvs diff -r1.22 -r1.23 pkgsrc/emulators/snes9x/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/snes9x/distinfo 2019/01/04 23:34:36 1.22
+++ pkgsrc/emulators/snes9x/distinfo 2019/03/05 12:12:31 1.23
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.22 2019/01/04 23:34:36 nia Exp $ 1$NetBSD: distinfo,v 1.23 2019/03/05 12:12:31 nia Exp $
2 2
3SHA1 (snes9x-1.58.tar.gz) = c94ceb8d7b322b4bfa030b1327d815b697e4176a 3SHA1 (snes9x-1.59.2.tar.gz) = d6205269b539b62e6ae49da4261b48290b773a47
4RMD160 (snes9x-1.58.tar.gz) = 51f7fe17f003998b35204046ca7d193d37980da1 4RMD160 (snes9x-1.59.2.tar.gz) = 6ae871a66e4bb18901f8ed8cc2fcbf9aa4b809ba
5SHA512 (snes9x-1.58.tar.gz) = 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d 5SHA512 (snes9x-1.59.2.tar.gz) = 84d2dfc12a991b77b30ba9a591d285ecd4cc5fbb418282900209db9191d61611123ffa7d715b7abeed9b891e9af88ab4c46616502523a881127e2ede008236e4
6Size (snes9x-1.58.tar.gz) = 2830667 bytes 6Size (snes9x-1.59.2.tar.gz) = 2819803 bytes
7SHA1 (patch-unix_configure) = 9df9a805141396583bceb35bea1bda157ed3ed6b 7SHA1 (patch-unix_configure) = 9df9a805141396583bceb35bea1bda157ed3ed6b
8SHA1 (patch-unix_unix.cpp) = a78882348d28f091863c75ea50e853369c8762a1 8SHA1 (patch-unix_unix.cpp) = a78882348d28f091863c75ea50e853369c8762a1
cvs diff -r1.63 -r1.64 pkgsrc/emulators/snes9x-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/snes9x-gtk/Makefile 2019/01/02 09:54:05 1.63
+++ pkgsrc/emulators/snes9x-gtk/Makefile 2019/03/05 12:12:31 1.64
@@ -1,47 +1,56 @@ @@ -1,47 +1,56 @@
1# $NetBSD: Makefile,v 1.63 2019/01/02 09:54:05 nia Exp $ 1# $NetBSD: Makefile,v 1.64 2019/03/05 12:12:31 nia Exp $
2 2
3.include "../../emulators/snes9x/Makefile.common" 3.include "../../emulators/snes9x/Makefile.common"
4 4
5PKGNAME= snes9x-gtk-${SNES9X_VERSION} 5PKGNAME= snes9x-gtk-${SNES9X_VERSION}
6 6
7MAINTAINER= nia@NetBSD.org 7MAINTAINER= nia@NetBSD.org
8COMMENT= Super Nintendo Entertainment System (SNES) emulator (GUI version) 8COMMENT= Super Nintendo Entertainment System (SNES) emulator (GUI version)
9 9
10CONFIGURE_DIRS+= gtk 10USE_TOOLS+= pkg-config
11BUILD_DIRS+= gtk 
12GNU_CONFIGURE= yes 
13 
14USE_TOOLS+= autoreconf autoconf automake pkg-config 
15USE_TOOLS+= msgfmt xgettext msgmerge 11USE_TOOLS+= msgfmt xgettext msgmerge
16USE_TOOLS+= gawk 12USE_TOOLS+= gawk
17 13
18BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 14MESON_ARGS+= -Dsystem-zip=false
 15MESON_ARGS+= -Dportaudio=false
 16
 17BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
 18BUILD_DEPENDS+= ${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson
19 19
20.include "../../mk/oss.buildlink3.mk" 20.include "../../mk/oss.buildlink3.mk"
21 21
22.if ${OSS_TYPE} != "none" 22.if ${OSS_TYPE} != "none"
23SUBST_CLASSES+= oss 23SUBST_CLASSES+= oss
24SUBST_STAGE.oss= pre-configure 24SUBST_STAGE.oss= pre-configure
25SUBST_MESSAGE.oss= Correct path to OSS device. 25SUBST_MESSAGE.oss= Correct path to OSS device.
26SUBST_FILES.oss+= gtk/src/gtk_sound_driver_oss.cpp 26SUBST_FILES.oss+= gtk/src/gtk_sound_driver_oss.cpp
27SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" 27SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
28.endif 28.endif
29 29
30LIBS.SunOS+= -lsocket -lnsl 30LIBS.SunOS+= -lsocket -lnsl
31 31
32BUILDLINK_TRANSFORM+= rm:-ldl 32BUILDLINK_TRANSFORM+= rm:-ldl
33 33
34pre-configure: 34do-configure:
35 cd ${WRKSRC}/gtk && ./autogen.sh 35 cd ${WRKSRC}/gtk && ${SETENV} ${MAKE_ENV} meson --prefix ${PREFIX} --libdir lib --mandir ${PKGMANDIR} --buildtype=plain ${MESON_ARGS} . output
 36
 37do-build:
 38 cd ${WRKSRC}/gtk && ${SETENV} ${MAKE_ENV} ninja -C output
 39
 40do-install:
 41 cd ${WRKSRC}/gtk && ${SETENV} ${INSTALL_ENV} ninja -C output install
 42
 43PYTHON_VERSIONS_INCOMPATIBLE= 27
36 44
37.include "options.mk" 45.include "options.mk"
38.include "../../converters/libiconv/buildlink3.mk" 46.include "../../converters/libiconv/buildlink3.mk"
39.include "../../devel/SDL2/buildlink3.mk" 47.include "../../devel/SDL2/buildlink3.mk"
40.include "../../devel/gettext-lib/buildlink3.mk" 48.include "../../devel/gettext-lib/buildlink3.mk"
41.include "../../devel/zlib/buildlink3.mk" 49.include "../../devel/zlib/buildlink3.mk"
42.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 50.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
43.include "../../graphics/png/buildlink3.mk" 51.include "../../graphics/png/buildlink3.mk"
44.include "../../x11/libXrandr/buildlink3.mk" 52.include "../../x11/libXrandr/buildlink3.mk"
45.include "../../x11/libXv/buildlink3.mk" 53.include "../../x11/libXv/buildlink3.mk"
 54.include "../../lang/python/application.mk"
46.include "../../mk/dlopen.buildlink3.mk" 55.include "../../mk/dlopen.buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/emulators/snes9x-gtk/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/snes9x-gtk/PLIST 2019/01/01 22:16:14 1.5
+++ pkgsrc/emulators/snes9x-gtk/PLIST 2019/03/05 12:12:31 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1@comment $NetBSD: PLIST,v 1.5 2019/01/01 22:16:14 nia Exp $ 1@comment $NetBSD: PLIST,v 1.6 2019/03/05 12:12:31 nia Exp $
2bin/snes9x-gtk 2bin/snes9x-gtk
3share/applications/snes9x.desktop 3share/applications/snes9x-gtk.desktop
4share/icons/hicolor/128x128/apps/snes9x.png 4share/icons/hicolor/128x128/apps/snes9x.png
5share/icons/hicolor/16x16/apps/snes9x.png 5share/icons/hicolor/16x16/apps/snes9x.png
6share/icons/hicolor/24x24/apps/snes9x.png 6share/icons/hicolor/24x24/apps/snes9x.png
7share/icons/hicolor/256x256/apps/snes9x.png 7share/icons/hicolor/256x256/apps/snes9x.png
8share/icons/hicolor/32x32/apps/snes9x.png 8share/icons/hicolor/32x32/apps/snes9x.png
9share/icons/hicolor/64x64/apps/snes9x.png 9share/icons/hicolor/64x64/apps/snes9x.png
10share/locale/es/LC_MESSAGES/snes9x-gtk.mo 10share/locale/es/LC_MESSAGES/snes9x-gtk.mo
11share/locale/fr_FR/LC_MESSAGES/snes9x-gtk.mo 11share/locale/fr_FR/LC_MESSAGES/snes9x-gtk.mo
12share/locale/ja/LC_MESSAGES/snes9x-gtk.mo 12share/locale/ja/LC_MESSAGES/snes9x-gtk.mo
13share/locale/pt_BR/LC_MESSAGES/snes9x-gtk.mo 13share/locale/pt_BR/LC_MESSAGES/snes9x-gtk.mo
14share/locale/ru/LC_MESSAGES/snes9x-gtk.mo 14share/locale/ru/LC_MESSAGES/snes9x-gtk.mo
15share/locale/sr@latin/LC_MESSAGES/snes9x-gtk.mo 15share/locale/sr@latin/LC_MESSAGES/snes9x-gtk.mo
16share/snes9x/cheats.bml 16share/snes9x/cheats.bml
cvs diff -r1.10 -r1.11 pkgsrc/emulators/snes9x-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/snes9x-gtk/distinfo 2019/01/01 22:16:14 1.10
+++ pkgsrc/emulators/snes9x-gtk/distinfo 2019/03/05 12:12:31 1.11
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.10 2019/01/01 22:16:14 nia Exp $ 1$NetBSD: distinfo,v 1.11 2019/03/05 12:12:31 nia Exp $
2 2
3SHA1 (snes9x-1.58.tar.gz) = c94ceb8d7b322b4bfa030b1327d815b697e4176a 3SHA1 (snes9x-1.59.2.tar.gz) = d6205269b539b62e6ae49da4261b48290b773a47
4RMD160 (snes9x-1.58.tar.gz) = 51f7fe17f003998b35204046ca7d193d37980da1 4RMD160 (snes9x-1.59.2.tar.gz) = 6ae871a66e4bb18901f8ed8cc2fcbf9aa4b809ba
5SHA512 (snes9x-1.58.tar.gz) = 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d 5SHA512 (snes9x-1.59.2.tar.gz) = 84d2dfc12a991b77b30ba9a591d285ecd4cc5fbb418282900209db9191d61611123ffa7d715b7abeed9b891e9af88ab4c46616502523a881127e2ede008236e4
6Size (snes9x-1.58.tar.gz) = 2830667 bytes 6Size (snes9x-1.59.2.tar.gz) = 2819803 bytes
7SHA1 (patch-gtk_configure.ac) = fa992d626d0cfc8b567d648f802c3d0944310cc5 7SHA1 (patch-shaders_shader__platform.h) = bc4acd8d3241a70ec08ea7481c5ec5c476b2c28f
cvs diff -r1.2 -r1.3 pkgsrc/emulators/snes9x-gtk/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/snes9x-gtk/options.mk 2019/01/01 22:16:14 1.2
+++ pkgsrc/emulators/snes9x-gtk/options.mk 2019/03/05 12:12:31 1.3
@@ -1,42 +1,44 @@ @@ -1,42 +1,44 @@
1# $NetBSD: options.mk,v 1.2 2019/01/01 22:16:14 nia Exp $ 1# $NetBSD: options.mk,v 1.3 2019/03/05 12:12:31 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.snes9x-gtk 3PKG_OPTIONS_VAR= PKG_OPTIONS.snes9x-gtk
4PKG_SUPPORTED_OPTIONS= alsa opengl pulseaudio 4PKG_SUPPORTED_OPTIONS= alsa opengl pulseaudio
5PKG_OPTIONS_REQUIRED_GROUPS= gtk 5PKG_OPTIONS_REQUIRED_GROUPS= gtk
6PKG_OPTIONS_GROUP.gtk= gtk2 gtk3 6PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
7PKG_SUGGESTED_OPTIONS+= gtk3 opengl 7PKG_SUGGESTED_OPTIONS+= gtk3 opengl
8PKG_SUGGESTED_OPTIONS.Linux+= alsa 8PKG_SUGGESTED_OPTIONS.Linux+= alsa
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12.if !empty(PKG_OPTIONS:Malsa) 12.if !empty(PKG_OPTIONS:Malsa)
13.include "../../audio/alsa-lib/buildlink3.mk" 13.include "../../audio/alsa-lib/buildlink3.mk"
14.else 14.else
15CONFIGURE_ARGS+= --without-alsa 15MESON_ARGS+= -Dalsa=false
16.endif 16.endif
17 17
18.if !empty(PKG_OPTIONS:Mgtk2) 18.if !empty(PKG_OPTIONS:Mgtk2)
19.include "../../x11/gtk2/buildlink3.mk" 19.include "../../x11/gtk2/buildlink3.mk"
20CONFIGURE_ARGS+= --with-gtk2 20MESON_ARGS+= -Dgtk2=true
21.else 21.else
22CONFIGURE_ARGS+= --without-gtk2 22MESON_ARGS+= -Dgtk2=false
23.endif 23.endif
24 24
25.if !empty(PKG_OPTIONS:Mgtk3) 25.if !empty(PKG_OPTIONS:Mgtk3)
26.include "../../x11/gtk3/buildlink3.mk" 26.include "../../x11/gtk3/buildlink3.mk"
27CONFIGURE_ARGS+= --with-gtk3 27MESON_ARGS+= -Dgtk3=true
28.else 28.else
29CONFIGURE_ARGS+= --without-gtk3 29MESON_ARGS+= -Dgtk3=false
30.endif 30.endif
31 31
32.if !empty(PKG_OPTIONS:Mopengl) 32.if !empty(PKG_OPTIONS:Mopengl)
33.include "../../graphics/MesaLib/buildlink3.mk" 33.include "../../graphics/MesaLib/buildlink3.mk"
 34MESON_ARGS+= -Dopengl=true
34.else 35.else
35CONFIGURE_ARGS+= --without-opengl 36MESON_ARGS+= -Dopengl=false
36.endif 37.endif
37 38
38.if !empty(PKG_OPTIONS:Mpulseaudio) 39.if !empty(PKG_OPTIONS:Mpulseaudio)
39.include "../../audio/pulseaudio/buildlink3.mk" 40.include "../../audio/pulseaudio/buildlink3.mk"
 41MESON_ARGS+= -Dpulseaudio=true
40.else 42.else
41CONFIGURE_ARGS+= --without-pulseaudio 43MESON_ARGS+= -Dpulseaudio=false
42.endif 44.endif
File Deleted: pkgsrc/emulators/snes9x-gtk/patches/Attic/patch-gtk_configure.ac
File Added: pkgsrc/emulators/snes9x-gtk/patches/patch-shaders_shader__platform.h
$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 */