CVS commit: pkgsrc/emulators

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Mon, 20 Nov 2023 10:19:01 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Nov 20 10:19:01 UTC 2023

Modified Files:
        pkgsrc/emulators/snes9x: Makefile.common distinfo
        pkgsrc/emulators/snes9x-gtk: Makefile PLIST options.mk
        pkgsrc/emulators/snes9x/patches: patch-unix_configure
            patch-unix_unix.cpp
Added Files:
        pkgsrc/emulators/snes9x/patches: patch-gtk_CMakeLists.txt
            patch-shaders_shader__platform.h
Removed Files:
        pkgsrc/emulators/snes9x-gtk: distinfo
        pkgsrc/emulators/snes9x-gtk/patches: patch-shaders_shader__platform.h

Log Message:
[libretro-]snes9x[-gtk]: Update to 1.62.3

Snes9x 1.62
- Fixed SA1 division with negative dividend again. (Atari2)
- Fixed timing on several instructions. (pi1541)
- MSU1 audio with no loop point will not repeat from start.
- Modernized some old memory-related code.
- Fixed a desynchronization in interlaced modes and reporting.
- Remove SA1 access to WRAM.
- Added second set of registers between S-DSP and S-SMP. Fixes
  PAL version of Virtual Bart.

Gtk + Windows:
- Added a Vulkan graphics output method. Similar to OpenGL, this
  can use libretro's slang shaders.
- Changed the automatic frame skip throttle to take place immediately
  before showing the frame, making VRR work better.
- Add menu item to clear recent files entries.
- Add fixed window size changes up to 10x.

Gtk:
- Switched to CMake for build system. Removed meson.
- Fixed some keys not working with modifiers. (Gutawer)
- Removed graphics options most people won't understand or need.
- Improved wayland support. Handle fractional DPI properly.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/snes9x/Makefile.common
cvs rdiff -u -r1.28 -r1.29 pkgsrc/emulators/snes9x/distinfo
cvs rdiff -u -r1.100 -r1.101 pkgsrc/emulators/snes9x-gtk/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/snes9x-gtk/PLIST
cvs rdiff -u -r1.15 -r0 pkgsrc/emulators/snes9x-gtk/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/snes9x-gtk/options.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/snes9x-gtk/patches/patch-shaders_shader__platform.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/snes9x/patches/patch-gtk_CMakeLists.txt \
    pkgsrc/emulators/snes9x/patches/patch-shaders_shader__platform.h
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/snes9x/patches/patch-unix_configure
cvs rdiff -u -r1.4 -r1.5 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/snes9x/Makefile.common
diff -u pkgsrc/emulators/snes9x/Makefile.common:1.6 pkgsrc/emulators/snes9x/Makefile.common:1.7
--- pkgsrc/emulators/snes9x/Makefile.common:1.6 Tue May  3 17:09:19 2022
+++ pkgsrc/emulators/snes9x/Makefile.common     Mon Nov 20 10:19:00 2023
@@ -1,20 +1,24 @@
-# $NetBSD: Makefile.common,v 1.6 2022/05/03 17:09:19 nia Exp $
+# $NetBSD: Makefile.common,v 1.7 2023/11/20 10:19:00 nia Exp $
 
 # used by emulators/libretro-snes9x/Makefile
 # used by emulators/snes9x/Makefile
 # used by emulators/snes9x-gtk/Makefile
 
-SNES9X_VERSION=                1.61
+SNES9X_VERSION=                1.62.3
 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
+GITHUB_SUBMODULES+=    KhronosGroup SPIRV-Cross 4e2fdb25671c742a9fbe93a6034eb1542244c7e1 external/SPIRV-Cross
+GITHUB_SUBMODULES+=    KhronosGroup glslang 6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7 external/glslang
+GITHUB_SUBMODULES+=    KhronosGroup Vulkan-Headers a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2 external/vulkan-headers
 
 HOMEPAGE=              http://www.snes9x.com/
 LICENSE=               snes9x-license
 
 USE_LANGUAGES=         c c++
+
+DISTINFO_FILE= ${.CURDIR}/../../emulators/snes9x/distinfo
+PATCHDIR=      ${.CURDIR}/../../emulators/snes9x/patches

