Update phonon to 4.3.1

Version required for KDE 4.2. Precise changes unknown.

3 files changed, 41 insertions, 12 deletions

diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 0746c0f81c1..7c63d53bc85 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/03 10:59:46 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/06 13:13:04 markd Exp $
 
-DISTNAME=	phonon-4.2.0
+DISTNAME=	phonon-4.3.1
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_KDE:=phonon/4.2.0/}
+MASTER_SITES=	${MASTER_SITE_KDE:=4.2.0/src/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	markd@NetBSD.org
@@ -14,6 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
 BUILD_DEPENDS+=	automoc4>=0.9.83:../../devel/automoc4
+DEPENDS+=	xine-xcb>=1.1.9:../../x11/xine-xcb
 
 USE_DIRS+=	kde4-1.0
 USE_TOOLS+=	pkg-config
@@ -22,12 +23,16 @@ USE_CMAKE=	yes
 CMAKE_ARG_PATH=	..
 CONFIGURE_DIRS=	_build
 
+PKGCONFIG_OVERRIDE+=	phonon.pc.cmake
+
 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"
+.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 df8ca749344..6f8f0d3e3f7 100644
--- a/multimedia/phonon/PLIST
+++ b/multimedia/phonon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/11/03 10:59:46 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/04/06 13:13:04 markd Exp $
 include/KDE/Phonon/AbstractAudioOutput
 include/KDE/Phonon/AbstractMediaStream
 include/KDE/Phonon/AbstractVideoOutput
@@ -17,9 +17,13 @@ include/KDE/Phonon/EffectDescriptionModel
 include/KDE/Phonon/EffectInterface
 include/KDE/Phonon/EffectParameter
 include/KDE/Phonon/EffectWidget
+include/KDE/Phonon/Experimental/AbstractVideoDataOutput
 include/KDE/Phonon/Experimental/AudioDataOutput
+include/KDE/Phonon/Experimental/SnapshotInterface
 include/KDE/Phonon/Experimental/VideoDataOutput
+include/KDE/Phonon/Experimental/VideoDataOutputInterface
 include/KDE/Phonon/Experimental/VideoFrame
+include/KDE/Phonon/Experimental/VideoFrame2
 include/KDE/Phonon/Experimental/Visualization
 include/KDE/Phonon/Global
 include/KDE/Phonon/MediaController
@@ -51,14 +55,27 @@ include/phonon/effect.h
 include/phonon/effectinterface.h
 include/phonon/effectparameter.h
 include/phonon/effectwidget.h
+include/phonon/experimental/abstractaudiodataoutput.h
+include/phonon/experimental/abstractvideodataoutput.h
 include/phonon/experimental/audiodataoutput.h
+include/phonon/experimental/audiodataoutputinterface.h
+include/phonon/experimental/audioformat.h
+include/phonon/experimental/avcapture.h
 include/phonon/experimental/backendcapabilities.h
 include/phonon/experimental/backendinterface.h
 include/phonon/experimental/export.h
 include/phonon/experimental/mediasource.h
 include/phonon/experimental/objectdescription.h
+include/phonon/experimental/packet.h
+include/phonon/experimental/packetpool.h
+include/phonon/experimental/phononnamespace.h
+include/phonon/experimental/snapshotinterface.h
 include/phonon/experimental/videodataoutput.h
+include/phonon/experimental/videodataoutput2.h
+include/phonon/experimental/videodataoutputinterface.h
 include/phonon/experimental/videoframe.h
+include/phonon/experimental/videoframe2.h
+include/phonon/experimental/videowidget.h
 include/phonon/experimental/visualization.h
 include/phonon/mediacontroller.h
 include/phonon/medianode.h
@@ -80,16 +97,23 @@ 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.2.0
+lib/libphonon.so.4.3.0
 lib/libphononexperimental.so
 lib/libphononexperimental.so.4
-lib/libphononexperimental.so.4.2.0
+lib/libphononexperimental.so.4.3.0
 lib/pkgconfig/phonon.pc
 share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-share/kde4/services/phononbackends/gstreamer.desktop
+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/xine.desktop
 @dirrm share/kde4/services/phononbackends
 @comment @dirrm share/kde4/services
 @comment @dirrm share/dbus-1/interfaces
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index 936ffef8c17..400d2b39408 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/03 10:59:46 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/04/06 13:13:04 markd Exp $
 
-SHA1 (phonon-4.2.0.tar.bz2) = 11e2f2d73b0f0ccd66dfbe82f95d5185c6dc005b
-RMD160 (phonon-4.2.0.tar.bz2) = 9a141abb24a5f4c9b484c9f28680e45c4bb788d8
-Size (phonon-4.2.0.tar.bz2) = 400435 bytes
+SHA1 (phonon-4.3.1.tar.bz2) = f7537e5280d0a4cc1348975daa7a7e45d833d45c
+RMD160 (phonon-4.3.1.tar.bz2) = d91cc7e994d4f6a143a7cd6c2a723b579b294141
+Size (phonon-4.3.1.tar.bz2) = 575856 bytes