Rex Dieter
11 years ago
parent
6e8727e183
commit
0cb4ffb2c0
@ -1,2 +1 @@
|
||||
/phonon-4.6.0.tar.xz
|
||||
/phonon-4.7.0.tar.xz
|
||||
/phonon-4.7.1.tar.xz
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From cf441af677beade70036453a6480d77d7e702346 Mon Sep 17 00:00:00 2001
|
||||
From: Rex Dieter <rdieter@math.unl.edu>
|
||||
Date: Tue, 5 Nov 2013 20:15:03 -0600
|
||||
Subject: [PATCH 3/4] fix rpath handling
|
||||
|
||||
REVIEW: 113649
|
||||
---
|
||||
cmake/FindPhononInternal.cmake | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
|
||||
index b48bfaf..3245e9b 100644
|
||||
--- a/cmake/FindPhononInternal.cmake
|
||||
+++ b/cmake/FindPhononInternal.cmake
|
||||
@@ -217,10 +217,14 @@ endif(APPLE)
|
||||
# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
|
||||
# install directory. Alex
|
||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
|
||||
-list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
|
||||
+set(_abs_LIB_INSTALL_DIR "${LIB_INSTALL_DIR}")
|
||||
+if (NOT IS_ABSOLUTE "${_abs_LIB_INSTALL_DIR}")
|
||||
+ set(_abs_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
|
||||
+endif()
|
||||
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
|
||||
+list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemCxxLibDir)
|
||||
if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||||
- set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_RPATH "${_abs_LIB_INSTALL_DIR}")
|
||||
endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||||
|
||||
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From f278a93493ac04ce04d48e8e5b5158caa0621ce3 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Sitter <sitter@kde.org>
|
||||
Date: Thu, 7 Nov 2013 16:16:59 +0100
|
||||
Subject: [PATCH 4/4] Ensure the PulseAudio envrionment is set up when running
|
||||
older backends
|
||||
|
||||
This ensures that pre-4.7 backends (expecting the environment to be
|
||||
set up by libphonon) retain working volume control.
|
||||
|
||||
CCBUG: 327279
|
||||
FIXED-IN: 4.7.1
|
||||
---
|
||||
phonon/audiooutput.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/phonon/audiooutput.cpp b/phonon/audiooutput.cpp
|
||||
index f40199e..dd33364 100644
|
||||
--- a/phonon/audiooutput.cpp
|
||||
+++ b/phonon/audiooutput.cpp
|
||||
@@ -108,6 +108,8 @@ void AudioOutputPrivate::init(Phonon::Category c)
|
||||
AudioOutputInterface47 *iface = Iface<AudioOutputInterface47>::cast(this);
|
||||
if (iface)
|
||||
iface->setStreamUuid(streamUuid);
|
||||
+ else
|
||||
+ pulse->setupStreamEnvironment(streamUuid);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 54b34b62eb54385e75fcbde2717b4bac0f7e40d3 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Sitter <sitter@kde.org>
|
||||
Date: Mon, 11 Nov 2013 16:32:00 +0100
|
||||
Subject: [PATCH 5/6] add more explicit debug to setupStreamEnvironment
|
||||
|
||||
---
|
||||
phonon/pulsesupport.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
|
||||
index 48c441e..f55d0b4 100644
|
||||
--- a/phonon/pulsesupport.cpp
|
||||
+++ b/phonon/pulsesupport.cpp
|
||||
@@ -1232,7 +1232,7 @@ void PulseSupport::setupStreamEnvironment(QString streamUuid)
|
||||
{
|
||||
pDebug() << "Please note that your current Phonon backend is trying to force"
|
||||
" stream dependent PulseAudio properties through envrionment variables."
|
||||
- " Slightly unprecise timing in doing so will prevent the first"
|
||||
+ " Slightly unprecise timing in doing so will cause the first"
|
||||
" of two subsequently started AudioOutputs to have disfunct volume"
|
||||
" control. Also see https://bugs.kde.org/show_bug.cgi?id=321288";
|
||||
|
||||
@@ -1241,6 +1241,7 @@ void PulseSupport::setupStreamEnvironment(QString streamUuid)
|
||||
QHashIterator<QString, QString> it(properties);
|
||||
while (it.hasNext()) {
|
||||
it.next();
|
||||
+ pDebug() << "PULSE_PROP_OVERRIDE_" << it.key() << " = " << it.value();
|
||||
qputenv(QString("PULSE_PROP_OVERRIDE_%1").arg(it.key()).toUtf8(), it.value().toUtf8());
|
||||
}
|
||||
}
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From 73b5d9628fa15890f78dec28653447596ab04539 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Sitter <sitter@kde.org>
|
||||
Date: Mon, 11 Nov 2013 17:20:52 +0100
|
||||
Subject: [PATCH 6/6] Add missing qdebug operator defintion.
|
||||
|
||||
BUG: 327455
|
||||
FIXED-IN: 4.7.1
|
||||
---
|
||||
phonon/phononnamespace.cpp | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/phonon/phononnamespace.cpp b/phonon/phononnamespace.cpp
|
||||
index cf1df73..275f4ea 100644
|
||||
--- a/phonon/phononnamespace.cpp
|
||||
+++ b/phonon/phononnamespace.cpp
|
||||
@@ -167,6 +167,12 @@ namespace Phonon
|
||||
return dbg.maybeSpace();
|
||||
}
|
||||
|
||||
+ QDebug operator <<(QDebug dbg, const Phonon::CaptureCategory &category)
|
||||
+ {
|
||||
+ dbg.space() << categoryToString(category);
|
||||
+ return dbg.maybeSpace();
|
||||
+ }
|
||||
+
|
||||
QDebug operator <<(QDebug dbg, const Phonon::Capture::DeviceType &type)
|
||||
{
|
||||
switch (type) {
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
Loading…
Reference in new issue