diffstat of debian/ for phonon_4.8.0-4 phonon_4.8.3-0ubuntu3 changelog | 153 ++ control | 18 libphonon-dev.install | 106 - libphonon4.symbols | 38 libphonon4qt5-4.symbols | 38 libphonon4qt5-dev.install | 132 - libphonon4qt5experimental-dev.install | 24 libphonon4qt5experimental4.symbols | 38 libphononexperimental4.symbols | 32 patches/do_not_assume_existing_backend.patch | 40 patches/fix_include_dirs | 26 patches/phonon_is_not_forced_in_KDE.diff | 15 patches/series | 8 patches/upstream_dont_allocate_a_char_with_undefined_size | 21 patches/upstream_fix_build_with_qt_5.4.2 | 30 patches/upstream_tear_cmake_logic_for_qt4_and_qt5_apart | 1023 ++++++++++++++ rules | 8 17 files changed, 1505 insertions(+), 245 deletions(-) diff -Nru phonon-4.8.0/debian/changelog phonon-4.8.3/debian/changelog --- phonon-4.8.0/debian/changelog 2014-11-27 13:44:10.000000000 +0000 +++ phonon-4.8.3/debian/changelog 2015-11-13 12:22:42.000000000 +0000 @@ -1,10 +1,58 @@ -phonon (4:4.8.0-4) unstable; urgency=medium +phonon (4:4.8.3-0ubuntu3) xenial; urgency=medium - * Team upload. - * Add do_not_assume_existing_backend.patch to solve a crash when running - without a backend (Closes: #771138). + * Cherry-pick some changes from Debian, in the absence of a full merge. + Brings improvements in compiler flag usage, which should fix FTBFS of + reverse depends. + * Add patches: + + debian/patches/fix_include_dirs + + debian/patches/upstream_dont_allocate_a_char_with_undefined_size + + debian/patches/upstream_fix_build_with_qt_5.4.2 + + debian/patches/upstream_tear_cmake_logic_for_qt4_and_qt5_apart + * Add build-dep on extra-cmake-modules. + + -- Iain Lane Fri, 13 Nov 2015 12:22:42 +0000 + +phonon (4:4.8.3-0ubuntu2) vivid; urgency=medium + + * Update symbols files for GCC 5. + + -- Matthias Klose Tue, 10 Mar 2015 16:22:58 +0100 + +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. + + -- Ron Betzen Mon, 24 Nov 2014 23:55:28 +0000 + +phonon (4:4.8.0-~4ubuntu2) vivid; urgency=medium + + * Remove phonon_is_not_forced_in_KDE.diff which installs header files + to the wrong directory + + -- Jonathan Riddell Fri, 07 Nov 2014 14:46:07 +0100 + +phonon (4:4.8.0-~4ubuntu1) vivid; urgency=medium - -- Lisandro Damián Nicanor Pérez Meyer Thu, 27 Nov 2014 10:33:03 -0300 + * Merge with Debian, remaining changes: + - Drop universe dependency libqzeitgeist-dev. + - in debian/rules set default to gstreamer + - move qt5 experimental headers from libphonon4qt5-dev.install + to libphonon4qt5experimental-dev.install + + -- Jonathan Riddell Wed, 29 Oct 2014 17:18:34 +0000 + +phonon (4:4.8.0-4) UNRELEASED; urgency=medium + + [ Lisandro Damián Nicanor Pérez Meyer ] + * Add myself to Uploaders. + + -- Debian Qt/KDE Maintainers Mon, 06 Oct 2014 14:03:01 -0300 phonon (4:4.8.0-3) unstable; urgency=medium @@ -71,6 +119,101 @@ -- Lisandro Damián Nicanor Pérez Meyer Mon, 09 Dec 2013 16:31:51 -0300 +phonon (4:4.7.80-0ubuntu2) utopic; urgency=medium + + * Use phonon-backend-gstreamer instead of phonon-backend-gstreamer1.0 + for dependencies and recommendations. + + -- Matthias Klose Wed, 10 Sep 2014 14:24:01 +0200 + +phonon (4:4.7.80-0ubuntu1) utopic; urgency=medium + + * New upstream beta release + + -- Jonathan Riddell Thu, 14 Aug 2014 14:18:52 +0200 + +phonon (4:4.7.2-0ubuntu1) utopic; urgency=medium + + * New upstream release + * Add missing symbols files for Qt5 libraries + * Add explicit phonon4qt5 dependency to symbols files + + -- Jonathan Riddell Thu, 10 Jul 2014 12:05:38 +0200 + +phonon (4:4.7.1-0ubuntu8) trusty; urgency=medium + + * Fix install location of usr/include/phonon4qt5/KDE/ + + -- Jonathan Riddell Wed, 02 Apr 2014 13:05:09 +0000 + +phonon (4:4.7.1-0ubuntu7) trusty; urgency=medium + + * Change recommended backend to phonon-backend-gstreamer1.0 + + -- Jonathan Riddell Mon, 24 Mar 2014 20:13:27 +0000 + +phonon (4:4.7.1-0ubuntu6) trusty; urgency=medium + + [ Scarlett Clark ] + * Fix .pri install location. + + -- Jonathan Riddell Mon, 24 Mar 2014 17:09:52 +0000 + +phonon (4:4.7.1-0ubuntu5) trusty; urgency=medium + + [ Timo Jyrinki ] + * Rebuild against Qt 5.2.1 + * Use the new mkspecs location + + -- Timo Jyrinki Mon, 10 Mar 2014 07:18:59 +0000 + +phonon (4:4.7.1-0ubuntu4) trusty; urgency=medium + + * Fix install of qt_phonon4qt5.pri + + -- Jonathan Riddell Fri, 14 Feb 2014 15:55:59 +0000 + +phonon (4:4.7.1-0ubuntu3) trusty; urgency=medium + + * Fix paths in libphonon4qt5-dev.install + + -- Jonathan Riddell Tue, 04 Feb 2014 17:39:47 +0000 + +phonon (4:4.7.1-0ubuntu2) trusty; urgency=medium + + * Fix paths in libphonon4qt5-dev.install + + -- Jonathan Riddell Thu, 30 Jan 2014 10:39:05 +0000 + +phonon (4:4.7.1-0ubuntu1) trusty; urgency=low + + * New upstream release + * Do not suggest phonon-backend-mplayer which no longer exists + * Do second build for phonon4qt5 and duplicate packages and debconf setup for it + + -- Jonathan Riddell Fri, 06 Dec 2013 12:32:48 +0000 + +phonon (4:4.7.0.0-2ubuntu3) trusty; urgency=low + + * Third time's the charm: suggest phonon-backend-vlc to + compliment the previous phonon-backend-gstreamer change. + + -- Adam Conrad Sat, 23 Nov 2013 22:06:30 -0700 + +phonon (4:4.7.0.0-2ubuntu2) trusty; urgency=low + + * Actually change default backend to phonon-backend-gstreamer. + + -- Dmitrijs Ledkovs Sun, 24 Nov 2013 04:53:10 +0000 + +phonon (4:4.7.0.0-2ubuntu1) trusty; urgency=low + + * Rebase on to debian, remaining changes: + - Drop universe dependency libqzeitgeist-dev. + - Change default backend to phonon-backend-gstreamer. + + -- Dmitrijs Ledkovs Sun, 24 Nov 2013 02:51:02 +0000 + phonon (4:4.7.0.0-2) unstable; urgency=low * Confirm symbol file on arm*: fixes FTBFSes. diff -Nru phonon-4.8.0/debian/control phonon-4.8.3/debian/control --- phonon-4.8.0/debian/control 2014-11-27 03:06:46.000000000 +0000 +++ phonon-4.8.3/debian/control 2015-11-13 10:35:28.000000000 +0000 @@ -1,21 +1,23 @@ Source: phonon Section: sound Priority: optional -Maintainer: Debian Qt/KDE Maintainers -Uploaders: Modestas Vainius , Fathi Boudra , - Diane Trout +Maintainer: Debian/Kubuntu 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), + extra-cmake-modules (>= 5.7), libglib2.0-dev, libpulse-dev (>= 0.9.21), libqt4-dev (>= 4:4.8.1), - libqzeitgeist-dev, + libqt5opengl5-dev, pkg-kde-tools (>= 0.12), qtbase5-dev, - qttools5-dev, - libqt5opengl5-dev + qttools5-dev Standards-Version: 3.9.5 Homepage: http://phonon.kde.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-req/phonon.git @@ -27,9 +29,7 @@ Depends: libphonon4 (>= ${source:Version}), ${misc:Depends}, ${phonon:Recommended-Backend-qt4} | phonon-backend -Suggests: phonon-backend-gstreamer, - phonon-backend-mplayer, - phonon-backend-vlc +Suggests: phonon-backend-gstreamer, phonon-backend-mplayer, phonon-backend-vlc Breaks: phonon-backend-xine (<< 4:4.6.0.0) Description: multimedia framework from KDE using Qt 4 - metapackage Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction 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 2014-03-10 18:53:30.000000000 +0000 +++ phonon-4.8.3/debian/libphonon-dev.install 2015-11-13 10:43:41.000000000 +0000 @@ -1,3 +1,37 @@ +usr/include/KDE/Phonon/AbstractAudioOutput +usr/include/KDE/Phonon/AbstractMediaStream +usr/include/KDE/Phonon/AbstractVideoOutput +usr/include/KDE/Phonon/AddonInterface +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/AbstractAudioOutput usr/include/phonon/AbstractMediaStream usr/include/phonon/AbstractVideoOutput @@ -35,42 +69,40 @@ 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/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 @@ -143,3 +175,5 @@ usr/share/phonon/buildsystem/PhononMacros.cmake usr/share/phonon/buildsystem/cmake_uninstall.cmake.in usr/share/qt4/mkspecs/modules/qt_phonon.pri +usr/share/phonon/buildsystem/PhononQt4.cmake +usr/share/phonon/buildsystem/PhononQt5.cmake diff -Nru phonon-4.8.0/debian/libphonon4.symbols phonon-4.8.3/debian/libphonon4.symbols --- phonon-4.8.0/debian/libphonon4.symbols 2014-11-27 03:06:38.000000000 +0000 +++ phonon-4.8.3/debian/libphonon4.symbols 2015-03-10 15:22:55.000000000 +0000 @@ -35,9 +35,9 @@ _ZN6Phonon11AudioOutputC1EP7QObject@Base 4:4.2.0 _ZN6Phonon11AudioOutputC2ENS_8CategoryEP7QObject@Base 4:4.2.0 _ZN6Phonon11AudioOutputC2EP7QObject@Base 4:4.2.0 - _ZN6Phonon11AudioOutputD0Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon11AudioOutputD1Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon11AudioOutputD2Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon11AudioOutputD0Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon11AudioOutputD1Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon11AudioOutputD2Ev@Base 4:4.6.0really4.5.0 _ZN6Phonon11MediaObject10clearQueueEv@Base 4:4.2.0 _ZN6Phonon11MediaObject11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.2.0 _ZN6Phonon11MediaObject11qt_metacastEPKc@Base 4:4.2.0 @@ -156,9 +156,9 @@ _ZN6Phonon11VideoWidgetC1ERNS_18VideoWidgetPrivateEP7QWidget@Base 4:4.2.0 _ZN6Phonon11VideoWidgetC2EP7QWidget@Base 4:4.2.0 _ZN6Phonon11VideoWidgetC2ERNS_18VideoWidgetPrivateEP7QWidget@Base 4:4.2.0 - _ZN6Phonon11VideoWidgetD0Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon11VideoWidgetD1Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon11VideoWidgetD2Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon11VideoWidgetD0Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon11VideoWidgetD1Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon11VideoWidgetD2Ev@Base 4:4.6.0really4.5.0 _ZN6Phonon12EffectWidget11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.2.0 _ZN6Phonon12EffectWidget11qt_metacastEPKc@Base 4:4.2.0 _ZN6Phonon12EffectWidget16staticMetaObjectE@Base 4:4.2.0 @@ -236,9 +236,9 @@ _ZN6Phonon15AudioDataOutput9dataReadyERK4QMapINS0_7ChannelE7QVectorIsEE@Base 4:4.6.0really4.3.80 _ZN6Phonon15AudioDataOutputC1EP7QObject@Base 4:4.6.0really4.3.80 _ZN6Phonon15AudioDataOutputC2EP7QObject@Base 4:4.6.0really4.3.80 - _ZN6Phonon15AudioDataOutputD0Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon15AudioDataOutputD1Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon15AudioDataOutputD2Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon15AudioDataOutputD0Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon15AudioDataOutputD1Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon15AudioDataOutputD2Ev@Base 4:4.6.0really4.5.0 _ZN6Phonon15EffectParameterC1ERKS0_@Base 4:4.2.0 _ZN6Phonon15EffectParameterC1EiRK7QString6QFlagsINS0_4HintEERK8QVariantS9_S9_RK5QListIS7_ES3_@Base 4:4.2.0 _ZN6Phonon15EffectParameterC1Ev@Base 4:4.2.0 @@ -315,9 +315,9 @@ _ZN6Phonon17VolumeFaderEffect9setVolumeEf@Base 4:4.2.0 _ZN6Phonon17VolumeFaderEffectC1EP7QObject@Base 4:4.2.0 _ZN6Phonon17VolumeFaderEffectC2EP7QObject@Base 4:4.2.0 - _ZN6Phonon17VolumeFaderEffectD0Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon17VolumeFaderEffectD1Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon17VolumeFaderEffectD2Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon17VolumeFaderEffectD0Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon17VolumeFaderEffectD1Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon17VolumeFaderEffectD2Ev@Base 4:4.6.0really4.5.0 _ZN6Phonon17registerMetaTypesEv@Base 4:4.6.0really4.4.3 _ZN6Phonon18MediaObjectPrivate15_k_stateChangedENS_5StateES1_@Base 4:4.2.0 _ZN6Phonon18MediaObjectPrivate18setupBackendObjectEv@Base 4:4.2.0 @@ -355,9 +355,9 @@ _ZN6Phonon19AbstractMediaStreamD2Ev@Base 4:4.2.0 _ZN6Phonon19AbstractVideoOutputC1ERNS_26AbstractVideoOutputPrivateE@Base 4:4.2.0 _ZN6Phonon19AbstractVideoOutputC2ERNS_26AbstractVideoOutputPrivateE@Base 4:4.2.0 - _ZN6Phonon19AbstractVideoOutputD0Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon19AbstractVideoOutputD1Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon19AbstractVideoOutputD2Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon19AbstractVideoOutputD0Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon19AbstractVideoOutputD1Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon19AbstractVideoOutputD2Ev@Base 4:4.6.0really4.5.0 _ZN6Phonon19BackendCapabilities18availableMimeTypesEv@Base 4:4.2.0 _ZN6Phonon19BackendCapabilities19isMimeTypeAvailableERK7QString@Base 4:4.2.0 _ZN6Phonon19BackendCapabilities21availableAudioEffectsEv@Base 4:4.2.0 @@ -705,13 +705,13 @@ _ZTVN6Phonon6EffectE@Base 4:4.2.0 _ZTVN6Phonon9MediaNodeE@Base 4:4.2.0 (c++)"non-virtual thunk to Phonon::AbstractAudioOutput::~AbstractAudioOutput()@Base" 4:4.2.0 - (c++)"non-virtual thunk to Phonon::AudioDataOutput::~AudioDataOutput()@Base" 4:4.6.0really4.5.0 - (c++)"non-virtual thunk to Phonon::AudioOutput::~AudioOutput()@Base" 4:4.6.0really4.5.0 + (optional|c++)"non-virtual thunk to Phonon::AudioDataOutput::~AudioDataOutput()@Base" 4:4.6.0really4.5.0 + (optional|c++)"non-virtual thunk to Phonon::AudioOutput::~AudioOutput()@Base" 4:4.6.0really4.5.0 (c++)"non-virtual thunk to Phonon::Effect::~Effect()@Base" 4:4.2.0 (c++)"non-virtual thunk to Phonon::EffectWidget::~EffectWidget()@Base" 4:4.2.0 (c++)"non-virtual thunk to Phonon::MediaObject::~MediaObject()@Base" 4:4.2.0 (c++)"non-virtual thunk to Phonon::SeekSlider::~SeekSlider()@Base" 4:4.2.0 (c++)"non-virtual thunk to Phonon::VideoPlayer::~VideoPlayer()@Base" 4:4.2.0 - (c++)"non-virtual thunk to Phonon::VideoWidget::~VideoWidget()@Base" 4:4.6.0really4.5.0 - (c++)"non-virtual thunk to Phonon::VolumeFaderEffect::~VolumeFaderEffect()@Base" 4:4.6.0really4.5.0 + (optional|c++)"non-virtual thunk to Phonon::VideoWidget::~VideoWidget()@Base" 4:4.6.0really4.5.0 + (optional|c++)"non-virtual thunk to Phonon::VolumeFaderEffect::~VolumeFaderEffect()@Base" 4:4.6.0really4.5.0 (c++)"non-virtual thunk to Phonon::VolumeSlider::~VolumeSlider()@Base" 4:4.2.0 diff -Nru phonon-4.8.0/debian/libphonon4qt5-4.symbols phonon-4.8.3/debian/libphonon4qt5-4.symbols --- phonon-4.8.0/debian/libphonon4qt5-4.symbols 2014-11-27 03:06:38.000000000 +0000 +++ phonon-4.8.3/debian/libphonon4qt5-4.symbols 2015-03-10 15:33:10.000000000 +0000 @@ -33,9 +33,9 @@ _ZN6Phonon11AudioOutputC1EP7QObject@Base 4:4.8.0 _ZN6Phonon11AudioOutputC2ENS_8CategoryEP7QObject@Base 4:4.8.0 _ZN6Phonon11AudioOutputC2EP7QObject@Base 4:4.8.0 - _ZN6Phonon11AudioOutputD0Ev@Base 4:4.8.0 - _ZN6Phonon11AudioOutputD1Ev@Base 4:4.8.0 - _ZN6Phonon11AudioOutputD2Ev@Base 4:4.8.0 + (optional)_ZN6Phonon11AudioOutputD0Ev@Base 4:4.8.0 + (optional)_ZN6Phonon11AudioOutputD1Ev@Base 4:4.8.0 + (optional)_ZN6Phonon11AudioOutputD2Ev@Base 4:4.8.0 _ZN6Phonon11MediaObject10clearQueueEv@Base 4:4.8.0 _ZN6Phonon11MediaObject11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.8.0 _ZN6Phonon11MediaObject11qt_metacastEPKc@Base 4:4.8.0 @@ -154,9 +154,9 @@ _ZN6Phonon11VideoWidgetC1ERNS_18VideoWidgetPrivateEP7QWidget@Base 4:4.8.0 _ZN6Phonon11VideoWidgetC2EP7QWidget@Base 4:4.8.0 _ZN6Phonon11VideoWidgetC2ERNS_18VideoWidgetPrivateEP7QWidget@Base 4:4.8.0 - _ZN6Phonon11VideoWidgetD0Ev@Base 4:4.8.0 - _ZN6Phonon11VideoWidgetD1Ev@Base 4:4.8.0 - _ZN6Phonon11VideoWidgetD2Ev@Base 4:4.8.0 + (optional)_ZN6Phonon11VideoWidgetD0Ev@Base 4:4.8.0 + (optional)_ZN6Phonon11VideoWidgetD1Ev@Base 4:4.8.0 + (optional)_ZN6Phonon11VideoWidgetD2Ev@Base 4:4.8.0 _ZN6Phonon12EffectWidget11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.8.0 _ZN6Phonon12EffectWidget11qt_metacastEPKc@Base 4:4.8.0 _ZN6Phonon12EffectWidget16staticMetaObjectE@Base 4:4.8.0 @@ -234,9 +234,9 @@ _ZN6Phonon15AudioDataOutput9dataReadyERK4QMapINS0_7ChannelE7QVectorIsEE@Base 4:4.8.0 _ZN6Phonon15AudioDataOutputC1EP7QObject@Base 4:4.8.0 _ZN6Phonon15AudioDataOutputC2EP7QObject@Base 4:4.8.0 - _ZN6Phonon15AudioDataOutputD0Ev@Base 4:4.8.0 - _ZN6Phonon15AudioDataOutputD1Ev@Base 4:4.8.0 - _ZN6Phonon15AudioDataOutputD2Ev@Base 4:4.8.0 + (optional)_ZN6Phonon15AudioDataOutputD0Ev@Base 4:4.8.0 + (optional)_ZN6Phonon15AudioDataOutputD1Ev@Base 4:4.8.0 + (optional)_ZN6Phonon15AudioDataOutputD2Ev@Base 4:4.8.0 _ZN6Phonon15EffectParameterC1ERKS0_@Base 4:4.8.0 _ZN6Phonon15EffectParameterC1EiRK7QString6QFlagsINS0_4HintEERK8QVariantS9_S9_RK5QListIS7_ES3_@Base 4:4.8.0 _ZN6Phonon15EffectParameterC1Ev@Base 4:4.8.0 @@ -313,9 +313,9 @@ _ZN6Phonon17VolumeFaderEffect9setVolumeEf@Base 4:4.8.0 _ZN6Phonon17VolumeFaderEffectC1EP7QObject@Base 4:4.8.0 _ZN6Phonon17VolumeFaderEffectC2EP7QObject@Base 4:4.8.0 - _ZN6Phonon17VolumeFaderEffectD0Ev@Base 4:4.8.0 - _ZN6Phonon17VolumeFaderEffectD1Ev@Base 4:4.8.0 - _ZN6Phonon17VolumeFaderEffectD2Ev@Base 4:4.8.0 + (optional)_ZN6Phonon17VolumeFaderEffectD0Ev@Base 4:4.8.0 + (optional)_ZN6Phonon17VolumeFaderEffectD1Ev@Base 4:4.8.0 + (optional)_ZN6Phonon17VolumeFaderEffectD2Ev@Base 4:4.8.0 _ZN6Phonon17registerMetaTypesEv@Base 4:4.8.0 _ZN6Phonon18MediaObjectPrivate15_k_stateChangedENS_5StateES1_@Base 4:4.8.0 _ZN6Phonon18MediaObjectPrivate18setupBackendObjectEv@Base 4:4.8.0 @@ -353,9 +353,9 @@ _ZN6Phonon19AbstractMediaStreamD2Ev@Base 4:4.8.0 _ZN6Phonon19AbstractVideoOutputC1ERNS_26AbstractVideoOutputPrivateE@Base 4:4.8.0 _ZN6Phonon19AbstractVideoOutputC2ERNS_26AbstractVideoOutputPrivateE@Base 4:4.8.0 - _ZN6Phonon19AbstractVideoOutputD0Ev@Base 4:4.8.0 - _ZN6Phonon19AbstractVideoOutputD1Ev@Base 4:4.8.0 - _ZN6Phonon19AbstractVideoOutputD2Ev@Base 4:4.8.0 + (optional)_ZN6Phonon19AbstractVideoOutputD0Ev@Base 4:4.8.0 + (optional)_ZN6Phonon19AbstractVideoOutputD1Ev@Base 4:4.8.0 + (optional)_ZN6Phonon19AbstractVideoOutputD2Ev@Base 4:4.8.0 _ZN6Phonon19BackendCapabilities18availableMimeTypesEv@Base 4:4.8.0 _ZN6Phonon19BackendCapabilities19isMimeTypeAvailableERK7QString@Base 4:4.8.0 _ZN6Phonon19BackendCapabilities21availableAudioEffectsEv@Base 4:4.8.0 @@ -705,13 +705,13 @@ _ZTVN6Phonon6EffectE@Base 4:4.8.0 _ZTVN6Phonon9MediaNodeE@Base 4:4.8.0 (c++)"non-virtual thunk to Phonon::AbstractAudioOutput::~AbstractAudioOutput()@Base" 4:4.8.0 - (c++)"non-virtual thunk to Phonon::AudioDataOutput::~AudioDataOutput()@Base" 4:4.8.0 - (c++)"non-virtual thunk to Phonon::AudioOutput::~AudioOutput()@Base" 4:4.8.0 + (optional|c++)"non-virtual thunk to Phonon::AudioDataOutput::~AudioDataOutput()@Base" 4:4.8.0 + (optional|c++)"non-virtual thunk to Phonon::AudioOutput::~AudioOutput()@Base" 4:4.8.0 (c++)"non-virtual thunk to Phonon::Effect::~Effect()@Base" 4:4.8.0 (c++)"non-virtual thunk to Phonon::EffectWidget::~EffectWidget()@Base" 4:4.8.0 (c++)"non-virtual thunk to Phonon::MediaObject::~MediaObject()@Base" 4:4.8.0 (c++)"non-virtual thunk to Phonon::SeekSlider::~SeekSlider()@Base" 4:4.8.0 (c++)"non-virtual thunk to Phonon::VideoPlayer::~VideoPlayer()@Base" 4:4.8.0 - (c++)"non-virtual thunk to Phonon::VideoWidget::~VideoWidget()@Base" 4:4.8.0 - (c++)"non-virtual thunk to Phonon::VolumeFaderEffect::~VolumeFaderEffect()@Base" 4:4.8.0 + (optional|c++)"non-virtual thunk to Phonon::VideoWidget::~VideoWidget()@Base" 4:4.8.0 + (optional|c++)"non-virtual thunk to Phonon::VolumeFaderEffect::~VolumeFaderEffect()@Base" 4:4.8.0 (c++)"non-virtual thunk to Phonon::VolumeSlider::~VolumeSlider()@Base" 4:4.8.0 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 2014-11-27 03:06:46.000000000 +0000 +++ phonon-4.8.3/debian/libphonon4qt5-dev.install 2015-11-13 10:45:52.000000000 +0000 @@ -1,3 +1,37 @@ +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/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/AbstractAudioOutput usr/include/phonon4qt5/phonon/AbstractMediaStream usr/include/phonon4qt5/phonon/AbstractVideoOutput @@ -35,42 +69,40 @@ 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/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 @@ -100,30 +132,6 @@ usr/include/phonon4qt5/phonon/effectinterface.h usr/include/phonon4qt5/phonon/effectparameter.h usr/include/phonon4qt5/phonon/effectwidget.h -usr/include/phonon4qt5/phonon/experimental/abstractaudiodataoutput.h -usr/include/phonon4qt5/phonon/experimental/abstractvideodataoutput.h -usr/include/phonon4qt5/phonon/experimental/audiodataoutput.h -usr/include/phonon4qt5/phonon/experimental/audiodataoutputinterface.h -usr/include/phonon4qt5/phonon/experimental/audioformat.h -usr/include/phonon4qt5/phonon/experimental/avcapture.h -usr/include/phonon4qt5/phonon/experimental/avcaptureinterface.h -usr/include/phonon4qt5/phonon/experimental/backendcapabilities.h -usr/include/phonon4qt5/phonon/experimental/backendinterface.h -usr/include/phonon4qt5/phonon/experimental/export.h -usr/include/phonon4qt5/phonon/experimental/globalconfig.h -usr/include/phonon4qt5/phonon/experimental/mediasource.h -usr/include/phonon4qt5/phonon/experimental/objectdescription.h -usr/include/phonon4qt5/phonon/experimental/packet.h -usr/include/phonon4qt5/phonon/experimental/packetpool.h -usr/include/phonon4qt5/phonon/experimental/phononnamespace.h -usr/include/phonon4qt5/phonon/experimental/snapshotinterface.h -usr/include/phonon4qt5/phonon/experimental/videodataoutput.h -usr/include/phonon4qt5/phonon/experimental/videodataoutput2.h -usr/include/phonon4qt5/phonon/experimental/videodataoutputinterface.h -usr/include/phonon4qt5/phonon/experimental/videoframe.h -usr/include/phonon4qt5/phonon/experimental/videoframe2.h -usr/include/phonon4qt5/phonon/experimental/videowidget.h -usr/include/phonon4qt5/phonon/experimental/visualization.h usr/include/phonon4qt5/phonon/globalconfig.h usr/include/phonon4qt5/phonon/globaldescriptioncontainer.h usr/include/phonon4qt5/phonon/mediacontroller.h @@ -155,8 +163,8 @@ usr/lib/*/cmake/phonon4qt5/PhononTargets.cmake usr/lib/*/libphonon4qt5.so usr/lib/*/pkgconfig/phonon4qt5.pc -usr/lib/*/qt5/plugins/designer/libphononwidgets.so usr/lib/*/qt5/mkspecs/modules/qt_phonon4qt5.pri +usr/lib/*/qt5/plugins/designer/phononwidgets.so usr/share/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml usr/share/phonon/buildsystem/COPYING-CMAKE-SCRIPTS usr/share/phonon4qt5/buildsystem/COPYING-CMAKE-SCRIPTS @@ -169,3 +177,5 @@ usr/share/phonon4qt5/buildsystem/MacroPushRequiredVars.cmake usr/share/phonon4qt5/buildsystem/PhononMacros.cmake usr/share/phonon4qt5/buildsystem/cmake_uninstall.cmake.in +usr/share/phonon4qt5/buildsystem/PhononQt4.cmake +usr/share/phonon4qt5/buildsystem/PhononQt5.cmake diff -Nru phonon-4.8.0/debian/libphonon4qt5experimental-dev.install phonon-4.8.3/debian/libphonon4qt5experimental-dev.install --- phonon-4.8.0/debian/libphonon4qt5experimental-dev.install 2014-11-27 03:06:38.000000000 +0000 +++ phonon-4.8.3/debian/libphonon4qt5experimental-dev.install 2014-12-12 15:21:14.000000000 +0000 @@ -7,3 +7,27 @@ usr/include/phonon4qt5/KDE/Phonon/Experimental/VideoFrame2 usr/include/phonon4qt5/KDE/Phonon/Experimental/Visualization usr/lib/*/libphonon4qt5experimental.so +usr/include/phonon4qt5/phonon/experimental/abstractaudiodataoutput.h +usr/include/phonon4qt5/phonon/experimental/abstractvideodataoutput.h +usr/include/phonon4qt5/phonon/experimental/audiodataoutput.h +usr/include/phonon4qt5/phonon/experimental/audiodataoutputinterface.h +usr/include/phonon4qt5/phonon/experimental/audioformat.h +usr/include/phonon4qt5/phonon/experimental/avcapture.h +usr/include/phonon4qt5/phonon/experimental/avcaptureinterface.h +usr/include/phonon4qt5/phonon/experimental/backendcapabilities.h +usr/include/phonon4qt5/phonon/experimental/backendinterface.h +usr/include/phonon4qt5/phonon/experimental/export.h +usr/include/phonon4qt5/phonon/experimental/globalconfig.h +usr/include/phonon4qt5/phonon/experimental/mediasource.h +usr/include/phonon4qt5/phonon/experimental/objectdescription.h +usr/include/phonon4qt5/phonon/experimental/packet.h +usr/include/phonon4qt5/phonon/experimental/packetpool.h +usr/include/phonon4qt5/phonon/experimental/phononnamespace.h +usr/include/phonon4qt5/phonon/experimental/snapshotinterface.h +usr/include/phonon4qt5/phonon/experimental/videodataoutput.h +usr/include/phonon4qt5/phonon/experimental/videodataoutput2.h +usr/include/phonon4qt5/phonon/experimental/videodataoutputinterface.h +usr/include/phonon4qt5/phonon/experimental/videoframe.h +usr/include/phonon4qt5/phonon/experimental/videoframe2.h +usr/include/phonon4qt5/phonon/experimental/videowidget.h +usr/include/phonon4qt5/phonon/experimental/visualization.h diff -Nru phonon-4.8.0/debian/libphonon4qt5experimental4.symbols phonon-4.8.3/debian/libphonon4qt5experimental4.symbols --- phonon-4.8.0/debian/libphonon4qt5experimental4.symbols 2014-11-27 03:06:38.000000000 +0000 +++ phonon-4.8.3/debian/libphonon4qt5experimental4.symbols 2015-03-10 15:53:07.000000000 +0000 @@ -33,9 +33,9 @@ _ZN6Phonon12Experimental15AudioDataOutput9setFormatENS1_6FormatE@Base 4:4.8.0 _ZN6Phonon12Experimental15AudioDataOutputC1EP7QObject@Base 4:4.8.0 _ZN6Phonon12Experimental15AudioDataOutputC2EP7QObject@Base 4:4.8.0 - _ZN6Phonon12Experimental15AudioDataOutputD0Ev@Base 4:4.8.0 - _ZN6Phonon12Experimental15AudioDataOutputD1Ev@Base 4:4.8.0 - _ZN6Phonon12Experimental15AudioDataOutputD2Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental15AudioDataOutputD0Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental15AudioDataOutputD1Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental15AudioDataOutputD2Ev@Base 4:4.8.0 _ZN6Phonon12Experimental15VideoDataOutput10endOfMediaEv@Base 4:4.8.0 _ZN6Phonon12Experimental15VideoDataOutput10setRunningEb@Base 4:4.8.0 _ZN6Phonon12Experimental15VideoDataOutput11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.8.0 @@ -47,9 +47,9 @@ _ZN6Phonon12Experimental15VideoDataOutput5startEv@Base 4:4.8.0 _ZN6Phonon12Experimental15VideoDataOutputC1EP7QObject@Base 4:4.8.0 _ZN6Phonon12Experimental15VideoDataOutputC2EP7QObject@Base 4:4.8.0 - _ZN6Phonon12Experimental15VideoDataOutputD0Ev@Base 4:4.8.0 - _ZN6Phonon12Experimental15VideoDataOutputD1Ev@Base 4:4.8.0 - _ZN6Phonon12Experimental15VideoDataOutputD2Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental15VideoDataOutputD0Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental15VideoDataOutputD1Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental15VideoDataOutputD2Ev@Base 4:4.8.0 _ZN6Phonon12Experimental16VideoDataOutput210endOfMediaEv@Base 4:4.8.0 _ZN6Phonon12Experimental16VideoDataOutput210frameReadyERKNS0_11VideoFrame2E@Base 4:4.8.0 _ZN6Phonon12Experimental16VideoDataOutput211qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.8.0 @@ -59,9 +59,9 @@ _ZN6Phonon12Experimental16VideoDataOutput216staticMetaObjectE@Base 4:4.8.0 _ZN6Phonon12Experimental16VideoDataOutput2C1EP7QObject@Base 4:4.8.0 _ZN6Phonon12Experimental16VideoDataOutput2C2EP7QObject@Base 4:4.8.0 - _ZN6Phonon12Experimental16VideoDataOutput2D0Ev@Base 4:4.8.0 - _ZN6Phonon12Experimental16VideoDataOutput2D1Ev@Base 4:4.8.0 - _ZN6Phonon12Experimental16VideoDataOutput2D2Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental16VideoDataOutput2D0Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental16VideoDataOutput2D1Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental16VideoDataOutput2D2Ev@Base 4:4.8.0 _ZN6Phonon12Experimental19BackendCapabilities28availableVideoCaptureDevicesEv@Base 4:4.8.0 _ZN6Phonon12Experimental23AbstractAudioDataOutput10setRunningEb@Base 4:4.8.0 _ZN6Phonon12Experimental23AbstractAudioDataOutput17setAllowedFormatsERK4QSetINS0_11AudioFormatEE@Base 4:4.8.0 @@ -105,12 +105,12 @@ _ZN6Phonon12Experimental9AvCaptureC1EP7QObject@Base 4:4.8.0 _ZN6Phonon12Experimental9AvCaptureC2ENS_15CaptureCategoryEP7QObject@Base 4:4.8.0 _ZN6Phonon12Experimental9AvCaptureC2EP7QObject@Base 4:4.8.0 - _ZN6Phonon12Experimental9AvCaptureD0Ev@Base 4:4.8.0 - _ZN6Phonon12Experimental9AvCaptureD1Ev@Base 4:4.8.0 - _ZN6Phonon12Experimental9AvCaptureD2Ev@Base 4:4.8.0 - _ZN6Phonon19AbstractVideoOutputD0Ev@Base 4:4.8.0 - _ZN6Phonon19AbstractVideoOutputD1Ev@Base 4:4.8.0 - _ZN6Phonon19AbstractVideoOutputD2Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental9AvCaptureD0Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental9AvCaptureD1Ev@Base 4:4.8.0 + (optional)_ZN6Phonon12Experimental9AvCaptureD2Ev@Base 4:4.8.0 + (optional)_ZN6Phonon19AbstractVideoOutputD0Ev@Base 4:4.8.0 + (optional)_ZN6Phonon19AbstractVideoOutputD1Ev@Base 4:4.8.0 + (optional)_ZN6Phonon19AbstractVideoOutputD2Ev@Base 4:4.8.0 _ZN6Phonon6Packet4dataEv@Base 4:4.8.0 _ZN6Phonon6Packet7setSizeEi@Base 4:4.8.0 _ZN6Phonon6PacketC1ERKS0_@Base 4:4.8.0 @@ -182,10 +182,10 @@ _ZTVN6Phonon12Experimental23AbstractVideoDataOutputE@Base 4:4.8.0 _ZTVN6Phonon12Experimental9AvCaptureE@Base 4:4.8.0 _ZTVN6Phonon19AbstractVideoOutputE@Base 4:4.8.0 - (c++)"non-virtual thunk to Phonon::Experimental::AudioDataOutput::~AudioDataOutput()@Base" 4:4.8.0 - (c++)"non-virtual thunk to Phonon::Experimental::AvCapture::~AvCapture()@Base" 4:4.8.0 + (optional|c++)"non-virtual thunk to Phonon::Experimental::AudioDataOutput::~AudioDataOutput()@Base" 4:4.8.0 + (optional|c++)"non-virtual thunk to Phonon::Experimental::AvCapture::~AvCapture()@Base" 4:4.8.0 (c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput2::endOfMedia()@Base" 4:4.8.0 (c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput2::frameReady(Phonon::Experimental::VideoFrame2 const&)@Base" 4:4.8.0 - (c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput2::~VideoDataOutput2()@Base" 4:4.8.0 - (c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput::~VideoDataOutput()@Base" 4:4.8.0 + (optional|c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput2::~VideoDataOutput2()@Base" 4:4.8.0 + (optional|c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput::~VideoDataOutput()@Base" 4:4.8.0 (c++)"non-virtual thunk to Phonon::Experimental::Visualization::~Visualization()@Base" 4:4.8.0 diff -Nru phonon-4.8.0/debian/libphononexperimental4.symbols phonon-4.8.3/debian/libphononexperimental4.symbols --- phonon-4.8.0/debian/libphononexperimental4.symbols 2013-01-04 19:55:10.000000000 +0000 +++ phonon-4.8.3/debian/libphononexperimental4.symbols 2015-03-10 15:49:43.000000000 +0000 @@ -33,9 +33,9 @@ _ZN6Phonon12Experimental15AudioDataOutput9setFormatENS1_6FormatE@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental15AudioDataOutputC1EP7QObject@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental15AudioDataOutputC2EP7QObject@Base 4:4.6.0really4.4.4 - _ZN6Phonon12Experimental15AudioDataOutputD0Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon12Experimental15AudioDataOutputD1Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon12Experimental15AudioDataOutputD2Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental15AudioDataOutputD0Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental15AudioDataOutputD1Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental15AudioDataOutputD2Ev@Base 4:4.6.0really4.5.0 _ZN6Phonon12Experimental15VideoDataOutput10endOfMediaEv@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental15VideoDataOutput10setRunningEb@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental15VideoDataOutput11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.6.0really4.4.4 @@ -47,9 +47,9 @@ _ZN6Phonon12Experimental15VideoDataOutput5startEv@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental15VideoDataOutputC1EP7QObject@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental15VideoDataOutputC2EP7QObject@Base 4:4.6.0really4.4.4 - _ZN6Phonon12Experimental15VideoDataOutputD0Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon12Experimental15VideoDataOutputD1Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon12Experimental15VideoDataOutputD2Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental15VideoDataOutputD0Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental15VideoDataOutputD1Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental15VideoDataOutputD2Ev@Base 4:4.6.0really4.5.0 _ZN6Phonon12Experimental16VideoDataOutput210endOfMediaEv@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental16VideoDataOutput210frameReadyERKNS0_11VideoFrame2E@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental16VideoDataOutput211qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.6.0really4.4.4 @@ -59,9 +59,9 @@ _ZN6Phonon12Experimental16VideoDataOutput216staticMetaObjectE@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental16VideoDataOutput2C1EP7QObject@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental16VideoDataOutput2C2EP7QObject@Base 4:4.6.0really4.4.4 - _ZN6Phonon12Experimental16VideoDataOutput2D0Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon12Experimental16VideoDataOutput2D1Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon12Experimental16VideoDataOutput2D2Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental16VideoDataOutput2D0Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental16VideoDataOutput2D1Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental16VideoDataOutput2D2Ev@Base 4:4.6.0really4.5.0 _ZN6Phonon12Experimental19BackendCapabilities28availableVideoCaptureDevicesEv@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental23AbstractAudioDataOutput10setRunningEb@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental23AbstractAudioDataOutput17setAllowedFormatsERK4QSetINS0_11AudioFormatEE@Base 4:4.6.0really4.4.4 @@ -105,9 +105,9 @@ _ZN6Phonon12Experimental9AvCaptureC1EP7QObject@Base 4:4.6.0really4.4.4 _ZN6Phonon12Experimental9AvCaptureC2ENS_15CaptureCategoryEP7QObject@Base 4:4.6.0really4.5.0 _ZN6Phonon12Experimental9AvCaptureC2EP7QObject@Base 4:4.6.0really4.4.4 - _ZN6Phonon12Experimental9AvCaptureD0Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon12Experimental9AvCaptureD1Ev@Base 4:4.6.0really4.5.0 - _ZN6Phonon12Experimental9AvCaptureD2Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental9AvCaptureD0Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental9AvCaptureD1Ev@Base 4:4.6.0really4.5.0 + (optional)_ZN6Phonon12Experimental9AvCaptureD2Ev@Base 4:4.6.0really4.5.0 _ZN6Phonon6Packet4dataEv@Base 4:4.6.0really4.4.4 _ZN6Phonon6Packet7setSizeEi@Base 4:4.6.0really4.4.4 _ZN6Phonon6PacketC1ERKS0_@Base 4:4.6.0really4.4.4 @@ -176,10 +176,10 @@ _ZTVN6Phonon12Experimental23AbstractAudioDataOutputE@Base 4:4.6.0really4.4.4 _ZTVN6Phonon12Experimental23AbstractVideoDataOutputE@Base 4:4.6.0really4.4.4 _ZTVN6Phonon12Experimental9AvCaptureE@Base 4:4.6.0really4.4.4 - (c++)"non-virtual thunk to Phonon::Experimental::AudioDataOutput::~AudioDataOutput()@Base" 4:4.6.0really4.5.0 - (c++)"non-virtual thunk to Phonon::Experimental::AvCapture::~AvCapture()@Base" 4:4.6.0really4.5.0 + (optional|c++)"non-virtual thunk to Phonon::Experimental::AudioDataOutput::~AudioDataOutput()@Base" 4:4.6.0really4.5.0 + (optional|c++)"non-virtual thunk to Phonon::Experimental::AvCapture::~AvCapture()@Base" 4:4.6.0really4.5.0 (c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput2::endOfMedia()@Base" 4:4.6.0really4.4.4 (c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput2::frameReady(Phonon::Experimental::VideoFrame2 const&)@Base" 4:4.6.0really4.4.4 - (c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput2::~VideoDataOutput2()@Base" 4:4.6.0really4.5.0 - (c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput::~VideoDataOutput()@Base" 4:4.6.0really4.5.0 + (optional|c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput2::~VideoDataOutput2()@Base" 4:4.6.0really4.5.0 + (optional|c++)"non-virtual thunk to Phonon::Experimental::VideoDataOutput::~VideoDataOutput()@Base" 4:4.6.0really4.5.0 (c++)"non-virtual thunk to Phonon::Experimental::Visualization::~Visualization()@Base" 4:4.6.0really4.4.4 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 2014-11-27 03:06:46.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/fix_include_dirs phonon-4.8.3/debian/patches/fix_include_dirs --- phonon-4.8.0/debian/patches/fix_include_dirs 1970-01-01 00:00:00.000000000 +0000 +++ phonon-4.8.3/debian/patches/fix_include_dirs 2015-11-13 10:24:52.000000000 +0000 @@ -0,0 +1,26 @@ +Index: phonon/cmake/FindPhononInternal.cmake +=================================================================== +--- phonon.orig/cmake/FindPhononInternal.cmake 2015-08-08 19:31:07.325120567 +0200 ++++ phonon/cmake/FindPhononInternal.cmake 2015-08-08 20:49:39.430450988 +0200 +@@ -399,6 +399,10 @@ + string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}") + endif (GCC_IS_NEWER_THAN_4_1) + ++ if (PHONON_BUILD_PHONON4QT5) # Qt5 ++ string (REPLACE "-fPIE" "-fPIC" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") ++ endif(PHONON_BUILD_PHONON4QT5) ++ + if (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") + set (KDE4_C_FLAGS "-fvisibility=hidden") +@@ -409,7 +413,9 @@ + file(WRITE "${_source_file}" "${_source}") + set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}") + +- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS} ${_include_dirs}" OUTPUT_VARIABLE _compile_output_var) ++ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} ++ CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" "${_include_dirs}" ++ OUTPUT_VARIABLE _compile_output_var) + + if(NOT _compile_result) + message("${_compile_output_var}") 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 2014-11-27 03:06:46.000000000 +0000 +++ phonon-4.8.3/debian/patches/phonon_is_not_forced_in_KDE.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -From: Sune Vuorela -Subject: Install headers where they were earlier -Forwarded: no - ---- a/includes/CMakeLists.txt -+++ b/includes/CMakeLists.txt -@@ -91,7 +91,7 @@ install( FILES - 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 diff -Nru phonon-4.8.0/debian/patches/series phonon-4.8.3/debian/patches/series --- phonon-4.8.0/debian/patches/series 2014-11-27 03:06:46.000000000 +0000 +++ phonon-4.8.3/debian/patches/series 2015-11-13 10:30:03.000000000 +0000 @@ -1,6 +1,6 @@ -# Backported patches -do_not_assume_existing_backend.patch - phonon-inc.patch -phonon_is_not_forced_in_KDE.diff findqt4_optional_x11.diff +upstream_dont_allocate_a_char_with_undefined_size +upstream_fix_build_with_qt_5.4.2 +fix_include_dirs +upstream_tear_cmake_logic_for_qt4_and_qt5_apart diff -Nru phonon-4.8.0/debian/patches/upstream_dont_allocate_a_char_with_undefined_size phonon-4.8.3/debian/patches/upstream_dont_allocate_a_char_with_undefined_size --- phonon-4.8.0/debian/patches/upstream_dont_allocate_a_char_with_undefined_size 1970-01-01 00:00:00.000000000 +0000 +++ phonon-4.8.3/debian/patches/upstream_dont_allocate_a_char_with_undefined_size 2015-11-13 10:23:20.000000000 +0000 @@ -0,0 +1,21 @@ +commit e321435ac993e5e0a280263a1c702cec2b671e7c +Author: Sergio Martins +Date: Sat May 2 23:15:00 2015 +0100 + + Don't allocate a char[] with an undefined size. + + packetSize is still undefined at this point. + +diff --git a/phonon/experimental/packetpool.cpp b/phonon/experimental/packetpool.cpp +index a1effe1..8ebe134 100644 +--- a/phonon/experimental/packetpool.cpp ++++ b/phonon/experimental/packetpool.cpp +@@ -35,7 +35,7 @@ int PacketPool::unusedPackets() const { return d_ptr->ringBufferSize; } + + PacketPoolPrivate::PacketPoolPrivate(int _packetSize, int _poolSize) + : freePackets(new PacketPrivate *[_poolSize]), +- packetMemory(new char[packetSize * _poolSize]), ++ packetMemory(new char[_packetSize * _poolSize]), + readPosition(0), writePosition(0), + ringBufferSize(_poolSize), + packetSize(_packetSize), diff -Nru phonon-4.8.0/debian/patches/upstream_fix_build_with_qt_5.4.2 phonon-4.8.3/debian/patches/upstream_fix_build_with_qt_5.4.2 --- phonon-4.8.0/debian/patches/upstream_fix_build_with_qt_5.4.2 1970-01-01 00:00:00.000000000 +0000 +++ phonon-4.8.3/debian/patches/upstream_fix_build_with_qt_5.4.2 2015-11-13 10:23:20.000000000 +0000 @@ -0,0 +1,30 @@ +commit e5b7ede37a9c89b0ec69ee2be7c219a79e836fe1 +Author: Hrvoje Senjan +Date: Tue May 26 20:43:05 2015 +0200 + + Fix build with Qt >= 5.4.2 + + Or with commit 3eca75d cherry picked. Qt will now require using + -fPIC flag for it's consumers. For cmake Qt5Core exports the flag in + it's public interface, but since visibility try_compile test + does not link against any lib, we need to pass collected CMAKE_CXX_FLAGS + (which have gathered -fPIC flag at that phase) + + This, for now only resolves the issue with gcc builds. + Other compilers will need to be checked. + + REVIEW: 123874 + +diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake +index 44862b5..1d98f27 100644 +--- a/cmake/FindPhononInternal.cmake ++++ b/cmake/FindPhononInternal.cmake +@@ -409,7 +409,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) + file(WRITE "${_source_file}" "${_source}") + set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}") + +- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var) ++ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS} ${_include_dirs}" OUTPUT_VARIABLE _compile_output_var) + + if(NOT _compile_result) + message("${_compile_output_var}") diff -Nru phonon-4.8.0/debian/patches/upstream_tear_cmake_logic_for_qt4_and_qt5_apart phonon-4.8.3/debian/patches/upstream_tear_cmake_logic_for_qt4_and_qt5_apart --- phonon-4.8.0/debian/patches/upstream_tear_cmake_logic_for_qt4_and_qt5_apart 1970-01-01 00:00:00.000000000 +0000 +++ phonon-4.8.3/debian/patches/upstream_tear_cmake_logic_for_qt4_and_qt5_apart 2015-11-13 10:23:59.000000000 +0000 @@ -0,0 +1,1023 @@ +commit 6d7e80cd5b0361272bb801b213e4fabde9a01784 +Author: Harald Sitter +Date: Sun Jun 7 13:13:58 2015 -0700 + + tear cmake logic for qt4 and qt5 apart + + - qt4 as before + - qt5 now uses ECM to set compiler flags and so forth + - paths are still coming out of the joint finder file as the variable names + in ECM are different and will potentially cause regressions + + REVIEW: 124009 + +Index: phonon/cmake/CMakeLists.txt +=================================================================== +--- phonon.orig/cmake/CMakeLists.txt 2015-08-08 21:34:30.337952165 +0200 ++++ phonon/cmake/CMakeLists.txt 2015-08-08 21:34:30.313953125 +0200 +@@ -8,4 +8,6 @@ + MacroOptionalFindPackage.cmake + MacroPushRequiredVars.cmake + PhononMacros.cmake ++ PhononQt4.cmake ++ PhononQt5.cmake + DESTINATION ${BUILDSYSTEM_INSTALL_DIR}) +Index: phonon/cmake/FindPhononInternal.cmake +=================================================================== +--- phonon.orig/cmake/FindPhononInternal.cmake 2015-08-08 21:34:30.337952165 +0200 ++++ phonon/cmake/FindPhononInternal.cmake 2015-08-08 21:38:14.120994060 +0200 +@@ -3,10 +3,30 @@ + # + # Copyright (c) 2008, Matthias Kretz + # Copyright (c) 2010, Mark Kretschmann +-# Copyright (c) 2010, Harald Sitter ++# Copyright (c) 2010-2015, Harald Sitter + # +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# ++# 1. Redistributions of source code must retain the copyright ++# notice, this list of conditions and the following disclaimer. ++# 2. Redistributions in binary form must reproduce the copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++# 3. The name of the author may not be used to endorse or promote products ++# derived from this software without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + # CMake Defaults + +@@ -40,133 +60,6 @@ + include(CheckCXXCompilerFlag) + include(${phonon_cmake_module_dir}/MacroEnsureVersion.cmake) + +- +-# Check Requirements +- +-# - Qt +- +-# Store CMAKE_MODULE_PATH and then append the current dir to it, so we are sure +-# we get the FindQt4.cmake located next to us and not a different one. +-# The original CMAKE_MODULE_PATH is restored later on. +-set(_phonon_cmake_module_path_back ${CMAKE_MODULE_PATH}) +-set(CMAKE_MODULE_PATH ${phonon_cmake_module_dir} ${CMAKE_MODULE_PATH} ) +- +-# # Tell FindQt4.cmake to point the QT_QTFOO_LIBRARY targets at the imported targets +-# # for the Qt libraries, so we get full handling of release and debug versions of the +-# # Qt libs and are flexible regarding the install location of Qt under Windows: +-# set(QT_USE_IMPORTED_TARGETS TRUE) +- +-if (NOT PHONON_BUILD_PHONON4QT5) # Qt4 +- if (NOT QT_MIN_VERSION) +- set(QT_MIN_VERSION "4.6.0") +- endif (NOT QT_MIN_VERSION) +- if (${QT_MIN_VERSION} VERSION_LESS "4.6.0") +- set(QT_MIN_VERSION "4.6.0") +- endif (${QT_MIN_VERSION} VERSION_LESS "4.6.0") +- +- find_package(Qt4) +- macro_log_feature(QT4_FOUND "Qt4" "" "" TRUE) +- +- # ----- compat +- macro (qt5_use_modules target) +- set(_deps "") +- foreach (arg ${ARGN}) +- if (arg STREQUAL "Core") +- list(APPEND _deps ${QT_QTCORE_LIBRARY}) +- elseif (arg STREQUAL "Gui") +- list(APPEND _deps ${QT_QTGUI_LIBRARY}) +- elseif (arg STREQUAL "Widgets") +- list(APPEND _deps ${QT_QTGUI_LIBRARY}) +- elseif (arg STREQUAL "DBus") +- list(APPEND _deps ${QT_QTDBUS_LIBRARY}) +- elseif (arg STREQUAL "OpenGL") +- list(APPEND _deps ${QT_QTOPENGL_LIBRARY}) +- elseif (arg STREQUAL "Declarative") +- list(APPEND _deps ${QT_QTDECLARATIVE_LIBRARY}) +- elseif (arg STREQUAL "Designer") +- list(APPEND _deps ${QT_QTDESIGNER_LIBRARY}) +- else () +- message("qt5_use_modules could not map ${arg} to Qt 4") +- endif () +- endforeach () +- target_link_libraries(${target} ${_deps}) +- endmacro (qt5_use_modules target args) +- +- macro (qt5_add_resources) +- qt4_add_resources(${ARGN}) +- endmacro (qt5_add_resources) +- +- macro (qt5_wrap_ui) +- qt4_wrap_ui(${ARGN}) +- endmacro () +-else (NOT PHONON_BUILD_PHONON4QT5) # Qt5 +- find_package(Qt5Core) +- macro_log_feature(Qt5Core_FOUND "Qt5 Core (qtbase)" "" "" TRUE) +- +- find_package(Qt5Gui) +- macro_log_feature(Qt5Gui_FOUND "Qt5 Gui (qtbase)" "" "" TRUE) +- +- find_package(Qt5Widgets) +- macro_log_feature(Qt5Widgets_FOUND "Qt5 Widgets (qtbase)" "" "" TRUE) +- +- if (Qt5_POSITION_INDEPENDENT_CODE) +- set(CMAKE_POSITION_INDEPENDENT_CODE ON) +- endif() +- +- #---- compat +- # Compat variables for plugins. +- function(_QT4_QUERY_QMAKE VAR RESULT) +- get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} LOCATION) +- execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} "-query" ${VAR} +- RESULT_VARIABLE return_code +- OUTPUT_VARIABLE output) +- if(NOT return_code) +- file(TO_CMAKE_PATH "${output}" output) +- STRING(REGEX REPLACE "(\r?\n)+$" "" output "${output}") +- set(${RESULT} ${output} PARENT_SCOPE) +- endif(NOT return_code) +- endfunction(_QT4_QUERY_QMAKE) +- +- _qt4_query_qmake(QT_INSTALL_IMPORTS QT_IMPORTS_DIR) +- _qt4_query_qmake(QT_HOST_DATA QT_MKSPECS_DIR) +- _qt4_query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR) +- +- set(QT_MKSPECS_DIR "${QT_MKSPECS_DIR}/mkspecs") +- +- # ---- more compat +- set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} +- ${Qt5Widgets_INCLUDE_DIRS} +- ${Qt5DBus_INCLUDE_DIRS}) +-endif (NOT PHONON_BUILD_PHONON4QT5) +- +-# - Automoc +- +-# Starting with CMake 2.8.6 there is a builtin to replace automoc4, use that when possible. +-if(CMAKE_VERSION VERSION_GREATER 2.8.5) +- message(STATUS "Using CMake automoc builtin") +- set(CMAKE_AUTOMOC TRUE) +- # Compatiblity Macros +- macro(AUTOMOC4_ADD_EXECUTABLE _target_NAME) +- add_executable(${_target_NAME} ${ARGN}) +- endmacro(AUTOMOC4_ADD_EXECUTABLE _target_NAME) +- macro(AUTOMOC4_ADD_LIBRARY _target_NAME _add_executable_param) +- add_library(${_target_NAME} ${_add_executable_param} ${ARGN}) +- endmacro(AUTOMOC4_ADD_LIBRARY) +-else(CMAKE_VERSION VERSION_GREATER 2.8.5) +- message(STATUS "Can not use CMake automoc builtin, trying to find automoc4") +- find_package(Automoc4 REQUIRED) +- if (NOT AUTOMOC4_VERSION) +- set(AUTOMOC4_VERSION "0.9.83") +- endif (NOT AUTOMOC4_VERSION) +- macro_ensure_version("0.9.86" "${AUTOMOC4_VERSION}" _automoc4_version_ok) +- if (NOT _automoc4_version_ok) +- message(FATAL_ERROR "Your version of automoc4 is too old. You have ${AUTOMOC4_VERSION}, you need at least 0.9.86") +- endif (NOT _automoc4_version_ok) +-endif(CMAKE_VERSION VERSION_GREATER 2.8.5) +- +-# restore the original CMAKE_MODULE_PATH +-set(CMAKE_MODULE_PATH ${_phonon_cmake_module_path_back}) +- + # Set Installation Directories - TODO, port to ECM's KDEInstallDirs! + + include(GNUInstallDirs) +@@ -208,329 +101,23 @@ + set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR}) + endif(APPLE) + +-# RPATH Handling +- +-# Set up RPATH handling, so the libs are found if they are installed to a non-standard location. +-# By default cmake builds the targets with full RPATH to everything in the build directory, +-# but then removes the RPATH when installing. +-# 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}") +-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 "${_abs_LIB_INSTALL_DIR}") +-endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1") +- +- +-# Uninstall Target +-if (NOT _phonon_uninstall_target_created) +- set(_phonon_uninstall_target_created TRUE) +- configure_file("${phonon_cmake_module_dir}/cmake_uninstall.cmake.in" "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" @ONLY) +- add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake") +-endif (NOT _phonon_uninstall_target_created) +- +- +-# Imported from FindKDE4Internal.cmake +-# Keep this portion copy'n'pastable for updatability. +-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +- +-if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) +- if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) +- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") +- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") +- +- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}") +- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}") +- set ( CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_EXE_LINKER_FLAGS}") +- +- # we profile... +- if(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile) +- set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") +- set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") +- endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile) +- endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +- if (CMAKE_C_COMPILER MATCHES "icc") +- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) +- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") +- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") +- endif (CMAKE_C_COMPILER MATCHES "icc") +-endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) +- +-#------------------------------------------------------------------------------- +- +- +-# Imported from FindKDE4Internal.cmake +-# Keep this portion copy'n'pastable for updatability. +-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +- +-# this macro is for internal use only. +-macro(KDE_CHECK_FLAG_EXISTS FLAG VAR DOC) +- if(NOT ${VAR} MATCHES "${FLAG}") +- set(${VAR} "${${VAR}} ${FLAG}" CACHE STRING "Flags used by the linker during ${DOC} builds." FORCE) +- endif(NOT ${VAR} MATCHES "${FLAG}") +-endmacro(KDE_CHECK_FLAG_EXISTS FLAG VAR) +- +-if (MSVC) +- set (KDE4_ENABLE_EXCEPTIONS -EHsc) +- +- # Qt disables the native wchar_t type, do it too to avoid linking issues +- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Zc:wchar_t-" ) +- +- # make sure that no header adds libcmt by default using #pragma comment(lib, "libcmt.lib") as done by mfc/afx.h +- kde_check_flag_exists("/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt" CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "Release with Debug Info") +- kde_check_flag_exists("/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt" CMAKE_EXE_LINKER_FLAGS_RELEASE "release") +- kde_check_flag_exists("/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt" CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "release minsize") +- kde_check_flag_exists("/NODEFAULTLIB:libcmtd /DEFAULTLIB:msvcrtd" CMAKE_EXE_LINKER_FLAGS_DEBUG "debug") +-endif(MSVC) +- +-# This macro is for internal use only +-# Return the directories present in gcc's include path. +-macro(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _result) +- set(${_result}) +- set(_gccOutput) +- file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n" ) +- execute_process(COMMAND ${CMAKE_C_COMPILER} -v -E -x ${_lang} -dD dummy +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles +- ERROR_VARIABLE _gccOutput +- OUTPUT_VARIABLE _gccStdout ) +- file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy") +- +- if( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list" ) +- SET(${_result} ${CMAKE_MATCH_1}) +- STRING(REPLACE "\n" " " ${_result} "${${_result}}") +- SEPARATE_ARGUMENTS(${_result}) +- ENDIF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list" ) +-ENDMACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang) +- +-if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES Clang) +- _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs) +- set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES +- ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${_dirs}) +-endif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES Clang) +- +-if (CMAKE_COMPILER_IS_GNUCXX) +- _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs) +- set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +- ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${_dirs}) +- +- set (KDE4_ENABLE_EXCEPTIONS "-fexceptions -UQT_NO_EXCEPTIONS") +- # Select flags. +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") +- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") +- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") +- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") +- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") +- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") +- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") +- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") +- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") +- +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") +- # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") +- +- if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) +- # This should not be needed, as it is also part of _KDE4_PLATFORM_DEFINITIONS below. +- # It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS}) +- # and also because it is/was needed by glibc for snprintf to be available when building C files. +- # See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c. +- add_definitions (-D_BSD_SOURCE) +- endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) +- +- if (CMAKE_SYSTEM_NAME STREQUAL GNU) +- set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread") +- set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread") +- endif (CMAKE_SYSTEM_NAME STREQUAL GNU) +- +- # gcc under Windows +- if (MINGW) +- set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--export-all-symbols") +- set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols") +- endif (MINGW) +- +- check_cxx_compiler_flag(-fPIE HAVE_FPIE_SUPPORT) +- if(KDE4_ENABLE_FPIE) +- if(HAVE_FPIE_SUPPORT) +- set (KDE4_CXX_FPIE_FLAGS "-fPIE") +- set (KDE4_PIE_LDFLAGS "-pie") +- else(HAVE_FPIE_SUPPORT) +- message(STATUS "Your compiler doesn't support the PIE flag") +- endif(HAVE_FPIE_SUPPORT) +- endif(KDE4_ENABLE_FPIE) +- +- check_cxx_compiler_flag(-Woverloaded-virtual __KDE_HAVE_W_OVERLOADED_VIRTUAL) +- if(__KDE_HAVE_W_OVERLOADED_VIRTUAL) +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual") +- endif(__KDE_HAVE_W_OVERLOADED_VIRTUAL) +- +- # visibility support +- check_cxx_compiler_flag(-fvisibility=hidden __KDE_HAVE_GCC_VISIBILITY) +- set( __KDE_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") +- +- # get the gcc version +- exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) +- +- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") +- # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: +- if (NOT _gcc_version) +- string (REGEX MATCH ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${gcc_on_macos}") +- if (gcc_on_macos) +- string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") +- endif (gcc_on_macos) +- endif (NOT _gcc_version) +- +- if (_gcc_version) +- macro_ensure_version("4.1.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_1) +- macro_ensure_version("4.2.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_2) +- macro_ensure_version("4.3.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_3) +- endif (_gcc_version) +- +- set(_GCC_COMPILED_WITH_BAD_ALLOCATOR FALSE) +- if (GCC_IS_NEWER_THAN_4_1) +- exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} -v OUTPUT_VARIABLE _gcc_alloc_info) +- string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}") +- endif (GCC_IS_NEWER_THAN_4_1) +- +- if (PHONON_BUILD_PHONON4QT5) # Qt5 +- string (REPLACE "-fPIE" "-fPIC" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +- endif(PHONON_BUILD_PHONON4QT5) +- +- if (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") +- set (KDE4_C_FLAGS "-fvisibility=hidden") +- # check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default"))) +- # if it doesn't and KDE compiles with hidden default visibiltiy plugins will break +- set(_source "#include \n int main()\n {\n #ifndef QT_VISIBILITY_AVAILABLE \n #error QT_VISIBILITY_AVAILABLE is not available\n #endif \n }\n") +- set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_qt_visibility.cpp) +- file(WRITE "${_source_file}" "${_source}") +- set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}") +- +- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} +- CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" "${_include_dirs}" +- OUTPUT_VARIABLE _compile_output_var) +- +- if(NOT _compile_result) +- message("${_compile_output_var}") +- message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation (try passing --reduce-exports to configure).") +- endif(NOT _compile_result) +- +- if (GCC_IS_NEWER_THAN_4_2) +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden") +- endif (GCC_IS_NEWER_THAN_4_2) +- else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) +- set (__KDE_HAVE_GCC_VISIBILITY 0) +- endif (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) +- +-endif (CMAKE_COMPILER_IS_GNUCXX) +- +- +-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs) +- set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +- ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${_dirs}) +- +- # Note that exceptions are enabled by default when building with clang. That +- # is, -fno-exceptions is not set in CMAKE_CXX_FLAGS below. This is because a +- # lot of code in different KDE modules ends up including code that throws +- # exceptions. Most (or all) of the occurrences are in template code that +- # never gets instantiated. Contrary to GCC, ICC and MSVC, clang (most likely +- # rightfully) complains about that. Trying to work around the issue by +- # passing -fdelayed-template-parsing brings other problems, as noted in +- # http://lists.kde.org/?l=kde-core-devel&m=138157459706783&w=2. +- # The generated code will be slightly bigger, but there is no way to avoid +- # it. +- set(KDE4_ENABLE_EXCEPTIONS "-fexceptions -UQT_NO_EXCEPTIONS") +- +- # Select flags. +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") +- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") +- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-inline") +- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") +- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") +- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") +- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-inline") +- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") +- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") +- +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -Woverloaded-virtual -fno-common -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden") +- set(KDE4_C_FLAGS "-fvisibility=hidden") +- +- # At least kdepim exports one function with C linkage that returns a +- # QString in a plugin, but clang does not like that. +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage") +- +- set(KDE4_CXX_FPIE_FLAGS "-fPIE") +- set(KDE4_PIE_LDFLAGS "-pie") +- +- if (CMAKE_SYSTEM_NAME STREQUAL GNU) +- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread") +- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread") +- endif (CMAKE_SYSTEM_NAME STREQUAL GNU) +- +- set(__KDE_HAVE_GCC_VISIBILITY TRUE) +- +- # check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default"))) +- # if it doesn't and KDE compiles with hidden default visibiltiy plugins will break +- set(_source "#include \n int main()\n {\n #ifndef QT_VISIBILITY_AVAILABLE \n #error QT_VISIBILITY_AVAILABLE is not available\n #endif \n }\n") +- set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_qt_visibility.cpp) +- file(WRITE "${_source_file}" "${_source}") +- set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}") +- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var) +- if(NOT _compile_result) +- message("${_compile_output_var}") +- message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation (try passing --reduce-exports to configure).") +- endif(NOT _compile_result) +-endif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- +- +-if (CMAKE_C_COMPILER MATCHES "icc") +- +- set (KDE4_ENABLE_EXCEPTIONS -fexceptions) +- # Select flags. +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") +- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") +- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -fno-inline -noalign") +- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -fno-inline -noalign") +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") +- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") +- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -fno-inline -noalign") +- set(CMAKE_C_FLAGS_DEBUGFULL "-g -fno-inline -noalign") +- +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -Wall -w1 -Wpointer-arith -fno-common") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -w1 -Wpointer-arith -fno-exceptions -fno-common") +- +- # visibility support +- set(__KDE_HAVE_ICC_VISIBILITY) +-# check_cxx_compiler_flag(-fvisibility=hidden __KDE_HAVE_ICC_VISIBILITY) +-# if (__KDE_HAVE_ICC_VISIBILITY) +-# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") +-# endif (__KDE_HAVE_ICC_VISIBILITY) +- +-endif (CMAKE_C_COMPILER MATCHES "icc") +- +-#------------------------------------------------------------------------------- +- +- +-# Random Stuff ++if (NOT PHONON_BUILD_PHONON4QT5) # Qt4 ++ include(${phonon_cmake_module_dir}/PhononQt4.cmake) ++else (NOT PHONON_BUILD_PHONON4QT5) # Qt5 ++ include(${phonon_cmake_module_dir}/PhononQt5.cmake) ++endif (NOT PHONON_BUILD_PHONON4QT5) + +-if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc") +- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common") +-endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc") +- +-# For Windows +-if(MSVC) +- if(CMAKE_COMPILER_2005) +- # to avoid a lot of deprecated warnings +- add_definitions( -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS ) +- endif(CMAKE_COMPILER_2005) +-endif(MSVC) ++# - Automoc (using builtin introduced in 1.8.5) ++# NOTE: the compatiibility macros are actively used by the backends, so they ++# cannot be dropped unless the backends get a major release removing all ++# use of them first. ++ ++message(STATUS "Using CMake automoc builtin") ++set(CMAKE_AUTOMOC TRUE) ++# Compatiblity Macros for old automoc nonesense ++macro(AUTOMOC4_ADD_EXECUTABLE _target_NAME) ++ add_executable(${_target_NAME} ${ARGN}) ++endmacro(AUTOMOC4_ADD_EXECUTABLE _target_NAME) ++macro(AUTOMOC4_ADD_LIBRARY _target_NAME _add_executable_param) ++ add_library(${_target_NAME} ${_add_executable_param} ${ARGN}) ++endmacro(AUTOMOC4_ADD_LIBRARY) +Index: phonon/cmake/PhononQt4.cmake +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ phonon/cmake/PhononQt4.cmake 2015-08-08 21:34:30.313953125 +0200 +@@ -0,0 +1,400 @@ ++# Copyright (c) 2008, Matthias Kretz ++# Copyright (c) 2010, Mark Kretschmann ++# Copyright (c) 2010-2015, Harald Sitter ++# ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# ++# 1. Redistributions of source code must retain the copyright ++# notice, this list of conditions and the following disclaimer. ++# 2. Redistributions in binary form must reproduce the copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++# 3. The name of the author may not be used to endorse or promote products ++# derived from this software without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++# RPATH Handling ++ ++# Set up RPATH handling, so the libs are found if they are installed to a non-standard location. ++# By default cmake builds the targets with full RPATH to everything in the build directory, ++# but then removes the RPATH when installing. ++# 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}") ++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 "${_abs_LIB_INSTALL_DIR}") ++endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1") ++ ++# Find Qt4 ++ ++# Store CMAKE_MODULE_PATH and then append the current dir to it, so we are sure ++# we get the FindQt4.cmake located next to us and not a different one. ++# The original CMAKE_MODULE_PATH is restored later on. ++set(_phonon_cmake_module_path_back ${CMAKE_MODULE_PATH}) ++set(CMAKE_MODULE_PATH ${phonon_cmake_module_dir} ${CMAKE_MODULE_PATH} ) ++ ++if (NOT QT_MIN_VERSION) ++ set(QT_MIN_VERSION "4.6.0") ++endif (NOT QT_MIN_VERSION) ++if (${QT_MIN_VERSION} VERSION_LESS "4.6.0") ++ set(QT_MIN_VERSION "4.6.0") ++endif (${QT_MIN_VERSION} VERSION_LESS "4.6.0") ++ ++find_package(Qt4) ++macro_log_feature(QT4_FOUND "Qt4" "" "" TRUE) ++ ++# ----- compat ++macro (qt5_use_modules target) ++ set(_deps "") ++ foreach (arg ${ARGN}) ++ if (arg STREQUAL "Core") ++ list(APPEND _deps ${QT_QTCORE_LIBRARY}) ++ elseif (arg STREQUAL "Gui") ++ list(APPEND _deps ${QT_QTGUI_LIBRARY}) ++ elseif (arg STREQUAL "Widgets") ++ list(APPEND _deps ${QT_QTGUI_LIBRARY}) ++ elseif (arg STREQUAL "DBus") ++ list(APPEND _deps ${QT_QTDBUS_LIBRARY}) ++ elseif (arg STREQUAL "OpenGL") ++ list(APPEND _deps ${QT_QTOPENGL_LIBRARY}) ++ elseif (arg STREQUAL "Declarative") ++ list(APPEND _deps ${QT_QTDECLARATIVE_LIBRARY}) ++ elseif (arg STREQUAL "Designer") ++ list(APPEND _deps ${QT_QTDESIGNER_LIBRARY}) ++ else () ++ message("qt5_use_modules could not map ${arg} to Qt 4") ++ endif () ++ endforeach () ++ target_link_libraries(${target} ${_deps}) ++endmacro (qt5_use_modules target args) ++ ++macro (qt5_add_resources) ++ qt4_add_resources(${ARGN}) ++endmacro (qt5_add_resources) ++ ++macro (qt5_wrap_ui) ++ qt4_wrap_ui(${ARGN}) ++endmacro () ++ ++ ++# restore the original CMAKE_MODULE_PATH ++set(CMAKE_MODULE_PATH ${_phonon_cmake_module_path_back}) ++ ++# Imported from FindKDE4Internal.cmake ++# Keep this portion copy'n'pastable for updatability. ++# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++ ++if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) ++ if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") ++ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) ++ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") ++ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") ++ ++ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}") ++ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}") ++ set ( CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_EXE_LINKER_FLAGS}") ++ ++ # we profile... ++ if(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile) ++ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") ++ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") ++ endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile) ++ endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") ++ if (CMAKE_C_COMPILER MATCHES "icc") ++ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) ++ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") ++ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") ++ endif (CMAKE_C_COMPILER MATCHES "icc") ++endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) ++ ++#------------------------------------------------------------------------------- ++ ++ ++# Imported from FindKDE4Internal.cmake ++# Keep this portion copy'n'pastable for updatability. ++# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++ ++# this macro is for internal use only. ++macro(KDE_CHECK_FLAG_EXISTS FLAG VAR DOC) ++ if(NOT ${VAR} MATCHES "${FLAG}") ++ set(${VAR} "${${VAR}} ${FLAG}" CACHE STRING "Flags used by the linker during ${DOC} builds." FORCE) ++ endif(NOT ${VAR} MATCHES "${FLAG}") ++endmacro(KDE_CHECK_FLAG_EXISTS FLAG VAR) ++ ++if (MSVC) ++ set (KDE4_ENABLE_EXCEPTIONS -EHsc) ++ ++ # Qt disables the native wchar_t type, do it too to avoid linking issues ++ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Zc:wchar_t-" ) ++ ++ # make sure that no header adds libcmt by default using #pragma comment(lib, "libcmt.lib") as done by mfc/afx.h ++ kde_check_flag_exists("/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt" CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "Release with Debug Info") ++ kde_check_flag_exists("/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt" CMAKE_EXE_LINKER_FLAGS_RELEASE "release") ++ kde_check_flag_exists("/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt" CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "release minsize") ++ kde_check_flag_exists("/NODEFAULTLIB:libcmtd /DEFAULTLIB:msvcrtd" CMAKE_EXE_LINKER_FLAGS_DEBUG "debug") ++endif(MSVC) ++ ++# This macro is for internal use only ++# Return the directories present in gcc's include path. ++macro(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _result) ++ set(${_result}) ++ set(_gccOutput) ++ file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n" ) ++ execute_process(COMMAND ${CMAKE_C_COMPILER} -v -E -x ${_lang} -dD dummy ++ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles ++ ERROR_VARIABLE _gccOutput ++ OUTPUT_VARIABLE _gccStdout ) ++ file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy") ++ ++ if( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list" ) ++ SET(${_result} ${CMAKE_MATCH_1}) ++ STRING(REPLACE "\n" " " ${_result} "${${_result}}") ++ SEPARATE_ARGUMENTS(${_result}) ++ ENDIF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list" ) ++ENDMACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang) ++ ++if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES Clang) ++ _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs) ++ set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ++ ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${_dirs}) ++endif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES Clang) ++ ++if (CMAKE_COMPILER_IS_GNUCXX) ++ _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs) ++ set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ++ ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${_dirs}) ++ ++ set (KDE4_ENABLE_EXCEPTIONS "-fexceptions -UQT_NO_EXCEPTIONS") ++ # Select flags. ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") ++ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") ++ set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") ++ set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") ++ set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") ++ set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") ++ set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") ++ set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") ++ set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") ++ ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") ++ # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") ++ ++ if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) ++ # This should not be needed, as it is also part of _KDE4_PLATFORM_DEFINITIONS below. ++ # It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS}) ++ # and also because it is/was needed by glibc for snprintf to be available when building C files. ++ # See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c. ++ add_definitions (-D_BSD_SOURCE) ++ endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) ++ ++ if (CMAKE_SYSTEM_NAME STREQUAL GNU) ++ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread") ++ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread") ++ endif (CMAKE_SYSTEM_NAME STREQUAL GNU) ++ ++ # gcc under Windows ++ if (MINGW) ++ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--export-all-symbols") ++ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols") ++ endif (MINGW) ++ ++ check_cxx_compiler_flag(-fPIE HAVE_FPIE_SUPPORT) ++ if(KDE4_ENABLE_FPIE) ++ if(HAVE_FPIE_SUPPORT) ++ set (KDE4_CXX_FPIE_FLAGS "-fPIE") ++ set (KDE4_PIE_LDFLAGS "-pie") ++ else(HAVE_FPIE_SUPPORT) ++ message(STATUS "Your compiler doesn't support the PIE flag") ++ endif(HAVE_FPIE_SUPPORT) ++ endif(KDE4_ENABLE_FPIE) ++ ++ check_cxx_compiler_flag(-Woverloaded-virtual __KDE_HAVE_W_OVERLOADED_VIRTUAL) ++ if(__KDE_HAVE_W_OVERLOADED_VIRTUAL) ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual") ++ endif(__KDE_HAVE_W_OVERLOADED_VIRTUAL) ++ ++ # visibility support ++ check_cxx_compiler_flag(-fvisibility=hidden __KDE_HAVE_GCC_VISIBILITY) ++ set( __KDE_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") ++ ++ # get the gcc version ++ exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) ++ ++ string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") ++ # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: ++ if (NOT _gcc_version) ++ string (REGEX MATCH ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${gcc_on_macos}") ++ if (gcc_on_macos) ++ string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") ++ endif (gcc_on_macos) ++ endif (NOT _gcc_version) ++ ++ if (_gcc_version) ++ macro_ensure_version("4.1.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_1) ++ macro_ensure_version("4.2.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_2) ++ macro_ensure_version("4.3.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_3) ++ endif (_gcc_version) ++ ++ set(_GCC_COMPILED_WITH_BAD_ALLOCATOR FALSE) ++ if (GCC_IS_NEWER_THAN_4_1) ++ exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} -v OUTPUT_VARIABLE _gcc_alloc_info) ++ string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}") ++ endif (GCC_IS_NEWER_THAN_4_1) ++ ++ if (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") ++ set (KDE4_C_FLAGS "-fvisibility=hidden") ++ # check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default"))) ++ # if it doesn't and KDE compiles with hidden default visibiltiy plugins will break ++ set(_source "#include \n int main()\n {\n #ifndef QT_VISIBILITY_AVAILABLE \n #error QT_VISIBILITY_AVAILABLE is not available\n #endif \n }\n") ++ set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_qt_visibility.cpp) ++ file(WRITE "${_source_file}" "${_source}") ++ set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}") ++ ++ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var) ++ ++ if(NOT _compile_result) ++ message("${_compile_output_var}") ++ message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation (try passing --reduce-exports to configure).") ++ endif(NOT _compile_result) ++ ++ if (GCC_IS_NEWER_THAN_4_2) ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden") ++ endif (GCC_IS_NEWER_THAN_4_2) ++ else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) ++ set (__KDE_HAVE_GCC_VISIBILITY 0) ++ endif (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) ++ ++endif (CMAKE_COMPILER_IS_GNUCXX) ++ ++ ++if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++ _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs) ++ set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ++ ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${_dirs}) ++ ++ # Note that exceptions are enabled by default when building with clang. That ++ # is, -fno-exceptions is not set in CMAKE_CXX_FLAGS below. This is because a ++ # lot of code in different KDE modules ends up including code that throws ++ # exceptions. Most (or all) of the occurrences are in template code that ++ # never gets instantiated. Contrary to GCC, ICC and MSVC, clang (most likely ++ # rightfully) complains about that. Trying to work around the issue by ++ # passing -fdelayed-template-parsing brings other problems, as noted in ++ # http://lists.kde.org/?l=kde-core-devel&m=138157459706783&w=2. ++ # The generated code will be slightly bigger, but there is no way to avoid ++ # it. ++ set(KDE4_ENABLE_EXCEPTIONS "-fexceptions -UQT_NO_EXCEPTIONS") ++ ++ # Select flags. ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") ++ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") ++ set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-inline") ++ set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") ++ set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") ++ set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") ++ set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-inline") ++ set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") ++ set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") ++ ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -Woverloaded-virtual -fno-common -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden") ++ set(KDE4_C_FLAGS "-fvisibility=hidden") ++ ++ # At least kdepim exports one function with C linkage that returns a ++ # QString in a plugin, but clang does not like that. ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage") ++ ++ set(KDE4_CXX_FPIE_FLAGS "-fPIE") ++ set(KDE4_PIE_LDFLAGS "-pie") ++ ++ if (CMAKE_SYSTEM_NAME STREQUAL GNU) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread") ++ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread") ++ endif (CMAKE_SYSTEM_NAME STREQUAL GNU) ++ ++ set(__KDE_HAVE_GCC_VISIBILITY TRUE) ++ ++ # check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default"))) ++ # if it doesn't and KDE compiles with hidden default visibiltiy plugins will break ++ set(_source "#include \n int main()\n {\n #ifndef QT_VISIBILITY_AVAILABLE \n #error QT_VISIBILITY_AVAILABLE is not available\n #endif \n }\n") ++ set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_qt_visibility.cpp) ++ file(WRITE "${_source_file}" "${_source}") ++ set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}") ++ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var) ++ if(NOT _compile_result) ++ message("${_compile_output_var}") ++ message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation (try passing --reduce-exports to configure).") ++ endif(NOT _compile_result) ++endif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++ ++ ++if (CMAKE_C_COMPILER MATCHES "icc") ++ ++ set (KDE4_ENABLE_EXCEPTIONS -fexceptions) ++ # Select flags. ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") ++ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") ++ set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -fno-inline -noalign") ++ set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -fno-inline -noalign") ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") ++ set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") ++ set(CMAKE_C_FLAGS_DEBUG "-O2 -g -fno-inline -noalign") ++ set(CMAKE_C_FLAGS_DEBUGFULL "-g -fno-inline -noalign") ++ ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -Wall -w1 -Wpointer-arith -fno-common") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -w1 -Wpointer-arith -fno-exceptions -fno-common") ++ ++ # visibility support ++ set(__KDE_HAVE_ICC_VISIBILITY) ++# check_cxx_compiler_flag(-fvisibility=hidden __KDE_HAVE_ICC_VISIBILITY) ++# if (__KDE_HAVE_ICC_VISIBILITY) ++# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") ++# endif (__KDE_HAVE_ICC_VISIBILITY) ++ ++endif (CMAKE_C_COMPILER MATCHES "icc") ++ ++#------------------------------------------------------------------------------- ++ ++ ++# Random Stuff ++ ++if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc") ++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common") ++endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc") ++ ++# For Windows ++if(MSVC) ++ if(CMAKE_COMPILER_2005) ++ # to avoid a lot of deprecated warnings ++ add_definitions( -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS ) ++ endif(CMAKE_COMPILER_2005) ++endif(MSVC) ++ ++# Uninstall Target ++if (NOT _phonon_uninstall_target_created) ++ set(_phonon_uninstall_target_created TRUE) ++ configure_file("${phonon_cmake_module_dir}/cmake_uninstall.cmake.in" "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" @ONLY) ++ add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake") ++endif (NOT _phonon_uninstall_target_created) +Index: phonon/cmake/PhononQt5.cmake +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ phonon/cmake/PhononQt5.cmake 2015-08-08 21:34:30.313953125 +0200 +@@ -0,0 +1,68 @@ ++# Copyright (c) 2008, Matthias Kretz ++# Copyright (c) 2010, Mark Kretschmann ++# Copyright (c) 2010-2015, Harald Sitter ++# ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# ++# 1. Redistributions of source code must retain the copyright ++# notice, this list of conditions and the following disclaimer. ++# 2. Redistributions in binary form must reproduce the copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++# 3. The name of the author may not be used to endorse or promote products ++# derived from this software without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++find_package(Qt5Core) ++macro_log_feature(Qt5Core_FOUND "Qt5 Core (qtbase)" "" "" TRUE) ++ ++find_package(Qt5Gui) ++macro_log_feature(Qt5Gui_FOUND "Qt5 Gui (qtbase)" "" "" TRUE) ++ ++find_package(Qt5Widgets) ++macro_log_feature(Qt5Widgets_FOUND "Qt5 Widgets (qtbase)" "" "" TRUE) ++ ++#---- compat ++# Compat variables for plugins. ++function(_QT4_QUERY_QMAKE VAR RESULT) ++ get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} LOCATION) ++ execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} "-query" ${VAR} ++ RESULT_VARIABLE return_code ++ OUTPUT_VARIABLE output) ++ if(NOT return_code) ++ file(TO_CMAKE_PATH "${output}" output) ++ STRING(REGEX REPLACE "(\r?\n)+$" "" output "${output}") ++ set(${RESULT} ${output} PARENT_SCOPE) ++ endif(NOT return_code) ++endfunction(_QT4_QUERY_QMAKE) ++ ++_qt4_query_qmake(QT_INSTALL_IMPORTS QT_IMPORTS_DIR) ++_qt4_query_qmake(QT_HOST_DATA QT_MKSPECS_DIR) ++_qt4_query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR) ++ ++set(QT_MKSPECS_DIR "${QT_MKSPECS_DIR}/mkspecs") ++ ++# ---- more compat ++set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ++ ${Qt5Widgets_INCLUDE_DIRS} ++ ${Qt5DBus_INCLUDE_DIRS}) ++ ++# ECM ++ ++find_package(ECM 1.7.0 NO_MODULE REQUIRED) ++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++include(KDECMakeSettings) ++include(KDECompilerSettings) diff -Nru phonon-4.8.0/debian/rules phonon-4.8.3/debian/rules --- phonon-4.8.0/debian/rules 2014-11-27 03:06:38.000000000 +0000 +++ phonon-4.8.3/debian/rules 2015-11-13 11:11:53.000000000 +0000 @@ -8,8 +8,8 @@ libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages) include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk -RECOMMENDED_PHONON4_QT4_BACKEND := phonon-backend-vlc -RECOMMENDED_PHONON4_QT5_BACKEND := phonon4qt5-backend-vlc +RECOMMENDED_PHONON4_QT4_BACKEND := phonon-backend-gstreamer +RECOMMENDED_PHONON4_QT5_BACKEND := phonon4qt5-backend-gstreamer override_dh_auto_clean: $(overridden_command) @@ -28,6 +28,10 @@ $(overridden_command) --builddirectory=build-qt5 override_dh_install: + rm debian/tmp/usr/include/KDE/Phonon/AudioDevice + rm debian/tmp/usr/include/KDE/Phonon/AudioDeviceEnumerator + rm debian/tmp/usr/include/phonon4qt5/KDE/Phonon/AudioDevice + rm debian/tmp/usr/include/phonon4qt5/KDE/Phonon/AudioDeviceEnumerator dh_install --fail-missing override_dh_strip: