protrekkr: Updated SOURCE_URI (#4930)

* protrekkr: Updated SOURCE_URI, fix build
2026-04-23 04:00:05 +02:00 · 2020-05-21 23:59:05 -07:00
parent 7397478c13
commit d99056fa1e
2 changed files with 104 additions and 71 deletions
--- a/media-sound/protrekkr/patches/protrekkr-2.5.4.patchset
+++ b/media-sound/protrekkr/patches/protrekkr-2.5.4.patchset
@@ -1,4 +1,4 @@
-From 4662e2c5030efdf290f6320eaf077abc820eb51e Mon Sep 17 00:00:00 2001
+From 752af040600eaf24859790a431a8e835676c149c Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Tue, 4 Mar 2014 21:49:16 +0100
 Subject: Import initial patch.
@@ -210,33 +210,33 @@ index 0000000..efbfd22
 +tinypack.o: src/samples/wavpack/tinypack.cpp
 +	$(CXX) -c -o $(@) $(FLAGS) $<
 diff --git a/release/distrib/replay/lib/include/replay.h b/release/distrib/replay/lib/include/replay.h
-index 1945eab..51778e4 100644
+index 77d7652..f001033 100644
 --- a/release/distrib/replay/lib/include/replay.h
 +++ b/release/distrib/replay/lib/include/replay.h
@@ -49,6 +49,8 @@
- #include "../sounddriver/include/sounddriver_aos4.h"
- #elif defined(__PSP__)
- #include "../sounddriver/include/sounddriver_psp.h"
+ #include "../sounddriver/include/sounddriver_aos4.h"
+ #elif defined(__PSP__)
+ #include "../sounddriver/include/sounddriver_psp.h"
 +#elif defined(__HAIKU__)
 +#include "../sounddriver/include/sounddriver_haiku.h"
- #else
- #error "Can't work without any sound driver !"
- #endif
+ #else
+ #error "Can't work without any sound driver !"
+ #endif
 diff --git a/release/distrib/replay/lib/replay.cpp b/release/distrib/replay/lib/replay.cpp
-index ea2ee35..f720cd1 100644
+index d669c8b..0e420af 100644
 --- a/release/distrib/replay/lib/replay.cpp
 +++ b/release/distrib/replay/lib/replay.cpp
@@ -43,6 +43,10 @@
- #define int32 int32_t
- #endif
- 
+ #define int32 int32_t
+ #endif
+ 
 +#if defined(__HAIKU__)
 +#include <SupportDefs.h>
 +#endif
 +
- #if !defined(__STAND_ALONE__)
- #include "../../../../src/midi/include/midi.h"
- #include "../../../../src/include/variables.h"
+ #if !defined(__STAND_ALONE__)
+ #include "../../../../src/midi/include/midi.h"
+ #include "../../../../src/include/variables.h"
 diff --git a/release/distrib/replay/lib/sounddriver/include/sounddriver_haiku.h b/release/distrib/replay/lib/sounddriver/include/sounddriver_haiku.h
 new file mode 100644
 index 0000000..294c6f8
@@ -547,48 +547,48 @@ index 0000000..7791631
 +}
 +
 diff --git a/release/distrib/replay/lib/wavpack.cpp b/release/distrib/replay/lib/wavpack.cpp
-index 4ced7c6..942d30d 100644
+index e0ead57..23a77c9 100644
 --- a/release/distrib/replay/lib/wavpack.cpp
 +++ b/release/distrib/replay/lib/wavpack.cpp
@@ -33,6 +33,8 @@
- // SUCH DAMAGE.
- // ------------------------------------------------------
+ // SUCH DAMAGE.
+ // ------------------------------------------------------
 
 +#include <stdint.h>
 + 
- #include "include/samples_unpack.h"
- #include "include/wavpack.h"
- 
+ #include "include/samples_unpack.h"
+ #include "include/wavpack.h"
+ 
 diff --git a/src/editors/editor_instrument.cpp b/src/editors/editor_instrument.cpp
-index 83312cf..0cb4db7 100644
+index e76a912..8092595 100644
 --- a/src/editors/editor_instrument.cpp
 +++ b/src/editors/editor_instrument.cpp
