CVS commit: pkgsrc/emulators

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May  3 17:09:19 UTC 2022

Modified Files:
        pkgsrc/emulators/libretro-snes9x: distinfo
        pkgsrc/emulators/snes9x: Makefile Makefile.common distinfo
        pkgsrc/emulators/snes9x-gtk: Makefile PLIST distinfo options.mk
        pkgsrc/emulators/snes9x/patches: patch-unix_configure
            patch-unix_unix.cpp
Added Files:
        pkgsrc/emulators/snes9x: options.mk

Log Message:
[libretro-]snes9x[-gtk]: update to 1.61

- Restructured tile.cpp tile renderer from heavy macros into C++
  templates, significantly lowering compile time. (yoffy)
- MichaelBuckley provided a brand new MacOS port that is completely
  rewritten based on newer, supported APIs.
- Fixed an out-of-bound memory access in sound DSP. (Sour, byuu)
- Revert default SFX2 clock speed increase.
- Added a render position hack. Fixes glitches in several games.
- Allow an SRAM mapping up to 128KB.

Gtk:
- Added an option to show time. (taimoorgit)
- Use a submodule for glslang, because it doesn't guarantee API stability.
- Switched to GTK's C++ interface, gtkmm3. This effectively drops
  GTK+ 2.0 support.
- Joysticks can now be hotplugged. (jraby)

Unix:
- Added audio output threading. (yoffy)
- Added screensaver prevention on joystick use. (greg-kennedy)
- Fix YUY2 conversion. (greg-kennedy)
- Add alsa output support. (cjacker)
- Add I420 conversion. (cjacker)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/libretro-snes9x/distinfo
cvs rdiff -u -r1.59 -r1.60 pkgsrc/emulators/snes9x/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/snes9x/Makefile.common
cvs rdiff -u -r1.27 -r1.28 pkgsrc/emulators/snes9x/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/snes9x/options.mk
cvs rdiff -u -r1.84 -r1.85 pkgsrc/emulators/snes9x-gtk/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/snes9x-gtk/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/emulators/snes9x-gtk/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/snes9x-gtk/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/snes9x/patches/patch-unix_configure
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/libretro-snes9x/distinfo
diff -u pkgsrc/emulators/libretro-snes9x/distinfo:1.7 pkgsrc/emulators/libretro-snes9x/distinfo:1.8
--- pkgsrc/emulators/libretro-snes9x/distinfo:1.7       Tue Oct 26 10:23:56 2021
+++ pkgsrc/emulators/libretro-snes9x/distinfo   Tue May  3 17:09:19 2022
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:23:56 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/05/03 17:09:19 nia Exp $
 
-BLAKE2s (snes9x-1.60.tar.gz) = e320ff01777a7be7e23ee17ac0c6e2b61dc9291325cccb77c72eadf2aa4a3334
-SHA512 (snes9x-1.60.tar.gz) = 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
-Size (snes9x-1.60.tar.gz) = 2863228 bytes
+BLAKE2s (KhronosGroup-SPIRV-Cross-1458bae62ec67ea7d12c5a13b740e23ed4bb226c.tar.gz) = 0217ec92d9e149ca71c21c4046a135c461127c8e60e4345208750771952a2ff7
+SHA512 (KhronosGroup-SPIRV-Cross-1458bae62ec67ea7d12c5a13b740e23ed4bb226c.tar.gz) = 
bfa3cc944450db59a57a685eea12b0ed0b5059d55a092ac5cdf6f4dc03c1e2d2e62fa5a576156c772340e12136b10d7ed790bb35b4aece2ee8405e64f826e31b
+Size (KhronosGroup-SPIRV-Cross-1458bae62ec67ea7d12c5a13b740e23ed4bb226c.tar.gz) = 676662 bytes
+BLAKE2s (KhronosGroup-glslang-bcf6a2430e99e8fc24f9f266e99316905e6d5134.tar.gz) = 906f6c53907cd74869fa64351c9e3ef188c8f51cfd737e7d8be234904a9968b3
+SHA512 (KhronosGroup-glslang-bcf6a2430e99e8fc24f9f266e99316905e6d5134.tar.gz) = 
de2ebc0cd89d22582c079006ac45a812e3aaaad9a44c77c68530aa1468fbc840c6ae25a4356d4e9fc697524cd721d26506d85bc35eac98452eabce0bc098b5a4
+Size (KhronosGroup-glslang-bcf6a2430e99e8fc24f9f266e99316905e6d5134.tar.gz) = 3188787 bytes
+BLAKE2s (snes9x-1.61.tar.gz) = 9bef648bce8d223b9f64ab45bd1037a00fed51e25e853f6674949a073009b20c
+SHA512 (snes9x-1.61.tar.gz) = 8b644f5b7136e89fd222bcb430fc736c74a3e383d7e6c7f0880235f6fa4c0f77abbf02493f8d654a12e87701111643e33877bc21bb3dfcc9b82a056fa1b1d880
+Size (snes9x-1.61.tar.gz) = 3016890 bytes

