From 1a4777836ba0efb32779e7dbbdc9aa408602a01b Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 8 May 2021 15:17:30 +0200 Subject: [PATCH] schismtracker, bump version (#5882) --- .../schismtracker.rdef.in} | 16 +++++++++++- .../patches/schismtracker-20120105.patchset | 25 ------------------- .../patches/schismtracker-20200412.patchset | 22 ++++++++++++++++ ...5.recipe => schismtracker-20200412.recipe} | 25 ++++++++++++++----- 4 files changed, 56 insertions(+), 32 deletions(-) rename media-sound/schismtracker/{patches/schismtracker.rdef => additional-files/schismtracker.rdef.in} (90%) delete mode 100644 media-sound/schismtracker/patches/schismtracker-20120105.patchset create mode 100644 media-sound/schismtracker/patches/schismtracker-20200412.patchset rename media-sound/schismtracker/{schismtracker-20120105.recipe => schismtracker-20200412.recipe} (71%) diff --git a/media-sound/schismtracker/patches/schismtracker.rdef b/media-sound/schismtracker/additional-files/schismtracker.rdef.in similarity index 90% rename from media-sound/schismtracker/patches/schismtracker.rdef rename to media-sound/schismtracker/additional-files/schismtracker.rdef.in index eb6e8f1b1..3ad3fdfed 100644 --- a/media-sound/schismtracker/patches/schismtracker.rdef +++ b/media-sound/schismtracker/additional-files/schismtracker.rdef.in @@ -1,5 +1,19 @@ -resource(11) #'VICN' array { +resource app_flags B_MULTIPLE_LAUNCH; + +resource app_version { + major = @MAJOR@, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "schismtracker", + long_info = "@LONG_INFO@" +}; + +resource app_signature "@APP_SIGNATURE@"; + +resource vector_icon { $"6E636966070500020012023DD1A8B9D7513BE6D53FE1164815B743D845FF0082" $"00003603B3937B0340342C03C0C2400144994C99020012023CA5D9B939353C54" $"4C3FD3A2C44FDD4485C300FF59FFFF00250A042038205D5C4D4E240A04B548BC" diff --git a/media-sound/schismtracker/patches/schismtracker-20120105.patchset b/media-sound/schismtracker/patches/schismtracker-20120105.patchset deleted file mode 100644 index ed0f3d2af..000000000 --- a/media-sound/schismtracker/patches/schismtracker-20120105.patchset +++ /dev/null @@ -1,25 +0,0 @@ -From 00ee988722c54bfb1ce9c157226598b0404f7fcf Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 20 Apr 2015 21:03:52 +0200 -Subject: Remove -ldl - -* Does not exist in Haiku. - -diff --git a/Makefile.am b/Makefile.am -index 66a8922..03a080b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -393,7 +393,7 @@ AM_OBJCFLAGS = $(AM_CFLAGS) - schismtracker_DEPENDENCIES = $(files_windres) - schismtracker_LDADD = $(lib_asound) $(lib_win32) $(SDL_LIBS) $(LIBM) - --if ! USE_WIN32 --schismtracker_LDADD += -ldl --endif -+#if ! USE_WIN32 -+#schismtracker_LDADD += -ldl -+#endif - --- -2.2.2 - diff --git a/media-sound/schismtracker/patches/schismtracker-20200412.patchset b/media-sound/schismtracker/patches/schismtracker-20200412.patchset new file mode 100644 index 000000000..6363055ab --- /dev/null +++ b/media-sound/schismtracker/patches/schismtracker-20200412.patchset @@ -0,0 +1,22 @@ +From ced865dfe51e709fc1f7e29053a3f018aae7d891 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 8 May 2021 14:54:09 +0000 +Subject: Fix config directory + + +diff --git a/schism/config.c b/schism/config.c +index 6d2e25b..f897fa0 100644 +--- a/schism/config.c ++++ b/schism/config.c +@@ -52,6 +52,8 @@ int cfg_video_width, cfg_video_height; + # define DOT_SCHISM "Library/Application Support/Schism Tracker" + #elif defined(GEKKO) + # define DOT_SCHISM "." ++#elif defined(__HAIKU__) ++# define DOT_SCHISM "config/settings/schism" + #else + # define DOT_SCHISM ".schism" + #endif +-- +2.30.2 + diff --git a/media-sound/schismtracker/schismtracker-20120105.recipe b/media-sound/schismtracker/schismtracker-20200412.recipe similarity index 71% rename from media-sound/schismtracker/schismtracker-20120105.recipe rename to media-sound/schismtracker/schismtracker-20200412.recipe index d3e82d601..bb6920834 100644 --- a/media-sound/schismtracker/schismtracker-20120105.recipe +++ b/media-sound/schismtracker/schismtracker-20200412.recipe @@ -13,13 +13,13 @@ even the Wii. Most development is currently done on 64-bit Linux. Schism will \ most likely build on any architecture supported by GCC4 (e.g. alpha, m68k, \ arm, etc.) but it will probably not be as well-optimized on many systems." HOMEPAGE="http://schismtracker.org/" -COPYRIGHT="2003-2012 Storlek - 2005-2009 Mrs. Brisby" +COPYRIGHT="2003-2019 Storlek Mrs. Brisby et al" LICENSE="GNU GPL v2" -REVISION="3" -SOURCE_URI="https://github.com/schismtracker/schismtracker/archive/20120105.tar.gz" -CHECKSUM_SHA256="c3fe6266b0b4b56efcfff4b302661c00f6c152df7ece5c73d01bf10d1be7c841" +REVISION="1" +SOURCE_URI="https://github.com/schismtracker/schismtracker/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="255a07cdcf4df818095c290be5cc7e291a09581d5ce2cb7088b45285f74ede3d" PATCHES="schismtracker-$portVersion.patchset" +ADDITIONAL_FILES="schismtracker.rdef.in" ARCHITECTURES="!x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86" @@ -44,7 +44,7 @@ BUILD_PREREQUIRES=" cmd:find cmd:gcc$secondaryArchSuffix cmd:make - cmd:python + cmd:python3.7 " BUILD() @@ -58,5 +58,18 @@ INSTALL() { make install + # we are not linux + rm -rf $dataDir/{applications,pixmaps} + + local APP_SIGNATURE="application/x-vnd.schismtracker" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local LONG_INFO="$SUMMARY" + sed \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + $portDir/additional-files/schismtracker.rdef.in > schismtracker.rdef + addResourcesToBinaries schismtracker.rdef $binDir/schismtracker + addAppDeskbarSymlink "$binDir"/schismtracker SchismTracker }