@@ -44,6 +44,10 @@
- #include "../files/include/files.h"
- #include "../ui/include/requesters.h"
- 
+ #include "../files/include/files.h"
+ #include "../ui/include/requesters.h"
+ 
 +#if defined(__HAIKU__)
 +#include <SupportDefs.h>
 +#endif
 +
- // ------------------------------------------------------
- // Variables
- extern REQUESTER Overwrite_Requester;
+ // ------------------------------------------------------
+ // Variables
+ extern REQUESTER Overwrite_Requester;
 diff --git a/src/editors/editor_pattern.cpp b/src/editors/editor_pattern.cpp
-index e4674ac..29d4dec 100644
+index ec2eecb..7e235a8 100644
 --- a/src/editors/editor_pattern.cpp
 +++ b/src/editors/editor_pattern.cpp
@@ -38,6 +38,10 @@
- #include "include/editor_instrument.h"
- #include "include/editor_sequencer.h"
- 
+ #include "include/editor_instrument.h"
+ #include "include/editor_sequencer.h"
+ 
 +#if defined(__HAIKU__)
 +#include <SupportDefs.h>
 +#endif
 +
- // ------------------------------------------------------
- // Constants
- #define POS_HORIZ_SLIDER 716
+ // ------------------------------------------------------
+ // Constants
+ #define POS_HORIZ_SLIDER 716
 diff --git a/src/extralibs/sdl_draw/makefile.haiku b/src/extralibs/sdl_draw/makefile.haiku
 new file mode 100644
 index 0000000..e321d5d
@@ -758,58 +758,90 @@ index 0000000..5ffb952
 +xmltest.o: tinyxml.h tinystr.h
 +tinyxmlerror.o: tinyxml.h tinystr.h
 diff --git a/src/files/files_list.cpp b/src/files/files_list.cpp
-index 6cd2848..fed9828 100644
+index 71753b7..994a62e 100644
 --- a/src/files/files_list.cpp
 +++ b/src/files/files_list.cpp
@@ -286,7 +286,7 @@ void Set_Current_Dir(void)
-     }
- }
- 
-#if defined(__LINUX__) || defined(__MACOSX__)
+     }
+ }
+ 
+-#if defined(__LINUX__) || defined(__MACOSX__)
 +#if defined(__LINUX__) || defined(__MACOSX__) || defined(__HAIKU__)
