CVS commit: pkgsrc/emulators/emulationstation

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug 22 05:31:50 UTC 2025

Modified Files:
        pkgsrc/emulators/emulationstation: Makefile PLIST distinfo options.mk
        pkgsrc/emulators/emulationstation/patches:
            patch-es-core_src_utils_FileSystemUtil.cpp
Added Files:
        pkgsrc/emulators/emulationstation/patches:
            patch-es-core_src_resources_ResourceManager.cpp

Log Message:
emulationstation: updated to 2.11.2

2.11.2
Unknown changes


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/emulators/emulationstation/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/emulationstation/PLIST \
    pkgsrc/emulators/emulationstation/options.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/emulationstation/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/emulationstation/patches/patch-es-core_src_resources_ResourceManager.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/emulationstation/patches/patch-es-core_src_utils_FileSystemUtil.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/emulationstation/Makefile
diff -u pkgsrc/emulators/emulationstation/Makefile:1.62 pkgsrc/emulators/emulationstation/Makefile:1.63
--- pkgsrc/emulators/emulationstation/Makefile:1.62     Wed Aug 20 11:34:55 2025
+++ pkgsrc/emulators/emulationstation/Makefile  Fri Aug 22 05:31:50 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2025/08/20 11:34:55 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2025/08/22 05:31:50 adam Exp $
 
-DISTNAME=      emulationstation-2.9.4
-PKGREVISION=   27
+DISTNAME=      emulationstation-2.11.2
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=RetroPie/}
 GITHUB_PROJECT=        EmulationStation
@@ -12,17 +11,14 @@ HOMEPAGE=   https://github.com/RetroPie/Em
 COMMENT=       Themeable multi-system emulator frontend
 LICENSE=       mit
 
-USE_CMAKE=     yes
-USE_TOOLS+=    pkg-config
-USE_LANGUAGES+=        c c++
-
-USE_CXX_FEATURES+=     c++11
+USE_CXX_FEATURES=      c++11
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            pkg-config
 
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
-WRKSRC=                ${WRKDIR}/EmulationStation-${PKGVERSION_NOREV}
-
 INSTALLATION_DIRS=     bin share/doc/emulationstation
+INSTALLATION_DIRS+=    share/emulationstation/resources/help
 
 SUBST_CLASSES+=                fceu
 SUBST_STAGE.fceu=      pre-configure
@@ -59,11 +55,15 @@ post-configure:
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/GAMELISTS.md ${WRKSRC}/README.md \
-           ${WRKSRC}/SYSTEMS.md ${WRKSRC}/THEMES.md \
-           ${DESTDIR}${PREFIX}/share/doc/emulationstation
+               ${WRKSRC}/SYSTEMS.md ${WRKSRC}/THEMES.md \
+               ${DESTDIR}${PREFIX}/share/doc/emulationstation
+       cd ${WRKSRC} && ${FIND} resources -type f -print | while read f; do \
+               ${INSTALL_DATA} "$${f}" ${DESTDIR}${PREFIX}/share/emulationstation/"$${f}"; \
+       done
 
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../graphics/freeimage/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"

Index: pkgsrc/emulators/emulationstation/PLIST
diff -u pkgsrc/emulators/emulationstation/PLIST:1.2 pkgsrc/emulators/emulationstation/PLIST:1.3
--- pkgsrc/emulators/emulationstation/PLIST:1.2 Mon Jan  1 22:29:27 2018
+++ pkgsrc/emulators/emulationstation/PLIST     Fri Aug 22 05:31:50 2025
@@ -1,6 +1,74 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/01 22:29:27 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/08/22 05:31:50 adam Exp $
 bin/emulationstation
 share/doc/emulationstation/GAMELISTS.md
 share/doc/emulationstation/README.md
 share/doc/emulationstation/SYSTEMS.md
 share/doc/emulationstation/THEMES.md
