[SCM] mixxx/master: Fix build failures on ARM as qreal is float, not double.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 87d7f88277b65d0eb5b7b58afc5983f08114c067
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jan 29 09:50:45 2014 +0000

    Fix build failures on ARM as qreal is float, not double.

diff --git a/debian/patches/9001-waveformsignalcolors_fix.patch b/debian/patches/9001-waveformsignalcolors_fix.patch
new file mode 100644
index 0000000..5e33271
--- /dev/null
+++ b/debian/patches/9001-waveformsignalcolors_fix.patch
@@ -0,0 +1,71 @@
+Description: On ARM, qreal is float, not double.
+Author: RJ Ryan <rryan at mixxx.org>
+Applied-Upstream: yes
+---
+ src/waveform/renderers/waveformrendererhsv.cpp  |    2 +-
+ src/waveform/renderers/waveformsignalcolors.cpp |   12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+--- mixxx.orig/src/waveform/renderers/waveformrendererhsv.cpp
++++ mixxx/src/waveform/renderers/waveformrendererhsv.cpp
+@@ -69,7 +69,7 @@ void WaveformRendererHSV::draw(QPainter*
+     allGain *= factory->getVisualGain(::WaveformWidgetFactory::All);
+ 
+     // Save HSV of waveform color
+-    double h,s,v;
++    qreal h,s,v;
+ 
+     // Get base color of waveform in the HSV format (s and v isn't use)
+     m_pColors->getLowColor().getHsvF(&h,&s,&v);
+--- mixxx.orig/src/waveform/renderers/waveformsignalcolors.cpp
++++ mixxx/src/waveform/renderers/waveformsignalcolors.cpp
+@@ -68,14 +68,14 @@ void WaveformSignalColors::fallBackFromS
+     qWarning() << "WaveformSignalColors::fallBackFromSignalColor - " \
+                   "skin do not provide low/mid/high signal colors";
+ 
+-    double h,s,l,a;
++    qreal h,s,l,a;
+     m_signalColor.getHslF(&h,&s,&l,&a);
+ 
+     const double analogousAngle = 1.0/12.0;
+ 
+     if( s < 0.1) // gray
+     {
+-        const double sMax = 1.0 - h;
++        const qreal sMax = 1.0 - h;
+         m_lowColor.setHslF(h,s,l);
+         m_midColor.setHslF(h,s+sMax*0.2,l);
+         m_highColor.setHslF(h,s+sMax*0.4,l);
+@@ -84,28 +84,28 @@ void WaveformSignalColors::fallBackFromS
+     {
+         if( l < 0.1) // ~white
+         {
+-            const double lMax = 1.0 - l;
++            const qreal lMax = 1.0 - l;
+             m_lowColor.setHslF(h,s,l);
+             m_midColor.setHslF(h,s,l+lMax*0.2);
+             m_highColor.setHslF(h,s,l+lMax*0.4);
+         }
+         else if( l < 0.5)
+         {
+-            const double lMax = 1.0 - l;
++            const qreal lMax = 1.0 - l;
+             m_lowColor.setHslF(h,s,l);
+             m_midColor.setHslF(stableHue(h-analogousAngle*0.3),s,l+lMax*0.1);
+             m_highColor.setHslF(stableHue(h+analogousAngle*0.3),s,l+lMax*0.4);
+         }
+         else if ( l < 0.9)
+         {
+-            const double lMin = l;
++            const qreal lMin = l;
+             m_lowColor.setHslF(h,s,l);
+             m_midColor.setHslF(stableHue(h-analogousAngle*0.3),s,l-lMin*0.1);
+             m_highColor.setHslF(stableHue(h+analogousAngle*0.3),s,l-lMin*0.4);
+         }
+         else // ~black
+         {
+-            const double lMin = l;
++            const qreal lMin = l;
+             m_lowColor.setHslF(h,s,l);
+             m_midColor.setHslF(h,s,l-lMin*0.2);
+             m_highColor.setHslF(h,s,l-lMin*0.4);
diff --git a/debian/patches/series b/debian/patches/series
index d11e443..5797080 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0004-soundtouch.patch
 0091-desktop_file.patch
 1001-buildsystem.patch
+9001-waveformsignalcolors_fix.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 7e21478..99ce26b 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -2,3 +2,4 @@
 0003-disable_soundsourcem4a.patch
 0004-soundtouch.patch
 1001-buildsystem.patch
+9001-waveformsignalcolors_fix.patch

-- 
mixxx packaging