Mon Mar 19 10:07:52 2012 UTC ()
Update to 4.5.1

Required for KDE SC 4.8


(markd)
diff -r1.20 -r1.21 pkgsrc/multimedia/phonon/Makefile
diff -r1.5 -r1.6 pkgsrc/multimedia/phonon/PLIST
diff -r1.5 -r1.6 pkgsrc/multimedia/phonon/distinfo
diff -r1.13 -r1.14 pkgsrc/multimedia/phonon/buildlink3.mk
diff -r1.1 -r0 pkgsrc/multimedia/phonon/patches/patch-volumefader_plugin.cpp
diff -r1.1 -r0 pkgsrc/multimedia/phonon/patches/patch-xine-kequalizer_plugin.cpp
cvs diff -r1.20 -r1.21 pkgsrc/multimedia/phonon/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/phonon/Makefile 2012/03/03 00:12:26 1.20
+++ pkgsrc/multimedia/phonon/Makefile 2012/03/19 10:07:52 1.21
@@ -1,44 +1,36 @@ @@ -1,44 +1,36 @@
1# $NetBSD: Makefile,v 1.20 2012/03/03 00:12:26 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2012/03/19 10:07:52 markd Exp $
2 2
3DISTNAME= phonon-4.4.2 3DISTNAME= phonon-4.5.1
4PKGREVISION= 7 
5CATEGORIES= multimedia 4CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.4.2/} 5MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.5.1/src/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= markd@NetBSD.org 8MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://phonon.kde.org 9HOMEPAGE= http://phonon.kde.org
11COMMENT= Multimedia API for KDE and QT 10COMMENT= Multimedia API for KDE and QT
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16# BUILD_MAKE_FLAGS+= VERBOSE=1 15# BUILD_MAKE_FLAGS+= VERBOSE=1
17 16
18BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 17BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
19 18
20USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config
21USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
22USE_CMAKE= yes 21USE_CMAKE= yes
23CMAKE_ARG_PATH= .. 22CMAKE_ARG_PATH= ..
24CONFIGURE_DIRS= _build 23CONFIGURE_DIRS= _build
25CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF 24CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
26 25
27PKGCONFIG_OVERRIDE+= phonon.pc.cmake 26PKGCONFIG_OVERRIDE+= phonon.pc.cmake
28 27
29pre-configure: 28pre-configure:
30 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ 29 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
31 ${MKDIR} ${WRKSRC}/_build 30 ${MKDIR} ${WRKSRC}/_build
32 31
33.include "../../multimedia/gstreamer0.10/buildlink3.mk" 
34.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 
35 
36BUILDLINK_API_DEPENDS.xine-lib+= xine-lib>=1.1.19nb7 
37BUILDLINK_ABI_DEPENDS.xine-lib?= xine-lib>=1.1.19nb1 
38.include "../../multimedia/xine-lib/buildlink3.mk" 
39.include "../../x11/libxcb/buildlink3.mk" 
40.include "../../x11/qt4-libs/buildlink3.mk" 32.include "../../x11/qt4-libs/buildlink3.mk"
41.include "../../x11/qt4-tools/buildlink3.mk" 33.include "../../x11/qt4-tools/buildlink3.mk"
42.include "../../x11/qt4-qdbus/buildlink3.mk" 34.include "../../x11/qt4-qdbus/buildlink3.mk"
43 35
44.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/phonon/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/phonon/PLIST 2010/10/25 20:10:19 1.5
+++ pkgsrc/multimedia/phonon/PLIST 2012/03/19 10:07:52 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2010/10/25 20:10:19 markd Exp $ 1@comment $NetBSD: PLIST,v 1.6 2012/03/19 10:07:52 markd Exp $
2include/KDE/Phonon/AbstractAudioOutput 2include/KDE/Phonon/AbstractAudioOutput
3include/KDE/Phonon/AbstractMediaStream 3include/KDE/Phonon/AbstractMediaStream
4include/KDE/Phonon/AbstractVideoOutput 4include/KDE/Phonon/AbstractVideoOutput
5include/KDE/Phonon/AddonInterface 5include/KDE/Phonon/AddonInterface
6include/KDE/Phonon/AudioDevice 6include/KDE/Phonon/AudioDevice
7include/KDE/Phonon/AudioDeviceEnumerator 7include/KDE/Phonon/AudioDeviceEnumerator
8include/KDE/Phonon/AudioOutput 8include/KDE/Phonon/AudioOutput
9include/KDE/Phonon/AudioOutputDevice 9include/KDE/Phonon/AudioOutputDevice
10include/KDE/Phonon/AudioOutputDeviceModel 10include/KDE/Phonon/AudioOutputDeviceModel
11include/KDE/Phonon/AudioOutputInterface 11include/KDE/Phonon/AudioOutputInterface
12include/KDE/Phonon/BackendCapabilities 12include/KDE/Phonon/BackendCapabilities
13include/KDE/Phonon/BackendInterface 13include/KDE/Phonon/BackendInterface
14include/KDE/Phonon/Effect 14include/KDE/Phonon/Effect
@@ -41,56 +41,61 @@ include/KDE/Phonon/VideoPlayer @@ -41,56 +41,61 @@ include/KDE/Phonon/VideoPlayer
41include/KDE/Phonon/VideoWidget 41include/KDE/Phonon/VideoWidget
42include/KDE/Phonon/VideoWidgetInterface 42include/KDE/Phonon/VideoWidgetInterface
43include/KDE/Phonon/VolumeFaderEffect 43include/KDE/Phonon/VolumeFaderEffect
44include/KDE/Phonon/VolumeFaderInterface 44include/KDE/Phonon/VolumeFaderInterface
45include/KDE/Phonon/VolumeSlider 45include/KDE/Phonon/VolumeSlider
46include/phonon/AbstractAudioOutput 46include/phonon/AbstractAudioOutput
47include/phonon/AbstractMediaStream 47include/phonon/AbstractMediaStream
48include/phonon/AbstractVideoOutput 48include/phonon/AbstractVideoOutput
49include/phonon/AddonInterface 49include/phonon/AddonInterface
50include/phonon/AudioCaptureDevice 50include/phonon/AudioCaptureDevice
51include/phonon/AudioCaptureDeviceModel 51include/phonon/AudioCaptureDeviceModel
52include/phonon/AudioChannelDescription 52include/phonon/AudioChannelDescription
53include/phonon/AudioChannelDescriptionModel 53include/phonon/AudioChannelDescriptionModel
 54include/phonon/AudioDataOutput
