phonon 4.6.0-1 maj port

5 files changed, 63 insertions, 44 deletions

diff --git a/extra/phonon/.footprint.i686 b/extra/phonon/.footprint.i686
index 749f9a468..b04675c41 100644
--- a/extra/phonon/.footprint.i686
+++ b/extra/phonon/.footprint.i686
@@ -73,6 +73,7 @@ drwxr-xr-x	root/root	usr/include/phonon/
 -rw-r--r--	root/root	usr/include/phonon/EffectParameter
 -rw-r--r--	root/root	usr/include/phonon/EffectWidget
 -rw-r--r--	root/root	usr/include/phonon/Global
+-rw-r--r--	root/root	usr/include/phonon/GlobalDescriptionContainer
 -rw-r--r--	root/root	usr/include/phonon/MediaController
 -rw-r--r--	root/root	usr/include/phonon/MediaNode
 -rw-r--r--	root/root	usr/include/phonon/MediaObject
@@ -139,6 +140,7 @@ drwxr-xr-x	root/root	usr/include/phonon/experimental/
 -rw-r--r--	root/root	usr/include/phonon/experimental/videowidget.h
 -rw-r--r--	root/root	usr/include/phonon/experimental/visualization.h
 -rw-r--r--	root/root	usr/include/phonon/globalconfig.h
+-rw-r--r--	root/root	usr/include/phonon/globaldescriptioncontainer.h
 -rw-r--r--	root/root	usr/include/phonon/mediacontroller.h
 -rw-r--r--	root/root	usr/include/phonon/medianode.h
 -rw-r--r--	root/root	usr/include/phonon/mediaobject.h
@@ -162,12 +164,18 @@ drwxr-xr-x	root/root	usr/include/phonon/experimental/
 -rw-r--r--	root/root	usr/include/phonon/volumefaderinterface.h
 -rw-r--r--	root/root	usr/include/phonon/volumeslider.h
 drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/cmake/
+drwxr-xr-x	root/root	usr/lib/cmake/phonon/
+-rw-r--r--	root/root	usr/lib/cmake/phonon/PhononConfig.cmake
+-rw-r--r--	root/root	usr/lib/cmake/phonon/PhononConfigVersion.cmake
+-rw-r--r--	root/root	usr/lib/cmake/phonon/PhononTargets-release.cmake
+-rw-r--r--	root/root	usr/lib/cmake/phonon/PhononTargets.cmake
 lrwxrwxrwx	root/root	usr/lib/libphonon.so -> libphonon.so.4
-lrwxrwxrwx	root/root	usr/lib/libphonon.so.4 -> libphonon.so.4.5.1
--rwxr-xr-x	root/root	usr/lib/libphonon.so.4.5.1
+lrwxrwxrwx	root/root	usr/lib/libphonon.so.4 -> libphonon.so.4.6.0
+-rwxr-xr-x	root/root	usr/lib/libphonon.so.4.6.0
 lrwxrwxrwx	root/root	usr/lib/libphononexperimental.so -> libphononexperimental.so.4
-lrwxrwxrwx	root/root	usr/lib/libphononexperimental.so.4 -> libphononexperimental.so.4.5.1
--rwxr-xr-x	root/root	usr/lib/libphononexperimental.so.4.5.1
+lrwxrwxrwx	root/root	usr/lib/libphononexperimental.so.4 -> libphononexperimental.so.4.6.0
+-rwxr-xr-x	root/root	usr/lib/libphononexperimental.so.4.6.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/phonon.pc
 drwxr-xr-x	root/root	usr/lib/qt/
@@ -178,18 +186,21 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/dbus-1/
 drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-drwxr-xr-x	root/root	usr/share/phonon-buildsystem/
--rw-r--r--	root/root	usr/share/phonon-buildsystem/COPYING-CMAKE-SCRIPTS
--rw-r--r--	root/root	usr/share/phonon-buildsystem/FindAutomoc4.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/FindPackageHandleStandardArgs.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/FindPhononInternal.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/FindQt4.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/MacroEnsureVersion.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/MacroLogFeature.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/MacroOptionalFindPackage.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/MacroPushRequiredVars.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/PhononMacros.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/cmake_uninstall.cmake.in
+drwxr-xr-x	root/root	usr/share/phonon/
+drwxr-xr-x	root/root	usr/share/phonon/buildsystem/
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/COPYING-CMAKE-SCRIPTS
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/FindAutomoc4.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/FindPackageHandleStandardArgs.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/FindPhononInternal.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/FindQt4.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/MacroEnsureVersion.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/MacroLogFeature.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/MacroOptionalFindPackage.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/MacroPushRequiredVars.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/PhononMacros.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/Qt4ConfigDependentSettings.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/Qt4Macros.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/cmake_uninstall.cmake.in
 drwxr-xr-x	root/root	usr/share/qt/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/modules/
