From e91bfa07eefa0021f03ba11b5a3bdab6b95a59ba Mon Sep 17 00:00:00 2001 From: Ho Tuan Kiet Date: Wed, 27 Dec 2017 11:51:54 +0700 Subject: [PATCH] advancemame: move config directory to B_USER_SETTINGS_DIRECTORY (#1966) * games-emulation/advancemame: cosmetic changes to recipe * games-emulation/advancemame: move config directory to user settings directory * games-emulation/advancemame: bump revision * games-emulation/advancemame: fit DESCRIPTION in 80 cols --- .../advancemame/advancemame-1.4.recipe | 13 +++-- .../advancemame/advancemame-3.5.recipe | 13 +++-- .../patches/advancemame-1.4.patchset | 55 ++++++++++++++++++- 3 files changed, 69 insertions(+), 12 deletions(-) diff --git a/games-emulation/advancemame/advancemame-1.4.recipe b/games-emulation/advancemame/advancemame-1.4.recipe index 50031efbe..ca6a0f897 100644 --- a/games-emulation/advancemame/advancemame-1.4.recipe +++ b/games-emulation/advancemame/advancemame-1.4.recipe @@ -1,11 +1,11 @@ SUMMARY="Unofficial MAME version with advanced video support" -DESCRIPTION="\ -AdvanceMAME is unofficial MAME version with advanced video support +DESCRIPTION=" \ +AdvanceMAME is unofficial MAME version with advanced video support \ for better use with TVs, Arcade monitors, PC monitors and LCD screens." HOMEPAGE="http://advancemame.sourceforge.net" SOURCE_URI="https://github.com/amadvance/advancemame/releases/download/advancemame-$portVersion/advancemame-$portVersion.tar.gz" CHECKSUM_SHA256="525e0897cd41fe8d3ef563e59592da740ebe005eda0948515dca410d01624bcc" -REVISION="2" +REVISION="3" LICENSE="GNU GPL v2" COPYRIGHT="1996-2006, Nicola Salmoria and the MAME Team" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -20,7 +20,8 @@ PROVIDES=" cmd:advm$secondaryArchSuffix cmd:advmame$secondaryArchSuffix cmd:advs$secondaryArchSuffix - " +" + REQUIRES=" haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix @@ -28,13 +29,15 @@ REQUIRES=" lib:libsdl$secondaryArchSuffix lib:libz$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libexpat$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libsdl$secondaryArchSuffix devel:libz$secondaryArchSuffix - " +" + BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf diff --git a/games-emulation/advancemame/advancemame-3.5.recipe b/games-emulation/advancemame/advancemame-3.5.recipe index faf8ba6c8..476c8b9b5 100644 --- a/games-emulation/advancemame/advancemame-3.5.recipe +++ b/games-emulation/advancemame/advancemame-3.5.recipe @@ -1,11 +1,11 @@ SUMMARY="Unofficial MAME version with advanced video support" -DESCRIPTION="\ -AdvanceMAME is unofficial MAME version with advanced video support +DESCRIPTION=" \ +AdvanceMAME is unofficial MAME version with advanced video support \ for better use with TVs, Arcade monitors, PC monitors and LCD screens." HOMEPAGE="http://advancemame.sourceforge.net" SOURCE_URI="https://github.com/amadvance/advancemame/releases/download/v$portVersion/advancemame-$portVersion.tar.gz" CHECKSUM_SHA256="779b3b43e3fbdf4bb24e97c418499cd4550446494e19f5d576827242b0821814" -REVISION="2" +REVISION="3" LICENSE="GNU GPL v2" COPYRIGHT="1996-2006, Nicola Salmoria and the MAME Team" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -22,7 +22,8 @@ PROVIDES=" cmd:advmenu$secondaryArchSuffix cmd:advmess$secondaryArchSuffix cmd:advs$secondaryArchSuffix - " +" + REQUIRES=" haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix @@ -30,13 +31,15 @@ REQUIRES=" lib:libsdl$secondaryArchSuffix lib:libz$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libexpat$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libsdl$secondaryArchSuffix devel:libz$secondaryArchSuffix - " +" + BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf diff --git a/games-emulation/advancemame/patches/advancemame-1.4.patchset b/games-emulation/advancemame/patches/advancemame-1.4.patchset index 485d3694a..2fc9ec743 100644 --- a/games-emulation/advancemame/patches/advancemame-1.4.patchset +++ b/games-emulation/advancemame/patches/advancemame-1.4.patchset @@ -1,4 +1,4 @@ -From 1ca177b2fbaf56b68147ed803c49466e145ae4be Mon Sep 17 00:00:00 2001 +From 3e4360dc01abec68741f8790fe3f631a752f93ff Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 16 May 2015 18:20:46 +0000 Subject: don't set docdir and mandir, we do already. @@ -18,5 +18,56 @@ index 4d99d59..eeec99f 100644 AC_OUTPUT -- -2.2.2 +2.15.0 + + +From 2d2b76fd26b5cbd4d2e120a2e9b9ac0a2a804ca3 Mon Sep 17 00:00:00 2001 +From: Ho Tuan Kiet +Date: Tue, 26 Dec 2017 17:30:26 +0000 +Subject: Move config directory to B_USER_SETTINGS_DIRECTORY + + +diff --git a/advance/linux/file.c b/advance/linux/file.c +index ba4aa41..fda1e99 100644 +--- a/advance/linux/file.c ++++ b/advance/linux/file.c +@@ -34,6 +34,10 @@ + #include "target.h" + #include "snstring.h" + ++#ifdef __HAIKU__ ++#include ++#endif ++ + #if HAVE_SYS_UTSNAME_H + #include + #endif +@@ -89,14 +93,22 @@ adv_error file_init(void) + if (home) { + snprintf(FL.home_dir_buffer, sizeof(FL.home_dir_buffer), "%s", home); + } else { ++#ifdef __HAIKU__ ++ char buffer[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH]; ++ find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, buffer, sizeof(buffer)); ++ home = buffer; ++ const char app_folder[] = "advancemame"; ++#else + /* try $HOME/.advance */ + home = getenv("HOME"); ++ const char app_folder[] = ".advance" ++#endif + if (home) { +- /* add the .advance subdirectory */ ++ /* add subdirectory */ + if (!home[0] || home[strlen(home)-1] != '/') +- snprintf(FL.home_dir_buffer, sizeof(FL.home_dir_buffer), "%s/.advance", home); ++ snprintf(FL.home_dir_buffer, sizeof(FL.home_dir_buffer), "%s/%s", home, app_folder); + else +- snprintf(FL.home_dir_buffer, sizeof(FL.home_dir_buffer), "%s.advance", home); ++ snprintf(FL.home_dir_buffer, sizeof(FL.home_dir_buffer), "%s%s", home, app_folder); + } else { + /* use ROOT */ + snprintf(FL.home_dir_buffer, sizeof(FL.home_dir_buffer), "%s", FL.data_dir_buffer); +-- +2.15.0