Index: pkgsrc/emulators/snes9x/Makefile
diff -u pkgsrc/emulators/snes9x/Makefile:1.59 pkgsrc/emulators/snes9x/Makefile:1.60
--- pkgsrc/emulators/snes9x/Makefile:1.59       Wed Apr  1 10:08:15 2020
+++ pkgsrc/emulators/snes9x/Makefile    Tue May  3 17:09:19 2022
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2020/04/01 10:08:15 nia Exp $
-
-PKGREVISION=   1
+# $NetBSD: Makefile,v 1.60 2022/05/03 17:09:19 nia Exp $
 
 .include "../../emulators/snes9x/Makefile.common"
 
@@ -18,20 +16,6 @@ CONFIGURE_ARGS+=     --enable-netplay
 
 CONFIGURE_ARGS+=       --with-system-zip
 
-.include "../../mk/oss.buildlink3.mk"
-
-.if ${OSS_TYPE} != "none"
-SUBST_CLASSES+=                oss
-SUBST_STAGE.oss=       pre-configure
-SUBST_MESSAGE.oss=     Correct path to OSS device.
-SUBST_FILES.oss+=      unix/unix.cpp
-SUBST_SED.oss=         -e "s,/dev/dsp,${DEVOSSAUDIO},g"
-
-CONFIGURE_ARGS+=       --enable-sound
-.else
-PKG_SKIP_REASON+=      "No sound support on this platform"
-.endif
-
 INSTALLATION_DIRS+=    bin
 INSTALLATION_DIRS+=    share/doc/snes9x
 
@@ -51,6 +35,7 @@ do-install:
        ${INSTALL_MAN} ${WRKSRC}/unix/docs/readme_unix.html \
            ${DESTDIR}${PREFIX}/share/doc/snes9x
 
+.include "options.mk"
 .include "../../archivers/minizip/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/emulators/snes9x/Makefile.common
diff -u pkgsrc/emulators/snes9x/Makefile.common:1.5 pkgsrc/emulators/snes9x/Makefile.common:1.6
--- pkgsrc/emulators/snes9x/Makefile.common:1.5 Wed Apr  1 10:08:15 2020
+++ pkgsrc/emulators/snes9x/Makefile.common     Tue May  3 17:09:19 2022
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile.common,v 1.5 2020/04/01 10:08:15 nia Exp $
+# $NetBSD: Makefile.common,v 1.6 2022/05/03 17:09:19 nia Exp $
 
 # used by emulators/libretro-snes9x/Makefile
 # used by emulators/snes9x/Makefile
 # used by emulators/snes9x-gtk/Makefile
 
-SNES9X_VERSION=                1.60
+SNES9X_VERSION=                1.61
 DISTNAME=              snes9x-${SNES9X_VERSION}
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=snes9xgit/}
 GITHUB_PROJECT=                snes9x
 GITHUB_TAG=            ${SNES9X_VERSION}
 
+GITHUB_SUBMODULES+=    KhronosGroup SPIRV-Cross 1458bae62ec67ea7d12c5a13b740e23ed4bb226c shaders/SPIRV-Cross
+GITHUB_SUBMODULES+=    KhronosGroup glslang bcf6a2430e99e8fc24f9f266e99316905e6d5134 shaders/glslang
+
 HOMEPAGE=              http://www.snes9x.com/
 LICENSE=               snes9x-license
 
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++