+share/emulationstation/resources/arrow.svg
+share/emulationstation/resources/busy_0.svg
+share/emulationstation/resources/busy_1.svg
+share/emulationstation/resources/busy_2.svg
+share/emulationstation/resources/busy_3.svg
+share/emulationstation/resources/button.png
+share/emulationstation/resources/button_filled.png
+share/emulationstation/resources/cartridge.svg
+share/emulationstation/resources/checkbox_checked.svg
+share/emulationstation/resources/checkbox_unchecked.svg
+share/emulationstation/resources/fav_add.svg
+share/emulationstation/resources/fav_remove.svg
+share/emulationstation/resources/folder.svg
+share/emulationstation/resources/frame.png
+share/emulationstation/resources/help/analog_down.svg
+share/emulationstation/resources/help/analog_left.svg
+share/emulationstation/resources/help/analog_right.svg
+share/emulationstation/resources/help/analog_stick.svg
+share/emulationstation/resources/help/analog_thumb.svg
+share/emulationstation/resources/help/analog_up.svg
+share/emulationstation/resources/help/button_1.svg
+share/emulationstation/resources/help/button_2.svg
+share/emulationstation/resources/help/button_3.svg
+share/emulationstation/resources/help/button_4.svg
+share/emulationstation/resources/help/button_a.svg
+share/emulationstation/resources/help/button_b.svg
+share/emulationstation/resources/help/button_circle.svg
+share/emulationstation/resources/help/button_cross.svg
+share/emulationstation/resources/help/button_hotkey.svg
+share/emulationstation/resources/help/button_l.svg
+share/emulationstation/resources/help/button_lr.svg
+share/emulationstation/resources/help/button_lt.svg
+share/emulationstation/resources/help/button_r.svg
+share/emulationstation/resources/help/button_rt.svg
+share/emulationstation/resources/help/button_select.svg
+share/emulationstation/resources/help/button_square.svg
+share/emulationstation/resources/help/button_start.svg
+share/emulationstation/resources/help/button_triangle.svg
+share/emulationstation/resources/help/button_x.svg
+share/emulationstation/resources/help/button_y.svg
+share/emulationstation/resources/help/buttons_east.svg
+share/emulationstation/resources/help/buttons_north.svg
+share/emulationstation/resources/help/buttons_south.svg
+share/emulationstation/resources/help/buttons_west.svg
+share/emulationstation/resources/help/dpad_all.svg
+share/emulationstation/resources/help/dpad_down.svg
+share/emulationstation/resources/help/dpad_left.svg
+share/emulationstation/resources/help/dpad_leftright.svg
+share/emulationstation/resources/help/dpad_right.svg
+share/emulationstation/resources/help/dpad_up.svg
+share/emulationstation/resources/help/dpad_updown.svg
+share/emulationstation/resources/mamebioses.xml
+share/emulationstation/resources/mamedevices.xml
+share/emulationstation/resources/mamenames.xml
+share/emulationstation/resources/mameres.py
+share/emulationstation/resources/off.svg
+share/emulationstation/resources/on.svg
+share/emulationstation/resources/opensans_hebrew_condensed_light.ttf
+share/emulationstation/resources/opensans_hebrew_condensed_regular.ttf
+share/emulationstation/resources/option_arrow.svg
+share/emulationstation/resources/scroll_gradient.png
+share/emulationstation/resources/slider_knob.svg
+share/emulationstation/resources/splash.svg
+share/emulationstation/resources/star_filled.svg
+share/emulationstation/resources/star_unfilled.svg
+share/emulationstation/resources/textinput_ninepatch.png
+share/emulationstation/resources/textinput_ninepatch_active.png
+share/emulationstation/resources/window_icon_256.png
Index: pkgsrc/emulators/emulationstation/options.mk
diff -u pkgsrc/emulators/emulationstation/options.mk:1.2 pkgsrc/emulators/emulationstation/options.mk:1.3
--- pkgsrc/emulators/emulationstation/options.mk:1.2    Sun Sep  8 12:34:38 2019
+++ pkgsrc/emulators/emulationstation/options.mk        Fri Aug 22 05:31:50 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/09/08 12:34:38 nia Exp $
+# $NetBSD: options.mk,v 1.3 2025/08/22 05:31:50 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.emulationstation
 PKG_OPTIONS_REQUIRED_GROUPS=   graphics
@@ -6,7 +6,7 @@ PKG_OPTIONS_GROUP.graphics=     opengl
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(MACHINE_ARCH:M*arm*)
+.if ${MACHINE_ARCH:M*arm*}
 PKG_OPTIONS_GROUP.graphics+=   rpi
 PKG_SUGGESTED_OPTIONS+=                rpi
 .else

Index: pkgsrc/emulators/emulationstation/distinfo
diff -u pkgsrc/emulators/emulationstation/distinfo:1.10 pkgsrc/emulators/emulationstation/distinfo:1.11
--- pkgsrc/emulators/emulationstation/distinfo:1.10     Fri Nov 12 15:38:16 2021
+++ pkgsrc/emulators/emulationstation/distinfo  Fri Aug 22 05:31:50 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2021/11/12 15:38:16 nia Exp $
+$NetBSD: distinfo,v 1.11 2025/08/22 05:31:50 adam Exp $
 
