Update phonon{,-qt5} to 4.9.0

Changes

* Builsystem helpers are now installed to CMAKE_INSTALL_DATAROOTDIR
* CMake 2.8.9 is required to use GNUInstallDirs and for the Qt5 code
  branches
* automoc4 support was removed. Building always use the cmake built-in
  solution now.
* Qt5 and Qt4 builds use different CMake configurations now
  * Qt4 is as it always has been
  * Qt5 moved away from crudely ported Qt4 configurations to using
    extra-cmake-modules' KDE compiler and cmake flags.
  * Installation paths and so forth are still jointly configured as to
    retain backwards compatibility (i.e. Qt5 build does not follow ECM's
    KDEInstallationPaths)

Bug Fixes

* VolumeSlider has seen async behavior improvements making the slider
  not hop around when changing the volume rapidly and the backend is
  lagging a bit behind. The volume change now occurs upon slider release
  rather than instantly.
* Fixed a duble encoding issue with local paths that contain percent
  encoded characters being double-encoded

New API

* New AudioOutputInterface49 for backends to implement. This interface
  implements long-existing frontend interfaces for muting, giving the
  backend easier access and control.
  * setMuted(bool) mutes an AudioOuput (without the 4.9 interface this
    is done via setVolume(0.0) on the backend)
  * mutedChanged(bool) signal emitted by the backend to asyncronuously
    notify of the mute application
  * The interface is only used if PulseSupport is not intercepting calls
* New methods to differntiate states of PulseSupport
  * request(bool) is used by backends to request PulseAudio usage but no
    interception, this essentially enables device listing but lets
    everything else fall through to the backend (the existing isActive()
    method will not return true after request(true), which makes it
    different from enable(true))
  * isRequested() is a getter for request()'s state
  * isUsable() is part of the previouys isActive() behavior, it is true
    iff pulseaudio can be used (daemon running, connected etc)
  * isUsed() is a combination of isRequested() and isUsable() (i.e. active
    but not intercepting)
  * The existing isActive() communicates the same state as before (active
    and intercepting) but now also takes requested into consideration
  * Enabling always implies requsting automatically, so request(false)
    and enable(true) will ultimately still restul in isRequested==true

7 files changed, 34 insertions, 56 deletions

diff --git a/multimedia/phonon-qt5/Makefile b/multimedia/phonon-qt5/Makefile
index 545c7edbad9..b50edddfbe8 100644
--- a/multimedia/phonon-qt5/Makefile
+++ b/multimedia/phonon-qt5/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2016/04/11 19:01:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2016/04/26 08:08:50 markd Exp $
 
-DISTNAME=       phonon-4.8.3
+DISTNAME=       phonon-4.9.0
 PKGNAME=	${DISTNAME:S/-/-qt5-/}
-PKGREVISION=	2
 
 COMMENT=	Multimedia API for KF5
 
@@ -10,6 +9,8 @@ COMMENT=	Multimedia API for KF5
 
 CMAKE_ARGS+=	-DPHONON_BUILD_PHONON4QT5=ON
 
+BUILD_DEPENDS+=	extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
+
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
 
diff --git a/multimedia/phonon-qt5/PLIST b/multimedia/phonon-qt5/PLIST
index 8ac459891a7..c0ebca9bbbc 100644
--- a/multimedia/phonon-qt5/PLIST
+++ b/multimedia/phonon-qt5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/03/01 08:59:54 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/04/26 08:08:50 markd Exp $
 include/phonon4qt5/KDE/Phonon/AbstractAudioOutput
 include/phonon4qt5/KDE/Phonon/AbstractMediaStream
 include/phonon4qt5/KDE/Phonon/AbstractVideoOutput
@@ -159,6 +159,10 @@ include/phonon4qt5/phonon/volumefaderinterface.h
 include/phonon4qt5/phonon/volumeslider.h
 lib/cmake/phonon4qt5/Phonon4Qt5Config.cmake
 lib/cmake/phonon4qt5/Phonon4Qt5ConfigVersion.cmake
+lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfig.cmake
+lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfigVersion.cmake
+lib/cmake/phonon4qt5/PhononExperimentalTargets-noconfig.cmake
+lib/cmake/phonon4qt5/PhononExperimentalTargets.cmake
 lib/cmake/phonon4qt5/PhononTargets-noconfig.cmake
 lib/cmake/phonon4qt5/PhononTargets.cmake
 lib/libphonon4qt5.so
@@ -169,10 +173,9 @@ lib/libphonon4qt5experimental.so.4
 lib/libphonon4qt5experimental.so.${PKGVERSION}
 lib/pkgconfig/phonon4qt5.pc
 qt5/mkspecs/modules/qt_phonon4qt5.pri
-qt5/plugins/designer/libphononwidgets.so
+qt5/plugins/designer/phononwidgets.so
 share/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml
 share/phonon4qt5/buildsystem/COPYING-CMAKE-SCRIPTS
-share/phonon4qt5/buildsystem/FindAutomoc4.cmake
 share/phonon4qt5/buildsystem/FindPackageHandleStandardArgs.cmake
 share/phonon4qt5/buildsystem/FindPhononInternal.cmake
 share/phonon4qt5/buildsystem/MacroEnsureVersion.cmake
@@ -180,4 +183,6 @@ share/phonon4qt5/buildsystem/MacroLogFeature.cmake
 share/phonon4qt5/buildsystem/MacroOptionalFindPackage.cmake
 share/phonon4qt5/buildsystem/MacroPushRequiredVars.cmake
 share/phonon4qt5/buildsystem/PhononMacros.cmake
+share/phonon4qt5/buildsystem/PhononQt4.cmake
+share/phonon4qt5/buildsystem/PhononQt5.cmake
 share/phonon4qt5/buildsystem/cmake_uninstall.cmake.in
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index b7a909f056d..82fec3b1ac4 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.52 2016/03/05 11:27:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2016/04/26 08:08:50 markd Exp $
 
-DISTNAME=	phonon-4.8.3
-PKGREVISION=	3
+DISTNAME=	phonon-4.9.0
 
 COMMENT=	Multimedia API for KDE and QT
 
 .include "Makefile.common"
 
-BUILD_DEPENDS+=	automoc4>=0.9.83:../../devel/automoc4
-
 .include "../../x11/qt4-libs/buildlink3.mk"
 BUILDLINK_DEPMETHOD.qt4-tools=	full
 .include "../../x11/qt4-tools/buildlink3.mk"
