CVS commit: pkgsrc/emulators

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Tue, 19 Nov 2024 14:58:05 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 19 14:58:05 UTC 2024

Modified Files:
        pkgsrc/emulators/flycast: Makefile Makefile.common distinfo
        pkgsrc/emulators/flycast/patches: patch-CMakeLists.txt
        pkgsrc/emulators/libretro-flycast: Makefile options.mk
Added Files:
        pkgsrc/emulators/flycast/patches: patch-core_ui_gui.cpp
Removed Files:
        pkgsrc/emulators/flycast/patches: patch-core_deps_khronos_GL4_gl3w.c
            patch-core_rend_gui.cpp

Log Message:
[libretro-]flycast: Update to 2.4

   v2.4: RetroAchievements, Force Feedback

What's Changed

     * RetroAchievements support
     * UI improvements with save state thumbnails
     * Force Feedback support for some arcade games (F355, 18 Wheeler,
       Maximum Speed, Faster Than Speed, Initial D, Club Kart, King of Route
       66, Tokyo Bus Guide, Sega Driving Simulator)
     * Various fixes by vkedwardli
     * Many upgrades by scribam

Fixed Games

     * Beach Spikers
     * Capcom vs SNK 2000 Pro
     * Irides: Master of blocks
     * Mars TV
     * Metropolis Street Racer
     * Mortal Kombat
     * Quake III
     * Red Dog Superior Firepower
     * Shin Nihon Pro Wrestling
     * Soul Surfer
     * Virtua Cop 2

v2.3: Battle Cable, more SystemSP games

What's New

     * Battle Cable support
     * SystemSP hopper games: kingyo, manpuku, shateki, magicpop, unomedal,
       puyomedal, ochaken and westdmrg
     * Club Kart card reader support
     * Gamepad dead zone and saturation settings
     * HID barcode scanner support for card games (Mushi King, Dinosaur King,
       Love & Berry)

Fixed Games

     * Initial D v2/v3
     * Melty Blood: Act Cadenza
     * Confidential Mission
     * The Maze of the Kings
     * Spikers Battle
     * NBA Showtime
     * NHL 2K2
     * Ready 2 Rumble Boxing
     * Monkey Ball
     * Crackin'DJ 1 and 2
     * F355 (Naomi)
     * Samurai Shodown VI
     * Shenmue
     * Test Drive Le Mans
     * Sakura Taisen 3
     * Death Crimson 2
     * Force Five
     * NHL 2K2
     * Shakatto Tambourine
     * Xtreme Sports
     * Blue Stinger
     * RevolveR
     * Kaen Seibo
     * Nittere Shiki! Mirai Yosou Studio
     * Shakatto Tambourine Arcade


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/flycast/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/flycast/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/flycast/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/flycast/patches/patch-core_deps_khronos_GL4_gl3w.c \
    pkgsrc/emulators/flycast/patches/patch-core_rend_gui.cpp
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/flycast/patches/patch-core_ui_gui.cpp
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/libretro-flycast/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/libretro-flycast/options.mk

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

Modified files:

Index: pkgsrc/emulators/flycast/Makefile
diff -u pkgsrc/emulators/flycast/Makefile:1.11 pkgsrc/emulators/flycast/Makefile:1.12
--- pkgsrc/emulators/flycast/Makefile:1.11      Thu Nov 14 22:19:42 2024
+++ pkgsrc/emulators/flycast/Makefile   Tue Nov 19 14:58:04 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.11 2024/11/14 22:19:42 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2024/11/19 14:58:04 nia Exp $
 
-PKGREVISION= 7
 .include "Makefile.common"
 
 MAINTAINER=    nia%NetBSD.org@localhost

