commit phonon4qt5 for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2013-12-19 12:50:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phonon4qt5 (Old)
and /work/SRC/openSUSE:Factory/.phonon4qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon4qt5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/phonon4qt5/phonon4qt5.changes 2013-12-03 10:28:46.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2013-12-19 12:50:45.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Dec 6 16:43:27 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Update to 4.7.1
+ * Fixed compatibility issues with older backend versions
+- Move away from pkgconfig(...) BuildRequires and just use
+ libqt5-$upstreammodulename-(devel|private-headers-devel)
+
+-------------------------------------------------------------------
Old:
----
phonon-4.7.0.tar.xz
New:
----
phonon-4.7.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phonon4qt5.spec ++++++
--- /var/tmp/diff_new_pack.5OdTff/_old 2013-12-19 12:50:46.000000000 +0100
+++ /var/tmp/diff_new_pack.5OdTff/_new 2013-12-19 12:50:46.000000000 +0100
@@ -19,7 +19,7 @@
%define rname phonon
Name: phonon4qt5
-Version: 4.7.0
+Version: 4.7.1
Release: 0
Summary: Multimedia Platform Abstraction
License: LGPL-2.0+
@@ -31,9 +31,9 @@
BuildRequires: fdupes
BuildRequires: kde4-filesystem
BuildRequires: libpulse-devel
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5Declarative)
-BuildRequires: pkgconfig(Qt5Designer)
+BuildRequires: libqt5-qtbase-devel
+BuildRequires: libqt5-qtquick1-devel
+BuildRequires: libqt5-qttools-devel
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -47,9 +47,9 @@
Summary: Phonon Multimedia Platform Abstraction
Group: Development/Libraries/KDE
Requires: libphonon4qt5 = %{version}
-Requires: pkgconfig(Qt5Core)
-Requires: pkgconfig(Qt5Declarative)
-Requires: pkgconfig(Qt5Designer)
+Requires: libqt5-qtbase-devel
+Requires: libqt5-qtquick1-devel
+Requires: libqt5-qttools-devel
%description devel
Phonon is a cross-platform portable Multimedia Support Abstraction,
++++++ phonon-4.7.0.tar.xz -> phonon-4.7.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.0/CMakeLists.txt new/phonon-4.7.1/CMakeLists.txt
--- old/phonon-4.7.0/CMakeLists.txt 2013-11-04 17:49:06.000000000 +0100
+++ new/phonon-4.7.1/CMakeLists.txt 2013-12-06 11:22:44.000000000 +0100
@@ -21,7 +21,7 @@
# If you are unsure about the this: http://plan99.net/~mike/writing-shared-libraries.html
set(PHONON_LIB_MAJOR_VERSION "4") # Only change on binary incompatible changes
set(PHONON_LIB_MINOR_VERSION "7") # Only change on binary compatible changes with new interfaces
-set(PHONON_LIB_PATCH_VERSION "0") # Bump whenever you feel like it :P
+set(PHONON_LIB_PATCH_VERSION "1") # Bump whenever you feel like it :P
set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}")
set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION})
set(PHONON_LIB_SONAME phonon)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.0/cmake/FindPhononInternal.cmake new/phonon-4.7.1/cmake/FindPhononInternal.cmake
--- old/phonon-4.7.0/cmake/FindPhononInternal.cmake 2013-11-04 17:49:06.000000000 +0100
+++ new/phonon-4.7.1/cmake/FindPhononInternal.cmake 2013-12-06 11:22:44.000000000 +0100
@@ -217,10 +217,14 @@
# 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")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.0/doc/Phonon4Qt5.dox new/phonon-4.7.1/doc/Phonon4Qt5.dox
--- old/phonon-4.7.0/doc/Phonon4Qt5.dox 2013-11-04 17:49:06.000000000 +0100
+++ new/phonon-4.7.1/doc/Phonon4Qt5.dox 2013-12-06 11:22:44.000000000 +0100
@@ -36,6 +36,13 @@
Phonon4Qt5 installation does not conflict with regular Phonon installations in
any way; It uses different file and folder names for everything installed.
+\subsection phonon4qt5_building_backends Backends
+
+Since Phonon4Qt5 uses isolated paths from regular Phonon, the backends also need
+to be built specifically in Phonon4Qt5 mode using the PHONON_BUILD_PHONON4QT5
+option for CMake. Defining PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT
+however is not necessary as Phonon has internal logic for backend plugin lookup.
+
\section phonon4qt5_using Usage
Except for a couple of lines in CMake, using Phonon4Qt5 is identical to using
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.0/phonon/audiooutput.cpp new/phonon-4.7.1/phonon/audiooutput.cpp
--- old/phonon-4.7.0/phonon/audiooutput.cpp 2013-11-04 17:49:06.000000000 +0100
+++ new/phonon-4.7.1/phonon/audiooutput.cpp 2013-12-06 11:22:44.000000000 +0100
@@ -108,6 +108,8 @@
AudioOutputInterface47 *iface = Iface<AudioOutputInterface47>::cast(this);
if (iface)
iface->setStreamUuid(streamUuid);
+ else
+ pulse->setupStreamEnvironment(streamUuid);
}
}
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.0/phonon/mediasource.h new/phonon-4.7.1/phonon/mediasource.h
--- old/phonon-4.7.0/phonon/mediasource.h 2013-11-04 17:49:06.000000000 +0100
+++ new/phonon-4.7.1/phonon/mediasource.h 2013-12-06 11:22:44.000000000 +0100
@@ -62,7 +62,7 @@
class PHONON_EXPORT MediaSource
{
friend class StreamInterface;
- friend QDebug operator <<(QDebug dbg, const Phonon::MediaSource &);
+ friend PHONON_EXPORT QDebug operator <<(QDebug dbg, const Phonon::MediaSource &);
public:
/**
* Identifies the type of media described by the MediaSource object.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.0/phonon/phononnamespace.cpp new/phonon-4.7.1/phonon/phononnamespace.cpp
--- old/phonon-4.7.0/phonon/phononnamespace.cpp 2013-11-04 17:49:06.000000000 +0100
+++ new/phonon-4.7.1/phonon/phononnamespace.cpp 2013-12-06 11:22:44.000000000 +0100
@@ -167,6 +167,12 @@
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) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.7.0/phonon/pulsesupport.cpp new/phonon-4.7.1/phonon/pulsesupport.cpp
--- old/phonon-4.7.0/phonon/pulsesupport.cpp 2013-11-04 17:49:06.000000000 +0100
+++ new/phonon-4.7.1/phonon/pulsesupport.cpp 2013-12-06 11:22:44.000000000 +0100
@@ -1232,7 +1232,7 @@
{
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 @@
QHashIterator
participants (1)
-
root@hilbert.suse.de