- int list_file(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
- {
-     int i;
+ int list_file(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
+ {
+     int i;
 diff --git a/src/samples/include/samples_ops.h b/src/samples/include/samples_ops.h
-index 3b0a640..752427b 100644
+index 32b73b1..f408850 100644
 --- a/src/samples/include/samples_ops.h
 +++ b/src/samples/include/samples_ops.h
@@ -37,6 +37,10 @@
- #include "../../include/variables.h"
- #include "../../ui/include/misc_draw.h"
- 
+ #include "../../include/variables.h"
+ #include "../../ui/include/misc_draw.h"
+ 
 +#if defined(__HAIKU__)
 +#include <SupportDefs.h>
 +#endif
 +
- // ------------------------------------------------------
- // Variables
- extern int cur_sample_buffer;
+ // ------------------------------------------------------
+ // Variables
+ extern int cur_sample_buffer;
 diff --git a/src/support/main.cpp b/src/support/main.cpp
-index c08685a..bd4c97b 100644
+index 4bc3e47..38e6359 100644
 --- a/src/support/main.cpp
 +++ b/src/support/main.cpp
@@ -59,6 +59,10 @@
- #include <mach-o/dyld.h>
- #endif
- 
+ #include <mach-o/dyld.h>
+ #endif
+ 
 +#if defined(__HAIKU__)
 +#include <libgen.h>
 +#endif
 +
- #if defined(__AMIGAOS4__) || defined(__AROS__)
- const char *AMIGA_VERSION = "\0$VER: " TITLE " " VER_VER "." VER_REV "." VER_REVSMALL "\0";
- #endif
+ #if defined(__AMIGAOS4__) || defined(__AROS__)
+ const char *AMIGA_VERSION = "\0$VER: " TITLE " " VER_VER "." VER_REV "." VER_REVSMALL "\0";
+ #endif
@@ -444,6 +448,9 @@ extern SDL_NEED int SDL_main(int argc, char *argv[])
-     }
-     CHDIR(ExePath);
- 
+     }
+     CHDIR(ExePath);
+ 
 +#elif defined(__HAIKU__)
 +	chdir(dirname(argv[0]));
 +    GETCWD(ExePath, MAX_PATH);
- #elif defined(__AMIGAOS4__) || defined(__AROS__)
-     CHDIR("/PROGDIR/");
-     GETCWD(ExePath, MAX_PATH);
+ #elif defined(__AMIGAOS4__) || defined(__AROS__)
+     CHDIR("/PROGDIR/");
+     GETCWD(ExePath, MAX_PATH);
 -- 
-1.8.3.4
+2.26.0
+
+
+From 76b1720b3d2983748c7b3f4fe734e76da5edd299 Mon Sep 17 00:00:00 2001
+From: Ken Mays <kmays2000@gmail.com>
+Date: Wed, 26 Feb 2020 21:49:16 +0100
+Subject: wavpack narrowing conversion patch
+
+
+diff --git a/src/samples/wavpack/words.cpp b/src/samples/wavpack/words.cpp
+index 54c440e..c7b1f04 100644
+--- a/src/samples/wavpack/words.cpp
+++ b/src/samples/wavpack/words.cpp
+@@ -67,7 +67,7 @@
+ 
+ ///////////////////////////// local table storage ////////////////////////////
+ 
+-const uint32_t bitset [] =
+const ssize_t bitset [] =
+ {
+     1L << 0, 1L << 1, 1L << 2, 1L << 3,
+     1L << 4, 1L << 5, 1L << 6, 1L << 7,
+@@ -79,7 +79,7 @@ const uint32_t bitset [] =
+     1L << 28, 1L << 29, 1L << 30, 1L << 31
+ };
+ 
+-const uint32_t bitmask [] =
+const ssize_t bitmask [] =
+ {
+     (1L << 0) - 1, (1L << 1) - 1, (1L << 2) - 1, (1L << 3) - 1,
+     (1L << 4) - 1, (1L << 5) - 1, (1L << 6) - 1, (1L << 7) - 1,
+-- 
+2.26.0

--- a/media-sound/protrekkr/protrekkr-2.5.4.recipe
+++ b/media-sound/protrekkr/protrekkr-2.5.4.recipe
@@ -1,19 +1,21 @@
 SUMMARY="Tracker program to create small sized electronic music"
-DESCRIPTION="
-ProTrekkr (formerly known as NoiseTrekker by Juan Antonio Arguelles Rius aka \
+DESCRIPTION="ProTrekkr (aka NoiseTrekker by Juan Antonio Arguelles Rius aka \
 Arguru) is a tracker program combining a software synthesizer together with a \
 traditional samples tracker which can be used to create electronic music (like \
 psytrance, trance goa, hard acid, IDM, chip, techno, etc.) for small sized \
 intros, demos or games."
 HOMEPAGE="https://github.com/falkTX/protrekkr/"
-COPYRIGHT="2008-2010 Franck Charlet.
+COPYRIGHT="2008-2011 Franck Charlet.
 	Based on Juan Antonio Arguelles Rius's NoiseTrekker."
 LICENSE="BSD (3-clause)"
-REVISION="2"
-SOURCE_URI="svn+http://protrekkr.googlecode.com/svn/trunk/#670"
+REVISION="1"
+srcGitRev="0b96ba56379eb179423e9dcbec31a08bf0326c9f"
+SOURCE_URI="https://github.com/falkTX/protrekkr/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="01011b996ae58a753d19e1b8637b6c0bb597b33767ad6e1555ecfaf640709d73"
 PATCHES="protrekkr-2.5.4.patchset"
+SOURCE_DIR="protrekkr-$srcGitRev"

-ARCHITECTURES="!x86_gcc2 x86"
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
@@ -46,5 +48,4 @@ INSTALL()
 	mkdir -p $TARGET_DIR
 	cd release/distrib
 	cp -r history.txt instruments license.txt modules presets ptk_haiku replay reverbs skins $TARGET_DIR
-	addAppDeskbarSymlink $TARGET_DIR/ptk_haiku Protrekkr
 }