rev 11808 - in branches/kde4/packages/kdebase-runtime/debian: . patches

Pino Toscano pino-guest at alioth.debian.org
Thu Jul 31 08:11:18 UTC 2008


Author: pino-guest
Date: 2008-07-31 08:11:18 +0000 (Thu, 31 Jul 2008)
New Revision: 11808

Added:
   branches/kde4/packages/kdebase-runtime/debian/patches/05_r839927_qreal.diff
Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/patches/series
Log:
Add upstream patch 05_r839927_qreal.diff to fix the build of phonon-xine when qreal is not double but float (eg on arm(el)).


Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-07-30 15:20:21 UTC (rev 11807)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-07-31 08:11:18 UTC (rev 11808)
@@ -1,3 +1,12 @@
+kdebase-runtime (4:4.1.0-2) UNRELEASED; urgency=low
+
+  +++ Changes by Pino Toscano:
+
+  * Add upstream patch 05_r839927_qreal.diff to fix the build of phonon-xine
+    when qreal is not double but float.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 31 Jul 2008 10:09:25 +0200
+
 kdebase-runtime (4:4.1.0-1) unstable; urgency=low
 
   * New upstream released.

Added: branches/kde4/packages/kdebase-runtime/debian/patches/05_r839927_qreal.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/05_r839927_qreal.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/05_r839927_qreal.diff	2008-07-31 08:11:18 UTC (rev 11808)
@@ -0,0 +1,59 @@
+Index: runtime/phonon/xine/videowidget.cpp
+===================================================================
+--- runtime/phonon/xine/videowidget.cpp	(revision 839926)
++++ runtime/phonon/xine/videowidget.cpp	(revision 839927)
+@@ -226,12 +226,13 @@
+     return m_brightness;
+ }
+ 
++static const qreal ONE = 1.0;
+ void VideoWidget::setBrightness(qreal newBrightness)
+ {
+-    newBrightness = qBound(-1.0, newBrightness, 1.0);
++    newBrightness = qBound(-ONE, newBrightness, ONE);
+     if (m_brightness != newBrightness) {
+         m_brightness = newBrightness;
+-        upstreamEvent(new SetParamEvent(XINE_PARAM_VO_BRIGHTNESS, static_cast<int>(0x7fff * (m_brightness + 1.0))));
++        upstreamEvent(new SetParamEvent(XINE_PARAM_VO_BRIGHTNESS, static_cast<int>(0x7fff * (m_brightness + ONE))));
+     }
+ }
+ 
+@@ -242,10 +243,10 @@
+ 
+ void VideoWidget::setContrast(qreal newContrast)
+ {
+-    newContrast = qBound(-1.0, newContrast, 1.0);
++    newContrast = qBound(-ONE, newContrast, ONE);
+     if (m_contrast != newContrast) {
+         m_contrast = newContrast;
+-        upstreamEvent(new SetParamEvent(XINE_PARAM_VO_CONTRAST, static_cast<int>(0x7fff * (m_contrast + 1.0))));
++        upstreamEvent(new SetParamEvent(XINE_PARAM_VO_CONTRAST, static_cast<int>(0x7fff * (m_contrast + ONE))));
+     }
+ }
+ 
+@@ -256,10 +257,10 @@
+ 
+ void VideoWidget::setHue(qreal newHue)
+ {
+-    newHue = qBound(-1.0, newHue, 1.0);
++    newHue = qBound(-ONE, newHue, ONE);
+     if (m_hue != newHue) {
+         m_hue = newHue;
+-        upstreamEvent(new SetParamEvent(XINE_PARAM_VO_HUE, static_cast<int>(0x7fff * (m_hue + 1.0))));
++        upstreamEvent(new SetParamEvent(XINE_PARAM_VO_HUE, static_cast<int>(0x7fff * (m_hue + ONE))));
+     }
+ }
+ 
+@@ -270,10 +271,10 @@
+ 
+ void VideoWidget::setSaturation(qreal newSaturation)
+ {
+-    newSaturation = qBound(-1.0, newSaturation, 1.0);
++    newSaturation = qBound(-ONE, newSaturation, ONE);
+     if (m_saturation != newSaturation) {
+         m_saturation = newSaturation;
+-        upstreamEvent(new SetParamEvent(XINE_PARAM_VO_SATURATION, static_cast<int>(0x7fff * (m_saturation + 1.0))));
++        upstreamEvent(new SetParamEvent(XINE_PARAM_VO_SATURATION, static_cast<int>(0x7fff * (m_saturation + ONE))));
+     }
+ }
+ 

Modified: branches/kde4/packages/kdebase-runtime/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/series	2008-07-30 15:20:21 UTC (rev 11807)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/series	2008-07-31 08:11:18 UTC (rev 11808)
@@ -2,3 +2,4 @@
 02_ksvgtopng4.diff
 03_ktrash4.diff
 04_disable_debug_by_default.diff
+05_r839927_qreal.diff




More information about the pkg-kde-commits mailing list