CVS commit: pkgsrc/games/REminiscence

["Yorick Hardy" <yhardy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   yhardy
Date:           Sun Oct 13 20:56:41 UTC 2024

Modified Files:
        pkgsrc/games/REminiscence: Makefile distinfo
Added Files:
        pkgsrc/games/REminiscence/patches: patch-Makefile patch-prf_player.cpp

Log Message:
games/REminiscence: update to REminiscence-0.5.2

* pkgsrc changes:
        - enable adlib/opl3 support for DOS .prf music

* release 0.5.2
        - added initial support for PC98 data files
        - added configuration to fix Adlib 0xE0 writes
        - fixed cutscene seeks with Macintosh data files


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/games/REminiscence/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/REminiscence/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/REminiscence/patches/patch-Makefile \
    pkgsrc/games/REminiscence/patches/patch-prf_player.cpp

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

Modified files:

Index: pkgsrc/games/REminiscence/Makefile
diff -u pkgsrc/games/REminiscence/Makefile:1.30 pkgsrc/games/REminiscence/Makefile:1.31
--- pkgsrc/games/REminiscence/Makefile:1.30     Sat Apr  6 08:05:22 2024
+++ pkgsrc/games/REminiscence/Makefile  Sun Oct 13 20:56:41 2024
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.30 2024/04/06 08:05:22 wiz Exp $
-DISTNAME=              REminiscence-0.5.1
-PKGREVISION=           2
+# $NetBSD: Makefile,v 1.31 2024/10/13 20:56:41 yhardy Exp $
+DISTNAME=              REminiscence-0.5.2
 CATEGORIES=            games
 MASTER_SITES=          http://cyxdown.free.fr/reminiscence/
 DIST_SUBDIR=           ${PKGNAME_NOREV}
 EXTRACT_SUFX=          .tar.bz2
 DISTFILES=             ${DEFAULT_DISTFILES}
+DISTFILES+=            opl3.h opl3.c
 DISTFILES+=            stb_vorbis.c
+SITES.opl3.h=          ${MASTER_SITE_GITHUB:=nukeykt/}Nuked-OPL3/raw/cfedb09efc03f1d7b5fc1f04dd449d77d8c49d50/
+SITES.opl3.c=          ${MASTER_SITE_GITHUB:=nukeykt/}Nuked-OPL3/raw/cfedb09efc03f1d7b5fc1f04dd449d77d8c49d50/
 SITES.stb_vorbis.c=    ${MASTER_SITE_GITHUB:=nothings/}stb/raw/1ee679ca2ef753a528db5ba6801e1067b40481b8/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://cyxdown.free.fr/reminiscence/
 COMMENT=               Engine to play Flashback by Delphine Software
-LICENSE=               gnu-gpl-v3 AND public-domain
+LICENSE=               gnu-gpl-v3 AND gnu-lgpl-v2.1 AND public-domain
 
 USE_LANGUAGES=         c++
 
@@ -23,6 +25,8 @@ INSTALLATION_DIRS+=   share/applications
 INSTALLATION_DIRS+=    share/doc/REminiscence
 
 pre-build:
+       ${CP} ${WRKDIR}/opl3.h ${WRKSRC}/
+       ${CP} ${WRKDIR}/opl3.c ${WRKSRC}/
        ${CP} ${WRKDIR}/stb_vorbis.c ${WRKSRC}/
 
 do-install:

Index: pkgsrc/games/REminiscence/distinfo
diff -u pkgsrc/games/REminiscence/distinfo:1.10 pkgsrc/games/REminiscence/distinfo:1.11
--- pkgsrc/games/REminiscence/distinfo:1.10     Sun Sep 10 09:54:43 2023
+++ pkgsrc/games/REminiscence/distinfo  Sun Oct 13 20:56:41 2024
@@ -1,8 +1,16 @@
-$NetBSD: distinfo,v 1.10 2023/09/10 09:54:43 yhardy Exp $
+$NetBSD: distinfo,v 1.11 2024/10/13 20:56:41 yhardy Exp $
 
-BLAKE2s (REminiscence-0.5.1/REminiscence-0.5.1.tar.bz2) = 45259683a0c68df785f7944d3e331b0fa29858572c58167f37e47e9b73c546ac
-SHA512 (REminiscence-0.5.1/REminiscence-0.5.1.tar.bz2) = 2fbc72a6b3f476cb4b854019117bcce6f502ee9234c57b007d8e69fa3b9d84f9591558fe8b4fbc6eefdc2a579ae80f289cf9e853b46cc722850bdcac7e142e05
-Size (REminiscence-0.5.1/REminiscence-0.5.1.tar.bz2) = 167717 bytes
-BLAKE2s (REminiscence-0.5.1/stb_vorbis.c) = 53181653cd536f0eae2e2605cbcbbb935c0e217c621a342cf53529501572dd48
-SHA512 (REminiscence-0.5.1/stb_vorbis.c) = 860d87b37bfc9624544d62e72e3c28075db18a24e81d7cadf622b726bd9b94e5f3485afe0d8ac223a976a2d65cd5ee527a3c4831aae9947168a25cf19bf78c88
-Size (REminiscence-0.5.1/stb_vorbis.c) = 192790 bytes
+BLAKE2s (REminiscence-0.5.2/REminiscence-0.5.2.tar.bz2) = 4cdd3fceaf94700a76c6f1f994b25dec542c06a15a22ad439109981727d28704
+SHA512 (REminiscence-0.5.2/REminiscence-0.5.2.tar.bz2) = ce0219b41ebfc2f58446f6a2a088be28650629b3b4a36778989d16e534b0337a49be615ca899ddfd150cdb82302c0e249d90647c74761eb3456dbf63425221f0
+Size (REminiscence-0.5.2/REminiscence-0.5.2.tar.bz2) = 172015 bytes
+BLAKE2s (REminiscence-0.5.2/opl3.c) = 6697cec23b2694c423b52abf336e505b3a4cd99a147a242bf1072fdee025a4d3
+SHA512 (REminiscence-0.5.2/opl3.c) = 4f506d25707e8e8aab608011e4ef5137a698b89f8bea7098b9f79cce7a02f8296fb24975e8835bf48a48903bf888ab58b24144b8c411c2feedb913c04f485317
+Size (REminiscence-0.5.2/opl3.c) = 42406 bytes
+BLAKE2s (REminiscence-0.5.2/opl3.h) = 7b2f4d6f092fc48ebb2d25fe9b4f54ff6be2c499d00df4746f78ed23c8259577
+SHA512 (REminiscence-0.5.2/opl3.h) = dcab8764205a91e6e0c21c8643c81ee64249cec31bbff26682b8cfc655dd25044b680e43df30464dc676eaf2d953e2344b1bf96d41322d06353ee3de0684047b
+Size (REminiscence-0.5.2/opl3.h) = 4350 bytes
+BLAKE2s (REminiscence-0.5.2/stb_vorbis.c) = 53181653cd536f0eae2e2605cbcbbb935c0e217c621a342cf53529501572dd48
+SHA512 (REminiscence-0.5.2/stb_vorbis.c) = 860d87b37bfc9624544d62e72e3c28075db18a24e81d7cadf622b726bd9b94e5f3485afe0d8ac223a976a2d65cd5ee527a3c4831aae9947168a25cf19bf78c88
+Size (REminiscence-0.5.2/stb_vorbis.c) = 192790 bytes
+SHA1 (patch-Makefile) = 73a2f1f9aaebaf87a1aabdfdeb6a892591e02aa4
+SHA1 (patch-prf_player.cpp) = 28ff499166132ca8042bdd2e3e5b9b145eb85fda

Added files:

Index: pkgsrc/games/REminiscence/patches/patch-Makefile
diff -u /dev/null pkgsrc/games/REminiscence/patches/patch-Makefile:1.1
--- /dev/null   Sun Oct 13 20:56:41 2024
+++ pkgsrc/games/REminiscence/patches/patch-Makefile    Sun Oct 13 20:56:41 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile,v 1.1 2024/10/13 20:56:41 yhardy Exp $
+
+Enable the OPL3 emulation for adlib music.
+The MT32 driver needs munt, so disable it.
+
+--- Makefile.orig      2024-10-12 22:21:37.310552587 +0000
++++ Makefile
+@@ -19,8 +19,8 @@ SRCS = collision.cpp cpc_player.cpp cuts
+ #CXXFLAGS += -DUSE_STATIC_SCALER
+ #SCALERS  := scalers/scaler_nearest.cpp scalers/scaler_tv2x.cpp scalers/scaler_xbr.cpp
+ 
+-#CXXFLAGS    += -DUSE_MIDI_DRIVER
+-#MIDIDRIVERS := midi_driver_adlib.cpp midi_driver_mt32.cpp
++CXXFLAGS    += -DUSE_MIDI_DRIVER
++MIDIDRIVERS := midi_driver_adlib.cpp # midi_driver_mt32.cpp
+ #MIDI_LIBS   := -lmt32emu
+ 
+ LIBS = $(MIDI_LIBS) $(MODPLUG_LIBS) $(SDL_LIBS) $(TREMOR_LIBS) $(ZLIB_LIBS)
Index: pkgsrc/games/REminiscence/patches/patch-prf_player.cpp
diff -u /dev/null pkgsrc/games/REminiscence/patches/patch-prf_player.cpp:1.1
--- /dev/null   Sun Oct 13 20:56:41 2024
+++ pkgsrc/games/REminiscence/patches/patch-prf_player.cpp      Sun Oct 13 20:56:41 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-prf_player.cpp,v 1.1 2024/10/13 20:56:41 yhardy Exp $
+
+Enable the OPL3 emulation for adlib music.
+The MT32 driver needs munt, so disable it.
+
+--- prf_player.cpp.orig        2024-10-12 22:26:15.279342221 +0000
++++ prf_player.cpp
+@@ -21,7 +21,7 @@ static const struct {
+ } _midiDrivers[] = {
+ #ifdef USE_MIDI_DRIVER
+       { MODE_ADLIB, TIMER_ADLIB_HZ, &midi_driver_adlib },
+-      { MODE_MT32, TIMER_MT32_HZ, &midi_driver_mt32 },
++//    { MODE_MT32, TIMER_MT32_HZ, &midi_driver_mt32 },
+ #endif
+       { -1, 0, 0 }
+ };