Index: pkgsrc/emulators/snes9x/distinfo
diff -u pkgsrc/emulators/snes9x/distinfo:1.28 pkgsrc/emulators/snes9x/distinfo:1.29
--- pkgsrc/emulators/snes9x/distinfo:1.28       Tue May  3 17:09:19 2022
+++ pkgsrc/emulators/snes9x/distinfo    Mon Nov 20 10:19:00 2023
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.28 2022/05/03 17:09:19 nia Exp $
+$NetBSD: distinfo,v 1.29 2023/11/20 10:19:00 nia Exp $
 
-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
+BLAKE2s (KhronosGroup-SPIRV-Cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz) = 13efb2c6ee687bc849b16e406028fdd04dd56aa52dc68ec5f3f766f2243e416b
+SHA512 (KhronosGroup-SPIRV-Cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz) = 
ec47b1d966006c6e654e84e7fa16124c774de3ca6fd508d3cfe0568e3df79eee3f5aeedfae1d744b99e162beeee23afe498249b2291091bc14c0357db304bebe
+Size (KhronosGroup-SPIRV-Cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz) = 1714902 bytes
+BLAKE2s (KhronosGroup-Vulkan-Headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz) = 400ab5b06150ea9b53c0937f36c8ac811540cf5534b870de71e99378c64f8283
+SHA512 (KhronosGroup-Vulkan-Headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz) = 
b35541413efb5124691e0d13403acc00a85af51e3165828e892e90f059a7d7dc83f9bde43c6a7a1f471ae6eb8ec0155ee873adcc7afb537d5adbaccafcd7d849
+Size (KhronosGroup-Vulkan-Headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz) = 1832285 bytes
+BLAKE2s (KhronosGroup-glslang-6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7.tar.gz) = bb3a1f149905af1a1830ad9d8bcef27e5ec1df7ce87f03f24cfcfc065f67ccb4
+SHA512 (KhronosGroup-glslang-6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7.tar.gz) = 
49efe8841bbe2d603d5dd03bdb273bb991ee6ea509081048c01b7c4de6d4cad42f223755e1cb391c426993fba72ed3878e28bcce8dd7f6eeb5adf873705b7d62
+Size (KhronosGroup-glslang-6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7.tar.gz) = 3694607 bytes
+BLAKE2s (snes9x-1.62.3.tar.gz) = 6a516b64fc0bba5770b2659cfb32eb8e68f5108a5d2e339a086972f5f27795bb
+SHA512 (snes9x-1.62.3.tar.gz) = 005222bc054fbdfef92acc3ce5ad1f4b18eaff4382ab352d61e5c9c3fbe952ca085e964535e628730976f795c568e9e8751e6ef997f864c719c421d67d9e04db
+Size (snes9x-1.62.3.tar.gz) = 3423799 bytes
+SHA1 (patch-gtk_CMakeLists.txt) = d096662fc1ffa88fe70e68175fedadf950df0d24
+SHA1 (patch-shaders_shader__platform.h) = b026b27fb2fb7f6a3df9ec0c40bf334729d30f28
+SHA1 (patch-unix_configure) = 99a9693d98462430e2fa072bad648089f7035d39
+SHA1 (patch-unix_unix.cpp) = 46e2edc50769e040bc729492f213f455cd1f61c1

Index: pkgsrc/emulators/snes9x-gtk/Makefile
diff -u pkgsrc/emulators/snes9x-gtk/Makefile:1.100 pkgsrc/emulators/snes9x-gtk/Makefile:1.101
--- pkgsrc/emulators/snes9x-gtk/Makefile:1.100  Tue Nov 14 14:01:48 2023
+++ pkgsrc/emulators/snes9x-gtk/Makefile        Mon Nov 20 10:19:00 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.100 2023/11/14 14:01:48 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2023/11/20 10:19:00 nia Exp $
 
-PKGREVISION= 14
 .include "../../emulators/snes9x/Makefile.common"
 
 PKGNAME=       snes9x-gtk-${SNES9X_VERSION}
@@ -12,11 +11,15 @@ USE_TOOLS+= pkg-config
 USE_TOOLS+=    msgfmt xgettext
 USE_TOOLS+=    gawk
 
-CONFIGURE_DIRS=        gtk
+USE_PKGLOCALEDIR=      yes
+
+CMAKE_ARGS+=   -DUSE_SYSTEMZIP=ON
+CMAKE_ARGS+=   -DENABLE_PCH=OFF
+CMAKE_ARGS+=   -DCMAKE_INSTALL_LOCALEDIR=${PKGLOCALEDIR}/locale
 
 TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
 
