From 0cb4ffb2c04ef020f572e8c5767ed4d3013a31a3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 6 Dec 2013 09:16:12 -0600 Subject: [PATCH] phonon-4.7.1 --- .gitignore | 3 +- 0003-fix-rpath-handling.patch | 35 ------------------- ...Audio-envrionment-is-set-up-when-run.patch | 31 ---------------- ...icit-debug-to-setupStreamEnvironment.patch | 33 ----------------- ...dd-missing-qdebug-operator-defintion.patch | 31 ---------------- phonon.spec | 17 ++++----- sources | 2 +- 7 files changed, 8 insertions(+), 144 deletions(-) delete mode 100644 0003-fix-rpath-handling.patch delete mode 100644 0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch delete mode 100644 0005-add-more-explicit-debug-to-setupStreamEnvironment.patch delete mode 100644 0006-Add-missing-qdebug-operator-defintion.patch diff --git a/.gitignore b/.gitignore index 61462b1..5a04ea4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/phonon-4.6.0.tar.xz -/phonon-4.7.0.tar.xz +/phonon-4.7.1.tar.xz diff --git a/0003-fix-rpath-handling.patch b/0003-fix-rpath-handling.patch deleted file mode 100644 index 2b8f40a..0000000 --- a/0003-fix-rpath-handling.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cf441af677beade70036453a6480d77d7e702346 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -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 - diff --git a/0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch b/0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch deleted file mode 100644 index c058b40..0000000 --- a/0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f278a93493ac04ce04d48e8e5b5158caa0621ce3 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -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::cast(this); - if (iface) - iface->setStreamUuid(streamUuid); -+ else -+ pulse->setupStreamEnvironment(streamUuid); - } - } - #endif --- -1.8.4.2 - diff --git a/0005-add-more-explicit-debug-to-setupStreamEnvironment.patch b/0005-add-more-explicit-debug-to-setupStreamEnvironment.patch deleted file mode 100644 index 7d48d59..0000000 --- a/0005-add-more-explicit-debug-to-setupStreamEnvironment.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 54b34b62eb54385e75fcbde2717b4bac0f7e40d3 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -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 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 - diff --git a/0006-Add-missing-qdebug-operator-defintion.patch b/0006-Add-missing-qdebug-operator-defintion.patch deleted file mode 100644 index b538fdf..0000000 --- a/0006-Add-missing-qdebug-operator-defintion.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 73b5d9628fa15890f78dec28653447596ab04539 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -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 - diff --git a/phonon.spec b/phonon.spec index 6975e01..c2ae05a 100644 --- a/phonon.spec +++ b/phonon.spec @@ -10,8 +10,8 @@ Summary: Multimedia framework api Name: phonon -Version: 4.7.0 -Release: 8%{?dist} +Version: 4.7.1 +Release: 1%{?dist} License: LGPLv2+ URL: http://phonon.kde.org/ %if 0%{?snap} @@ -21,12 +21,8 @@ Source0: http://download.kde.org/stable/phonon/%{version}/phonon-%{version}.tar. %endif Patch0: phonon-4.7.0-rpath_use_link_path.patch +# workaround cmake bogosity calculating relative dirs + /usr-move Patch1: phonon-4.7.0-rootDir.patch -## upstream patches -Patch0003: 0003-fix-rpath-handling.patch -Patch0004: 0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch -Patch0005: 0005-add-more-explicit-debug-to-setupStreamEnvironment.patch -Patch0006: 0006-Add-missing-qdebug-operator-defintion.patch BuildRequires: automoc4 >= 0.9.86 BuildRequires: cmake >= 2.6.9 @@ -89,10 +85,6 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %prep %setup -q -%patch0003 -p1 -b .0003 -%patch0004 -p1 -b .0004 -%patch0005 -p1 -b .0005 -%patch0006 -p1 -b .0006 %patch0 -p1 -b .rpath_use_link_path %patch1 -p1 -b .rootDir @@ -201,6 +193,9 @@ test "$(pkg-config --modversion phonon4qt5)" = "%{version}" %changelog +* Fri Dec 06 2013 Rex Dieter 4.7.1-1 +- phonon-4.7.1 + * Fri Nov 15 2013 Rex Dieter 4.7.0-8 - more upstream fixes, upstreamable rpath_use_link_path handling diff --git a/sources b/sources index 6136728..4193a1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f5c1a847ac8ae73e67bf762199978278 phonon-4.7.0.tar.xz +0935e1c00440a03e3032860030398665 phonon-4.7.1.tar.xz