Update to 4.5.1

Required for KDE SC 4.8

6 files changed, 34 insertions, 87 deletions

diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 1f9de96cf32..eb497ae0041 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2012/03/03 00:12:26 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2012/03/19 10:07:52 markd Exp $
 
-DISTNAME=	phonon-4.4.2
-PKGREVISION=	7
+DISTNAME=	phonon-4.5.1
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_KDE:=phonon/4.4.2/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_KDE:=phonon/4.5.1/src/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://phonon.kde.org
@@ -30,13 +29,6 @@ pre-configure:
 	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 	${MKDIR} ${WRKSRC}/_build
 
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-
-BUILDLINK_API_DEPENDS.xine-lib+=	xine-lib>=1.1.19nb7
-BUILDLINK_ABI_DEPENDS.xine-lib?=	xine-lib>=1.1.19nb1
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../x11/qt4-qdbus/buildlink3.mk"
diff --git a/multimedia/phonon/PLIST b/multimedia/phonon/PLIST
index f49f7a6c240..1483153197c 100644
--- a/multimedia/phonon/PLIST
+++ b/multimedia/phonon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/10/25 20:10:19 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/03/19 10:07:52 markd Exp $
 include/KDE/Phonon/AbstractAudioOutput
 include/KDE/Phonon/AbstractMediaStream
 include/KDE/Phonon/AbstractVideoOutput
@@ -51,12 +51,14 @@ include/phonon/AudioCaptureDevice
 include/phonon/AudioCaptureDeviceModel
 include/phonon/AudioChannelDescription
 include/phonon/AudioChannelDescriptionModel
+include/phonon/AudioDataOutput
 include/phonon/AudioOutput
 include/phonon/AudioOutputDevice
 include/phonon/AudioOutputDeviceModel
 include/phonon/AudioOutputInterface
 include/phonon/AudioOutputInterface40
 include/phonon/AudioOutputInterface42
+include/phonon/AvCapture
 include/phonon/BackendCapabilities
 include/phonon/BackendInterface
 include/phonon/Effect
@@ -71,6 +73,7 @@ include/phonon/MediaNode
 include/phonon/MediaObject
 include/phonon/MediaObjectInterface
 include/phonon/MediaSource
+include/phonon/Mrl
 include/phonon/ObjectDescription
 include/phonon/ObjectDescriptionData
 include/phonon/ObjectDescriptionModel
@@ -81,6 +84,8 @@ include/phonon/SeekSlider
 include/phonon/StreamInterface
 include/phonon/SubtitleDescription
 include/phonon/SubtitleDescriptionModel
+include/phonon/VideoCaptureDevice
+include/phonon/VideoCaptureDeviceModel
 include/phonon/VideoPlayer
 include/phonon/VideoWidget
 include/phonon/VideoWidgetInterface
@@ -109,6 +114,7 @@ include/phonon/experimental/audiodataoutput.h
 include/phonon/experimental/audiodataoutputinterface.h
 include/phonon/experimental/audioformat.h
 include/phonon/experimental/avcapture.h
+include/phonon/experimental/avcaptureinterface.h
 include/phonon/experimental/backendcapabilities.h
 include/phonon/experimental/backendinterface.h
 include/phonon/experimental/export.h
@@ -132,6 +138,7 @@ include/phonon/medianode.h
 include/phonon/mediaobject.h
 include/phonon/mediaobjectinterface.h
 include/phonon/mediasource.h
+include/phonon/mrl.h
 include/phonon/objectdescription.h
 include/phonon/objectdescriptionmodel.h
 include/phonon/path.h
@@ -148,22 +155,24 @@ include/phonon/videowidgetinterface.h
 include/phonon/volumefadereffect.h
 include/phonon/volumefaderinterface.h
 include/phonon/volumeslider.h
-lib/kde4/plugins/phonon_backend/phonon_gstreamer.so
-lib/kde4/plugins/phonon_backend/phonon_xine.so
 lib/libphonon.so
 lib/libphonon.so.4
-lib/libphonon.so.4.4.0
+lib/libphonon.so.${PKGVERSION}
 lib/libphononexperimental.so
 lib/libphononexperimental.so.4
-lib/libphononexperimental.so.4.4.0
+lib/libphononexperimental.so.${PKGVERSION}
 lib/pkgconfig/phonon.pc
+qt4/mkspecs/modules/qt_phonon.pri
+qt4/plugins/designer/libphononwidgets.so
 share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-share/icons/oxygen/128x128/apps/phonon-xine.png
-share/icons/oxygen/16x16/apps/phonon-xine.png
-share/icons/oxygen/22x22/apps/phonon-xine.png
-share/icons/oxygen/32x32/apps/phonon-xine.png
-share/icons/oxygen/48x48/apps/phonon-xine.png
-share/icons/oxygen/64x64/apps/phonon-xine.png
-share/icons/oxygen/scalable/apps/phonon-xine.svgz
-share/kde4/services/phononbackends/gstreamer.desktop
-share/kde4/services/phononbackends/xine.desktop
+share/phonon-buildsystem/COPYING-CMAKE-SCRIPTS
+share/phonon-buildsystem/FindAutomoc4.cmake
+share/phonon-buildsystem/FindPackageHandleStandardArgs.cmake
+share/phonon-buildsystem/FindPhononInternal.cmake
+share/phonon-buildsystem/FindQt4.cmake
+share/phonon-buildsystem/MacroEnsureVersion.cmake
+share/phonon-buildsystem/MacroLogFeature.cmake
+share/phonon-buildsystem/MacroOptionalFindPackage.cmake
+share/phonon-buildsystem/MacroPushRequiredVars.cmake
+share/phonon-buildsystem/PhononMacros.cmake
+share/phonon-buildsystem/cmake_uninstall.cmake.in
diff --git a/multimedia/phonon/buildlink3.mk b/multimedia/phonon/buildlink3.mk
index 61dde090040..37cfc11ee7c 100644
--- a/multimedia/phonon/buildlink3.mk
+++ b/multimedia/phonon/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.13 2012/03/03 00:12:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2012/03/19 10:07:52 markd Exp $
 
 BUILDLINK_TREE+=	phonon
 
 .if !defined(PHONON_BUILDLINK3_MK)
 PHONON_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.phonon+=	phonon>=4.1.83
-BUILDLINK_ABI_DEPENDS.phonon?=	phonon>=4.4.2nb7
+BUILDLINK_API_DEPENDS.phonon+=	phonon>=4.5.0
+BUILDLINK_ABI_DEPENDS.phonon?=	phonon>=4.5.0
 BUILDLINK_PKGSRCDIR.phonon?=	../../multimedia/phonon
 
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index f46b4b1f3a3..97cbc10e32c 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.5 2011/09/20 16:50:54 joerg Exp $
+$NetBSD: distinfo,v 1.6 2012/03/19 10:07:52 markd Exp $
 
-SHA1 (phonon-4.4.2.tar.bz2) = c329d924fb75a89a9de8a4d799ff4dcd7ee3302e
-RMD160 (phonon-4.4.2.tar.bz2) = aa37903f166904dd09401541df8fc268a2858606
-Size (phonon-4.4.2.tar.bz2) = 629193 bytes
-SHA1 (patch-volumefader_plugin.cpp) = 3dbe051aeb5d9785fe1bd159470474f80c64c8fd
-SHA1 (patch-xine-kequalizer_plugin.cpp) = f776a291aac1eb4ae3cf3439a6467bb7d2489ad9
+SHA1 (phonon-4.5.1.tar.xz) = 710a9ffffe7e558f4d0ce5ea5c118cb248fb8da8
+RMD160 (phonon-4.5.1.tar.xz) = b5aa9313b62bac7d5233716db52c9275168ee191
+Size (phonon-4.5.1.tar.xz) = 291088 bytes
diff --git a/multimedia/phonon/patches/patch-volumefader_plugin.cpp b/multimedia/phonon/patches/patch-volumefader_plugin.cpp
deleted file mode 100644
index 6f5e2d2482f..00000000000
--- a/multimedia/phonon/patches/patch-volumefader_plugin.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-volumefader_plugin.cpp,v 1.1 2011/09/20 16:50:54 joerg Exp $
-
---- xine/volumefader_plugin.cpp.orig	2010-06-07 14:36:25.000000000 +0000
-+++ xine/volumefader_plugin.cpp
-@@ -141,10 +141,10 @@ typedef struct
- static const char *enum_fadeCurve[] = { "Fade3Decibel", "Fade6Decibel", "Fade9Decibel", "Fade12Decibel", NULL };
- 
- START_PARAM_DESCR(kvolumefader_parameters_t)
--PARAM_ITEM(POST_PARAM_TYPE_INT, fadeCurve, const_cast<char**>(enum_fadeCurve), 0.0, 0.0, 0, const_cast<char*>( I18N_NOOP("fade curve") ))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, currentVolume, NULL, 0.0, maxVolume, 0, const_cast<char*>( I18N_NOOP("current volume") ))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, fadeTo, NULL, 0.0, maxVolume, 0, const_cast<char*>( I18N_NOOP("volume to fade to") ))
--PARAM_ITEM(POST_PARAM_TYPE_INT, fadeTime, NULL, 0.0, 10000.0, 0, const_cast<char*>( I18N_NOOP("fade time in milliseconds") ))
-+PARAM_ITEM(kvolumefader_parameters_t, POST_PARAM_TYPE_INT, fadeCurve, const_cast<char**>(enum_fadeCurve), 0.0, 0.0, 0, const_cast<char*>( I18N_NOOP("fade curve") ))
-+PARAM_ITEM(kvolumefader_parameters_t, POST_PARAM_TYPE_DOUBLE, currentVolume, NULL, 0.0, maxVolume, 0, const_cast<char*>( I18N_NOOP("current volume") ))
-+PARAM_ITEM(kvolumefader_parameters_t, POST_PARAM_TYPE_DOUBLE, fadeTo, NULL, 0.0, maxVolume, 0, const_cast<char*>( I18N_NOOP("volume to fade to") ))
-+PARAM_ITEM(kvolumefader_parameters_t, POST_PARAM_TYPE_INT, fadeTime, NULL, 0.0, 10000.0, 0, const_cast<char*>( I18N_NOOP("fade time in milliseconds") ))
- END_PARAM_DESCR(param_descr)
- 
- static int set_parameters (xine_post_t *this_gen, void *param_gen) 
diff --git a/multimedia/phonon/patches/patch-xine-kequalizer_plugin.cpp b/multimedia/phonon/patches/patch-xine-kequalizer_plugin.cpp
deleted file mode 100644
index db04707ec07..00000000000
--- a/multimedia/phonon/patches/patch-xine-kequalizer_plugin.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-xine-kequalizer_plugin.cpp,v 1.1 2011/09/20 16:50:54 joerg Exp $
-
---- xine/kequalizer_plugin.cpp.orig	2010-06-07 14:36:25.000000000 +0000
-+++ xine/kequalizer_plugin.cpp
-@@ -107,17 +107,17 @@ typedef struct
-  */
- START_PARAM_DESCR(kequalizer_parameters_t)
- 
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, preAmp, NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Equalizer pre-amp gain"))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[0], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 1 60Hz Gain"))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[1], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 2 170Hz Gain"))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[2], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 3 310Hz Gain"))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[3], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 4 600Hz Gain"))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[4], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 5 1000Hz Gain"))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[5], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 6 3000Hz Gain"))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[6], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 7 6000Hz Gain"))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[7], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 8 12000Hz Gain"))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[8], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 9 14000Hz Gain"))
--PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[9], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 10 16000Hz Gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, preAmp, NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Equalizer pre-amp gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[0], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 1 60Hz Gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[1], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 2 170Hz Gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[2], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 3 310Hz Gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[3], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 4 600Hz Gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[4], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 5 1000Hz Gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[5], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 6 3000Hz Gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[6], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 7 6000Hz Gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[7], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 8 12000Hz Gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[8], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 9 14000Hz Gain"))
-+PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[9], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 10 16000Hz Gain"))
- 
- END_PARAM_DESCR(param_descr)
-