[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.5.0-5-2-g18b60bd

Pino Toscano pino at alioth.debian.org
Fri Dec 2 11:11:47 UTC 2011


The following commit has been merged in the master branch:
commit 18b60bdb9db19ac420c1b8d86814a3b87722c1c3
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 2 12:10:53 2011 +0100

    backport upstream patch to switch from pow() to qPow() (#650708)
    
    commit d7d3a08, patch upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch
---
 debian/changelog                                   |    3 ++
 debian/patches/series                              |    1 +
 ...se-Use-qPow-as-pow-is-sometimes-not-found.patch |   35 ++++++++++++++++++++
 3 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2568c97..d4ffdd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 phonon (4:4.6.0really4.5.0-6) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream patch to switch from pow() to qPow(). (Closes: #650708)
+    (commit d7d3a08, upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 02 Dec 2011 11:50:17 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 0ac5673..1b78929 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ no_rpath.patch
 phonon_is_not_forced_in_KDE.diff
 upstream_PHONON_EXPORT_DEPRECATED.diff
 findqt4_optional_x11.diff
+upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch
diff --git a/debian/patches/upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch b/debian/patches/upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch
new file mode 100644
index 0000000..160fed6
--- /dev/null
+++ b/debian/patches/upstream_pulse-Use-qPow-as-pow-is-sometimes-not-found.patch
@@ -0,0 +1,35 @@
+From d7d3a08d4c9dff8da5299aeaefe28e1e02d03ee6 Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <colin at mageia.org>
+Date: Thu, 4 Aug 2011 16:55:47 +0100
+Subject: [PATCH] pulse: Use qPow() as pow() is sometimes not found. (cherry
+ picked from commit
+ 436d5379abe83c53c652d8a251f7ab504a1523df)
+
+---
+ phonon/pulsestream.cpp |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/phonon/pulsestream.cpp b/phonon/pulsestream.cpp
+index d1e6711..e129f1b 100644
+--- a/phonon/pulsestream.cpp
++++ b/phonon/pulsestream.cpp
+@@ -21,6 +21,7 @@
+ */
+ 
+ #include "pulsestream_p.h"
++#include <QtCore/qmath.h>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -81,7 +82,7 @@ void PulseStream::setVolume(const pa_cvolume *volume)
+         // AudioOutput expects the "backend" to supply values that have been
+         // adjusted for Stephens' law, so we need to fudge them accordingly
+         // so that the %ages match up in KMix/the application's own slider.
+-        emit volumeChanged(pow(vol, VOLTAGE_TO_LOUDNESS_EXPONENT));
++        emit volumeChanged(qPow(vol, VOLTAGE_TO_LOUDNESS_EXPONENT));
+     }
+ }
+ 
+-- 
+1.7.7.3
+

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list