Index: pkgsrc/emulators/snes9x/distinfo
diff -u pkgsrc/emulators/snes9x/distinfo:1.27 pkgsrc/emulators/snes9x/distinfo:1.28
--- pkgsrc/emulators/snes9x/distinfo:1.27       Tue Oct 26 10:24:01 2021
+++ pkgsrc/emulators/snes9x/distinfo    Tue May  3 17:09:19 2022
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.27 2021/10/26 10:24:01 nia Exp $
+$NetBSD: distinfo,v 1.28 2022/05/03 17:09:19 nia Exp $
 
-BLAKE2s (snes9x-1.60.tar.gz) = e320ff01777a7be7e23ee17ac0c6e2b61dc9291325cccb77c72eadf2aa4a3334
-SHA512 (snes9x-1.60.tar.gz) = 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
-Size (snes9x-1.60.tar.gz) = 2863228 bytes
-SHA1 (patch-unix_configure) = dcfc4d8c2e2527fc91a1abb0d04a96a15e6a65c8
-SHA1 (patch-unix_unix.cpp) = 4ef289037fcd7a540b021ead7d906800c932e1bc
+BLAKE2s (KhronosGroup-SPIRV-Cross-1458bae62ec67ea7d12c5a13b740e23ed4bb226c.tar.gz) = 0217ec92d9e149ca71c21c4046a135c461127c8e60e4345208750771952a2ff7
+SHA512 (KhronosGroup-SPIRV-Cross-1458bae62ec67ea7d12c5a13b740e23ed4bb226c.tar.gz) = 
bfa3cc944450db59a57a685eea12b0ed0b5059d55a092ac5cdf6f4dc03c1e2d2e62fa5a576156c772340e12136b10d7ed790bb35b4aece2ee8405e64f826e31b
+Size (KhronosGroup-SPIRV-Cross-1458bae62ec67ea7d12c5a13b740e23ed4bb226c.tar.gz) = 676662 bytes
+BLAKE2s (KhronosGroup-glslang-bcf6a2430e99e8fc24f9f266e99316905e6d5134.tar.gz) = 906f6c53907cd74869fa64351c9e3ef188c8f51cfd737e7d8be234904a9968b3
+SHA512 (KhronosGroup-glslang-bcf6a2430e99e8fc24f9f266e99316905e6d5134.tar.gz) = 
de2ebc0cd89d22582c079006ac45a812e3aaaad9a44c77c68530aa1468fbc840c6ae25a4356d4e9fc697524cd721d26506d85bc35eac98452eabce0bc098b5a4
+Size (KhronosGroup-glslang-bcf6a2430e99e8fc24f9f266e99316905e6d5134.tar.gz) = 3188787 bytes
+BLAKE2s (snes9x-1.61.tar.gz) = 9bef648bce8d223b9f64ab45bd1037a00fed51e25e853f6674949a073009b20c
+SHA512 (snes9x-1.61.tar.gz) = 8b644f5b7136e89fd222bcb430fc736c74a3e383d7e6c7f0880235f6fa4c0f77abbf02493f8d654a12e87701111643e33877bc21bb3dfcc9b82a056fa1b1d880
+Size (snes9x-1.61.tar.gz) = 3016890 bytes
+SHA1 (patch-unix_configure) = e28781df414fa8b983157e5f063c7fad2fd24dd4
+SHA1 (patch-unix_unix.cpp) = 6490903a931792c7d7abb68e8478e7ecaf3d902f

Index: pkgsrc/emulators/snes9x-gtk/Makefile
diff -u pkgsrc/emulators/snes9x-gtk/Makefile:1.84 pkgsrc/emulators/snes9x-gtk/Makefile:1.85
--- pkgsrc/emulators/snes9x-gtk/Makefile:1.84   Mon Mar 28 10:53:05 2022
+++ pkgsrc/emulators/snes9x-gtk/Makefile        Tue May  3 17:09:19 2022
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.84 2022/03/28 10:53:05 tnn Exp $
+# $NetBSD: Makefile,v 1.85 2022/05/03 17:09:19 nia Exp $
 
-PKGREVISION= 15
 .include "../../emulators/snes9x/Makefile.common"
 
 PKGNAME=       snes9x-gtk-${SNES9X_VERSION}
@@ -14,7 +13,9 @@ USE_TOOLS+=   gawk
 
 CONFIGURE_DIRS=        gtk
 
-BUILD_DEPENDS+=        gettext-m4-[0-9]*:../../devel/gettext-m4
+TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
+
+GCC_REQD+=     7 # C++17
 
 .include "../../mk/oss.buildlink3.mk"
 
@@ -41,6 +42,7 @@ LDFLAGS.SunOS+=               -lsocket -lnsl
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/gtkmm3/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/emulators/snes9x-gtk/PLIST
diff -u pkgsrc/emulators/snes9x-gtk/PLIST:1.6 pkgsrc/emulators/snes9x-gtk/PLIST:1.7
--- pkgsrc/emulators/snes9x-gtk/PLIST:1.6       Tue Mar  5 12:12:31 2019
+++ pkgsrc/emulators/snes9x-gtk/PLIST   Tue May  3 17:09:19 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/03/05 12:12:31 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/05/03 17:09:19 nia Exp $
 bin/snes9x-gtk
 share/applications/snes9x-gtk.desktop
 share/icons/hicolor/128x128/apps/snes9x.png
@@ -13,4 +13,6 @@ share/locale/ja/LC_MESSAGES/snes9x-gtk.m
 share/locale/pt_BR/LC_MESSAGES/snes9x-gtk.mo
 share/locale/ru/LC_MESSAGES/snes9x-gtk.mo
 share/locale/sr@latin/LC_MESSAGES/snes9x-gtk.mo
+share/locale/uk/LC_MESSAGES/snes9x-gtk.mo
+share/locale/zh_CN/LC_MESSAGES/snes9x-gtk.mo
 share/snes9x/cheats.bml

Index: pkgsrc/emulators/snes9x-gtk/distinfo
diff -u pkgsrc/emulators/snes9x-gtk/distinfo:1.14 pkgsrc/emulators/snes9x-gtk/distinfo:1.15
--- pkgsrc/emulators/snes9x-gtk/distinfo:1.14   Tue Oct 26 10:24:01 2021
+++ pkgsrc/emulators/snes9x-gtk/distinfo        Tue May  3 17:09:19 2022
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:24:01 nia Exp $
+$NetBSD: distinfo,v 1.15 2022/05/03 17:09:19 nia Exp $
 
-BLAKE2s (snes9x-1.60.tar.gz) = e320ff01777a7be7e23ee17ac0c6e2b61dc9291325cccb77c72eadf2aa4a3334
-SHA512 (snes9x-1.60.tar.gz) = 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
-Size (snes9x-1.60.tar.gz) = 2863228 bytes
+BLAKE2s (KhronosGroup-SPIRV-Cross-1458bae62ec67ea7d12c5a13b740e23ed4bb226c.tar.gz) = 0217ec92d9e149ca71c21c4046a135c461127c8e60e4345208750771952a2ff7
+SHA512 (KhronosGroup-SPIRV-Cross-1458bae62ec67ea7d12c5a13b740e23ed4bb226c.tar.gz) = 
bfa3cc944450db59a57a685eea12b0ed0b5059d55a092ac5cdf6f4dc03c1e2d2e62fa5a576156c772340e12136b10d7ed790bb35b4aece2ee8405e64f826e31b
+Size (KhronosGroup-SPIRV-Cross-1458bae62ec67ea7d12c5a13b740e23ed4bb226c.tar.gz) = 676662 bytes
+BLAKE2s (KhronosGroup-glslang-bcf6a2430e99e8fc24f9f266e99316905e6d5134.tar.gz) = 906f6c53907cd74869fa64351c9e3ef188c8f51cfd737e7d8be234904a9968b3
+SHA512 (KhronosGroup-glslang-bcf6a2430e99e8fc24f9f266e99316905e6d5134.tar.gz) = 
de2ebc0cd89d22582c079006ac45a812e3aaaad9a44c77c68530aa1468fbc840c6ae25a4356d4e9fc697524cd721d26506d85bc35eac98452eabce0bc098b5a4
+Size (KhronosGroup-glslang-bcf6a2430e99e8fc24f9f266e99316905e6d5134.tar.gz) = 3188787 bytes
+BLAKE2s (snes9x-1.61.tar.gz) = 9bef648bce8d223b9f64ab45bd1037a00fed51e25e853f6674949a073009b20c
+SHA512 (snes9x-1.61.tar.gz) = 8b644f5b7136e89fd222bcb430fc736c74a3e383d7e6c7f0880235f6fa4c0f77abbf02493f8d654a12e87701111643e33877bc21bb3dfcc9b82a056fa1b1d880
+Size (snes9x-1.61.tar.gz) = 3016890 bytes
 SHA1 (patch-shaders_shader__platform.h) = bc4acd8d3241a70ec08ea7481c5ec5c476b2c28f