-USE_CMAKE=     yes
+CONFIGURE_DIR= gtk
 
 USE_CXX_FEATURES+=     c++17
 
@@ -29,21 +32,21 @@ SUBST_MESSAGE.oss=  Correct path to OSS d
 SUBST_FILES.oss+=      gtk/src/gtk_sound_driver_oss.cpp
 SUBST_SED.oss=         -e "s,/dev/dsp,${DEVOSSAUDIO},g"
 LDFLAGS+=              ${LIBOSSAUDIO}
-MESON_ARGS+=           -Doss=true
 .else
-MESON_ARGS+=           -Doss=false
+CMAKE_ARGS+=           -DUSE_OSS=OFF
 .endif
 
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
 .include "options.mk"
-.include "../../devel/meson/build.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../archivers/minizip/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/libepoxy/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/gtkmm3/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"

Index: pkgsrc/emulators/snes9x-gtk/PLIST
diff -u pkgsrc/emulators/snes9x-gtk/PLIST:1.7 pkgsrc/emulators/snes9x-gtk/PLIST:1.8
--- pkgsrc/emulators/snes9x-gtk/PLIST:1.7       Tue May  3 17:09:19 2022
+++ pkgsrc/emulators/snes9x-gtk/PLIST   Mon Nov 20 10:19:00 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2022/05/03 17:09:19 nia Exp $
+@comment $NetBSD: PLIST,v 1.8 2023/11/20 10:19:00 nia Exp $
 bin/snes9x-gtk
 share/applications/snes9x-gtk.desktop
 share/icons/hicolor/128x128/apps/snes9x.png
@@ -7,6 +7,7 @@ share/icons/hicolor/24x24/apps/snes9x.pn
 share/icons/hicolor/256x256/apps/snes9x.png
 share/icons/hicolor/32x32/apps/snes9x.png
 share/icons/hicolor/64x64/apps/snes9x.png
+share/icons/hicolor/scalable/apps/snes9x.svg
 share/locale/es/LC_MESSAGES/snes9x-gtk.mo
 share/locale/fr_FR/LC_MESSAGES/snes9x-gtk.mo
 share/locale/ja/LC_MESSAGES/snes9x-gtk.mo

Index: pkgsrc/emulators/snes9x-gtk/options.mk
diff -u pkgsrc/emulators/snes9x-gtk/options.mk:1.5 pkgsrc/emulators/snes9x-gtk/options.mk:1.6
--- pkgsrc/emulators/snes9x-gtk/options.mk:1.5  Tue May  3 17:09:19 2022
+++ pkgsrc/emulators/snes9x-gtk/options.mk      Mon Nov 20 10:19:01 2023
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2022/05/03 17:09:19 nia Exp $
+# $NetBSD: options.mk,v 1.6 2023/11/20 10:19:01 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.snes9x-gtk
-PKG_SUPPORTED_OPTIONS=         alsa opengl pulseaudio portaudio wayland
+PKG_SUPPORTED_OPTIONS=         alsa pulseaudio portaudio wayland
 
-PKG_SUGGESTED_OPTIONS+=                opengl
 PKG_SUGGESTED_OPTIONS.Linux+=  alsa
 
 .include "../../mk/oss.buildlink3.mk"
@@ -23,33 +22,23 @@ PKG_SUGGESTED_OPTIONS+=             wayland
 .if !empty(PKG_OPTIONS:Malsa)
 .include "../../audio/alsa-lib/buildlink3.mk"
 .else
-MESON_ARGS+=   -Dalsa=false
-.endif
-
-.if !empty(PKG_OPTIONS:Mopengl)
-.include "../../graphics/MesaLib/buildlink3.mk"
-MESON_ARGS+=   -Dopengl=true
-.else
-MESON_ARGS+=   -Dopengl=false
+CMAKE_ARGS+=   -DUSE_ALSA=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
-MESON_ARGS+=   -Dpulseaudio=true
 .else
-MESON_ARGS+=   -Dpulseaudio=false
+CMAKE_ARGS+=   -DUSE_PULSEAUDIO=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mportaudio)
 .include "../../audio/portaudio/buildlink3.mk"
-MESON_ARGS+=   -Dportaudio=true
 .else
-MESON_ARGS+=   -Dportaudio=false
+CMAKE_ARGS+=   -DUSE_PORTAUDIO=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mwayland)
 .include "../../devel/wayland/buildlink3.mk"
