diff -Nru phonon-4.8.2/CMakeLists.txt phonon-4.8.3/CMakeLists.txt --- phonon-4.8.2/CMakeLists.txt 2014-11-03 10:46:07.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 "2") # 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.2/debian/changelog phonon-4.8.3/debian/changelog --- phonon-4.8.2/debian/changelog 2014-11-25 00:23:06.000000000 +0000 +++ phonon-4.8.3/debian/changelog 2014-12-12 15:32:30.000000000 +0000 @@ -1,3 +1,9 @@ +phonon (4:4.8.3-0ubuntu1) vivid; urgency=medium + + * New upstream release. + + -- Mikhail Ivchenko Fri, 12 Dec 2014 15:24:43 +0000 + phonon (4:4.8.2-0ubuntu1) vivid; urgency=medium * New upstream release. diff -Nru phonon-4.8.2/includes/CMakeLists.txt phonon-4.8.3/includes/CMakeLists.txt --- phonon-4.8.2/includes/CMakeLists.txt 2014-11-03 10:46:07.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.2/includes/old/phonon phonon-4.8.3/includes/old/phonon --- phonon-4.8.2/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.2/phonon/audiooutput.cpp phonon-4.8.3/phonon/audiooutput.cpp --- phonon-4.8.2/phonon/audiooutput.cpp 2014-11-03 10:46:07.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.2/phonon/CMakeLists.txt phonon-4.8.3/phonon/CMakeLists.txt --- phonon-4.8.2/phonon/CMakeLists.txt 2014-11-03 10:46:07.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.2/phonon/experimental/CMakeLists.txt phonon-4.8.3/phonon/experimental/CMakeLists.txt --- phonon-4.8.2/phonon/experimental/CMakeLists.txt 2014-11-03 10:46:07.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.2/PhononConfig.cmake.in phonon-4.8.3/PhononConfig.cmake.in --- phonon-4.8.2/PhononConfig.cmake.in 2014-11-03 10:46:07.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