Index: pkgsrc/emulators/flycast/Makefile.common
diff -u pkgsrc/emulators/flycast/Makefile.common:1.6 pkgsrc/emulators/flycast/Makefile.common:1.7
--- pkgsrc/emulators/flycast/Makefile.common:1.6        Sun Aug 25 06:18:40 2024
+++ pkgsrc/emulators/flycast/Makefile.common    Tue Nov 19 14:58:04 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2024/08/25 06:18:40 wiz Exp $
+# $NetBSD: Makefile.common,v 1.7 2024/11/19 14:58:04 nia Exp $
 # used by emulators/flycast/Makefile
 # used by emulators/libretro-flycast/Makefile
 
-DISTNAME=      flycast-2.2
+DISTNAME=      flycast-2.4
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=flyinghead/}
 GITHUB_PROJECT=        flycast
@@ -13,7 +13,6 @@ LICENSE=      gnu-gpl-v2
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 
-USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
@@ -36,10 +35,12 @@ PATCHDIR=   ${.CURDIR}/../../emulators/fly
 
 USE_CXX_FEATURES+=     c++17
 
-GITHUB_SUBMODULES+=    flyinghead libchdr 925400c4c4b67bafdff8dfad9a1474b22d980777 core/deps/libchdr
+GITHUB_SUBMODULES+=    flyinghead libchdr 9b6ff6c3c24311750096232a05ee9c5b4963e66c core/deps/libchdr
 GITHUB_SUBMODULES+=    flyinghead mingw-breakpad 1ab24bcc817ebe629bf77daa53529d02361cb1e9 core/deps/breakpad
 GITHUB_SUBMODULES+=    vinniefalco LuaBridge fab7b33b896a42dcc865ba5ecdbacd9f40 core/deps/luabridge
+GITHUB_SUBMODULES+=    RetroAchievements rcheevos 563230b1c249774b4852c944dc7cdcb952c9e8e8 core/deps/rcheevos
 
+.include "../../devel/cmake/build.mk"
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/miniupnpc/buildlink3.mk"

Index: pkgsrc/emulators/flycast/distinfo
diff -u pkgsrc/emulators/flycast/distinfo:1.3 pkgsrc/emulators/flycast/distinfo:1.4
--- pkgsrc/emulators/flycast/distinfo:1.3       Fri Nov 17 09:27:51 2023
+++ pkgsrc/emulators/flycast/distinfo   Tue Nov 19 14:58:04 2024
@@ -1,17 +1,19 @@
-$NetBSD: distinfo,v 1.3 2023/11/17 09:27:51 nia Exp $
+$NetBSD: distinfo,v 1.4 2024/11/19 14:58:04 nia Exp $
 
