haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

milkytracker, bump version (#6168)

Browse Source
This commit is contained in:
Schrijvers Luc
2021-09-01 22:28:46 +02:00
committed by GitHub
parent a6a5909c71
commit bb07c6a43d
3 changed files with 102 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media-sound/milkytracker/milkytracker-1.01.00.recipe → media-sound/milkytracker/milkytracker-1.03.00.recipe
View File

@@ -19,19 +19,20 @@ COPYRIGHT="
"
LICENSE="GNU GPL v3
New-BSD"
REVISION="3"
REVISION="1"
SOURCE_URI="https://github.com/milkytracker/MilkyTracker/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="9b07c910c3c037ae57a76a4d571511a50276a563a0d2463e1d88256b756b76b7"
CHECKSUM_SHA256="72d5357e303380b52383b66b51f944a77cd77e2b3bfeb227d87cc0e72ab292f7"
SOURCE_DIR="MilkyTracker-$portVersion"
PATCHES="milkytracker-$portVersion.patchset"
PATCHES="milkytracker-$portVersion-gcc2.patchset"
if [ $effectiveTargetArchitecture != "x86_gcc2" ]; then
PATCHES="milkytracker-$portVersion-gcc4.patchset"
PATCHES="milkytracker-$portVersion.patchset"
fi
ARCHITECTURES="?x86_gcc2 x86 x86_64"
ARCHITECTURES="x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="!x86" #crashes
PROVIDES="
milkytracker = $portVersion
milkytracker$secondaryArchSuffix = $portVersion
app:MilkyTracker = $portVersion
app:MilkySettings = $portVersion
"
@@ -42,7 +43,7 @@ REQUIRES="
"
BUILD_REQUIRES="
haiku_devel
haiku${secondaryArchSuffix}_devel
devel:libz$secondaryArchSuffix >= 1.2.3
devel:libzzip_0$secondaryArchSuffix
"
@@ -54,7 +55,7 @@ BUILD_PREREQUIRES="
BUILD()
{
VER_X=1; VER_YY=01; VER_ZZ=00;
VER_X=1; VER_YY=03; VER_ZZ=00;
echo "const int MILKYTRACKER_VERSION = 0x${VER_X}${VER_YY}${VER_ZZ};" \
> src/tracker/version.h
echo "const char MILKYTRACKER_VERSION_STRING[] = \"MilkyTracker ${VER_X}.${VER_YY}.${VER_ZZ}\";" \

128
media-sound/milkytracker/patches/milkytracker-1.01.00.patchset → media-sound/milkytracker/patches/milkytracker-1.03.00-gcc2.patchset
View File

@@ -1,7 +1,7 @@
From cd4b51220d4482ff681278e89d2e296ec2b13323 Mon Sep 17 00:00:00 2001
From 526dba76a0c77ad0ee5a5b749f41345599991097 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:22:32 +0000
Subject: include <strings.h>
Subject: Include <strings.h>
diff --git a/src/ppui/BasicTypes.h b/src/ppui/BasicTypes.h
@@ -18,48 +18,13 @@ index 20eba8b..63e0c1c 100644
#include "PPSystemString_POSIX.h"
#endif
--
2.15.1
2.30.2
From 911a07a0e82a830467635990332c8d595e3c11c4 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:47:15 +0000
Subject: link against libstdc++
diff --git a/platforms/haiku/Jamfiles/src-tracker-Jamfile b/platforms/haiku/Jamfiles/src-tracker-Jamfile
index 39e0412..2931ecf 100644
--- a/platforms/haiku/Jamfiles/src-tracker-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-Jamfile
@@ -11,7 +11,7 @@ SubDirHdrs $(PathPPUI) haiku ;
SubDirHdrs $(PathTracker) haiku ;
SubDirHdrs - ;
-LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker ;
+LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lstdc++.r4 ;
LinkLibraries MilkyTracker :
libcompression
diff --git a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
index 662ee18..b76c586 100644
--- a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
@@ -1,6 +1,6 @@
SubDir TOP src tracker haiku MilkySettings ;
-LINKLIBS on MilkySettings = -lbe -lmidi2 ;
+LINKLIBS on MilkySettings = -lbe -lmidi2 -lstdc++.r4 ;
Main MilkySettings :
MilkySettingsApplication.cpp
--
2.15.1
From 3992ae5a2a6cec1b98757a5e18be8287747c1dbc Mon Sep 17 00:00:00 2001
From 6f2b4b90b2db90dc08527899d799632d20067b70 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 23 May 2017 23:34:15 +0200
Subject: Build update for 1.0.0.
Subject: Build update for 1.0.3.00
diff --git a/platforms/haiku/Add_Jamfiles.sh b/platforms/haiku/Add_Jamfiles.sh
@@ -130,15 +95,15 @@ index e2323fa..4329ffa 100644
zziplib/MyIO.cpp
;
diff --git a/platforms/haiku/Jamfiles/src-tracker-Jamfile b/platforms/haiku/Jamfiles/src-tracker-Jamfile
index 2931ecf..a9dc7db 100644
index 39e0412..68d2519 100644
--- a/platforms/haiku/Jamfiles/src-tracker-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-Jamfile
@@ -11,11 +11,10 @@ SubDirHdrs $(PathPPUI) haiku ;
SubDirHdrs $(PathTracker) haiku ;
SubDirHdrs - ;
-LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lstdc++.r4 ;
+LINKLIBS on MilkyTracker = -Xlinker --no-whole-archive -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lstdc++.r4 -lz -lzzip ;
-LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker ;
+LINKLIBS on MilkyTracker = -Xlinker --no-whole-archive -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lz -lzzip ;
LinkLibraries MilkyTracker :
libcompression
@@ -160,53 +125,52 @@ index 2931ecf..a9dc7db 100644
FileExtProvider.cpp
FileIdentificator.cpp
diff --git a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
index b76c586..4ece810 100644
index 662ee18..3042b44 100644
--- a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
@@ -1,6 +1,6 @@
SubDir TOP src tracker haiku MilkySettings ;
-LINKLIBS on MilkySettings = -lbe -lmidi2 -lstdc++.r4 ;
-LINKLIBS on MilkySettings = -lbe -lmidi2 ;
+LINKLIBS on MilkySettings = -Xlinker --no-whole-archive -lbe -lmidi2 ;
Main MilkySettings :
MilkySettingsApplication.cpp
--
2.30.2
From 4c7a239af8a42f463d4cbb04d47b881a49869d09 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:47:15 +0000
Subject: link against libstdc++
diff --git a/platforms/haiku/Jamfiles/src-tracker-Jamfile b/platforms/haiku/Jamfiles/src-tracker-Jamfile
index 68d2519..8cb0073 100644
--- a/platforms/haiku/Jamfiles/src-tracker-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-Jamfile
@@ -11,7 +11,7 @@ SubDirHdrs $(PathPPUI) haiku ;
SubDirHdrs $(PathTracker) haiku ;
SubDirHdrs - ;
-LINKLIBS on MilkyTracker = -Xlinker --no-whole-archive -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lz -lzzip ;
+LINKLIBS on MilkyTracker = -Xlinker --no-whole-archive -lbe -lgame -lmedia -lmidi2 -ltextencoding -lstdc++.r4 -ltracker -lz -lzzip ;
LinkLibraries MilkyTracker :
libcompression
diff --git a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
index 3042b44..4ece810 100644
--- a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
@@ -1,6 +1,6 @@
SubDir TOP src tracker haiku MilkySettings ;
-LINKLIBS on MilkySettings = -Xlinker --no-whole-archive -lbe -lmidi2 ;
+LINKLIBS on MilkySettings = -Xlinker --no-whole-archive -lbe -lmidi2 -lstdc++.r4 ;
Main MilkySettings :
MilkySettingsApplication.cpp
diff --git a/src/ppui/haiku/MilkyView.cpp b/src/ppui/haiku/MilkyView.cpp
index 1ded1b3..2e56afe 100644
--- a/src/ppui/haiku/MilkyView.cpp
+++ b/src/ppui/haiku/MilkyView.cpp
@@ -424,7 +424,8 @@ MilkyView::MouseWheelChanged(float deltaX, float deltaY)
TMouseWheelEventParams wheelEventParams;
wheelEventParams.pos.x = (pp_int32)point.x;
wheelEventParams.pos.y = (pp_int32)point.y;
- wheelEventParams.delta = (pp_int32)-deltaY;
+ wheelEventParams.deltaX = (pp_int32)deltaX;
+ wheelEventParams.deltaY = -(pp_int32)deltaY;
MilkyWindow* milkyWindow = (MilkyWindow*)Window();
--
2.15.1
From 6f963bf8a77776296d8fa21418ef14d79f68f664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 10 Jan 2018 15:41:44 +0100
Subject: Build fix
diff --git a/platforms/haiku/Jamfiles/src-ppui-Jamfile b/platforms/haiku/Jamfiles/src-ppui-Jamfile
index 4595986..af08708 100644
--- a/platforms/haiku/Jamfiles/src-ppui-Jamfile
+++ b/platforms/haiku/Jamfiles/src-ppui-Jamfile
@@ -12,6 +12,7 @@ SubDirHdrs - ;
Library libppui :
Button.cpp
CheckBox.cpp
+ CheckBoxLabel.cpp
Container.cpp
ContextMenu.cpp
Control.cpp
--
2.15.1
2.30.2

130
media-sound/milkytracker/patches/milkytracker-1.01.00-gcc4.patchset → media-sound/milkytracker/patches/milkytracker-1.03.00.patchset
View File

@@ -1,11 +1,11 @@
From d27ab27a0b248c688f1b22a8b42b7f9a7e383eaf Mon Sep 17 00:00:00 2001
From 526dba76a0c77ad0ee5a5b749f41345599991097 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:22:32 +0000
Subject: include <strings.h>
Subject: Include <strings.h>
diff --git a/src/ppui/BasicTypes.h b/src/ppui/BasicTypes.h
index 23ab385..831c284 100644
index 20eba8b..63e0c1c 100644
--- a/src/ppui/BasicTypes.h
+++ b/src/ppui/BasicTypes.h
@@ -43,7 +43,7 @@ typedef signed int pp_int32;
@@ -18,48 +18,13 @@ index 23ab385..831c284 100644
#include "PPSystemString_POSIX.h"
#endif
--
2.12.2
2.30.2
From fc6fc4fbb9ffde6b4d0f9dc31a0b45d67b566f97 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:47:15 +0000
Subject: link against libstdc++
diff --git a/platforms/haiku/Jamfiles/src-tracker-Jamfile b/platforms/haiku/Jamfiles/src-tracker-Jamfile
index 39e0412..2931ecf 100644
--- a/platforms/haiku/Jamfiles/src-tracker-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-Jamfile
@@ -11,7 +11,7 @@ SubDirHdrs $(PathPPUI) haiku ;
SubDirHdrs $(PathTracker) haiku ;
SubDirHdrs - ;
-LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker ;
+LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lstdc++ ;
LinkLibraries MilkyTracker :
libcompression
diff --git a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
index 662ee18..b76c586 100644
--- a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
@@ -1,6 +1,6 @@
SubDir TOP src tracker haiku MilkySettings ;
-LINKLIBS on MilkySettings = -lbe -lmidi2 ;
+LINKLIBS on MilkySettings = -lbe -lmidi2 -lstdc++ ;
Main MilkySettings :
MilkySettingsApplication.cpp
--
2.12.2
From 3fadce6df023928645e011e81fb86d247bc768ed Mon Sep 17 00:00:00 2001
From 6f2b4b90b2db90dc08527899d799632d20067b70 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 23 May 2017 23:34:15 +0200
Subject: Build update for 1.0.0.
Subject: Build update for 1.0.3.00
diff --git a/platforms/haiku/Add_Jamfiles.sh b/platforms/haiku/Add_Jamfiles.sh
@@ -130,15 +95,15 @@ index e2323fa..4329ffa 100644
zziplib/MyIO.cpp
;
diff --git a/platforms/haiku/Jamfiles/src-tracker-Jamfile b/platforms/haiku/Jamfiles/src-tracker-Jamfile
index 2931ecf..a9dc7db 100644
index 39e0412..68d2519 100644
--- a/platforms/haiku/Jamfiles/src-tracker-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-Jamfile
@@ -11,11 +11,10 @@ SubDirHdrs $(PathPPUI) haiku ;
SubDirHdrs $(PathTracker) haiku ;
SubDirHdrs - ;
-LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lstdc++ ;
+LINKLIBS on MilkyTracker = -Xlinker --no-whole-archive -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lstdc++ -lz -lzzip ;
-LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker ;
+LINKLIBS on MilkyTracker = -Xlinker --no-whole-archive -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lz -lzzip ;
LinkLibraries MilkyTracker :
libcompression
@@ -160,53 +125,52 @@ index 2931ecf..a9dc7db 100644
FileExtProvider.cpp
FileIdentificator.cpp
diff --git a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
index b76c586..4ece810 100644
index 662ee18..3042b44 100644
--- a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
@@ -1,6 +1,6 @@
SubDir TOP src tracker haiku MilkySettings ;
-LINKLIBS on MilkySettings = -lbe -lmidi2 -lstdc++ ;
-LINKLIBS on MilkySettings = -lbe -lmidi2 ;
+LINKLIBS on MilkySettings = -Xlinker --no-whole-archive -lbe -lmidi2 ;
Main MilkySettings :
MilkySettingsApplication.cpp
--
2.30.2
From 4c7a239af8a42f463d4cbb04d47b881a49869d09 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:47:15 +0000
Subject: link against libstdc++
diff --git a/platforms/haiku/Jamfiles/src-tracker-Jamfile b/platforms/haiku/Jamfiles/src-tracker-Jamfile
index 68d2519..8cb0073 100644
--- a/platforms/haiku/Jamfiles/src-tracker-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-Jamfile
@@ -11,7 +11,7 @@ SubDirHdrs $(PathPPUI) haiku ;
SubDirHdrs $(PathTracker) haiku ;
SubDirHdrs - ;
-LINKLIBS on MilkyTracker = -Xlinker --no-whole-archive -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lz -lzzip ;
+LINKLIBS on MilkyTracker = -Xlinker --no-whole-archive -lbe -lgame -lmedia -lmidi2 -ltextencoding -lstdc++ -ltracker -lz -lzzip ;
LinkLibraries MilkyTracker :
libcompression
diff --git a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
index 3042b44..4ece810 100644
--- a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
@@ -1,6 +1,6 @@
SubDir TOP src tracker haiku MilkySettings ;
-LINKLIBS on MilkySettings = -Xlinker --no-whole-archive -lbe -lmidi2 ;
+LINKLIBS on MilkySettings = -Xlinker --no-whole-archive -lbe -lmidi2 -lstdc++ ;
Main MilkySettings :
MilkySettingsApplication.cpp
diff --git a/src/ppui/haiku/MilkyView.cpp b/src/ppui/haiku/MilkyView.cpp
index 1ded1b3..2e56afe 100644
--- a/src/ppui/haiku/MilkyView.cpp
+++ b/src/ppui/haiku/MilkyView.cpp
@@ -424,7 +424,8 @@ MilkyView::MouseWheelChanged(float deltaX, float deltaY)
TMouseWheelEventParams wheelEventParams;
wheelEventParams.pos.x = (pp_int32)point.x;
wheelEventParams.pos.y = (pp_int32)point.y;
- wheelEventParams.delta = (pp_int32)-deltaY;
+ wheelEventParams.deltaX = (pp_int32)deltaX;
+ wheelEventParams.deltaY = -(pp_int32)deltaY;
MilkyWindow* milkyWindow = (MilkyWindow*)Window();
--
2.12.2
From 6f963bf8a77776296d8fa21418ef14d79f68f664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 10 Jan 2018 15:41:44 +0100
Subject: Build fix
diff --git a/platforms/haiku/Jamfiles/src-ppui-Jamfile b/platforms/haiku/Jamfiles/src-ppui-Jamfile
index 4595986..af08708 100644
--- a/platforms/haiku/Jamfiles/src-ppui-Jamfile
+++ b/platforms/haiku/Jamfiles/src-ppui-Jamfile
@@ -12,6 +12,7 @@ SubDirHdrs - ;
Library libppui :
Button.cpp
CheckBox.cpp
+ CheckBoxLabel.cpp
Container.cpp
ContextMenu.cpp
Control.cpp
--
2.15.1
2.30.2