diff --git a/games-puzzle/mirrormagic/additional-files/mirrormagic.rdef.in b/games-puzzle/mirrormagic/additional-files/mirrormagic.rdef.in new file mode 100644 index 000000000..724639938 --- /dev/null +++ b/games-puzzle/mirrormagic/additional-files/mirrormagic.rdef.in @@ -0,0 +1,38 @@ +resource app_flags B_SINGLE_LAUNCH; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "Mirror Magic", + long_info = "@LONG_INFO@" +}; + +resource app_signature "@APP_SIGNATURE@"; + +resource vector_icon array { + $"6E6369660703A9D1AC03CAD2BB0323A72A0376BD7903086E0D05010401760702" + $"07BFD5B57ABE95B598C0F7B586C339B5C6C244B4F2C4EFB6DDC861B908C6C1B7" + $"D8C815B8F9C7B4B974C7E7B94AC6F0BA43C55EBBD5C61BBB00C2E8BB3DBDF9BA" + $"1AC072BAA2BD59B8A9BC04B5CDBCC1B72FBD26B59E0206B717B967B683BB95B8" + $"B6B82DBC04B5CDBA60B701BCC1B72FBDF9BA1ABD59B8A9BCA8BC1ABA11C022BB" + $"64BE24B89EC037B5B7C02BB72AC028B578C043B55CBFF3B560C023B5E43B0207" + $"C7B4B974C6F0BA43C7E7B94AC861B908C815B8F9C8F1BAC3CA19BE38C98ABC7C" + $"C9FDC0A2C947C572C988C309C926C572C8E4C56CC8FDC588C7E5C49CC5C9C31D" + $"C6B6C3FEC5B1C0AFC55EBBD5C582BE42C61BBB000207B5A2C127B643C2EFB587" + $"C0CBB55CBFF3B536C045B560C023B5B7C02BB578C043B72AC028BA11C022B89E" + $"C037BBA3C22ABED4C630BD3AC42EBE68C7823ACA17BDEEC8D3BB6857B78AC67D" + $"B974C7BAB6E5C4B70206BA11C022BBA3C22ABB64BE24BDF9BA1ABCA8BC1AC072" + $"BAA2C55EBBD5C2E8BB3DC582BE42C5C9C31DC5B1C0AFC4BBC3C9C256C4B5C376" + $"4BC12AC530BED4C630C009C5CBBD3AC42E0208C5C9C31DC4BBC3C9C6B6C3FEC8" + $"E4C56CC7E5C49CC8FDC588C947C572C926C572C7F2C6B7C4CFC8D2C649C7B2C4" + $"0AC999C1E0C992C2D8C94EC062C9B93ACA17BEBECA11BDEEC8D3BED4C630BE68" + $"C782C009C5CBC256C4B5C12AC530C3764B02044030C34530BC3A30304030BC3A" + $"30C3454050BC3A50C34550504050C34550BC3A080A0601060241100000000000" + $"00003EA000C6A00049F0000A05060001020304051001178423040A000100000A" + $"010101000A020102000A020103000A030104000A04010500" +}; diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe deleted file mode 100644 index 13bde37eb..000000000 --- a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY="A game like Deflektor (C64) or Mindbender (Amiga)" -DESCRIPTION="Make the laser reach the target by rotating mirrors. Beware of \ -overheating!" -HOMEPAGE="https://www.artsoft.org/mirrormagic/" -COPYRIGHT="1989-2003 Artsoft Entertainment" -LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://www.artsoft.org/RELEASES/unix/mirrormagic/mirrormagic-$portVersion.tar.gz" -CHECKSUM_SHA256="79b3f13d493523438eeb988beffc272c804bc7a4361b83167a082c77e74b3ce2" -PATCHES="mirrormagic-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2" - -PROVIDES=" - mirrormagic = $portVersion - app:mirrormagic = $portVersion - " -REQUIRES=" - haiku - lib:libSDL_1.2 - lib:libSDL_image_1.2 - lib:libSDL_mixer_1.2 - " - -BUILD_REQUIRES=" - haiku_devel - devel:libSDL - devel:libSDL_image - devel:libSDL_mixer - " -BUILD_PREREQUIRES=" - cmd:gcc - cmd:ld - cmd:make - " - -BUILD() -{ - # parallel build not available. - make sdl -} - -INSTALL() -{ - destDir="$appsDir/Mirror Magic" - mkdir -p "$destDir" - cp -r mirrormagic graphics levels music sounds "$destDir" - addAppDeskbarSymlink "$destDir/mirrormagic" "Mirror Magic" -} diff --git a/games-puzzle/mirrormagic/mirrormagic-3.0.0.recipe b/games-puzzle/mirrormagic/mirrormagic-3.0.0.recipe new file mode 100644 index 000000000..4ad8beb53 --- /dev/null +++ b/games-puzzle/mirrormagic/mirrormagic-3.0.0.recipe @@ -0,0 +1,70 @@ +SUMMARY="A game like Deflektor (C64) or Mindbender (Amiga)" +DESCRIPTION="Make the laser reach the target by rotating mirrors. Beware of \ +overheating!" +HOMEPAGE="https://www.artsoft.org/mirrormagic/" +COPYRIGHT="1989-2018 Artsoft Entertainment" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://www.artsoft.org/RELEASES/unix/mirrormagic/mirrormagic-$portVersion.tar.gz" +CHECKSUM_SHA256="c79ad19d461c080011e12f5b9e6b1d3de4b8325e452ef4bb6e8a63a62ce9ffec" +ADDITIONAL_FILES="mirrormagic.rdef.in" + +ARCHITECTURES="x86_gcc2 x86_64" + +PROVIDES=" + mirrormagic = $portVersion + app:mirrormagic = $portVersion + " +REQUIRES=" + haiku + lib:libSDL_1.2 + lib:libSDL_image_1.2 + lib:libSDL_mixer_1.2 + lib:libSDL_net_1.2 + " + +BUILD_REQUIRES=" + haiku_devel + devel:libSDL_1.2 + devel:libSDL_image_1.2 + devel:libSDL_mixer_1.2 + devel:libSDL_net_1.2 + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:ld + cmd:make + " + +BUILD() +{ + rm -rf lib + + make sdl \ + RO_GAME_DIR="$appsDir/Mirror Magic" \ + RW_GAME_DIR="$settingsDir/$portName" +} + +INSTALL() +{ + mkdir -p "$appsDir/Mirror Magic" + cp rocksndiamonds "$appsDir/Mirror Magic/Mirror Magic" + cp -r conf graphics levels music sounds "$appsDir/Mirror Magic" + + local APP_SIGNATURE="application/x-vnd.mirrormagic" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local LONG_INFO="$SUMMARY" + sed \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + $portDir/additional-files/mirrormagic.rdef.in > $sourceDir/mirrormagic.rdef + + addResourcesToBinaries $sourceDir/mirrormagic.rdef "$appsDir/Mirror Magic/Mirror Magic" + + addAppDeskbarSymlink "$appsDir/Mirror Magic/Mirror Magic" +} diff --git a/games-puzzle/mirrormagic/patches/mirrormagic-2.0.2.patchset b/games-puzzle/mirrormagic/patches/mirrormagic-2.0.2.patchset deleted file mode 100644 index 6f575b8ba..000000000 --- a/games-puzzle/mirrormagic/patches/mirrormagic-2.0.2.patchset +++ /dev/null @@ -1,83 +0,0 @@ -From 587046f039a7a29ed96383d9d73b1d605a398701 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 20 Jan 2014 21:07:38 +0100 -Subject: Have MirrorMagic looks for files in its own dir. - - -diff --git a/src/main.c b/src/main.c -index 0e3f90e..7a2cfaa 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -620,6 +620,8 @@ int num_element_info = sizeof(element_info)/sizeof(char *); - - int main(int argc, char *argv[]) - { -+ chdir(dirname(argv[0])); -+ - InitCommandName(argv[0]); - InitExitFunction(CloseAllAndExit); - InitPlatformDependantStuff(); --- -1.8.3.4 - - -From 78ab3228259485da50b6a78fa66d47ea08ae6f4f Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 20 Jan 2014 21:29:11 +0100 -Subject: Fix settings dir. - - -diff --git a/src/init.c b/src/init.c -index 923da8c..e287635 100644 ---- a/src/init.c -+++ b/src/init.c -@@ -23,6 +23,10 @@ - #include "tools.h" - #include "files.h" - -+#if __HAIKU__ -+#include -+#endif -+ - static void InitPlayerInfo(void); - static void InitLevelInfo(void); - static void InitSound(void); -@@ -33,10 +37,20 @@ static void InitElementProperties(void); - - void OpenAll(void) - { -+#if __HAIKU__ -+ char dir[256]; -+ find_directory(B_USER_SETTINGS_DIRECTORY, 0, true, dir, sizeof(dir)); -+ strcat(dir, "/mirrormagic"); -+ InitProgramInfo(dir, -+ PROGRAM_TITLE_STRING, WINDOW_TITLE_STRING, -+ ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME, -+ MSDOS_POINTER_FILENAME); -+#else - InitProgramInfo(UNIX_USERDATA_DIRECTORY, - PROGRAM_TITLE_STRING, WINDOW_TITLE_STRING, - ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME, - MSDOS_POINTER_FILENAME); -+#endif - - InitPlayerInfo(); - -diff --git a/src/libgame/misc.c b/src/libgame/misc.c -index 7a55d94..a46a298 100644 ---- a/src/libgame/misc.c -+++ b/src/libgame/misc.c -@@ -348,7 +348,9 @@ char *getRealName() - - char *getHomeDir() - { --#if defined(PLATFORM_UNIX) -+#if __HAIKU__ -+ return ""; -+#elif defined(PLATFORM_UNIX) - static char *home_dir = NULL; - - if (!home_dir) --- -1.8.3.4 -