-BLAKE2s (flycast-2.2.tar.gz) = 3df8031cf57a9031883ebe03c2d0812f71e6f48025d1f7fee6401992a6a41d6a
-SHA512 (flycast-2.2.tar.gz) = 23415ca804f9a6b3c77cf5c94c8de2813b8ce15ad04b9a726a3817cb81a84de2a6c3057684c18832955f2bf537ca30f5bff7ae34c26bd3684bb68723143d6b74
-Size (flycast-2.2.tar.gz) = 14510385 bytes
-BLAKE2s (flyinghead-libchdr-925400c4c4b67bafdff8dfad9a1474b22d980777.tar.gz) = fe973a99dc88e956e7ced84d2bcd10461abaebb409efc00da762354991554359
-SHA512 (flyinghead-libchdr-925400c4c4b67bafdff8dfad9a1474b22d980777.tar.gz) = 
2c439fd1f8b1e97deaf2b92968ec069c067e8824bacb03f2a65570eec032d3af9ff2b2f28eb2066d4ab25b5c8e90fc87462de47c53b7b86b6839b39850fe7235
-Size (flyinghead-libchdr-925400c4c4b67bafdff8dfad9a1474b22d980777.tar.gz) = 1748616 bytes
+BLAKE2s (RetroAchievements-rcheevos-563230b1c249774b4852c944dc7cdcb952c9e8e8.tar.gz) = 7e9483ebad83562298b05474d1adca89fd76e4a1609bcfe6741b1b31d0dbc411
+SHA512 (RetroAchievements-rcheevos-563230b1c249774b4852c944dc7cdcb952c9e8e8.tar.gz) = 
e424ae35d1ac68320a3666f96a5c82baf83d7e862474b03fce2780ff21a4176126911f65f9ad6068718412b30d81798f2eac82ea4b0b9e04de6de292876ba08a
+Size (RetroAchievements-rcheevos-563230b1c249774b4852c944dc7cdcb952c9e8e8.tar.gz) = 669618 bytes
+BLAKE2s (flycast-2.4.tar.gz) = 4f365c7db88c553bb8ac77b2a21af52913ca06c55faf547c93adc2e86fd8ca6f
+SHA512 (flycast-2.4.tar.gz) = 7add53e915631afe44446f65b7db394edf382295a27156a879ce779236297c38f26c1664002a6f521dd44c838c01a2034c69afb539d087c0263f41fd5d64e4d3
+Size (flycast-2.4.tar.gz) = 30398953 bytes
+BLAKE2s (flyinghead-libchdr-9b6ff6c3c24311750096232a05ee9c5b4963e66c.tar.gz) = d2e49853df6dadf2968c277299f3ca8833ab4cc48bc3362e759756ee26acbe3e
+SHA512 (flyinghead-libchdr-9b6ff6c3c24311750096232a05ee9c5b4963e66c.tar.gz) = 
39e08b6eb0bedf87f55cbe6e6921fba878a232391ad2f461de684538b9bbef9a4c48885d304ff25d8d6794fd4f217e7a2b85d3a2305ad5542510ae97b325ffe1
+Size (flyinghead-libchdr-9b6ff6c3c24311750096232a05ee9c5b4963e66c.tar.gz) = 4221405 bytes
 BLAKE2s (flyinghead-mingw-breakpad-1ab24bcc817ebe629bf77daa53529d02361cb1e9.tar.gz) = 8ac9757b984e33bd7d486f0719758671e07aab5101c3ad3b80cecc8eeb7c04c6
 SHA512 (flyinghead-mingw-breakpad-1ab24bcc817ebe629bf77daa53529d02361cb1e9.tar.gz) = 
57f0ef0f5f05343d516c1bcc2af372d02c535dfbdb25d6dc0d8a4587411385d5da3c73383e1a61d30ba028fff8f806bf0a337a278f214caee79d50868aa568ed
 Size (flyinghead-mingw-breakpad-1ab24bcc817ebe629bf77daa53529d02361cb1e9.tar.gz) = 5383206 bytes
 BLAKE2s (vinniefalco-LuaBridge-fab7b33b896a42dcc865ba5ecdbacd9f40.tar.gz) = 2b0d728012815bb58fa974be88e37abaf37e8509eec9fa68356a2eff9616954d
 SHA512 (vinniefalco-LuaBridge-fab7b33b896a42dcc865ba5ecdbacd9f40.tar.gz) = 
b47ac42637d615bd6497a8d09f6c7c6e8f7a762b80fc1a4b284cb65754302def2a7b1339c8aeb146900ad5ad247a5b33fb381ce07451f97b60a155f7f1b41a9a
 Size (vinniefalco-LuaBridge-fab7b33b896a42dcc865ba5ecdbacd9f40.tar.gz) = 543800 bytes
-SHA1 (patch-CMakeLists.txt) = d33897aa0b53fdf1f559909b6e194263c9489f5d
-SHA1 (patch-core_deps_khronos_GL4_gl3w.c) = f987eb1415f9155b590a7d319ba2aa2994973236
-SHA1 (patch-core_rend_gui.cpp) = 8cf1beb83758dc72e1ceb4097f660449400fb666
+SHA1 (patch-CMakeLists.txt) = c91544a74e5488acbcd5b51a3af4e631f5457c8a
+SHA1 (patch-core_ui_gui.cpp) = 0c204987aa02cb3a3419900668690e62cbf47bc4

