5 files changed, 27 insertions, 24 deletions

diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile
index 4bc96949e669..d15253ae3b24 100644
--- a/multimedia/qt5-multimedia/Makefile
+++ b/multimedia/qt5-multimedia/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	multimedia
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	4
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	qt5-
 
diff --git a/multimedia/qt5-multimedia/pkg-plist b/multimedia/qt5-multimedia/pkg-plist
index 3bdc2b20e6b6..5384589afc9e 100644
--- a/multimedia/qt5-multimedia/pkg-plist
+++ b/multimedia/qt5-multimedia/pkg-plist
@@ -23,6 +23,7 @@
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideorendererinterface_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideowidget_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideowindow_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgsttools_global_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstutils_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideobuffer_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideorendererplugin_p.h
@@ -245,15 +246,19 @@
 %%QT_INCDIR%%/QtMultimedia/qvideorenderercontrol.h
 %%QT_INCDIR%%/QtMultimedia/qvideosurfaceformat.h
 %%QT_INCDIR%%/QtMultimedia/qvideowindowcontrol.h
-%%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h
-%%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h
-%%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qsgvideonode_rgb_p.h
-%%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qsgvideonode_texture_p.h
-%%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qsgvideonode_yuv_p.h
-%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_p
-%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pDepends
-%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pVersion
-%%QT_INCDIR%%/QtMultimediaQuick_p/qtmultimediaquick_pversion.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/QtMultimediaGstTools
+%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/QtMultimediaGstToolsDepends
+%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/QtMultimediaGstToolsVersion
+%%GSTREAMER%%%%QT_INCDIR%%/QtMultimediaGstTools/qtmultimediagsttoolsversion.h
+%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_render_p.h
+%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qdeclarativevideooutput_window_p.h
+%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_rgb_p.h
+%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_texture_p.h
+%%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qsgvideonode_yuv_p.h
+%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuick
+%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuickDepends
+%%QT_INCDIR%%/QtMultimediaQuick/QtMultimediaQuickVersion
+%%QT_INCDIR%%/QtMultimediaQuick/qtmultimediaquickversion.h
 %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qpaintervideosurface_p.h
 %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qvideowidget_p.h
 %%QT_INCDIR%%/QtMultimediaWidgets/QCameraViewfinder
@@ -287,25 +292,27 @@
 %%QT_LIBDIR%%/libQt5Multimedia.so.%%SHORTVER%%
 %%QT_LIBDIR%%/libQt5Multimedia.so.%%FULLVER%%
 %%DEBUG%%%%QT_LIBDIR%%/libQt5Multimedia.so.%%FULLVER%%.debug
-%%QT_LIBDIR%%/libQt5MultimediaQuick_p.prl
-%%QT_LIBDIR%%/libQt5MultimediaQuick_p.so
-%%QT_LIBDIR%%/libQt5MultimediaQuick_p.so.5
-%%QT_LIBDIR%%/libQt5MultimediaQuick_p.so.%%SHORTVER%%
-%%QT_LIBDIR%%/libQt5MultimediaQuick_p.so.%%FULLVER%%
-%%DEBUG%%%%QT_LIBDIR%%/libQt5MultimediaQuick_p.so.%%FULLVER%%.debug
+%%GSTREAMER%%%%QT_LIBDIR%%/libQt5MultimediaGstTools.prl
+%%GSTREAMER%%%%QT_LIBDIR%%/libQt5MultimediaGstTools.so
+%%GSTREAMER%%%%QT_LIBDIR%%/libQt5MultimediaGstTools.so.5
+%%GSTREAMER%%%%QT_LIBDIR%%/libQt5MultimediaGstTools.so.%%SHORTVER%%
+%%GSTREAMER%%%%QT_LIBDIR%%/libQt5MultimediaGstTools.so.%%FULLVER%%
+%%GSTREAMER%%%%DEBUG%%%%QT_LIBDIR%%/libQt5MultimediaGstTools.so.%%FULLVER%%.debug
+%%QT_LIBDIR%%/libQt5MultimediaQuick.prl
+%%QT_LIBDIR%%/libQt5MultimediaQuick.so
+%%QT_LIBDIR%%/libQt5MultimediaQuick.so.5
+%%QT_LIBDIR%%/libQt5MultimediaQuick.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5MultimediaQuick.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5MultimediaQuick.so.%%FULLVER%%.debug
 %%QT_LIBDIR%%/libQt5MultimediaWidgets.prl
 %%QT_LIBDIR%%/libQt5MultimediaWidgets.so
 %%QT_LIBDIR%%/libQt5MultimediaWidgets.so.5
 %%QT_LIBDIR%%/libQt5MultimediaWidgets.so.%%SHORTVER%%
 %%QT_LIBDIR%%/libQt5MultimediaWidgets.so.%%FULLVER%%
 %%DEBUG%%%%QT_LIBDIR%%/libQt5MultimediaWidgets.so.%%FULLVER%%.debug
-%%GSTREAMER%%%%QT_LIBDIR%%/libqgsttools_p.prl
-%%GSTREAMER%%%%QT_LIBDIR%%/libqgsttools_p.so
-%%GSTREAMER%%%%QT_LIBDIR%%/libqgsttools_p.so.1
-%%GSTREAMER%%%%QT_LIBDIR%%/libqgsttools_p.so.1.0
-%%GSTREAMER%%%%QT_LIBDIR%%/libqgsttools_p.so.1.0.0
 %%QT_MKSPECDIR%%/modules/qt_lib_multimedia.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_multimedia_private.pri
+%%GSTREAMER%%%%QT_MKSPECDIR%%/modules/qt_lib_multimediagsttools_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qtmultimediaquicktools_private.pri
diff --git a/multimedia/qt5-phonon4-gstreamer/Makefile b/multimedia/qt5-phonon4-gstreamer/Makefile
index 4bbbcca73793..0b81287fa25a 100644
--- a/multimedia/qt5-phonon4-gstreamer/Makefile
+++ b/multimedia/qt5-phonon4-gstreamer/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	phonon
 PORTVERSION=	4.9.0
-PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend-gstreamer/${PORTVERSION}
 PKGNAMEPREFIX=	qt5-
diff --git a/multimedia/qt5-phonon4-vlc/Makefile b/multimedia/qt5-phonon4-vlc/Makefile
index e9e3dc533524..bc0bdc56927e 100644
--- a/multimedia/qt5-phonon4-vlc/Makefile
+++ b/multimedia/qt5-phonon4-vlc/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	phonon
 PORTVERSION=	0.9.1
-PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
 PKGNAMEPREFIX=	qt5-
diff --git a/multimedia/qt5-phonon4/Makefile b/multimedia/qt5-phonon4/Makefile
index ea409fab4ea5..a509c603c109 100644
--- a/multimedia/qt5-phonon4/Makefile
+++ b/multimedia/qt5-phonon4/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	phonon
 PORTVERSION=	4.9.1
-PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	qt5-