-BLAKE2s (emulationstation-2.9.4.tar.gz) = a7e28f04b02e131de05d95d44c01dced2b7a7a5efc1e589eda053e5714f62d2e
-SHA512 (emulationstation-2.9.4.tar.gz) = aa2670668e0fac1c462351f98fd1440146dbb766fc08968a4c9c0b8181bf28646cd06e4bcc3b4baef9c46c5e54e3d2271bdc71c7fef28cda78550e0aae36ae04
-Size (emulationstation-2.9.4.tar.gz) = 852960 bytes
+BLAKE2s (emulationstation-2.11.2.tar.gz) = 5de343f2710df7983f02b39ae983d07859c9398fc7dc8532282c51b0ead8d813
+SHA512 (emulationstation-2.11.2.tar.gz) = 49abfdfb90ddd1abac0cca2008c9efaf657dbf973e3caa07d547163ed29b7a74c8cfc6e82e1bbad6da4c8c122c748783e003d70cc3a626edec9191ee055d4e19
+Size (emulationstation-2.11.2.tar.gz) = 942655 bytes
 SHA1 (patch-es-app_src_ScraperCmdLine.cpp) = cdb2ccc0a1cff45e407b3608c9c95b9aae7b3366
-SHA1 (patch-es-core_src_components_ImageGridComponent.h) = f53ffe1528a351e58d99cfe76791c1ba4ab27b18
-SHA1 (patch-es-core_src_utils_FileSystemUtil.cpp) = bc0af15b0bd2bae44d8039911b2b1c6433f79b08
+SHA1 (patch-es-core_src_resources_ResourceManager.cpp) = f131c2be296eea31640c5dd9207e549804a5b1b4
+SHA1 (patch-es-core_src_utils_FileSystemUtil.cpp) = a89477be09616659b7f7e17e3b8f840f940cb595
 SHA1 (patch-external_CMakeLists.txt) = d08cb2eecb59242ef1252338c6a79d6716ece8b1

Index: pkgsrc/emulators/emulationstation/patches/patch-es-core_src_utils_FileSystemUtil.cpp
diff -u pkgsrc/emulators/emulationstation/patches/patch-es-core_src_utils_FileSystemUtil.cpp:1.1 pkgsrc/emulators/emulationstation/patches/patch-es-core_src_utils_FileSystemUtil.cpp:1.2
--- pkgsrc/emulators/emulationstation/patches/patch-es-core_src_utils_FileSystemUtil.cpp:1.1    Tue Mar 24 15:52:38 2020
+++ pkgsrc/emulators/emulationstation/patches/patch-es-core_src_utils_FileSystemUtil.cpp        Fri Aug 22 05:31:50 2025
@@ -1,16 +1,17 @@
-$NetBSD: patch-es-core_src_utils_FileSystemUtil.cpp,v 1.1 2020/03/24 15:52:38 nia Exp $
+$NetBSD: patch-es-core_src_utils_FileSystemUtil.cpp,v 1.2 2025/08/22 05:31:50 adam Exp $
 
 stat64 is non-portable
 
---- es-core/src/utils/FileSystemUtil.cpp.orig  2019-12-29 21:18:29.000000000 +0000
+--- es-core/src/utils/FileSystemUtil.cpp.orig  2023-04-13 14:23:07.000000000 +0000
 +++ es-core/src/utils/FileSystemUtil.cpp
-@@ -19,6 +19,9 @@
+@@ -21,6 +21,10 @@
  #else // _WIN32
  #include <dirent.h>
  #include <unistd.h>
 +#ifndef __linux__
 +#define stat64 stat
++#define lstat64 lstat
 +#endif
  #endif // _WIN32
  
- namespace Utils
+ //////////////////////////////////////////////////////////////////////////

Added files:

Index: pkgsrc/emulators/emulationstation/patches/patch-es-core_src_resources_ResourceManager.cpp
diff -u /dev/null pkgsrc/emulators/emulationstation/patches/patch-es-core_src_resources_ResourceManager.cpp:1.1
--- /dev/null   Fri Aug 22 05:31:50 2025
+++ pkgsrc/emulators/emulationstation/patches/patch-es-core_src_resources_ResourceManager.cpp   Fri Aug 22 05:31:50 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-es-core_src_resources_ResourceManager.cpp,v 1.1 2025/08/22 05:31:50 adam Exp $
+
+Find resources in share/emulationstation/resources.
+
+--- es-core/src/resources/ResourceManager.cpp.orig     2025-08-22 05:14:18.446070416 +0000
++++ es-core/src/resources/ResourceManager.cpp
+@@ -33,7 +33,7 @@ std::string ResourceManager::getResource
+                       return test;
+ 
+               // check in exepath
+-              test = Utils::FileSystem::getExePath() + "/resources/" + &path[2];
++              test = Utils::FileSystem::getExePath() + "/../share/emulationstation/resources/" + &path[2];
+               if(Utils::FileSystem::exists(test))
+                       return test;
+