54include/phonon/AudioOutput 55include/phonon/AudioOutput
55include/phonon/AudioOutputDevice 56include/phonon/AudioOutputDevice
56include/phonon/AudioOutputDeviceModel 57include/phonon/AudioOutputDeviceModel
57include/phonon/AudioOutputInterface 58include/phonon/AudioOutputInterface
58include/phonon/AudioOutputInterface40 59include/phonon/AudioOutputInterface40
59include/phonon/AudioOutputInterface42 60include/phonon/AudioOutputInterface42
 61include/phonon/AvCapture
60include/phonon/BackendCapabilities 62include/phonon/BackendCapabilities
61include/phonon/BackendInterface 63include/phonon/BackendInterface
62include/phonon/Effect 64include/phonon/Effect
63include/phonon/EffectDescription 65include/phonon/EffectDescription
64include/phonon/EffectDescriptionModel 66include/phonon/EffectDescriptionModel
65include/phonon/EffectInterface 67include/phonon/EffectInterface
66include/phonon/EffectParameter 68include/phonon/EffectParameter
67include/phonon/EffectWidget 69include/phonon/EffectWidget
68include/phonon/Global 70include/phonon/Global
69include/phonon/MediaController 71include/phonon/MediaController
70include/phonon/MediaNode 72include/phonon/MediaNode
71include/phonon/MediaObject 73include/phonon/MediaObject
72include/phonon/MediaObjectInterface 74include/phonon/MediaObjectInterface
73include/phonon/MediaSource 75include/phonon/MediaSource
 76include/phonon/Mrl
