diff options
| author | dholland <dholland@pkgsrc.org> | 2015-06-25 06:01:01 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2015-06-25 06:01:01 +0000 |
| commit | 7c8237662b5fac1cac03a5eace06668ec8f04760 (patch) | |
| tree | 97c9ada83df292a9d0563aa23ef931c740724d9e /audio | |
| parent | a140f2628e90bda9915391d45bacbf328c429adb (diff) | |
| download | pkgsrc-7c8237662b5fac1cac03a5eace06668ec8f04760.tar.gz | |
Extend this patch to a second chunk of code with the same logic.
Seen in the Solaris build.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/milkytracker/distinfo | 4 | ||||
| -rw-r--r-- | audio/milkytracker/patches/patch-src_tracker_TrackerStartup.cpp | 25 |
2 files changed, 24 insertions, 5 deletions
diff --git a/audio/milkytracker/distinfo b/audio/milkytracker/distinfo index 51ef7f30b99..63738d90724 100644 --- a/audio/milkytracker/distinfo +++ b/audio/milkytracker/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2014/09/24 12:17:19 jperkin Exp $ +$NetBSD: distinfo,v 1.8 2015/06/25 06:01:01 dholland Exp $ SHA1 (milkytracker-0.90.86.tar.bz2) = 620bc1f81894f526d9e806189c5f7f17c3b57b97 RMD160 (milkytracker-0.90.86.tar.bz2) = 09a4913d737362c42d16a4bcfc1de69e1d1bdbd4 Size (milkytracker-0.90.86.tar.bz2) = 2202256 bytes SHA1 (patch-src_compression_zziplib_generic_fseeko.cpp) = 002754ec91a5d3b986fabe9266cc8999ac148c82 -SHA1 (patch-src_tracker_TrackerStartup.cpp) = fadcc814e328cf805423e9ab282913b2fd1bd0f2 +SHA1 (patch-src_tracker_TrackerStartup.cpp) = 389ef435b0cd7c67bec81c5e2e450590d7224dca diff --git a/audio/milkytracker/patches/patch-src_tracker_TrackerStartup.cpp b/audio/milkytracker/patches/patch-src_tracker_TrackerStartup.cpp index c06b302dc67..40f1922f68c 100644 --- a/audio/milkytracker/patches/patch-src_tracker_TrackerStartup.cpp +++ b/audio/milkytracker/patches/patch-src_tracker_TrackerStartup.cpp @@ -1,12 +1,31 @@ -$NetBSD: patch-src_tracker_TrackerStartup.cpp,v 1.1 2014/01/02 06:45:48 dholland Exp $ +$NetBSD: patch-src_tracker_TrackerStartup.cpp,v 1.2 2015/06/25 06:01:01 dholland Exp $ Taking the absolute value of the difference of two values doesn't work if the difference is unsigned. Do something else semi-reasonable instead for the case when the clock goes backwards. ---- src/tracker/TrackerStartUp.cpp~ 2008-02-23 16:32:45.000000000 +0000 +--- src/tracker/TrackerStartUp.cpp.orig 2013-11-09 00:12:01.000000000 +0000 +++ src/tracker/TrackerStartUp.cpp -@@ -134,14 +134,16 @@ void Tracker::hideSplash() +@@ -119,14 +119,16 @@ void Tracker::showSplash() + pp_int32 deltaT = 100; + while (shade <= 256.0f) + { +- pp_int32 startTime = ::PPGetTickCount(); ++ pp_uint32 startTime = ::PPGetTickCount(); + #if defined(__EXCLUDE_BIGLOGO__) || defined(__LOWRES__) + screen->paintSplash(LogoSmall::rawData, LogoSmall::width, LogoSmall::height, LogoSmall::width*4, 4, (int)shade); + #else + screen->paintSplash(LogoBig::rawData, LogoBig::width, LogoBig::height, LogoBig::width*3, 3, (int)shade); + #endif + shade+=deltaT * (1.0f/6.25f); +- deltaT = abs(::PPGetTickCount() - startTime); ++ pp_uint32 nowTime = ::PPGetTickCount(); ++ /* just in case the clock goes backwards */ ++ deltaT = nowTime > startTime ? nowTime - startTime : 0; + if (!deltaT) deltaT++; + } + #if defined(__EXCLUDE_BIGLOGO__) || defined(__LOWRES__) +@@ -150,14 +152,16 @@ void Tracker::hideSplash() pp_int32 deltaT = 100; while (shade >= 0.0f) { |