diff --git a/multimedia/phonon/Makefile.common b/multimedia/phonon/Makefile.common
index 10afc6b6372..331911eddbc 100644
--- a/multimedia/phonon/Makefile.common
+++ b/multimedia/phonon/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2016/03/01 08:54:42 markd Exp $
+# $NetBSD: Makefile.common,v 1.2 2016/04/26 08:08:50 markd Exp $
 
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_KDE:=phonon/4.8.3/src/}
+MASTER_SITES=	${MASTER_SITE_KDE:=phonon/4.9.0/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	markd@NetBSD.org
diff --git a/multimedia/phonon/PLIST b/multimedia/phonon/PLIST
index a53ced40967..ab9d1687d1e 100644
--- a/multimedia/phonon/PLIST
+++ b/multimedia/phonon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/11/09 22:45:05 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/04/26 08:08:50 markd Exp $
 include/KDE/Phonon/AbstractAudioOutput
 include/KDE/Phonon/AbstractMediaStream
 include/KDE/Phonon/AbstractVideoOutput
@@ -159,6 +159,10 @@ include/phonon/volumefaderinterface.h
 include/phonon/volumeslider.h
 lib/cmake/phonon/PhononConfig.cmake
 lib/cmake/phonon/PhononConfigVersion.cmake
+lib/cmake/phonon/PhononExperimentalConfig.cmake
+lib/cmake/phonon/PhononExperimentalConfigVersion.cmake
+lib/cmake/phonon/PhononExperimentalTargets-noconfig.cmake
+lib/cmake/phonon/PhononExperimentalTargets.cmake
 lib/cmake/phonon/PhononTargets-noconfig.cmake
 lib/cmake/phonon/PhononTargets.cmake
 lib/libphonon.so
@@ -172,7 +176,6 @@ qt4/mkspecs/modules/qt_phonon.pri
 qt4/plugins/designer/libphononwidgets.so
 share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 share/phonon/buildsystem/COPYING-CMAKE-SCRIPTS
-share/phonon/buildsystem/FindAutomoc4.cmake
 share/phonon/buildsystem/FindPackageHandleStandardArgs.cmake
 share/phonon/buildsystem/FindPhononInternal.cmake
 share/phonon/buildsystem/MacroEnsureVersion.cmake
@@ -180,4 +183,6 @@ share/phonon/buildsystem/MacroLogFeature.cmake
 share/phonon/buildsystem/MacroOptionalFindPackage.cmake
 share/phonon/buildsystem/MacroPushRequiredVars.cmake
 share/phonon/buildsystem/PhononMacros.cmake
+share/phonon/buildsystem/PhononQt4.cmake
+share/phonon/buildsystem/PhononQt5.cmake
 share/phonon/buildsystem/cmake_uninstall.cmake.in
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index 383b4249228..f67f3c46e5f 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2016/03/01 08:54:42 markd Exp $
+$NetBSD: distinfo,v 1.17 2016/04/26 08:08:50 markd Exp $
 
-SHA1 (phonon-4.8.3.tar.xz) = aac5dc44ae4821e6165c6735b9c6063dd111ac03
-RMD160 (phonon-4.8.3.tar.xz) = c035f253eda49635377122423bb72161f97f18d3
-SHA512 (phonon-4.8.3.tar.xz) = 368014e808fe9ac84cdb4caf99dec93470907ca959e9a900fd6a8d86b3a44603b91be06b64b0f484d199663647bf82e84f643900edcf6a0c90ea55c53f767701
-Size (phonon-4.8.3.tar.xz) = 322012 bytes
-SHA1 (patch-cmake_FindPhononInternal.cmake) = 3b578d419b86eb12078fa650aca61f1f2f2fff6f
+SHA1 (phonon-4.9.0.tar.xz) = 5823cec679f16021c121dfb756fb215cee17caee
+RMD160 (phonon-4.9.0.tar.xz) = 42e3230c39319bcb5da4a8b2b14da7d8e563e772
+SHA512 (phonon-4.9.0.tar.xz) = 6201b0fa8620cf2640f1488d2ea9605ddd9894af077be247bdcc1ee20f4f7352f6b42fa834bcc074ec3ede1281fdbc3bf137961591f8d954d02a29186ff17a5c
+Size (phonon-4.9.0.tar.xz) = 321860 bytes
+SHA1 (patch-cmake_FindPhononInternal.cmake) = 637df634276927ce8cdeeaa8657a8bbd88380544
diff --git a/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake b/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake
index ea742cedeee..a7d4c9aad86 100644
--- a/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake
+++ b/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake
@@ -1,11 +1,10 @@
-$NetBSD: patch-cmake_FindPhononInternal.cmake,v 1.3 2016/03/01 08:54:42 markd Exp $
+$NetBSD: patch-cmake_FindPhononInternal.cmake,v 1.4 2016/04/26 08:08:50 markd Exp $
 
 Disable Darwin section, creates unusable libraries.
-_include_dirs fix for qt-5.4.2
 
---- cmake/FindPhononInternal.cmake.orig	2014-12-04 09:30:26.000000000 +0000
+--- cmake/FindPhononInternal.cmake.orig	2016-04-18 04:25:17.000000000 +0000
 +++ cmake/FindPhononInternal.cmake
-@@ -199,14 +199,14 @@ set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME
+@@ -92,14 +92,14 @@ set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME
                                   ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel)
  
  # on the Mac support an extra install directory for application bundles
@@ -20,34 +19,5 @@ _include_dirs fix for qt-5.4.2
 -endif(APPLE)
 +endif(notAPPLE)
  
- # RPATH Handling
- 
-@@ -324,16 +324,16 @@ if (CMAKE_COMPILER_IS_GNUCXX)
-    # 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_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-reorder-blocks -fno-schedule-insns -fno-inline")
-+   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_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -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")
- 
-@@ -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}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
- 
-       if(NOT _compile_result)
-          message("${_compile_output_var}")
+ if (NOT PHONON_BUILD_PHONON4QT5) # Qt4
+     include(${phonon_cmake_module_dir}/PhononQt4.cmake)