Index: pkgsrc/emulators/snes9x-gtk/options.mk
diff -u pkgsrc/emulators/snes9x-gtk/options.mk:1.4 pkgsrc/emulators/snes9x-gtk/options.mk:1.5
--- pkgsrc/emulators/snes9x-gtk/options.mk:1.4  Wed Apr  1 10:08:15 2020
+++ pkgsrc/emulators/snes9x-gtk/options.mk      Tue May  3 17:09:19 2022
@@ -1,12 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2020/04/01 10:08:15 nia Exp $
+# $NetBSD: options.mk,v 1.5 2022/05/03 17:09:19 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.snes9x-gtk
 PKG_SUPPORTED_OPTIONS=         alsa opengl pulseaudio portaudio wayland
 
-PKG_OPTIONS_REQUIRED_GROUPS=   gtk
-PKG_OPTIONS_GROUP.gtk=         gtk2 gtk3
-
-PKG_SUGGESTED_OPTIONS+=                gtk3 opengl
+PKG_SUGGESTED_OPTIONS+=                opengl
 PKG_SUGGESTED_OPTIONS.Linux+=  alsa
 
 .include "../../mk/oss.buildlink3.mk"
@@ -29,20 +26,6 @@ PKG_SUGGESTED_OPTIONS+=              wayland
 MESON_ARGS+=   -Dalsa=false
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk2)
-.include "../../x11/gtk2/buildlink3.mk"
-MESON_ARGS+=   -Dgtk2=true
-.else
-MESON_ARGS+=   -Dgtk2=false
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtk3)
-.include "../../x11/gtk3/buildlink3.mk"
-MESON_ARGS+=   -Dgtk3=true
-.else
-MESON_ARGS+=   -Dgtk3=false
-.endif
-
 .if !empty(PKG_OPTIONS:Mopengl)
 .include "../../graphics/MesaLib/buildlink3.mk"
 MESON_ARGS+=   -Dopengl=true

Index: pkgsrc/emulators/snes9x/patches/patch-unix_configure
diff -u pkgsrc/emulators/snes9x/patches/patch-unix_configure:1.2 pkgsrc/emulators/snes9x/patches/patch-unix_configure:1.3
--- pkgsrc/emulators/snes9x/patches/patch-unix_configure:1.2    Wed Apr  1 10:08:15 2020
+++ pkgsrc/emulators/snes9x/patches/patch-unix_configure        Tue May  3 17:09:19 2022
@@ -1,30 +1,29 @@
-$NetBSD: patch-unix_configure,v 1.2 2020/04/01 10:08:15 nia Exp $
+$NetBSD: patch-unix_configure,v 1.3 2022/05/03 17:09:19 nia Exp $
 
 !Linux sometimes has OSS.
 
---- unix/configure.orig        2019-04-23 18:57:18.000000000 +0000
+--- unix/configure.orig        2022-03-03 16:41:25.000000000 +0000
 +++ unix/configure
-@@ -6291,22 +6291,8 @@ fi
+@@ -7327,21 +7327,7 @@ fi
  
  
  if test "x$enable_sound" = "xyes"; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sound is supported on this platform" >&5
--$as_echo_n "checking whether sound is supported on this platform... " >&6; }
+-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sound is supported on this platform" >&5
+-printf %s "checking whether sound is supported on this platform... " >&6; }
 -      if test "x$snes9x_cv_linux_os" = "xyes"; then
--              { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
+-              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-printf "%s\n" "yes" >&6; }
 -      else
--              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your OS is not Linux. Build without sound support." >&5
--$as_echo "$as_me: WARNING: Your OS is not Linux. Build without sound support." >&2;}
+-              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
+-              { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Your OS is not Linux. Build without sound support." >&5
+-printf "%s\n" "$as_me: WARNING: Your OS is not Linux. Build without sound support." >&2;}
 -              enable_sound="no"
 -      fi
 -fi
 -
 -if test "x$enable_sound" = "xyes"; then
-       ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-+              S9XLIBS="$S9XLIBS $LIBOSSAUDIO"
- if test "x$ac_cv_header_pthread_h" = xyes; then :
- 
-               S9XDEFS="$S9XDEFS -DUSE_THREADS"
++      S9XLIBS="$S9XLIBS $LIBOSSAUDIO"
+       ac_fn_cxx_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+ if test "x$ac_cv_header_pthread_h" = xyes
+ then :

Index: pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp
diff -u pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp:1.3 pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp:1.4
--- pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp:1.3     Thu Apr 25 13:06:58 2019
+++ pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp Tue May  3 17:09:19 2022
@@ -1,33 +1,24 @@
-$NetBSD: patch-unix_unix.cpp,v 1.3 2019/04/25 13:06:58 nia Exp $
+$NetBSD: patch-unix_unix.cpp,v 1.4 2022/05/03 17:09:19 nia Exp $
 
 Avoid colliding with libc functions.
 
---- unix/unix.cpp.orig 2019-04-23 18:57:18.000000000 +0000
+--- unix/unix.cpp.orig 2022-03-03 16:41:25.000000000 +0000
 +++ unix/unix.cpp
-@@ -156,7 +156,7 @@ bool S9xDisplayPollButton (uint32, bool 
- bool S9xDisplayPollAxis (uint32, int16 *);
- bool S9xDisplayPollPointer (uint32, int16 *, int16 *);
- 
--static long log2 (long);
-+static long log2_l (long);
- static void SoundTrigger (void);
- static void InitTimer (void);
- static void NSRTControllerSetup (void);
-@@ -230,7 +230,7 @@ void _makepath (char *path, const char *
-       }
- }
+@@ -164,7 +164,7 @@ static bool8 ReadJoysticks (void);
+ void S9xLatchJSEvent();
+ #endif
  
 -static long log2 (long num)
-+static long log2_l (long num)
++static long snes9x_log2 (long num)
  {
        long    n = 0;
  
-@@ -1356,7 +1356,7 @@ bool8 S9xOpenSoundDevice (void)
-               return (FALSE);
-       }
+@@ -1467,7 +1467,7 @@ bool8 S9xOpenSoundDevice (void)
+               bool(unixSettings.ThreadSound)
+       );
  
 -      J = log2(unixSettings.SoundFragmentSize) | (4 << 16);
-+      J = log2_l(unixSettings.SoundFragmentSize) | (4 << 16);
++      J = snes9x_log2(unixSettings.SoundFragmentSize) | (4 << 16);
        if (ioctl(so.sound_fd, SNDCTL_DSP_SETFRAGMENT, &J) == -1)
                return (FALSE);
  

Added files:

Index: pkgsrc/emulators/snes9x/options.mk
diff -u /dev/null pkgsrc/emulators/snes9x/options.mk:1.1
--- /dev/null   Tue May  3 17:09:19 2022
+++ pkgsrc/emulators/snes9x/options.mk  Tue May  3 17:09:19 2022
@@ -0,0 +1,26 @@
+# $NetBSD: options.mk,v 1.1 2022/05/03 17:09:19 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.snes9x
+PKG_SUPPORTED_OPTIONS=         alsa
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OPSYS} == "Linux" || ${OSS_TYPE} == "none"
+PKG_SUGGESTED_OPTIONS=         alsa
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+=       --enable-sound-alsa
+.  include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --enable-sound
+
+SUBST_CLASSES+=                oss
+SUBST_STAGE.oss=       pre-configure
+SUBST_MESSAGE.oss=     Correct path to OSS device.
+SUBST_FILES.oss+=      unix/unix.cpp
+SUBST_SED.oss=         -e "s,/dev/dsp,${DEVOSSAUDIO},g"
+.endif