-MESON_ARGS+=   -Dwayland=true
 .else
-MESON_ARGS+=   -Dwayland=false
+CMAKE_ARGS+=   -DUSE_WAYLAND=ON
 .endif

Index: pkgsrc/emulators/snes9x/patches/patch-unix_configure
diff -u pkgsrc/emulators/snes9x/patches/patch-unix_configure:1.3 pkgsrc/emulators/snes9x/patches/patch-unix_configure:1.4
--- pkgsrc/emulators/snes9x/patches/patch-unix_configure:1.3    Tue May  3 17:09:19 2022
+++ pkgsrc/emulators/snes9x/patches/patch-unix_configure        Mon Nov 20 10:19:00 2023
@@ -1,6 +1,7 @@
-$NetBSD: patch-unix_configure,v 1.3 2022/05/03 17:09:19 nia Exp $
+$NetBSD: patch-unix_configure,v 1.4 2023/11/20 10:19:00 nia Exp $
 
 !Linux sometimes has OSS.
+https://github.com/snes9xgit/snes9x/pull/887
 
 --- unix/configure.orig        2022-03-03 16:41:25.000000000 +0000
 +++ unix/configure

Index: pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp
diff -u pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp:1.4 pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp:1.5
--- pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp:1.4     Tue May  3 17:09:19 2022
+++ pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp Mon Nov 20 10:19:00 2023
@@ -1,6 +1,7 @@
-$NetBSD: patch-unix_unix.cpp,v 1.4 2022/05/03 17:09:19 nia Exp $
+$NetBSD: patch-unix_unix.cpp,v 1.5 2023/11/20 10:19:00 nia Exp $
 
 Avoid colliding with libc functions.
+https://github.com/snes9xgit/snes9x/pull/887
 
 --- unix/unix.cpp.orig 2022-03-03 16:41:25.000000000 +0000
 +++ unix/unix.cpp

Added files:

Index: pkgsrc/emulators/snes9x/patches/patch-gtk_CMakeLists.txt
diff -u /dev/null pkgsrc/emulators/snes9x/patches/patch-gtk_CMakeLists.txt:1.1
--- /dev/null   Mon Nov 20 10:19:01 2023
+++ pkgsrc/emulators/snes9x/patches/patch-gtk_CMakeLists.txt    Mon Nov 20 10:19:00 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-gtk_CMakeLists.txt,v 1.1 2023/11/20 10:19:00 nia Exp $
+
+Support systems without libdl.
+https://github.com/snes9xgit/snes9x/pull/886
+
+--- gtk/CMakeLists.txt.orig    2023-03-30 16:18:33.000000000 +0000
++++ gtk/CMakeLists.txt
+@@ -63,9 +63,8 @@ pkg_check_modules(XRANDR REQUIRED xrandr
+ 
+ find_library(X11 X11 REQUIRED)
+ find_library(XEXT Xext REQUIRED)
+-find_library(DL dl REQUIRED)
+ list(APPEND ARGS ${SDL2_CFLAGS} ${GTK_CFLAGS} ${XRANDR_CFLAGS})
+-list(APPEND LIBS ${X11} ${XEXT} ${DL} ${SDL2_LIBRARIES} ${GTK_LIBRARIES} ${XRANDR_LIBRARIES})
++list(APPEND LIBS ${X11} ${XEXT} ${CMAKE_DL_LIBS} ${SDL2_LIBRARIES} ${GTK_LIBRARIES} ${XRANDR_LIBRARIES})
+ 
+ pkg_check_modules(EPOXY REQUIRED epoxy)
+ list(APPEND ARGS ${EPOXY_CFLAGS})
Index: pkgsrc/emulators/snes9x/patches/patch-shaders_shader__platform.h
diff -u /dev/null pkgsrc/emulators/snes9x/patches/patch-shaders_shader__platform.h:1.1
--- /dev/null   Mon Nov 20 10:19:01 2023
+++ pkgsrc/emulators/snes9x/patches/patch-shaders_shader__platform.h    Mon Nov 20 10:19:00 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-shaders_shader__platform.h,v 1.1 2023/11/20 10:19:00 nia Exp $
+
+Add missing include for chdir in Unix.
+This appears to be fixed upstream.
+
+--- shaders/shader_platform.h.orig     2023-03-30 16:18:33.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 */

Prev by Date: CVS commit: pkgsrc/devel/cmake
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/cmake
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index