diff --git a/extra/phonon/.footprint.x86_64 b/extra/phonon/.footprint.x86_64
index 749f9a468..b04675c41 100644
--- a/extra/phonon/.footprint.x86_64
+++ b/extra/phonon/.footprint.x86_64
@@ -73,6 +73,7 @@ drwxr-xr-x	root/root	usr/include/phonon/
 -rw-r--r--	root/root	usr/include/phonon/EffectParameter
 -rw-r--r--	root/root	usr/include/phonon/EffectWidget
 -rw-r--r--	root/root	usr/include/phonon/Global
+-rw-r--r--	root/root	usr/include/phonon/GlobalDescriptionContainer
 -rw-r--r--	root/root	usr/include/phonon/MediaController
 -rw-r--r--	root/root	usr/include/phonon/MediaNode
 -rw-r--r--	root/root	usr/include/phonon/MediaObject
@@ -139,6 +140,7 @@ drwxr-xr-x	root/root	usr/include/phonon/experimental/
 -rw-r--r--	root/root	usr/include/phonon/experimental/videowidget.h
 -rw-r--r--	root/root	usr/include/phonon/experimental/visualization.h
 -rw-r--r--	root/root	usr/include/phonon/globalconfig.h
+-rw-r--r--	root/root	usr/include/phonon/globaldescriptioncontainer.h
 -rw-r--r--	root/root	usr/include/phonon/mediacontroller.h
 -rw-r--r--	root/root	usr/include/phonon/medianode.h
 -rw-r--r--	root/root	usr/include/phonon/mediaobject.h
@@ -162,12 +164,18 @@ drwxr-xr-x	root/root	usr/include/phonon/experimental/
 -rw-r--r--	root/root	usr/include/phonon/volumefaderinterface.h
 -rw-r--r--	root/root	usr/include/phonon/volumeslider.h
 drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/cmake/
+drwxr-xr-x	root/root	usr/lib/cmake/phonon/
+-rw-r--r--	root/root	usr/lib/cmake/phonon/PhononConfig.cmake
+-rw-r--r--	root/root	usr/lib/cmake/phonon/PhononConfigVersion.cmake
+-rw-r--r--	root/root	usr/lib/cmake/phonon/PhononTargets-release.cmake
+-rw-r--r--	root/root	usr/lib/cmake/phonon/PhononTargets.cmake
 lrwxrwxrwx	root/root	usr/lib/libphonon.so -> libphonon.so.4
-lrwxrwxrwx	root/root	usr/lib/libphonon.so.4 -> libphonon.so.4.5.1
--rwxr-xr-x	root/root	usr/lib/libphonon.so.4.5.1
+lrwxrwxrwx	root/root	usr/lib/libphonon.so.4 -> libphonon.so.4.6.0
+-rwxr-xr-x	root/root	usr/lib/libphonon.so.4.6.0
 lrwxrwxrwx	root/root	usr/lib/libphononexperimental.so -> libphononexperimental.so.4
-lrwxrwxrwx	root/root	usr/lib/libphononexperimental.so.4 -> libphononexperimental.so.4.5.1
--rwxr-xr-x	root/root	usr/lib/libphononexperimental.so.4.5.1
+lrwxrwxrwx	root/root	usr/lib/libphononexperimental.so.4 -> libphononexperimental.so.4.6.0
+-rwxr-xr-x	root/root	usr/lib/libphononexperimental.so.4.6.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/phonon.pc
 drwxr-xr-x	root/root	usr/lib/qt/
@@ -178,18 +186,21 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/dbus-1/
 drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-drwxr-xr-x	root/root	usr/share/phonon-buildsystem/