74include/phonon/ObjectDescription 77include/phonon/ObjectDescription
75include/phonon/ObjectDescriptionData 78include/phonon/ObjectDescriptionData
76include/phonon/ObjectDescriptionModel 79include/phonon/ObjectDescriptionModel
77include/phonon/ObjectDescriptionModelData 80include/phonon/ObjectDescriptionModelData
78include/phonon/Path 81include/phonon/Path
79include/phonon/PlatformPlugin 82include/phonon/PlatformPlugin
80include/phonon/SeekSlider 83include/phonon/SeekSlider
81include/phonon/StreamInterface 84include/phonon/StreamInterface
82include/phonon/SubtitleDescription 85include/phonon/SubtitleDescription
83include/phonon/SubtitleDescriptionModel 86include/phonon/SubtitleDescriptionModel
 87include/phonon/VideoCaptureDevice
 88include/phonon/VideoCaptureDeviceModel
84include/phonon/VideoPlayer 89include/phonon/VideoPlayer
85include/phonon/VideoWidget 90include/phonon/VideoWidget
86include/phonon/VideoWidgetInterface 91include/phonon/VideoWidgetInterface
87include/phonon/VideoWidgetInterface44 92include/phonon/VideoWidgetInterface44
88include/phonon/VideoWidgetInterfaceLatest 93include/phonon/VideoWidgetInterfaceLatest
89include/phonon/VolumeFaderEffect 94include/phonon/VolumeFaderEffect
90include/phonon/VolumeFaderInterface 95include/phonon/VolumeFaderInterface
91include/phonon/VolumeSlider 96include/phonon/VolumeSlider
92include/phonon/abstractaudiooutput.h 97include/phonon/abstractaudiooutput.h
93include/phonon/abstractmediastream.h 98include/phonon/abstractmediastream.h
94include/phonon/abstractvideooutput.h 99include/phonon/abstractvideooutput.h
95include/phonon/addoninterface.h 100include/phonon/addoninterface.h
96include/phonon/audiodataoutput.h 101include/phonon/audiodataoutput.h
@@ -99,71 +104,75 @@ include/phonon/audiooutput.h @@ -99,71 +104,75 @@ include/phonon/audiooutput.h
99include/phonon/audiooutputinterface.h 104include/phonon/audiooutputinterface.h
100include/phonon/backendcapabilities.h 105include/phonon/backendcapabilities.h
101include/phonon/backendinterface.h 106include/phonon/backendinterface.h
102include/phonon/effect.h 107include/phonon/effect.h
103include/phonon/effectinterface.h 108include/phonon/effectinterface.h
104include/phonon/effectparameter.h 109include/phonon/effectparameter.h
105include/phonon/effectwidget.h 110include/phonon/effectwidget.h
106include/phonon/experimental/abstractaudiodataoutput.h 111include/phonon/experimental/abstractaudiodataoutput.h
107include/phonon/experimental/abstractvideodataoutput.h 112include/phonon/experimental/abstractvideodataoutput.h
108include/phonon/experimental/audiodataoutput.h 113include/phonon/experimental/audiodataoutput.h
109include/phonon/experimental/audiodataoutputinterface.h 114include/phonon/experimental/audiodataoutputinterface.h
110include/phonon/experimental/audioformat.h 115include/phonon/experimental/audioformat.h
111include/phonon/experimental/avcapture.h 116include/phonon/experimental/avcapture.h
 117include/phonon/experimental/avcaptureinterface.h