Index: pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt
diff -u pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt:1.3 pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt:1.3   Fri Nov 17 09:27:51 2023
+++ pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt       Tue Nov 19 14:58:05 2024
@@ -1,70 +1,51 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2023/11/17 09:27:51 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2024/11/19 14:58:05 nia Exp $
 
-- Treat APPLE less specially.
-- Use proper dependencies when building libretro core.
+- Find exact Lua version with pkg-config.
+- Use system dependencies also when compiling the libretro core.
 
---- CMakeLists.txt.orig        2023-10-27 22:19:54.000000000 +0000
+--- CMakeLists.txt.orig        2024-10-21 14:13:00.000000000 +0000
 +++ CMakeLists.txt
-@@ -429,12 +429,6 @@ if(NOT LIBRETRO)
-               endif()
+@@ -462,7 +462,8 @@ if(NOT LIBRETRO)
+               target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
        endif()
  
--      find_package(ZLIB)
--      if(TARGET ZLIB::ZLIB AND NOT ANDROID AND (NOT WIN32 OR WINDOWS_STORE))
--              set(WITH_SYSTEM_ZLIB ON CACHE BOOL "Use system provided zlib library")
--              target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
--      endif()
--
-       find_package(Lua 5.2)
+-      find_package(Lua 5.2)
++      find_package(PkgConfig)
++      pkg_check_modules(LUA lua-5.2)
        if(NOT APPLE AND LUA_FOUND)
                target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
-@@ -448,6 +442,12 @@ add_subdirectory(core/deps/libchdr EXCLU
- target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static)
- target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include)
+               target_include_directories(${PROJECT_NAME} PRIVATE ${LUA_INCLUDE_DIR} core/deps/luabridge/Source)
+@@ -515,22 +516,22 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND 
+               target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBPULSE)
+       endif()
  
-+find_package(ZLIB)
-+if(TARGET ZLIB::ZLIB AND NOT ANDROID AND (NOT WIN32 OR WINDOWS_STORE))
-+      set(WITH_SYSTEM_ZLIB ON CACHE BOOL "Use system provided zlib library")
-+      target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
+-      if(USE_HOST_LIBZIP)
+-              pkg_check_modules(LIBZIP IMPORTED_TARGET libzip)
+-              if(LIBZIP_FOUND)
+-                      target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBZIP)
+-              endif()
+-      endif()
+-
+       if(ENABLE_OPROFILE)
+               target_compile_definitions(${PROJECT_NAME} PRIVATE DYNA_OPROF)
+               target_link_libraries(${PROJECT_NAME} PRIVATE opagent)
+       endif()
 +endif()
 +
- if(NOT WITH_SYSTEM_ZLIB)
-       target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/core/deps/libchdr/deps/zlib-1.2.11")
-       target_link_libraries(${PROJECT_NAME} PRIVATE zlib)
-@@ -459,7 +459,7 @@ if(NOT WITH_SYSTEM_ZLIB)
- endif()
- 
- find_package(PkgConfig)
--if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND NOT LIBRETRO)
-+if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT LIBRETRO)
-       pkg_check_modules(AO IMPORTED_TARGET ao)
-       if(AO_FOUND)
-               target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LIBAO)
-@@ -485,7 +485,9 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND 
-               target_compile_definitions(${PROJECT_NAME} PRIVATE USE_PULSEAUDIO)
-               target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBPULSE)
-       endif()
++find_package(MiniUPnPc)
++if(MINIUPNP_FOUND)
++      target_include_directories(${PROJECT_NAME} PRIVATE ${MINIUPNP_INCLUDE_DIRS})
++      target_link_libraries(${PROJECT_NAME} PRIVATE ${MINIUPNP_LIBRARIES})
 +endif()
  