--rw-r--r--	root/root	usr/share/phonon-buildsystem/COPYING-CMAKE-SCRIPTS
--rw-r--r--	root/root	usr/share/phonon-buildsystem/FindAutomoc4.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/FindPackageHandleStandardArgs.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/FindPhononInternal.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/FindQt4.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/MacroEnsureVersion.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/MacroLogFeature.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/MacroOptionalFindPackage.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/MacroPushRequiredVars.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/PhononMacros.cmake
--rw-r--r--	root/root	usr/share/phonon-buildsystem/cmake_uninstall.cmake.in
+drwxr-xr-x	root/root	usr/share/phonon/
+drwxr-xr-x	root/root	usr/share/phonon/buildsystem/
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/COPYING-CMAKE-SCRIPTS
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/FindAutomoc4.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/FindPackageHandleStandardArgs.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/FindPhononInternal.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/FindQt4.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/MacroEnsureVersion.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/MacroLogFeature.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/MacroOptionalFindPackage.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/MacroPushRequiredVars.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/PhononMacros.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/Qt4ConfigDependentSettings.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/Qt4Macros.cmake
+-rw-r--r--	root/root	usr/share/phonon/buildsystem/cmake_uninstall.cmake.in
 drwxr-xr-x	root/root	usr/share/qt/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/
 drwxr-xr-x	root/root	usr/share/qt/mkspecs/modules/
diff --git a/extra/phonon/.md5sum.i686 b/extra/phonon/.md5sum.i686
index 6fd234d98..8f7274835 100644
--- a/extra/phonon/.md5sum.i686
+++ b/extra/phonon/.md5sum.i686
@@ -1,4 +1,3 @@
 44c0339046c343835df64d9cbc2c26d5  FindPulseAudio.cmake
-e5c997f39d618d36ced0c857e63c8f83  libqzeitgeist08.patch
-3df071b7f9996afcd67b18958955ecdd  phonon-4.5.1.tar.xz
+bbe0c1c62ed14c31479c4c1a6cf1e173  phonon-4.6.0.tar.xz
 40aba68801b58fc5e17fc96446ad777a  pulsestream.cpp
diff --git a/extra/phonon/.md5sum.x86_64 b/extra/phonon/.md5sum.x86_64
index 6fd234d98..8f7274835 100644
--- a/extra/phonon/.md5sum.x86_64
+++ b/extra/phonon/.md5sum.x86_64
@@ -1,4 +1,3 @@
 44c0339046c343835df64d9cbc2c26d5  FindPulseAudio.cmake
-e5c997f39d618d36ced0c857e63c8f83  libqzeitgeist08.patch
-3df071b7f9996afcd67b18958955ecdd  phonon-4.5.1.tar.xz
+bbe0c1c62ed14c31479c4c1a6cf1e173  phonon-4.6.0.tar.xz
 40aba68801b58fc5e17fc96446ad777a  pulsestream.cpp
diff --git a/extra/phonon/Pkgfile b/extra/phonon/Pkgfile
index 79e2e8330..6779e935d 100644
--- a/extra/phonon/Pkgfile
+++ b/extra/phonon/Pkgfile
@@ -2,20 +2,18 @@
 # URL: http://phonon.kde.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: qt, xine-lib, cmake, gst-plugins-base, automoc4,sip,libqzeitgeist
-# Run on: qt,xine-lib,gst-plugins-base,sip,libqzeitgeist
+# Depends on: qt, xine-lib, cmake, gst-plugins-base, automoc4,sip,libqzeitgeist,pulseaudio
+# Run on: qt,xine-lib,gst-plugins-base,sip,libqzeitgeist,pulseaudio
 
 name=phonon
-version=4.5.1
-release=2
+version=4.6.0
+release=1
 source=(ftp://ftp.kde.org/pub/kde/stable/phonon/$version/src//$name-$version.tar.xz
 	FindPulseAudio.cmake
-	pulsestream.cpp
-	libqzeitgeist08.patch)
+	pulsestream.cpp)
 
 build() {
 	cd $name-$version
-	patch -Np1 -i ../libqzeitgeist08.patch
 	cp -f ../FindPulseAudio.cmake cmake/
 	cp -f ../pulsestream.cpp phonon/
 	cd ..
@@ -25,7 +23,8 @@ build() {
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
     		-DCMAKE_SKIP_RPATH=ON \
-   	 	-DWITH_QZeitgeist=OFF
+		-DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
+    		-DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
 	make
 	make DESTDIR=$PKG install
 }