diffstat for phonon-4.8.0 phonon-4.8.3 CMakeLists.txt | 4 PhononConfig.cmake.in | 7 + debian/changelog | 6 + debian/control | 34 ++++---- debian/libphonon-dev.install | 74 ++++++++--------- debian/libphonon4qt5-dev.install | 73 ++++++++--------- debian/libphononexperimental-dev.docs | 1 debian/libphononexperimental4.docs | 1 debian/patches/do_not_assume_existing_backend.patch | 40 --------- debian/patches/findqt4_optional_x11.diff | 18 ---- debian/patches/phonon-inc.patch | 50 ------------ debian/patches/phonon_is_not_forced_in_KDE.diff | 30 ------- debian/patches/series | 6 - debian/phononexperimental/README.Debian | 19 ---- debian/rules | 4 debian/watch | 2 includes/CMakeLists.txt | 83 ++++++++++---------- includes/old/phonon | 35 ++++++++ phonon/CMakeLists.txt | 2 phonon/audiooutput.cpp | 3 phonon/experimental/CMakeLists.txt | 2 phonon/factory.cpp | 12 +- phonon/objectdescriptionmodel.h | 3 phonon/pulsesupport.cpp | 27 ++++-- 24 files changed, 223 insertions(+), 313 deletions(-) diff -Nru phonon-4.8.0/CMakeLists.txt phonon-4.8.3/CMakeLists.txt --- phonon-4.8.0/CMakeLists.txt 2014-09-06 16:14:24.000000000 +0000 +++ phonon-4.8.3/CMakeLists.txt 2014-12-04 09:30:26.000000000 +0000 @@ -11,6 +11,8 @@ option(PHONON_BUILD_DESIGNER_PLUGIN "Build the Qt Designer plugin" ON) option(PHONON_BUILD_DOC "Build the API documentation" OFF) +option(PHONON_INSTALL_QT_COMPAT_HEADERS "Install QtPhonon compatibility headers" OFF) + option(PHONON_NO_CAPTURE "Disable the capture capabilities") option(PHONON_NO_DBUS "Deactivate DBus support (used to expose AudioOutputs and for deprecated runtime backend switching)" OFF) @@ -21,7 +23,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 "8") # 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 "3") # 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 -Nru phonon-4.8.0/PhononConfig.cmake.in phonon-4.8.3/PhononConfig.cmake.in --- phonon-4.8.0/PhononConfig.cmake.in 2014-09-06 16:14:24.000000000 +0000 +++ phonon-4.8.3/PhononConfig.cmake.in 2014-12-04 09:30:26.000000000 +0000 @@ -10,6 +10,7 @@ set(PHONON_NO_GRAPHICSVIEW @PHONON_NO_GRAPHICSVIEW@) set(PHONON_PULSESUPPORT @PHONON_PULSESUPPORT@) set(PHONON_FOUND_EXPERIMENTAL @PHONON_BUILD_EXPERIMENTAL@) +set(PHONON_QT_COMPAT_HEADERS @PHONON_INSTALL_QT_COMPAT_HEADERS@) # install locations set(PHONON_INCLUDE_DIR "${rootDir}/@INCLUDE_INSTALL_DIR@") @@ -30,7 +31,11 @@ # The following one is only for compatiblity set(PHONON_LIBS ${PHONON_LIBRARIES}) -set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR} ${PHONON_INCLUDE_DIR}/KDE ) +set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR} ${PHONON_INCLUDE_DIR}/KDE) + +if (PHONON_QT_COMPAT_HEADERS) + list(APPEND PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/Phonon) +endif() # Find Internal is included in the backends' finders rather than here. # http://lists.kde.org/?l=kde-multimedia&m=135934335320148&w=2 diff -Nru phonon-4.8.0/debian/changelog phonon-4.8.3/debian/changelog --- phonon-4.8.0/debian/changelog 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/changelog 2015-03-10 22:35:35.000000000 +0000 @@ -1,3 +1,9 @@ +phonon (4:4.8.3-0+exp1) experimental; urgency=medium + + * "New" upstream version + + -- Alf Gaida Tue, 10 Mar 2015 23:35:24 +0100 + phonon (4:4.8.0-5) unstable; urgency=medium * Team upload. diff -Nru phonon-4.8.0/debian/control phonon-4.8.3/debian/control --- phonon-4.8.0/debian/control 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/control 2015-03-10 22:33:18.000000000 +0000 @@ -2,23 +2,23 @@ Section: sound Priority: optional Maintainer: Debian Qt/KDE Maintainers -Uploaders: Modestas Vainius , - Fathi Boudra , - Diane Trout , - Lisandro Damián Nicanor Pérez Meyer -Build-Depends: automoc, - cmake (>= 2.8.7), - debhelper (>= 9), - dpkg-dev (>= 1.15.5), - libglib2.0-dev, - libpulse-dev (>= 0.9.21), - libqt4-dev (>= 4:4.8.1), - libqt5opengl5-dev, - libqzeitgeist-dev, - pkg-kde-tools (>= 0.12), - qtbase5-dev, - qttools5-dev -Standards-Version: 3.9.5 +Uploaders: + Alf Gaida +Build-Depends: + automoc, + cmake (>= 2.8.1), + debhelper (>= 9), + dpkg-dev (>= 1.15.5), + libglib2.0-dev, + libpulse-dev (>= 0.9.21), + libqt4-dev (>= 4:4.8.1), + libqt5opengl5-dev, + libqzeitgeist-dev, + pkg-kde-tools (>= 0.15.16), + qttools5-dev (>= 5.4.1), + qttools5-dev-tools, + qtquick1-5-dev, +Standards-Version: 3.9.6 Homepage: http://phonon.kde.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-req/phonon.git Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-req/phonon.git diff -Nru phonon-4.8.0/debian/libphonon-dev.install phonon-4.8.3/debian/libphonon-dev.install --- phonon-4.8.0/debian/libphonon-dev.install 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/libphonon-dev.install 2015-03-10 18:23:40.000000000 +0000 @@ -35,42 +35,42 @@ usr/include/phonon/ObjectDescriptionModel usr/include/phonon/ObjectDescriptionModelData usr/include/phonon/Path -usr/include/phonon/Phonon/AbstractAudioOutput -usr/include/phonon/Phonon/AbstractMediaStream -usr/include/phonon/Phonon/AbstractVideoOutput -usr/include/phonon/Phonon/AddonInterface -usr/include/phonon/Phonon/AudioDevice -usr/include/phonon/Phonon/AudioDeviceEnumerator -usr/include/phonon/Phonon/AudioOutput -usr/include/phonon/Phonon/AudioOutputDevice -usr/include/phonon/Phonon/AudioOutputDeviceModel -usr/include/phonon/Phonon/AudioOutputInterface -usr/include/phonon/Phonon/BackendCapabilities -usr/include/phonon/Phonon/BackendInterface -usr/include/phonon/Phonon/Effect -usr/include/phonon/Phonon/EffectDescription -usr/include/phonon/Phonon/EffectDescriptionModel -usr/include/phonon/Phonon/EffectInterface -usr/include/phonon/Phonon/EffectParameter -usr/include/phonon/Phonon/EffectWidget -usr/include/phonon/Phonon/Global -usr/include/phonon/Phonon/MediaController -usr/include/phonon/Phonon/MediaNode -usr/include/phonon/Phonon/MediaObject -usr/include/phonon/Phonon/MediaObjectInterface -usr/include/phonon/Phonon/MediaSource -usr/include/phonon/Phonon/ObjectDescription -usr/include/phonon/Phonon/ObjectDescriptionModel -usr/include/phonon/Phonon/Path -usr/include/phonon/Phonon/PlatformPlugin -usr/include/phonon/Phonon/SeekSlider -usr/include/phonon/Phonon/StreamInterface -usr/include/phonon/Phonon/VideoPlayer -usr/include/phonon/Phonon/VideoWidget -usr/include/phonon/Phonon/VideoWidgetInterface -usr/include/phonon/Phonon/VolumeFaderEffect -usr/include/phonon/Phonon/VolumeFaderInterface -usr/include/phonon/Phonon/VolumeSlider +usr/include/KDE/Phonon/AbstractAudioOutput +usr/include/KDE/Phonon/AbstractMediaStream +usr/include/KDE/Phonon/AbstractVideoOutput +usr/include/KDE/Phonon/AddonInterface +usr/include/KDE/Phonon/AudioDevice +usr/include/KDE/Phonon/AudioDeviceEnumerator +usr/include/KDE/Phonon/AudioOutput +usr/include/KDE/Phonon/AudioOutputDevice +usr/include/KDE/Phonon/AudioOutputDeviceModel +usr/include/KDE/Phonon/AudioOutputInterface +usr/include/KDE/Phonon/BackendCapabilities +usr/include/KDE/Phonon/BackendInterface +usr/include/KDE/Phonon/Effect +usr/include/KDE/Phonon/EffectDescription +usr/include/KDE/Phonon/EffectDescriptionModel +usr/include/KDE/Phonon/EffectInterface +usr/include/KDE/Phonon/EffectParameter +usr/include/KDE/Phonon/EffectWidget +usr/include/KDE/Phonon/Global +usr/include/KDE/Phonon/MediaController +usr/include/KDE/Phonon/MediaNode +usr/include/KDE/Phonon/MediaObject +usr/include/KDE/Phonon/MediaObjectInterface +usr/include/KDE/Phonon/MediaSource +usr/include/KDE/Phonon/ObjectDescription +usr/include/KDE/Phonon/ObjectDescriptionModel +usr/include/KDE/Phonon/Path +usr/include/KDE/Phonon/PlatformPlugin +usr/include/KDE/Phonon/SeekSlider +usr/include/KDE/Phonon/StreamInterface +usr/include/KDE/Phonon/VideoPlayer +usr/include/KDE/Phonon/VideoWidget +usr/include/KDE/Phonon/VideoWidgetInterface +usr/include/KDE/Phonon/VolumeFaderEffect +usr/include/KDE/Phonon/VolumeFaderInterface +usr/include/KDE/Phonon/VolumeSlider usr/include/phonon/PlatformPlugin usr/include/phonon/SeekSlider usr/include/phonon/StreamInterface @@ -111,7 +111,7 @@ usr/include/phonon/objectdescription.h usr/include/phonon/objectdescriptionmodel.h usr/include/phonon/path.h -usr/include/phonon/phonon +#usr/include/phonon/phonon usr/include/phonon/phonon_export.h usr/include/phonon/phonondefs.h usr/include/phonon/phononnamespace.h diff -Nru phonon-4.8.0/debian/libphonon4qt5-dev.install phonon-4.8.3/debian/libphonon4qt5-dev.install --- phonon-4.8.0/debian/libphonon4qt5-dev.install 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/libphonon4qt5-dev.install 2015-03-10 18:25:13.000000000 +0000 @@ -35,42 +35,42 @@ usr/include/phonon4qt5/phonon/ObjectDescriptionModel usr/include/phonon4qt5/phonon/ObjectDescriptionModelData usr/include/phonon4qt5/phonon/Path -usr/include/phonon4qt5/phonon/Phonon/AbstractAudioOutput -usr/include/phonon4qt5/phonon/Phonon/AbstractMediaStream -usr/include/phonon4qt5/phonon/Phonon/AbstractVideoOutput -usr/include/phonon4qt5/phonon/Phonon/AddonInterface -usr/include/phonon4qt5/phonon/Phonon/AudioDevice -usr/include/phonon4qt5/phonon/Phonon/AudioDeviceEnumerator -usr/include/phonon4qt5/phonon/Phonon/AudioOutput -usr/include/phonon4qt5/phonon/Phonon/AudioOutputDevice -usr/include/phonon4qt5/phonon/Phonon/AudioOutputDeviceModel -usr/include/phonon4qt5/phonon/Phonon/AudioOutputInterface -usr/include/phonon4qt5/phonon/Phonon/BackendCapabilities -usr/include/phonon4qt5/phonon/Phonon/BackendInterface -usr/include/phonon4qt5/phonon/Phonon/Effect -usr/include/phonon4qt5/phonon/Phonon/EffectDescription -usr/include/phonon4qt5/phonon/Phonon/EffectDescriptionModel -usr/include/phonon4qt5/phonon/Phonon/EffectInterface -usr/include/phonon4qt5/phonon/Phonon/EffectParameter -usr/include/phonon4qt5/phonon/Phonon/EffectWidget -usr/include/phonon4qt5/phonon/Phonon/Global -usr/include/phonon4qt5/phonon/Phonon/MediaController -usr/include/phonon4qt5/phonon/Phonon/MediaNode -usr/include/phonon4qt5/phonon/Phonon/MediaObject -usr/include/phonon4qt5/phonon/Phonon/MediaObjectInterface -usr/include/phonon4qt5/phonon/Phonon/MediaSource -usr/include/phonon4qt5/phonon/Phonon/ObjectDescription -usr/include/phonon4qt5/phonon/Phonon/ObjectDescriptionModel -usr/include/phonon4qt5/phonon/Phonon/Path -usr/include/phonon4qt5/phonon/Phonon/PlatformPlugin -usr/include/phonon4qt5/phonon/Phonon/SeekSlider -usr/include/phonon4qt5/phonon/Phonon/StreamInterface -usr/include/phonon4qt5/phonon/Phonon/VideoPlayer -usr/include/phonon4qt5/phonon/Phonon/VideoWidget -usr/include/phonon4qt5/phonon/Phonon/VideoWidgetInterface -usr/include/phonon4qt5/phonon/Phonon/VolumeFaderEffect -usr/include/phonon4qt5/phonon/Phonon/VolumeFaderInterface -usr/include/phonon4qt5/phonon/Phonon/VolumeSlider +usr/include/phonon4qt5/KDE/Phonon/AbstractAudioOutput +usr/include/phonon4qt5/KDE/Phonon/AbstractMediaStream +usr/include/phonon4qt5/KDE/Phonon/AbstractVideoOutput +usr/include/phonon4qt5/KDE/Phonon/AddonInterface +usr/include/phonon4qt5/KDE/Phonon/AudioDevice +usr/include/phonon4qt5/KDE/Phonon/AudioDeviceEnumerator +usr/include/phonon4qt5/KDE/Phonon/AudioOutput +usr/include/phonon4qt5/KDE/Phonon/AudioOutputDevice +usr/include/phonon4qt5/KDE/Phonon/AudioOutputDeviceModel +usr/include/phonon4qt5/KDE/Phonon/AudioOutputInterface +usr/include/phonon4qt5/KDE/Phonon/BackendCapabilities +usr/include/phonon4qt5/KDE/Phonon/BackendInterface +usr/include/phonon4qt5/KDE/Phonon/Effect +usr/include/phonon4qt5/KDE/Phonon/EffectDescription +usr/include/phonon4qt5/KDE/Phonon/EffectDescriptionModel +usr/include/phonon4qt5/KDE/Phonon/EffectInterface +usr/include/phonon4qt5/KDE/Phonon/EffectParameter +usr/include/phonon4qt5/KDE/Phonon/EffectWidget +usr/include/phonon4qt5/KDE/Phonon/Global +usr/include/phonon4qt5/KDE/Phonon/MediaController +usr/include/phonon4qt5/KDE/Phonon/MediaNode +usr/include/phonon4qt5/KDE/Phonon/MediaObject +usr/include/phonon4qt5/KDE/Phonon/MediaObjectInterface +usr/include/phonon4qt5/KDE/Phonon/MediaSource +usr/include/phonon4qt5/KDE/Phonon/ObjectDescription +usr/include/phonon4qt5/KDE/Phonon/ObjectDescriptionModel +usr/include/phonon4qt5/KDE/Phonon/Path +usr/include/phonon4qt5/KDE/Phonon/PlatformPlugin +usr/include/phonon4qt5/KDE/Phonon/SeekSlider +usr/include/phonon4qt5/KDE/Phonon/StreamInterface +usr/include/phonon4qt5/KDE/Phonon/VideoPlayer +usr/include/phonon4qt5/KDE/Phonon/VideoWidget +usr/include/phonon4qt5/KDE/Phonon/VideoWidgetInterface +usr/include/phonon4qt5/KDE/Phonon/VolumeFaderEffect +usr/include/phonon4qt5/KDE/Phonon/VolumeFaderInterface +usr/include/phonon4qt5/KDE/Phonon/VolumeSlider usr/include/phonon4qt5/phonon/PlatformPlugin usr/include/phonon4qt5/phonon/SeekSlider usr/include/phonon4qt5/phonon/StreamInterface @@ -135,7 +135,6 @@ usr/include/phonon4qt5/phonon/objectdescription.h usr/include/phonon4qt5/phonon/objectdescriptionmodel.h usr/include/phonon4qt5/phonon/path.h -usr/include/phonon4qt5/phonon/phonon usr/include/phonon4qt5/phonon/phonon_export.h usr/include/phonon4qt5/phonon/phonondefs.h usr/include/phonon4qt5/phonon/phononnamespace.h diff -Nru phonon-4.8.0/debian/libphononexperimental-dev.docs phonon-4.8.3/debian/libphononexperimental-dev.docs --- phonon-4.8.0/debian/libphononexperimental-dev.docs 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/libphononexperimental-dev.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/phononexperimental/README.Debian diff -Nru phonon-4.8.0/debian/libphononexperimental4.docs phonon-4.8.3/debian/libphononexperimental4.docs --- phonon-4.8.0/debian/libphononexperimental4.docs 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/libphononexperimental4.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/phononexperimental/README.Debian diff -Nru phonon-4.8.0/debian/patches/do_not_assume_existing_backend.patch phonon-4.8.3/debian/patches/do_not_assume_existing_backend.patch --- phonon-4.8.0/debian/patches/do_not_assume_existing_backend.patch 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/patches/do_not_assume_existing_backend.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -commit ec5f8fc79338e15b69d24fd89b9fccf93049624f -Author: Harald Sitter -Date: Wed Nov 26 23:28:06 2014 +0100 - - do not assume we have a backend when setting an output device - - random suggestion du jour: since debianesque distros are the only ones - allowing running without a backend (to my knowledge anyway), this fix - should be adopted there at the earliest convenient time. - - this change prevents a crash when run without a backend and getting device - changes as the Iface handling later on would directly call the cast output - without checking its validity. since the cast would always be null when - there is no backend we can just as well save time and return early. - - note: this is ultimately fallout from too excessive init() setup - when there is no backend, so the ideal fix would have been to abort the - setup there. given the limited testing exposure of alsa+phononserver+phonon - this less invasive fix is deemed more suitable for the existing code base - though. - (this lineup only happens with phononserver in the picture and that - bugger has already been killed off for plasma5) - - BUG: 341296 - CCMAIL: pkg-kde-talk@lists.alioth.debian.org - -diff --git a/phonon/audiooutput.cpp b/phonon/audiooutput.cpp -index 0768768..f118824 100644 ---- a/phonon/audiooutput.cpp -+++ b/phonon/audiooutput.cpp -@@ -54,6 +54,9 @@ static inline bool callSetOutputDevice(AudioOutputPrivate *const d, const AudioO - if (pulse->isActive()) - return pulse->setOutputDevice(d->getStreamUuid(), dev.index()); - -+ if (!d->backendObject()) -+ return false; -+ - Iface iface(d); - if (iface) { - return iface->setOutputDevice(dev); diff -Nru phonon-4.8.0/debian/patches/findqt4_optional_x11.diff phonon-4.8.3/debian/patches/findqt4_optional_x11.diff --- phonon-4.8.0/debian/patches/findqt4_optional_x11.diff 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/patches/findqt4_optional_x11.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -From: Pino Toscano -From: Modestas Vainius -Subject: Qt doesn't expose the X11 headers to the world, so no need to make it required. -Forwarded: not-needed -Origin: vendor -Last-Update: 2012-02-19 - ---- a/cmake/Qt4ConfigDependentSettings.cmake -+++ b/cmake/Qt4ConfigDependentSettings.cmake -@@ -27,7 +27,7 @@ - IF(UNIX) - # on OS X X11 may not be required - IF (Q_WS_X11) -- FIND_PACKAGE(X11 REQUIRED) -+ FIND_PACKAGE(X11) - ENDIF (Q_WS_X11) - FIND_PACKAGE(Threads) - SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) diff -Nru phonon-4.8.0/debian/patches/phonon-inc.patch phonon-4.8.3/debian/patches/phonon-inc.patch --- phonon-4.8.0/debian/patches/phonon-inc.patch 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/patches/phonon-inc.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -From: Sune Vuorela -Subject: Create a magic phonon header - Thanks to Matthias Kretz. -Forwarded: no -Last-Update: 2011-12-20 - ---- a/phonon/CMakeLists.txt -+++ b/phonon/CMakeLists.txt -@@ -222,3 +222,6 @@ if (QT_QTDBUS_FOUND AND NOT PHONON_NO_DB - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.${PHONON_LIB_SONAME_CAMEL}.AudioOutput.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}) - endif (QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS) - -+install(FILES -+ phonon -+DESTINATION ${INCLUDE_INSTALL_DIR}/phonon) ---- /dev/null -+++ b/phonon/phonon -@@ -0,0 +1,32 @@ -+#include "abstractaudiooutput.h" -+#include "abstractmediastream.h" -+#include "abstractvideooutput.h" -+#include "addoninterface.h" -+#include "audiooutput.h" -+#include "audiooutputinterface.h" -+#include "backendcapabilities.h" -+#include "backendinterface.h" -+#include "effect.h" -+#include "effectinterface.h" -+#include "effectparameter.h" -+#include "effectwidget.h" -+#include "globaldescriptioncontainer.h" -+#include "mediacontroller.h" -+#include "medianode.h" -+#include "mediaobject.h" -+#include "mediaobjectinterface.h" -+#include "mediasource.h" -+#include "objectdescription.h" -+#include "objectdescriptionmodel.h" -+#include "path.h" -+#include "phonondefs.h" -+#include "phononnamespace.h" -+#include "platformplugin.h" -+#include "seekslider.h" -+#include "streaminterface.h" -+#include "videoplayer.h" -+#include "videowidget.h" -+#include "videowidgetinterface.h" -+#include "volumefadereffect.h" -+#include "volumefaderinterface.h" -+#include "volumeslider.h" diff -Nru phonon-4.8.0/debian/patches/phonon_is_not_forced_in_KDE.diff phonon-4.8.3/debian/patches/phonon_is_not_forced_in_KDE.diff --- phonon-4.8.0/debian/patches/phonon_is_not_forced_in_KDE.diff 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/patches/phonon_is_not_forced_in_KDE.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From: Sune Vuorela -Subject: Install headers where they were earlier -Forwarded: no - -Index: phonon-4.8.0/includes/CMakeLists.txt -=================================================================== ---- phonon-4.8.0.orig/includes/CMakeLists.txt 2014-09-06 16:14:24.000000000 +0000 -+++ phonon-4.8.0/includes/CMakeLists.txt 2014-10-29 14:31:14.000000000 +0000 -@@ -91,7 +91,7 @@ - old/Phonon/VolumeFaderEffect - old/Phonon/VolumeFaderInterface - old/Phonon/VolumeSlider --DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel) -+DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon COMPONENT Devel) - - if (PHONON_BUILD_EXPERIMENTAL) - install(FILES -Index: phonon-4.8.0/PhononConfig.cmake.in -=================================================================== ---- phonon-4.8.0.orig/PhononConfig.cmake.in 2014-09-06 16:14:24.000000000 +0000 -+++ phonon-4.8.0/PhononConfig.cmake.in 2014-10-29 14:32:01.374544000 +0000 -@@ -30,7 +30,7 @@ - # The following one is only for compatiblity - set(PHONON_LIBS ${PHONON_LIBRARIES}) - --set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR} ${PHONON_INCLUDE_DIR}/KDE ) -+set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR} ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}/phonon ) - - # Find Internal is included in the backends' finders rather than here. - # http://lists.kde.org/?l=kde-multimedia&m=135934335320148&w=2 diff -Nru phonon-4.8.0/debian/patches/series phonon-4.8.3/debian/patches/series --- phonon-4.8.0/debian/patches/series 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# Backported patches -do_not_assume_existing_backend.patch - -phonon-inc.patch -phonon_is_not_forced_in_KDE.diff -findqt4_optional_x11.diff diff -Nru phonon-4.8.0/debian/phononexperimental/README.Debian phonon-4.8.3/debian/phononexperimental/README.Debian --- phonon-4.8.0/debian/phononexperimental/README.Debian 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/phononexperimental/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -The Phonon-Experimental library -------------------------------- - -This library is for use by Phonon backends or other internal Phonon -applications. It provides a testing ground for new but not-yet-finished -features. External third party applications should NOT depend on this library -because it might break in a myriad of ways and there is no API compatibility -guarantees. Just stick with the core Phonon library (libphonon4 and its -development package libphonon-dev) instead. What's more, the effective licence -of the Phonon-Experimental library is GNU General Public Licence version 3 or -later (in contrast to LGPL of libphonon). - -We (maintainers) reserve a right to pull this library from the archive if it -ends up abused too much. You have been warned. - -Due to the nature of the libphononexperimental-dev package (see above), it does -not depend on the libphonon-dev package. This is not a bug. - - -- Modestas Vainius Sat, 05 Mar 2011 00:46:42 +0200 diff -Nru phonon-4.8.0/debian/rules phonon-4.8.3/debian/rules --- phonon-4.8.0/debian/rules 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/rules 2015-03-10 18:12:21.000000000 +0000 @@ -2,11 +2,11 @@ #dh = --dbg-package=phonon-dbg -include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk +include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk # Enable strict interdependencies libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages) -include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk +include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk RECOMMENDED_PHONON4_QT4_BACKEND := phonon-backend-vlc RECOMMENDED_PHONON4_QT5_BACKEND := phonon4qt5-backend-vlc diff -Nru phonon-4.8.0/debian/watch phonon-4.8.3/debian/watch --- phonon-4.8.0/debian/watch 2015-02-10 12:22:39.000000000 +0000 +++ phonon-4.8.3/debian/watch 2015-03-10 16:56:33.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -http://download.kde.org/stable/phonon/([\d.]+)/ phonon-([\d.]+).tar.xz +http://download.kde.org/stable/phonon/([\d.]+)/src phonon-([\d.]+).tar.xz diff -Nru phonon-4.8.0/includes/CMakeLists.txt phonon-4.8.3/includes/CMakeLists.txt --- phonon-4.8.0/includes/CMakeLists.txt 2014-09-06 16:14:24.000000000 +0000 +++ phonon-4.8.3/includes/CMakeLists.txt 2014-12-04 09:30:26.000000000 +0000 @@ -53,45 +53,49 @@ phonon/VolumeSlider DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel) - -install( FILES - old/Phonon/AbstractAudioOutput - old/Phonon/AbstractMediaStream - old/Phonon/AbstractVideoOutput - old/Phonon/AddonInterface - old/Phonon/AudioDevice - old/Phonon/AudioDeviceEnumerator - old/Phonon/AudioOutput - old/Phonon/AudioOutputDevice - old/Phonon/AudioOutputDeviceModel - old/Phonon/AudioOutputInterface - old/Phonon/BackendCapabilities - old/Phonon/BackendInterface - old/Phonon/Effect - old/Phonon/EffectDescription - old/Phonon/EffectDescriptionModel - old/Phonon/EffectInterface - old/Phonon/EffectParameter - old/Phonon/EffectWidget - old/Phonon/Global - old/Phonon/MediaController - old/Phonon/MediaNode - old/Phonon/MediaObject - old/Phonon/MediaObjectInterface - old/Phonon/MediaSource - old/Phonon/ObjectDescription - old/Phonon/ObjectDescriptionModel - old/Phonon/Path - old/Phonon/PlatformPlugin - old/Phonon/SeekSlider - old/Phonon/StreamInterface - old/Phonon/VideoPlayer - old/Phonon/VideoWidget - old/Phonon/VideoWidgetInterface - old/Phonon/VolumeFaderEffect - old/Phonon/VolumeFaderInterface - old/Phonon/VolumeSlider -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel) +set(COMPAT_HEADERS + old/Phonon/AbstractAudioOutput + old/Phonon/AbstractMediaStream + old/Phonon/AbstractVideoOutput + old/Phonon/AddonInterface + old/Phonon/AudioDevice + old/Phonon/AudioDeviceEnumerator + old/Phonon/AudioOutput + old/Phonon/AudioOutputDevice + old/Phonon/AudioOutputDeviceModel + old/Phonon/AudioOutputInterface + old/Phonon/BackendCapabilities + old/Phonon/BackendInterface + old/Phonon/Effect + old/Phonon/EffectDescription + old/Phonon/EffectDescriptionModel + old/Phonon/EffectInterface + old/Phonon/EffectParameter + old/Phonon/EffectWidget + old/Phonon/Global + old/Phonon/MediaController + old/Phonon/MediaNode + old/Phonon/MediaObject + old/Phonon/MediaObjectInterface + old/Phonon/MediaSource + old/Phonon/ObjectDescription + old/Phonon/ObjectDescriptionModel + old/Phonon/Path + old/Phonon/PlatformPlugin + old/Phonon/SeekSlider + old/Phonon/StreamInterface + old/Phonon/VideoPlayer + old/Phonon/VideoWidget + old/Phonon/VideoWidgetInterface + old/Phonon/VolumeFaderEffect + old/Phonon/VolumeFaderInterface + old/Phonon/VolumeSlider +) +install(FILES ${COMPAT_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel) +if (PHONON_INSTALL_QT_COMPAT_HEADERS) + install(FILES ${COMPAT_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon COMPONENT Devel) # + install(FILES old/phonon DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel) # meta-include +endif() if (PHONON_BUILD_EXPERIMENTAL) install(FILES @@ -104,4 +108,5 @@ old/Phonon/Experimental/VideoFrame2 old/Phonon/Experimental/Visualization DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon/Experimental COMPONENT Devel) + # Qt4.x never included the experimental library, so no need for compat headers. endif (PHONON_BUILD_EXPERIMENTAL) diff -Nru phonon-4.8.0/includes/old/phonon phonon-4.8.3/includes/old/phonon --- phonon-4.8.0/includes/old/phonon 1970-01-01 00:00:00.000000000 +0000 +++ phonon-4.8.3/includes/old/phonon 2014-12-04 09:30:26.000000000 +0000 @@ -0,0 +1,35 @@ +// This is a compatibility include for QtPhonon. It should not be used +// in new software! + +#include "abstractaudiooutput.h" +#include "abstractmediastream.h" +#include "abstractvideooutput.h" +#include "addoninterface.h" +#include "audiooutput.h" +#include "audiooutputinterface.h" +#include "backendcapabilities.h" +#include "backendinterface.h" +#include "effect.h" +#include "effectinterface.h" +#include "effectparameter.h" +#include "effectwidget.h" +#include "globaldescriptioncontainer.h" +#include "mediacontroller.h" +#include "medianode.h" +#include "mediaobject.h" +#include "mediaobjectinterface.h" +#include "mediasource.h" +#include "objectdescription.h" +#include "objectdescriptionmodel.h" +#include "path.h" +#include "phonondefs.h" +#include "phononnamespace.h" +#include "platformplugin.h" +#include "seekslider.h" +#include "streaminterface.h" +#include "videoplayer.h" +#include "videowidget.h" +#include "videowidgetinterface.h" +#include "volumefadereffect.h" +#include "volumefaderinterface.h" +#include "volumeslider.h" diff -Nru phonon-4.8.0/phonon/CMakeLists.txt phonon-4.8.3/phonon/CMakeLists.txt --- phonon-4.8.0/phonon/CMakeLists.txt 2014-09-06 16:14:24.000000000 +0000 +++ phonon-4.8.3/phonon/CMakeLists.txt 2014-12-04 09:30:26.000000000 +0000 @@ -172,6 +172,8 @@ # This reduces inter-package dependencies and makes it easier to remove # dependencies of shared libraries without breaking binary compatibility. +target_include_directories(${PHONON_LIB_SONAME} + INTERFACE "$") install(TARGETS ${PHONON_LIB_SONAME} EXPORT PhononLibs ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff -Nru phonon-4.8.0/phonon/audiooutput.cpp phonon-4.8.3/phonon/audiooutput.cpp --- phonon-4.8.0/phonon/audiooutput.cpp 2014-09-06 16:14:24.000000000 +0000 +++ phonon-4.8.3/phonon/audiooutput.cpp 2014-12-04 09:30:26.000000000 +0000 @@ -54,6 +54,9 @@ if (pulse->isActive()) return pulse->setOutputDevice(d->getStreamUuid(), dev.index()); + if (!d->backendObject()) + return false; + Iface iface(d); if (iface) { return iface->setOutputDevice(dev); diff -Nru phonon-4.8.0/phonon/experimental/CMakeLists.txt phonon-4.8.3/phonon/experimental/CMakeLists.txt --- phonon-4.8.0/phonon/experimental/CMakeLists.txt 2014-09-06 16:14:24.000000000 +0000 +++ phonon-4.8.3/phonon/experimental/CMakeLists.txt 2014-12-04 09:30:26.000000000 +0000 @@ -29,6 +29,8 @@ LINK_INTERFACE_LIBRARIES "" ) install(TARGETS ${PHONON_LIB_SONAME}experimental EXPORT PhononLibs ${INSTALL_TARGETS_DEFAULT_ARGS}) +target_include_directories(${PHONON_LIB_SONAME}experimental + INTERFACE "$") ########### install headers ############### install(FILES diff -Nru phonon-4.8.0/phonon/factory.cpp phonon-4.8.3/phonon/factory.cpp --- phonon-4.8.0/phonon/factory.cpp 2014-09-06 16:14:24.000000000 +0000 +++ phonon-4.8.3/phonon/factory.cpp 2014-12-04 09:30:26.000000000 +0000 @@ -199,12 +199,16 @@ QList::iterator it; for (it = foundBackends.begin(); it != foundBackends.end(); ++it) { const BackendDescriptor &descriptor = *it; - if (descriptor.iid != iid) + if (descriptor.iid != iid) { continue; - if (tryCreateBackend(descriptor.pluginPath)) + } + if (tryCreateBackend(descriptor.pluginPath)) { return true; - else // Drop backends that failed to construct. - foundBackends.erase(it); + } else { // Drop backends that failed to construct. + it = foundBackends.erase(it); + if (it == foundBackends.end()) + break; + } } } diff -Nru phonon-4.8.0/phonon/objectdescriptionmodel.h phonon-4.8.3/phonon/objectdescriptionmodel.h --- phonon-4.8.0/phonon/objectdescriptionmodel.h 2014-09-06 16:14:24.000000000 +0000 +++ phonon-4.8.3/phonon/objectdescriptionmodel.h 2014-12-04 09:30:26.000000000 +0000 @@ -139,11 +139,10 @@ /* Required to ensure template class vtables are exported on both symbian and existing builds. */ -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT) || defined(Q_CC_CLANG) +#if defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT) // RVCT compiler (2.2.686) requires the export declaration to be on the class to export vtables // MWC compiler works both ways // GCCE compiler is unknown (it can't compile QtCore yet) -// Clang also requires the export declaration to be on the class to export vtables #define PHONON_TEMPLATE_CLASS_EXPORT PHONON_EXPORT #define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT #else diff -Nru phonon-4.8.0/phonon/pulsesupport.cpp phonon-4.8.3/phonon/pulsesupport.cpp --- phonon-4.8.0/phonon/pulsesupport.cpp 2014-09-06 16:14:24.000000000 +0000 +++ phonon-4.8.3/phonon/pulsesupport.cpp 2014-12-04 09:30:26.000000000 +0000 @@ -22,12 +22,13 @@ #include "pulsesupport.h" -#include -#include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include #ifdef HAVE_PULSEAUDIO #include "pulsestream_p.h" @@ -1148,9 +1149,21 @@ if (!qApp->applicationVersion().isEmpty()) qputenv(QString("PULSE_PROP_OVERRIDE_%1").arg(PA_PROP_APPLICATION_VERSION).toUtf8(), qApp->applicationVersion().toUtf8()); - if (!qApp->applicationName().isEmpty()) + if (!qApp->applicationName().isEmpty()) { + QString icon; +#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) + if (!qApp->windowIcon().isNull()){ + // Try to get the fromTheme() name of the QIcon. + icon = qApp->windowIcon().name(); + } +#endif + if (icon.isEmpty()) { + // If we failed to get a proper icon name, use the appname instead. + icon = qApp->applicationName().toLower(); + } qputenv(QString("PULSE_PROP_OVERRIDE_%1").arg(PA_PROP_APPLICATION_ICON_NAME).toUtf8(), - qApp->applicationName().toUtf8()); + icon.toUtf8()); + } return stream; }