-+if(PKG_CONFIG_FOUND)
-       if(USE_HOST_LIBZIP)
-               pkg_check_modules(LIBZIP IMPORTED_TARGET libzip)
-               if(LIBZIP_FOUND)
-@@ -510,7 +512,7 @@ if(NINTENDO_SWITCH AND USE_GLES)
-       target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::GLESV2)
- endif()
- 
--if(UNIX AND NOT APPLE AND NOT ANDROID)
-+if(UNIX AND NOT ANDROID)
-       add_definitions(
-               -DFLYCAST_DATADIR="${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/"
-               -DFLYCAST_SYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}/${PROJECT_NAME}/"
-@@ -1795,7 +1797,7 @@ else()
-       install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}")
+-      find_package(MiniUPnPc)
+-      if(MINIUPNP_FOUND)
+-              target_include_directories(${PROJECT_NAME} PRIVATE ${MINIUPNP_INCLUDE_DIRS})
+-              target_link_libraries(${PROJECT_NAME} PRIVATE ${MINIUPNP_LIBRARIES})
++if(USE_HOST_LIBZIP)
++      pkg_check_modules(LIBZIP IMPORTED_TARGET libzip)
++      if(LIBZIP_FOUND)
++              target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBZIP)
+       endif()
  endif()
  
--if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT LIBRETRO)
-+if(UNIX AND NOT ANDROID AND NOT LIBRETRO)
-       install(FILES shell/linux/man/${PROJECT_NAME}.1
-               DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-       )

Index: pkgsrc/emulators/libretro-flycast/Makefile
diff -u pkgsrc/emulators/libretro-flycast/Makefile:1.16 pkgsrc/emulators/libretro-flycast/Makefile:1.17
--- pkgsrc/emulators/libretro-flycast/Makefile:1.16     Thu Nov 14 22:19:42 2024
+++ pkgsrc/emulators/libretro-flycast/Makefile  Tue Nov 19 14:58:05 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.16 2024/11/14 22:19:42 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2024/11/19 14:58:05 nia Exp $
 
-PKGREVISION= 5
 .include "../../emulators/flycast/Makefile.common"
 
 PKGNAME=       libretro-${DISTNAME}

Index: pkgsrc/emulators/libretro-flycast/options.mk
diff -u pkgsrc/emulators/libretro-flycast/options.mk:1.4 pkgsrc/emulators/libretro-flycast/options.mk:1.5
--- pkgsrc/emulators/libretro-flycast/options.mk:1.4    Sun Aug 25 06:18:40 2024
+++ pkgsrc/emulators/libretro-flycast/options.mk        Tue Nov 19 14:58:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:40 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2024/11/19 14:58:05 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libretro-flycast
 
@@ -7,11 +7,11 @@ PKG_OPTIONS_VAR=              PKG_OPTIONS.libretro-f
 PKG_OPTIONS_REQUIRED_GROUPS+=  gl
 PKG_OPTIONS_GROUP.gl+=         opengl
 
-.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:M*arm*)
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:M*arm*}
 PKG_OPTIONS_GROUP.gl+=         rpi
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf)
+.if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf}
 PKG_SUGGESTED_OPTIONS+=                rpi
 .elif ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=                opengl

Added files:

Index: pkgsrc/emulators/flycast/patches/patch-core_ui_gui.cpp
diff -u /dev/null pkgsrc/emulators/flycast/patches/patch-core_ui_gui.cpp:1.1
--- /dev/null   Tue Nov 19 14:58:05 2024
+++ pkgsrc/emulators/flycast/patches/patch-core_ui_gui.cpp      Tue Nov 19 14:58:05 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-core_ui_gui.cpp,v 1.1 2024/11/19 14:58:05 nia Exp $
+
+Around these parts, we run Unix.
+
+--- core/ui/gui.cpp.orig       2024-11-19 14:34:33.973890750 +0000
++++ core/ui/gui.cpp
+@@ -2867,7 +2867,7 @@ static void gui_settings_about()
+ #ifdef __ANDROID__
+                       "Android"
+ #elif defined(__unix__)
+-                      "Linux"
++                      "Unix"
+ #elif defined(__APPLE__)
+ #ifdef TARGET_IPHONE
+               "iOS"

Prev by Date: CVS commit: pkgsrc/comms/asterisk19
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/comms/asterisk19
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index