From bb8f52c522dcffb8096ca3ec40dddc18df6c1e6c Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 11 Feb 2021 08:46:36 +0100 Subject: [PATCH] dmagnetic: fix hostbuild step and fix prefix path Need to change prefix path before host build as the path will be built into the dMagnetic binary used to generate the ini file. --- packages/dmagnetic/build.sh | 2 +- ...patch => change-prefix.patch.beforehostbuild} | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) rename packages/dmagnetic/{change-prefix.patch => change-prefix.patch.beforehostbuild} (84%) diff --git a/packages/dmagnetic/build.sh b/packages/dmagnetic/build.sh index 83542d344..30299cc62 100644 --- a/packages/dmagnetic/build.sh +++ b/packages/dmagnetic/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_HOSTBUILD=true termux_step_host_build() { cd $TERMUX_PKG_BUILDDIR make -j $TERMUX_MAKE_PROCESSES dMagnetic - mv dMagnetic ../$TERMUX_PKG_HOSTBUILD_DIR/ + mv dMagnetic $TERMUX_PKG_HOSTBUILD_DIR/ make clean } diff --git a/packages/dmagnetic/change-prefix.patch b/packages/dmagnetic/change-prefix.patch.beforehostbuild similarity index 84% rename from packages/dmagnetic/change-prefix.patch rename to packages/dmagnetic/change-prefix.patch.beforehostbuild index e712b3f6b..6d5d43d82 100644 --- a/packages/dmagnetic/change-prefix.patch +++ b/packages/dmagnetic/change-prefix.patch.beforehostbuild @@ -172,3 +172,19 @@ .br [RANDOM] .br +--- ../dMagnetic_helpscreens.c.orig 2021-02-11 07:39:20.978080747 +0000 ++++ ./src/toplevel/dMagnetic_helpscreens.c 2021-02-11 07:40:23.946167143 +0000 +@@ -67,10 +67,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"}, + {"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"}, + {"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"},