clockwerk: upstreamed patchset.

This commit is contained in:
Jerome Duval
2018-09-17 17:16:30 +02:00
parent c686638fc7
commit 40e67adc0a
2 changed files with 3 additions and 39 deletions

View File

@@ -9,13 +9,12 @@ HOMEPAGE="https://github.com/stippi/Clockwerk"
COPYRIGHT="2001-2009 Stephan Aßmus
2000-2006 Ingo Weinhold"
LICENSE="GNU GPL v2"
REVISION="5"
srcGitRev="d2f5ee511e52a7b6b213c608445cdec12c1ab318"
REVISION="6"
srcGitRev="c44c3ec92c59a6b0937ba5162de96634054b104c"
SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="b59825218cc32199da5611491655612ed580bec1d8005abfff841471cfc76a4a"
CHECKSUM_SHA256="55b4dc171edc4594e699a53aaaec2527b68af5971d636077c6b70193549bc25c"
SOURCE_FILENAME="$portName-$srcGitRev.tar.gz"
SOURCE_DIR="Clockwerk-$srcGitRev"
PATCHES="clockwerk-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86_64"

View File

@@ -1,35 +0,0 @@
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