Changes 5.2.1:

It provides many improvements over Qt 5.2.0 as well as packages Qt Creator 3.0.1. As a patch release, it does not add new features and remains binary compatible with Qt 5.2.0.

3 files changed, 22 insertions, 16 deletions

diff --git a/x11/qt5-qtmultimedia/Makefile b/x11/qt5-qtmultimedia/Makefile
index 1a1223a6681..489fa31b534 100644
--- a/x11/qt5-qtmultimedia/Makefile
+++ b/x11/qt5-qtmultimedia/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2014/04/20 02:27:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:32 adam Exp $
 
 .include "../../x11/qt5-qtbase/Makefile.common"
 
 PKGNAME=	qt5-qtmultimedia-${QTVERSION}
-PKGREVISION=	7
 COMMENT=	Qt5 module for multimedia
 
 USE_LIBTOOL=		yes
-
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
-BUILD_DIRS+=		qtmultimedia
+BUILD_DIRS=		qtmultimedia
+BUILD_TARGET=		sub-src
 MAKE_ENV+=		QTDIR=${QTDIR}
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
@@ -23,9 +22,10 @@ post-install:
 		ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
 .endfor
 
-.include "../../audio/pulseaudio/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
 .include "../../audio/openal/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.endif
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt5-qtmultimedia/PLIST b/x11/qt5-qtmultimedia/PLIST
index 0637d02183e..6b4fa9cf281 100644
--- a/x11/qt5-qtmultimedia/PLIST
+++ b/x11/qt5-qtmultimedia/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/30 06:37:11 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/04/23 07:05:32 adam Exp $
 lib/pkgconfig/Qt5Multimedia.pc
 lib/pkgconfig/Qt5MultimediaQuick_p.pc
 lib/pkgconfig/Qt5MultimediaWidgets.pc
@@ -253,8 +253,8 @@ qt5/lib/libQt5MultimediaQuick_p.la
 qt5/lib/libQt5MultimediaQuick_p.prl
 qt5/lib/libQt5MultimediaWidgets.la
 qt5/lib/libQt5MultimediaWidgets.prl
-qt5/lib/libqgsttools_p.la
-qt5/lib/libqgsttools_p.prl
+${PLIST.unix}qt5/lib/libqgsttools_p.la
+${PLIST.unix}qt5/lib/libqgsttools_p.prl
 qt5/lib/pkgconfig/Qt5Multimedia.pc
 qt5/lib/pkgconfig/Qt5MultimediaQuick_p.pc
 qt5/lib/pkgconfig/Qt5MultimediaWidgets.pc
@@ -263,10 +263,15 @@ qt5/mkspecs/modules/qt_lib_multimedia_private.pri
 qt5/mkspecs/modules/qt_lib_multimediawidgets.pri
 qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri
 qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri
-qt5/plugins/mediaservice/libgstaudiodecoder.la
-qt5/plugins/mediaservice/libgstcamerabin.la
-qt5/plugins/mediaservice/libgstmediacapture.la
-qt5/plugins/mediaservice/libgstmediaplayer.la
+${PLIST.mac}qt5/plugins/audio/libqtaudio_coreaudio.la
+${PLIST.mac}qt5/plugins/mediaservice/libqavfcamera.la
+${PLIST.mac}qt5/plugins/mediaservice/libqavfmediaplayer.la
+${PLIST.mac}qt5/plugins/mediaservice/libqqt7engine.la
+${PLIST.mac}qt5/plugins/mediaservice/libqtmedia_audioengine.la
+${PLIST.unix}qt5/plugins/mediaservice/libgstaudiodecoder.la
+${PLIST.unix}qt5/plugins/mediaservice/libgstcamerabin.la
+${PLIST.unix}qt5/plugins/mediaservice/libgstmediacapture.la
+${PLIST.unix}qt5/plugins/mediaservice/libgstmediaplayer.la
 qt5/plugins/playlistformats/libqtmultimedia_m3u.la
 qt5/qml/QtAudioEngine/libdeclarative_audioengine.la
 qt5/qml/QtAudioEngine/plugins.qmltypes
diff --git a/x11/qt5-qtmultimedia/buildlink3.mk b/x11/qt5-qtmultimedia/buildlink3.mk
index 99989a08074..a1bef25111e 100644
--- a/x11/qt5-qtmultimedia/buildlink3.mk
+++ b/x11/qt5-qtmultimedia/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2014/04/20 02:27:49 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2014/04/23 07:05:32 adam Exp $
 
 BUILDLINK_TREE+=	qt5-qtmultimedia
 
@@ -13,10 +13,11 @@ BUILDLINK_INCDIRS.qt5-qtmultimedia+=	qt5/include
 BUILDLINK_LIBDIRS.qt5-qtmultimedia+=	qt5/lib
 BUILDLINK_LIBDIRS.qt5-qtmultimedia+=	qt5/plugins
 
-.include "../../audio/pulseaudio/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
 .include "../../audio/openal/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.endif
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .endif	# QT5_QTMULTIMEDIA_BUILDLINK3_MK