112include/phonon/experimental/backendcapabilities.h 118include/phonon/experimental/backendcapabilities.h
113include/phonon/experimental/backendinterface.h 119include/phonon/experimental/backendinterface.h
114include/phonon/experimental/export.h 120include/phonon/experimental/export.h
115include/phonon/experimental/globalconfig.h 121include/phonon/experimental/globalconfig.h
116include/phonon/experimental/mediasource.h 122include/phonon/experimental/mediasource.h
117include/phonon/experimental/objectdescription.h 123include/phonon/experimental/objectdescription.h
118include/phonon/experimental/packet.h 124include/phonon/experimental/packet.h
119include/phonon/experimental/packetpool.h 125include/phonon/experimental/packetpool.h
120include/phonon/experimental/phononnamespace.h 126include/phonon/experimental/phononnamespace.h
121include/phonon/experimental/snapshotinterface.h 127include/phonon/experimental/snapshotinterface.h
122include/phonon/experimental/videodataoutput.h 128include/phonon/experimental/videodataoutput.h
123include/phonon/experimental/videodataoutput2.h 129include/phonon/experimental/videodataoutput2.h
124include/phonon/experimental/videodataoutputinterface.h 130include/phonon/experimental/videodataoutputinterface.h
125include/phonon/experimental/videoframe.h 131include/phonon/experimental/videoframe.h
126include/phonon/experimental/videoframe2.h 132include/phonon/experimental/videoframe2.h
127include/phonon/experimental/videowidget.h 133include/phonon/experimental/videowidget.h
128include/phonon/experimental/visualization.h 134include/phonon/experimental/visualization.h
129include/phonon/globalconfig.h 135include/phonon/globalconfig.h
130include/phonon/mediacontroller.h 136include/phonon/mediacontroller.h
131include/phonon/medianode.h 137include/phonon/medianode.h
132include/phonon/mediaobject.h 138include/phonon/mediaobject.h
133include/phonon/mediaobjectinterface.h 139include/phonon/mediaobjectinterface.h
134include/phonon/mediasource.h 140include/phonon/mediasource.h
 141include/phonon/mrl.h
135include/phonon/objectdescription.h 142include/phonon/objectdescription.h
136include/phonon/objectdescriptionmodel.h 143include/phonon/objectdescriptionmodel.h
137include/phonon/path.h 144include/phonon/path.h
138include/phonon/phonon_export.h 145include/phonon/phonon_export.h
139include/phonon/phonondefs.h 146include/phonon/phonondefs.h
140include/phonon/phononnamespace.h 147include/phonon/phononnamespace.h
141include/phonon/platformplugin.h 148include/phonon/platformplugin.h
142include/phonon/pulsesupport.h 149include/phonon/pulsesupport.h
143include/phonon/seekslider.h 150include/phonon/seekslider.h
144include/phonon/streaminterface.h 151include/phonon/streaminterface.h
145include/phonon/videoplayer.h 152include/phonon/videoplayer.h
146include/phonon/videowidget.h 153include/phonon/videowidget.h
147include/phonon/videowidgetinterface.h 154include/phonon/videowidgetinterface.h
148include/phonon/volumefadereffect.h 155include/phonon/volumefadereffect.h
149include/phonon/volumefaderinterface.h 156include/phonon/volumefaderinterface.h
150include/phonon/volumeslider.h 157include/phonon/volumeslider.h
151lib/kde4/plugins/phonon_backend/phonon_gstreamer.so 
152lib/kde4/plugins/phonon_backend/phonon_xine.so 
153lib/libphonon.so 158lib/libphonon.so
154lib/libphonon.so.4 159lib/libphonon.so.4
155lib/libphonon.so.4.4.0 160lib/libphonon.so.${PKGVERSION}
156lib/libphononexperimental.so 161lib/libphononexperimental.so
157lib/libphononexperimental.so.4 162lib/libphononexperimental.so.4
158lib/libphononexperimental.so.4.4.0 163lib/libphononexperimental.so.${PKGVERSION}
159lib/pkgconfig/phonon.pc 164lib/pkgconfig/phonon.pc
 165qt4/mkspecs/modules/qt_phonon.pri
 166qt4/plugins/designer/libphononwidgets.so
