From 1a1b9817a74c34747f7ee2dcb49c9fff923ebfe6 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 24 Jul 2021 12:18:15 +0200 Subject: [PATCH] dmagnetic: update to 0.32 --- packages/dmagnetic/Makefile.patch | 11 + .../_wonderland.patch.beforehostbuild | 31 --- packages/dmagnetic/build.sh | 5 +- .../change-prefix.patch.beforehostbuild | 197 +++--------------- ...gnetic_helpscreens.c.patch.beforehostbuild | 20 +- packages/dmagnetic/magnetic-scrolls.in | 2 +- 6 files changed, 50 insertions(+), 216 deletions(-) create mode 100644 packages/dmagnetic/Makefile.patch delete mode 100644 packages/dmagnetic/_wonderland.patch.beforehostbuild diff --git a/packages/dmagnetic/Makefile.patch b/packages/dmagnetic/Makefile.patch new file mode 100644 index 000000000..481f6913c --- /dev/null +++ b/packages/dmagnetic/Makefile.patch @@ -0,0 +1,11 @@ +--- ./Makefile.orig 2021-07-24 10:36:40.069413331 +0200 ++++ ./Makefile 2021-07-24 10:40:29.069413167 +0200 +@@ -99,7 +99,7 @@ + cp dMagneticini.5 $(INSTALLMAN)/man5/ + cp README.txt $(INSTALLSHARE)/dMagnetic/ + cp LICENSE.txt $(INSTALLSHARE)/dMagnetic/ +- cp dMagnetic.ini $(INSTALLSHARE)/dMagnetic/ ++ cp dMagnetic.ini $(INSTALLSHARE)/ + + + dMagnetic: $(OBJ_LOADER) $(OBJ_LINEA) $(OBJ_VM68K) $(OBJ_GUI) $(OBJ_TOPLEVEL) diff --git a/packages/dmagnetic/_wonderland.patch.beforehostbuild b/packages/dmagnetic/_wonderland.patch.beforehostbuild deleted file mode 100644 index d9908f14f..000000000 --- a/packages/dmagnetic/_wonderland.patch.beforehostbuild +++ /dev/null @@ -1,31 +0,0 @@ ---- ./src/toplevel/dMagnetic_helpscreens.c.orig 2021-07-10 21:06:45.831605096 +0000 -+++ ./src/toplevel/dMagnetic_helpscreens.c 2021-07-10 21:07:00.738274747 +0000 -@@ -86,7 +86,7 @@ - {"corruption", "Corruption", 3,1,"MSC/C" ,PLATFORM_MAG|PLATFORM_GFX|PLATFORM_MSDOS|PLATFORM_D64|PLATFORM_AMSTRADCPC|PLATFORM_SPECTRUM|PLATFORM_ARCHIMEDES |PLATFORM_TWORSC|PLATFORM_APPLEII}, - {"fish", "Fish!", 2,1,"MSC/F" ,PLATFORM_MAG|PLATFORM_GFX|PLATFORM_MSDOS|PLATFORM_D64|PLATFORM_AMSTRADCPC|PLATFORM_SPECTRUM|PLATFORM_ARCHIMEDES |PLATFORM_TWORSC}, - {"myth", "Myth", 1,0,"" ,PLATFORM_MAG|PLATFORM_GFX|PLATFORM_MSDOS|PLATFORM_D64|PLATFORM_AMSTRADCPC|PLATFORM_SPECTRUM }, -- {"wonderland", "Wonderland", 1,1,"wonderland/" ,PLATFORM_MAG|PLATFORM_GFX |PLATFORM_TWORSC}, -+ {"wonder", "Wonderland", 1,1,"wonderland/" ,PLATFORM_MAG|PLATFORM_GFX |PLATFORM_TWORSC}, - }; - - void dMagnetic_helpscreens_header() ---- ./src/loader/maggfxloader.c.orig 2021-07-11 13:13:06.320617293 +0000 -+++ ./src/loader/maggfxloader.c 2021-07-11 13:14:01.630819789 +0000 -@@ -80,7 +80,7 @@ - || (retrievefromcommandline(argc,argv,"corruption",NULL,0)) - || (retrievefromcommandline(argc,argv,"fish",NULL,0)) - || (retrievefromcommandline(argc,argv,"myth",NULL,0)) -- || (retrievefromcommandline(argc,argv,"wonderland",NULL,0))) -+ || (retrievefromcommandline(argc,argv,"wonder",NULL,0))) - { - gamenamegiven=1; - } -@@ -92,7 +92,7 @@ - } - { - int i; -- char* gameprefix[]={"pawn","guild","jinxter","corruption","fish","myth","wonderland"}; -+ char* gameprefix[]={"pawn","guild","jinxter","corruption","fish","myth","wonder"}; - char magname[32]; - char gfxname[32]; - char tworscname[32]; diff --git a/packages/dmagnetic/build.sh b/packages/dmagnetic/build.sh index 85d768114..98fc06ad2 100644 --- a/packages/dmagnetic/build.sh +++ b/packages/dmagnetic/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.dettus.net/dMagnetic TERMUX_PKG_DESCRIPTION="Interpreter for classic text adventure games and interactive fiction" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.31 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=0.32 TERMUX_PKG_SRCURL=https://www.dettus.net/dMagnetic/dMagnetic_${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=1a0356f04d3a5e252225b0fd38b9047957f292f67338ba83579958b46f184139 +TERMUX_PKG_SHA256=9671b863cbb126e122923fa974806ff0e998af471c98e878c1392c20a3606206 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_HOSTBUILD=true diff --git a/packages/dmagnetic/change-prefix.patch.beforehostbuild b/packages/dmagnetic/change-prefix.patch.beforehostbuild index 1134d23cd..97e3d5aea 100644 --- a/packages/dmagnetic/change-prefix.patch.beforehostbuild +++ b/packages/dmagnetic/change-prefix.patch.beforehostbuild @@ -1,174 +1,29 @@ ---- ./src/toplevel/dMagnetic.c.orig 2021-06-23 20:13:37.000000000 +0000 -+++ ./src/toplevel/dMagnetic.c 2021-07-10 20:09:18.905961467 +0000 -@@ -130,8 +130,21 @@ - { - dMagnetic_helpscreens_header(); - #define LOCNUM 14 -- const char *locations[LOCNUM]={"/etc/","/usr/local/share/","/usr/local/share/games/","/usr/local/share/dMagnetic/","/usr/local/games/","/usr/local/games/dMagnetic/","/usr/share/","/usr/share/games/","/usr/share/dMagnetic/","/usr/games/","/usr/games/dMagnetic/","/usr/share/doc/dmagnetic/","/usr/pkg/share/doc/dMagnetic/", -- "./"}; // this should always be the last one. -+ const char *locations[LOCNUM]={ -+ "@TERMUX_PREFIX@/etc/", -+ "@TERMUX_PREFIX@/share/", -+ "@TERMUX_PREFIX@/share/games/", -+ "@TERMUX_PREFIX@/share/games/dMagnetic/", -+ "@TERMUX_PREFIX@/games/", -+ "@TERMUX_PREFIX@/games/dMagnetic/", -+ "@TERMUX_PREFIX@/local/share/", -+ "@TERMUX_PREFIX@/local/share/games/", -+ "@TERMUX_PREFIX@/local/share/dMagnetic/", -+ "@TERMUX_PREFIX@/games/", -+ "@TERMUX_PREFIX@/games/dMagnetic/", -+ "@TERMUX_PREFIX@/share/doc/dmagnetic/", -+ "@TERMUX_PREFIX@/pkg/share/doc/dMagnetic/", -+ "./"}; // this should always be the last one. +--- ./src/toplevel/dMagnetic_pathnames.h.orig 2021-07-24 11:07:51.905404851 +0200 ++++ ./src/toplevel/dMagnetic_pathnames.h 2021-07-24 11:08:56.145404805 +0200 +@@ -33,16 +33,16 @@ + // some distributions require a specific prefix before the pathnames. + // those macros allow them to patch the prefixes in a centralized location. - f_inifile=NULL; - if (f_inifile==NULL) ---- ./dMagneticini.5.orig 2021-06-23 20:13:37.000000000 +0000 -+++ ./dMagneticini.5 2021-07-10 20:09:18.905961467 +0000 -@@ -32,7 +32,7 @@ - .Pp - rows=40 - .Pp --pawnmag=/usr/local/share/games/magneticscrolls/pawn.mag -+pawnmag=@TERMUX_PREFIX@/share/games/magneticscrolls/pawn.mag - . - .It Comments - ;This is a comment -@@ -53,7 +53,7 @@ - .br - [FILES] - .br --pawnmag=/usr/local/share/games/magneticscrolls/pawn.mag -+pawnmag=@TERMUX_PREFIX@/share/games/magneticscrolls/pawn.mag - .br - pawngfx=/home/games/magneticscrolls/pawn.gfx - .br -@@ -215,11 +215,11 @@ - .br - [FILES] - .br --pawnmag=/usr/local/share/games/magneticscrolls/pawn.mag -+pawnmag=@TERMUX_PREFIX@/share/games/magneticscrolls/pawn.mag - .br --pawngfx=/usr/local/share/games/magneticscrolls/pawn.gfx -+pawngfx=@TERMUX_PREFIX@/share/games/magneticscrolls/pawn.gfx - .br --;pawnmsdos=/usr/local/share/games/magneticscrolls/msdosversions/PAWN -+;pawnmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/PAWN - .br - ;pawnd64=/d64/PAWN1.d64,/d64/PAWN2.d64 - .br -@@ -233,13 +233,13 @@ - .br - ;pawnappleii=/nib/pawn.nib - .br --guildmag=/usr/local/share/games/magneticscrolls/guild.mag -+guildmag=@TERMUX_PREFIX@/share/games/magneticscrolls/guild.mag - .br --guildgfx=/usr/local/share/games/magneticscrolls/guild.gfx -+guildgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/guild.gfx - .br --;guildmsdos=/usr/local/share/games/magneticscrolls/msdosversions/GUILD -+;guildmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/GUILD - .br --;guildtworsc=/usr/local/share/games/magneticscrolls/MSC/GTWO.RSC -+;guildtworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/MSC/GTWO.RSC - .br - ;guild64=/d64/GUILD1.d64,/d64/GUILD2.d64 - .br -@@ -253,11 +253,11 @@ - .br - ;guildappleii=/nib/guild.nib - .br --jinxtermag=/usr/local/share/games/magneticscrolls/jinxter.mag -+jinxtermag=@TERMUX_PREFIX@/share/games/magneticscrolls/jinxter.mag - .br --jinxtergfx=/usr/local/share/games/magneticscrolls/jinxter.gfx -+jinxtergfx=@TERMUX_PREFIX@/share/games/magneticscrolls/jinxter.gfx - .br --;jinxtermsdos=/usr/local/share/games/magneticscrolls/msdosversions/JINXTER -+;jinxtermsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/JINXTER - .br - ;jinxterd64=/d64/JINXTER1.d64,/d64/JINXTER2.d64 - .br -@@ -271,13 +271,13 @@ - .br - ;jinxterappleii=/nib/jinxter1.nib,/nib/jinxter2.nib - .br --corruptionmag=/usr/local/share/games/magneticscrolls/ccorrupt.mag -+corruptionmag=@TERMUX_PREFIX@/share/games/magneticscrolls/ccorrupt.mag - .br --corruptiongfx=/usr/local/share/games/magneticscrolls/ccorrupt.gfx -+corruptiongfx=@TERMUX_PREFIX@/share/games/magneticscrolls/ccorrupt.gfx - .br --;corruptionmsdos=/usr/local/share/games/magneticscrolls/msdosversions/CORRUPT -+;corruptionmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/CORRUPT - .br --;corruptiontworsc=/usr/local/share/games/magneticscrolls/MSC/CTWO.RSC -+;corruptiontworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/MSC/CTWO.RSC - .br - ;corruptiond64=/d64/CORRUPT1.d64,/d64/CORRUPT2.d64 - .br -@@ -289,13 +289,13 @@ - .br - ;corruptionappleii=/2mg/corruptA.2mg,/2mg/corruptB.2mg,/2mg/corruptC.2mg - .br --fishmag=/usr/local/share/games/magneticscrolls/fish.mag -+fishmag=@TERMUX_PREFIX@/share/games/magneticscrolls/fish.mag - .br --fishgfx=/usr/local/share/games/magneticscrolls/fish.gfx -+fishgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/fish.gfx - .br --;fishmsdos=/usr/local/share/games/magneticscrolls/msdosversions/FISH -+;fishmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/FISH - .br --;fishtworsc=/usr/local/share/games/magneticscrolls/MSC/FTWO.RSC -+;fishtworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/MSC/FTWO.RSC - .br - ;fishd64=/d64/FISH1.d64,/d64/FISH2.d64 - .br -@@ -305,13 +305,13 @@ - .br - ;fisharchimedes=/adf/FISHarchimedes.adf - .br --mythmag=/usr/local/share/games/magneticscrolls/myth.mag -+mythmag=@TERMUX_PREFIX@/share/games/magneticscrolls/myth.mag - .br --mythgfx=/usr/local/share/games/magneticscrolls/myth.gfx -+mythgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/myth.gfx - .br --;mythmsdos=/usr/local/share/games/magneticscrolls/msdosversions/MYTH -+;mythmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/MYTH - .br --;mythd64=/usr/local/share/games/magneticscrolls/MYTH.d64 -+;mythd64=@TERMUX_PREFIX@/share/games/magneticscrolls/MYTH.d64 - .br - ;mythamstradcpc=/dsk/MYTH1.DSK,/dsk/MYTH2.DSK - .br -@@ -319,11 +319,11 @@ - .br - ;mytharchimedes=/adf/MYTHarchimedes.adf - .br --wonderlandmag=/usr/local/share/games/magneticscrolls/wonder.mag -+wonderlandmag=@TERMUX_PREFIX@/share/games/magneticscrolls/wonder.mag - .br --wonderlandgfx=/usr/local/share/games/magneticscrolls/wonder.gfx -+wonderlandgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/wonder.gfx - .br --;wonderlandtworsc=/usr/local/share/games/magneticscrolls/WONDER/TWO.RSC -+;wonderlandtworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/WONDER/TWO.RSC - .br - [RANDOM] - .br ---- ./README.txt.orig 2021-06-23 20:13:37.000000000 +0000 -+++ ./README.txt 2021-07-10 20:09:18.905961467 +0000 -@@ -59,7 +59,7 @@ +-#define PATH_ETC "/etc/" +-#define PATH_USR "/usr/" +-#define PATH_USR_LOCAL "/usr/local/" +-#define PATH_USR_LOCAL_SHARE "/usr/local/share/" +-#define PATH_USR_LOCAL_SHARE_GAMES "/usr/local/share/games/" +-#define PATH_USR_LOCAL_GAMES "/usr/local/games/" +-#define PATH_USR_SHARE "/usr/share/" +-#define PATH_USR_SHARE_GAMES "/usr/share/games/" +-#define PATH_USR_GAMES "/usr/games/" +-#define PATH_USR_PKG_SHARE "/usr/pkg/share/" ++#define PATH_ETC "@TERMUX_PREFIX@/etc/" ++#define PATH_USR "@TERMUX_PREFIX@/" ++#define PATH_USR_LOCAL "@TERMUX_PREFIX@/local/" ++#define PATH_USR_LOCAL_SHARE "@TERMUX_PREFIX@/local/share/" ++#define PATH_USR_LOCAL_SHARE_GAMES "@TERMUX_PREFIX@/local/share/games/" ++#define PATH_USR_LOCAL_GAMES "@TERMUX_PREFIX@/local/games/" ++#define PATH_USR_SHARE "@TERMUX_PREFIX@/share/" ++#define PATH_USR_SHARE_GAMES "@TERMUX_PREFIX@/share/games/" ++#define PATH_USR_GAMES "@TERMUX_PREFIX@/games/" ++#define PATH_USR_PKG_SHARE "@TERMUX_PREFIX@/pkg/share/" - Alternatively, you can select the .mag files like this: --% ./dMagnetic -ini dMagnetic.ini -mag /usr/local/share/games/pawn.mag -+% ./dMagnetic -ini dMagnetic.ini -mag @TERMUX_PREFIX@/share/games/pawn.mag - - TO SEE GRAPHICS IN WONDERLAND OR ANY GAME FROM THE MAGNETIC SCROLLS COLLECTION, - you have to type in 'GRAPHICS'. To see the EGA version of those pictures, run + #endif diff --git a/packages/dmagnetic/dMagnetic_helpscreens.c.patch.beforehostbuild b/packages/dmagnetic/dMagnetic_helpscreens.c.patch.beforehostbuild index 80974e64b..d6d4ec109 100644 --- a/packages/dmagnetic/dMagnetic_helpscreens.c.patch.beforehostbuild +++ b/packages/dmagnetic/dMagnetic_helpscreens.c.patch.beforehostbuild @@ -1,20 +1,20 @@ ---- ./src/toplevel/dMagnetic_helpscreens.c.orig 2021-06-23 20:13:37.000000000 +0000 -+++ ./src/toplevel/dMagnetic_helpscreens.c 2021-07-10 20:17:40.252485255 +0000 -@@ -68,10 +68,10 @@ +--- ./src/toplevel/dMagnetic_helpscreens.c.orig 2021-07-22 23:13:51.000000000 +0200 ++++ ./src/toplevel/dMagnetic_helpscreens.c 2021-07-24 11:23:49.169384729 +0200 +@@ -70,10 +70,10 @@ } tGameInfo; const tPlatformInfo cdMagnetic_platformInfo[NUMPLATFORMS]={ -- {"mag", "/usr/local/share/games/magneticscrolls/", ".mag" ,0,0,1,1, PLATFORM_MAG, "-mag MAGFILE.mag"}, -- {"gfx", "/usr/local/share/games/magneticscrolls/", ".gfx" ,0,0,1,1, PLATFORM_GFX, "-gfx GFXFILE.gfx"}, -+ {"mag", "@TERMUX_PREFIX@/share/games/magneticscrolls/", ".mag" ,0,0,1,1, PLATFORM_MAG, "-mag MAGFILE.mag"}, -+ {"gfx", "@TERMUX_PREFIX@/share/games/magneticscrolls/", ".gfx" ,0,0,1,1, PLATFORM_GFX, "-gfx GFXFILE.gfx"}, +- {"mag", PATH_USR_LOCAL_SHARE_GAMES"magneticscrolls/", ".mag" ,0,0,1,1, PLATFORM_MAG, "-mag MAGFILE.mag"}, +- {"gfx", PATH_USR_LOCAL_SHARE_GAMES"magneticscrolls/", ".gfx" ,0,0,1,1, PLATFORM_GFX, "-gfx GFXFILE.gfx"}, ++ {"mag", PATH_USR_SHARE_GAMES"magneticscrolls/", ".mag" ,0,0,1,1, PLATFORM_MAG, "-mag MAGFILE.mag"}, ++ {"gfx", PATH_USR_SHARE_GAMES"magneticscrolls/", ".gfx" ,0,0,1,1, PLATFORM_GFX, "-gfx GFXFILE.gfx"}, {"msdos", "/MSDOS/C/", "" ,1,0,1,0, PLATFORM_MSDOS, "-msdosdir DIRECTORY/"}, -- {"tworsc", "/usr/local/share/games/", "TWO.RSC",0,1,1,0, PLATFORM_TWORSC, "-tworsc DIRECTORY/TWO.RSC"}, -+ {"tworsc", "@TERMUX_PREFIX@/share/games/", "TWO.RSC",0,1,1,0, PLATFORM_TWORSC, "-tworsc DIRECTORY/TWO.RSC"}, +- {"tworsc", PATH_USR_LOCAL_SHARE"games/", "TWO.RSC",0,1,1,0, PLATFORM_TWORSC, "-tworsc DIRECTORY/TWO.RSC"}, ++ {"tworsc", PATH_USR_SHARE"games/", "TWO.RSC",0,1,1,0, PLATFORM_TWORSC, "-tworsc DIRECTORY/TWO.RSC"}, {"d64", "/8/", ".D64" ,1,0,2,0, PLATFORM_D64, "-d64 IMAGE1.d64,IMAGE2.d64"}, {"amstradcpc", "/dsk/amstradcpc/", ".DSK" ,1,0,2,0, PLATFORM_AMSTRADCPC, "-amstradcpc IMAGE1.DSK,IMAGE2.DSK"}, {"spectrum", "/dsk/spectrum/", ".DSK" ,0,0,1,0, PLATFORM_SPECTRUM, "-spectrum IMAGE.DSK"}, -@@ -282,8 +282,9 @@ +@@ -286,8 +286,9 @@ fprintf(stderr,"%s %s\n",argv0,cdMagnetic_platformInfo[i].cmdline); } fprintf(stderr,"\n"); diff --git a/packages/dmagnetic/magnetic-scrolls.in b/packages/dmagnetic/magnetic-scrolls.in index e2dd8f48a..fe7720d66 100644 --- a/packages/dmagnetic/magnetic-scrolls.in +++ b/packages/dmagnetic/magnetic-scrolls.in @@ -66,7 +66,7 @@ case $FG_GAME in ;; "Wonderland") FG_FILEDOWNLOAD=https://msmemorial.if-legends.org/download.php?wonderall.zip - FG_GAMENAME=wonder + FG_GAMENAME=wonderland ;; *) echo "Error: unknown game."