Hello community, here is the log from the commit of package phonon4qt5 for openSUSE:Factory checked in at 2015-01-07 09:38:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-20 07:27:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5.new/phonon4qt5.changes 2015-01-07 09:38:10.000000000 +0100 @@ -1,0 +2,23 @@ +Sat Dec 6 18:11:12 UTC 2014 - [email protected] + +- Update to 4.8.3: + * Set target interface include install dir + * Do not assume we have a backend when setting an output device, + kde#341296 + +------------------------------------------------------------------- +Wed Nov 5 22:48:14 UTC 2014 - [email protected] + +- Update to 4.8.2: + * Revised the logic used by PulseSupport to come up with an icon + name for PulseAudio. If the application has + QApplication::windowIcon set with an QIcon constructed through + QIcon::fromTheme(string) the actual icon name will be used. + Otherwise the lower-case version of + QCoreApplication::applicationName is used. + * Fixed building with the compiler clang by reverting + a previously introduced workaround. +- Fix Requires of devel package, there was a wrong "BuildRequires", + and they shall be found by pkg-config detection + +------------------------------------------------------------------- Old: ---- phonon-4.8.1.tar.xz New: ---- phonon-4.8.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon4qt5.spec ++++++ --- /var/tmp/diff_new_pack.4W5afn/_old 2015-01-07 09:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.4W5afn/_new 2015-01-07 09:38:12.000000000 +0100 @@ -19,13 +19,13 @@ %define rname phonon Name: phonon4qt5 -Version: 4.8.1 +Version: 4.8.3 Release: 0 Summary: Multimedia Platform Abstraction License: LGPL-2.0+ Group: System/GUI/KDE Url: http://phonon.kde.org/ -Source: http://download.kde.org/stable/%{rname}/%{version}/%{rname}-%{version}.tar.xz +Source: http://download.kde.org/stable/%{rname}/%{version}/src/%{rname}-%{version}.tar.xz Source1: baselibs.conf BuildRequires: cmake BuildRequires: fdupes @@ -53,9 +53,6 @@ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE Requires: libphonon4qt5 = %{version} -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Widgets) %description devel Phonon is a cross-platform portable Multimedia Support Abstraction, ++++++ phonon-4.8.1.tar.xz -> phonon-4.8.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/CMakeLists.txt new/phonon-4.8.3/CMakeLists.txt --- old/phonon-4.8.1/CMakeLists.txt 2014-10-15 13:18:52.000000000 +0200 +++ new/phonon-4.8.3/CMakeLists.txt 2014-12-04 10:30:26.000000000 +0100 @@ -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 "1") # 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/PhononConfig.cmake.in new/phonon-4.8.3/PhononConfig.cmake.in --- old/phonon-4.8.1/PhononConfig.cmake.in 2014-10-15 13:18:52.000000000 +0200 +++ new/phonon-4.8.3/PhononConfig.cmake.in 2014-12-04 10:30:26.000000000 +0100 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/includes/CMakeLists.txt new/phonon-4.8.3/includes/CMakeLists.txt --- old/phonon-4.8.1/includes/CMakeLists.txt 2014-10-15 13:18:52.000000000 +0200 +++ new/phonon-4.8.3/includes/CMakeLists.txt 2014-12-04 10:30:26.000000000 +0100 @@ -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) # <Phonon/Foo> + install(FILES old/phonon DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel) # <phonon/phonon> 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/includes/old/phonon new/phonon-4.8.3/includes/old/phonon --- old/phonon-4.8.1/includes/old/phonon 1970-01-01 01:00:00.000000000 +0100 +++ new/phonon-4.8.3/includes/old/phonon 2014-12-04 10:30:26.000000000 +0100 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/phonon/CMakeLists.txt new/phonon-4.8.3/phonon/CMakeLists.txt --- old/phonon-4.8.1/phonon/CMakeLists.txt 2014-10-15 13:18:52.000000000 +0200 +++ new/phonon-4.8.3/phonon/CMakeLists.txt 2014-12-04 10:30:26.000000000 +0100 @@ -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_INTERFACE:${INCLUDE_INSTALL_DIR}>") install(TARGETS ${PHONON_LIB_SONAME} EXPORT PhononLibs ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/phonon/audiooutput.cpp new/phonon-4.8.3/phonon/audiooutput.cpp --- old/phonon-4.8.1/phonon/audiooutput.cpp 2014-10-15 13:18:52.000000000 +0200 +++ new/phonon-4.8.3/phonon/audiooutput.cpp 2014-12-04 10:30:26.000000000 +0100 @@ -54,6 +54,9 @@ if (pulse->isActive()) return pulse->setOutputDevice(d->getStreamUuid(), dev.index()); + if (!d->backendObject()) + return false; + Iface<IFACES2> iface(d); if (iface) { return iface->setOutputDevice(dev); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/phonon/experimental/CMakeLists.txt new/phonon-4.8.3/phonon/experimental/CMakeLists.txt --- old/phonon-4.8.1/phonon/experimental/CMakeLists.txt 2014-10-15 13:18:52.000000000 +0200 +++ new/phonon-4.8.3/phonon/experimental/CMakeLists.txt 2014-12-04 10:30:26.000000000 +0100 @@ -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_INTERFACE:${INCLUDE_INSTALL_DIR}>") ########### install headers ############### install(FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/phonon/objectdescriptionmodel.h new/phonon-4.8.3/phonon/objectdescriptionmodel.h --- old/phonon-4.8.1/phonon/objectdescriptionmodel.h 2014-10-15 13:18:52.000000000 +0200 +++ new/phonon-4.8.3/phonon/objectdescriptionmodel.h 2014-12-04 10:30:26.000000000 +0100 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-4.8.1/phonon/pulsesupport.cpp new/phonon-4.8.3/phonon/pulsesupport.cpp --- old/phonon-4.8.1/phonon/pulsesupport.cpp 2014-10-15 13:18:52.000000000 +0200 +++ new/phonon-4.8.3/phonon/pulsesupport.cpp 2014-12-04 10:30:26.000000000 +0100 @@ -22,12 +22,13 @@ #include "pulsesupport.h" -#include <QtCore/QAbstractEventDispatcher> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QTimer> -#include <QtCore/QMutex> +#include <QAbstractEventDispatcher> #include <QApplication> +#include <QDebug> +#include <QIcon> +#include <QMutex> +#include <QStringList> +#include <QTimer> #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; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