160share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml 167share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
161share/icons/oxygen/128x128/apps/phonon-xine.png 168share/phonon-buildsystem/COPYING-CMAKE-SCRIPTS
162share/icons/oxygen/16x16/apps/phonon-xine.png 169share/phonon-buildsystem/FindAutomoc4.cmake
163share/icons/oxygen/22x22/apps/phonon-xine.png 170share/phonon-buildsystem/FindPackageHandleStandardArgs.cmake
164share/icons/oxygen/32x32/apps/phonon-xine.png 171share/phonon-buildsystem/FindPhononInternal.cmake
165share/icons/oxygen/48x48/apps/phonon-xine.png 172share/phonon-buildsystem/FindQt4.cmake
166share/icons/oxygen/64x64/apps/phonon-xine.png 173share/phonon-buildsystem/MacroEnsureVersion.cmake
167share/icons/oxygen/scalable/apps/phonon-xine.svgz 174share/phonon-buildsystem/MacroLogFeature.cmake
168share/kde4/services/phononbackends/gstreamer.desktop 175share/phonon-buildsystem/MacroOptionalFindPackage.cmake
169share/kde4/services/phononbackends/xine.desktop 176share/phonon-buildsystem/MacroPushRequiredVars.cmake
 177share/phonon-buildsystem/PhononMacros.cmake
 178share/phonon-buildsystem/cmake_uninstall.cmake.in
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/phonon/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/phonon/distinfo 2011/09/20 16:50:54 1.5
+++ pkgsrc/multimedia/phonon/distinfo 2012/03/19 10:07:52 1.6
@@ -1,7 +1,5 @@ @@ -1,7 +1,5 @@
1$NetBSD: distinfo,v 1.5 2011/09/20 16:50:54 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2012/03/19 10:07:52 markd Exp $
2 2
3SHA1 (phonon-4.4.2.tar.bz2) = c329d924fb75a89a9de8a4d799ff4dcd7ee3302e 3SHA1 (phonon-4.5.1.tar.xz) = 710a9ffffe7e558f4d0ce5ea5c118cb248fb8da8
4RMD160 (phonon-4.4.2.tar.bz2) = aa37903f166904dd09401541df8fc268a2858606 4RMD160 (phonon-4.5.1.tar.xz) = b5aa9313b62bac7d5233716db52c9275168ee191
5Size (phonon-4.4.2.tar.bz2) = 629193 bytes 5Size (phonon-4.5.1.tar.xz) = 291088 bytes
6SHA1 (patch-volumefader_plugin.cpp) = 3dbe051aeb5d9785fe1bd159470474f80c64c8fd 
7SHA1 (patch-xine-kequalizer_plugin.cpp) = f776a291aac1eb4ae3cf3439a6467bb7d2489ad9 
cvs diff -r1.13 -r1.14 pkgsrc/multimedia/phonon/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/phonon/buildlink3.mk 2012/03/03 00:12:26 1.13
+++ pkgsrc/multimedia/phonon/buildlink3.mk 2012/03/19 10:07:52 1.14
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.13 2012/03/03 00:12:26 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.14 2012/03/19 10:07:52 markd Exp $
2 2
3BUILDLINK_TREE+= phonon 3BUILDLINK_TREE+= phonon
4 4
5.if !defined(PHONON_BUILDLINK3_MK) 5.if !defined(PHONON_BUILDLINK3_MK)
6PHONON_BUILDLINK3_MK:= 6PHONON_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.phonon+= phonon>=4.1.83 8BUILDLINK_API_DEPENDS.phonon+= phonon>=4.5.0
9BUILDLINK_ABI_DEPENDS.phonon?= phonon>=4.4.2nb7 9BUILDLINK_ABI_DEPENDS.phonon?= phonon>=4.5.0
10BUILDLINK_PKGSRCDIR.phonon?= ../../multimedia/phonon 10BUILDLINK_PKGSRCDIR.phonon?= ../../multimedia/phonon
11 11
12.include "../../x11/qt4-libs/buildlink3.mk" 12.include "../../x11/qt4-libs/buildlink3.mk"
13.include "../../x11/qt4-qdbus/buildlink3.mk" 13.include "../../x11/qt4-qdbus/buildlink3.mk"
14.endif # PHONON_BUILDLINK3_MK 14.endif # PHONON_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -phonon 16BUILDLINK_TREE+= -phonon
File Deleted: pkgsrc/multimedia/phonon/patches/Attic/patch-volumefader_plugin.cpp
File Deleted: pkgsrc/multimedia/phonon/patches/Attic/patch-xine-kequalizer_plugin.cpp