[phonon/f20] more upstream fixes, upstreamable rpath_use_link_path handling
Rex Dieter
rdieter at fedoraproject.org
Fri Nov 15 13:42:56 UTC 2013
commit 6e8727e18334752685d22565a910c368ee1106fc
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Nov 15 07:43:20 2013 -0600
more upstream fixes, upstreamable rpath_use_link_path handling
...-explicit-debug-to-setupStreamEnvironment.patch | 33 ++++++++++++++++++++
0006-Add-missing-qdebug-operator-defintion.patch | 31 ++++++++++++++++++
phonon-4.7.0-really-fix-rpath-handling.patch | 11 ------
phonon-4.7.0-rpath_use_link_path.patch | 19 +++++++++++
phonon.spec | 13 ++++++--
5 files changed, 93 insertions(+), 14 deletions(-)
---
diff --git a/0005-add-more-explicit-debug-to-setupStreamEnvironment.patch b/0005-add-more-explicit-debug-to-setupStreamEnvironment.patch
new file mode 100644
index 0000000..7d48d59
--- /dev/null
+++ b/0005-add-more-explicit-debug-to-setupStreamEnvironment.patch
@@ -0,0 +1,33 @@
+From 54b34b62eb54385e75fcbde2717b4bac0f7e40d3 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter at 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
+
diff --git a/0006-Add-missing-qdebug-operator-defintion.patch b/0006-Add-missing-qdebug-operator-defintion.patch
new file mode 100644
index 0000000..b538fdf
--- /dev/null
+++ b/0006-Add-missing-qdebug-operator-defintion.patch
@@ -0,0 +1,31 @@
+From 73b5d9628fa15890f78dec28653447596ab04539 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter at 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
+
diff --git a/phonon-4.7.0-rpath_use_link_path.patch b/phonon-4.7.0-rpath_use_link_path.patch
new file mode 100644
index 0000000..c1fcc03
--- /dev/null
+++ b/phonon-4.7.0-rpath_use_link_path.patch
@@ -0,0 +1,19 @@
+diff -up phonon-4.7.0/cmake/FindPhononInternal.cmake.fix-rpath phonon-4.7.0/cmake/FindPhononInternal.cmake
+--- phonon-4.7.0/cmake/FindPhononInternal.cmake.fix-rpath 2013-11-15 07:38:14.447106838 -0600
++++ phonon-4.7.0/cmake/FindPhononInternal.cmake 2013-11-15 07:39:07.616134963 -0600
+@@ -216,7 +216,6 @@ endif(APPLE)
+ # These two options below make it set the RPATH of the installed targets to all
+ # RPATH directories outside the current CMAKE_BINARY_DIR and also the library
+ # install directory. Alex
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 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}")
+@@ -224,6 +223,7 @@ 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_USE_LINK_PATH TRUE)
+ set(CMAKE_INSTALL_RPATH "${_abs_LIB_INSTALL_DIR}")
+ endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+
diff --git a/phonon.spec b/phonon.spec
index c8bea8c..6975e01 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -11,7 +11,7 @@
Summary: Multimedia framework api
Name: phonon
Version: 4.7.0
-Release: 7%{?dist}
+Release: 8%{?dist}
License: LGPLv2+
URL: http://phonon.kde.org/
%if 0%{?snap}
@@ -20,11 +20,13 @@ Source0: phonon-%{version}-%{snap}.tar.xz
Source0: http://download.kde.org/stable/phonon/%{version}/phonon-%{version}.tar.xz
%endif
-Patch0: phonon-4.7.0-really-fix-rpath-handling.patch
+Patch0: phonon-4.7.0-rpath_use_link_path.patch
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,7 +91,9 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
%patch0003 -p1 -b .0003
%patch0004 -p1 -b .0004
-%patch0 -p1 -b .fix-rpath
+%patch0005 -p1 -b .0005
+%patch0006 -p1 -b .0006
+%patch0 -p1 -b .rpath_use_link_path
%patch1 -p1 -b .rootDir
@@ -197,6 +201,9 @@ test "$(pkg-config --modversion phonon4qt5)" = "%{version}"
%changelog
+* Fri Nov 15 2013 Rex Dieter <rdieter at fedoraproject.org> 4.7.0-8
+- more upstream fixes, upstreamable rpath_use_link_path handling
+
* Mon Nov 11 2013 Rex Dieter <rdieter at fedoraproject.org> 4.7.0-7
- workaround rootDir bogosity
More information about the scm-commits
mailing list