From acca0f425016453577312ef4badeb8b05e47f2ca Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 15 Jan 2018 18:45:35 +0300
Subject: [PATCH] Clockwerk: enable x86_64

---
 haiku-apps/clockwerk/clockwerk-1.0~git.recipe | 22 ++++++------
 .../patches/clockwerk-1.0~git.patchset        | 35 +++++++++++++++++++
 2 files changed, 46 insertions(+), 11 deletions(-)
 create mode 100644 haiku-apps/clockwerk/patches/clockwerk-1.0~git.patchset

diff --git a/haiku-apps/clockwerk/clockwerk-1.0~git.recipe b/haiku-apps/clockwerk/clockwerk-1.0~git.recipe
index 7e26989b5..05194f84a 100644
--- a/haiku-apps/clockwerk/clockwerk-1.0~git.recipe
+++ b/haiku-apps/clockwerk/clockwerk-1.0~git.recipe
@@ -9,33 +9,33 @@ HOMEPAGE="https://github.com/stippi/Clockwerk"
 COPYRIGHT="2001-2009 Stephan Aßmus
 	2000-2006 Ingo Weinhold"
 LICENSE="GNU GPL v2"
-REVISION="4"
+REVISION="5"
 srcGitRev="d2f5ee511e52a7b6b213c608445cdec12c1ab318"
 SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 SOURCE_FILENAME="$portName-$srcGitRev.tar.gz"
 SOURCE_DIR="Clockwerk-$srcGitRev"
 CHECKSUM_SHA256="b59825218cc32199da5611491655612ed580bec1d8005abfff841471cfc76a4a"
+PATCHES="clockwerk-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86_64"
 
 PROVIDES="
-	clockwerk$secondaryArchSuffix = $portVersion
-	app:Clockwerk$secondaryArchSuffix = $portVersion
+	clockwerk = $portVersion
+	app:Clockwerk = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
+	haiku
+	lib:libfreetype
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libfreetype$secondaryArchSuffix
+	haiku_devel
+	devel:libfreetype
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
+	cmd:gcc
 	cmd:jam
-	cmd:ld$secondaryArchSuffix
+	cmd:ld
 	"
 
 USER_SETTINGS_FILES="
diff --git a/haiku-apps/clockwerk/patches/clockwerk-1.0~git.patchset b/haiku-apps/clockwerk/patches/clockwerk-1.0~git.patchset
new file mode 100644
index 000000000..3c802fbbf
--- /dev/null
+++ b/haiku-apps/clockwerk/patches/clockwerk-1.0~git.patchset
@@ -0,0 +1,35 @@
+From ed35ffc8f2a921812a3a350194a6da065cb4ba4a Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Mon, 15 Jan 2018 18:43:11 +0300
+Subject: Fix build on x86_64
+
+
+diff --git a/src/editor/gui_stage/TransportControlGroup.cpp b/src/editor/gui_stage/TransportControlGroup.cpp
+index 04150a0..e3ed36b 100644
+--- a/src/editor/gui_stage/TransportControlGroup.cpp
++++ b/src/editor/gui_stage/TransportControlGroup.cpp
+@@ -284,7 +284,7 @@ TransportControlGroup::SetEnabled(bool enable)
+ 	if (!enable)
+ 		SetEnabled((uint32)0);
+ 	else
+-		SetEnabled(0xffffffff);
++		SetEnabled((uint32)0xffffffff);
+ }
+ 
+ 
+diff --git a/src/shared/playlist/PlaylistItemAudioReader.cpp b/src/shared/playlist/PlaylistItemAudioReader.cpp
+index 1d1182e..f55831d 100644
+--- a/src/shared/playlist/PlaylistItemAudioReader.cpp
++++ b/src/shared/playlist/PlaylistItemAudioReader.cpp
+@@ -109,7 +109,7 @@ PlaylistItemAudioReader::Read(void* buffer, int64 pos, int64 frames)
+ 				break;
+ 			case media_raw_audio_format::B_AUDIO_INT:
+ 				possibleGain = calc_possible_gain((int32*)buffer,
+-					channelCount, (int32)frames, INT32_MIN, INT32_MAX);
++					channelCount, (int32)frames, (int32)INT32_MIN, (int32)INT32_MAX);
+ 				break;
+ 			case media_raw_audio_format::B_AUDIO_SHORT:
+ 				possibleGain = calc_possible_gain((int16*)buffer,
+-- 
+2.15.1
+