Index: Mk/bsd.gstreamer.mk
===================================================================
--- Mk/bsd.gstreamer.mk
+++ Mk/bsd.gstreamer.mk
@@ -88,6 +88,7 @@
 		libcaca \
 		libmms \
 		libvisual \
+		mm \
 		mpeg2dec \
 		mpeg2enc \
 		musepack \
@@ -132,7 +133,6 @@
 		hal \
 		libpng \
 		mad \
-		mm \
 		mp3 \
 		nas \
 		python \
@@ -463,11 +463,11 @@
 libde265_DEPENDS=	multimedia/gstreamer-plugins-libde265
 libde265_IMPL=		bad
 
-mm_DEPENDS=	multimedia/gstreamermm
-mm_GST_PREFIX=	gstreamer
-mm_GST_SUFX=	# empty
-mm_GST_VERSION=	0.9.4
-mm_IMPL=	#
+mm_DEPENDS=			multimedia/gstreamermm
+mm_GST_PREFIX=		gstreamer
+mm_GST1_VERSION=	1.0
+mm_NAME10=			mm1
+mm_IMPL=			#
 
 mpeg2dec_DEPENDS=	multimedia/gstreamer-plugins-mpeg2dec
 mpeg2dec_IMPL=		ugly
@@ -624,9 +624,13 @@
 .if defined(USE_GSTREAMER1)
 . for ext in ${USE_GSTREAMER1}
 ${ext}_GST_PREFIX?=	gstreamer1-plugins-
+.  if defined(${ext}_GST1_VERSION)
+${ext}_GST_VERSION?=	${${ext}_GST1_VERSION}
+.  else
 ${ext}_GST_VERSION?=	${GST1_VERSION}
+.  endif
 ${ext}_NAME10?=		${ext}
-${ext}_GST_DEPENDS?=	${${ext}_DEPENDS:S,gstreamer-,gstreamer1-,}
+${ext}_GST_DEPENDS?=	${${ext}_DEPENDS:S,gstreamer-,gstreamer1-,:S,gstreamermm,gstreamermm1,}
 .  if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_GST_DEPENDS})
 _GST_BUILD_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME10}>=${${ext}_GST_VERSION}:${${ext}_GST_DEPENDS}
 _GST_RUN_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME10}>=${${ext}_GST_VERSION}:${${ext}_GST_DEPENDS}
Index: multimedia/Makefile
===================================================================
--- multimedia/Makefile
+++ multimedia/Makefile
@@ -158,6 +158,7 @@
     SUBDIR += gstreamer1-vaapi
     SUBDIR += gstreamer1-validate
     SUBDIR += gstreamermm
+    SUBDIR += gstreamermm1
     SUBDIR += gtk-recordmydesktop
     SUBDIR += gtk-youtube-viewer
     SUBDIR += gxine
Index: multimedia/gstreamermm/Makefile
===================================================================
--- multimedia/gstreamermm/Makefile
+++ multimedia/gstreamermm/Makefile
@@ -12,16 +12,21 @@
 COMMENT=	C++ wrapper library for the multimedia library GStreamer
 
 LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lang gmake libtool pathfix pkgconfig tar:xz
 USE_CXXSTD=	c++11
 USE_GSTREAMER=	theora vorbis cdparanoia gio pango
 USE_GNOME=	gnomeprefix gtkmm24
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-documentation
 INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
+
 PLIST_SUB=	GST_VERSION="${GST_VERSION}"
+
+PORTSCOUT=	limitw:1,even
 
 post-patch:
 # Fix the build with clang
Index: multimedia/gstreamermm/pkg-descr
===================================================================
--- multimedia/gstreamermm/pkg-descr
+++ multimedia/gstreamermm/pkg-descr
@@ -1 +1,3 @@
 C++ wrapper library for the multimedia library GStreamer
+
+WWW: https://gstreamer.freedesktop.org/bindings/cplusplus.html
Index: multimedia/gstreamermm1/Makefile
===================================================================
--- multimedia/gstreamermm1/Makefile
+++ multimedia/gstreamermm1/Makefile
@@ -1,27 +1,31 @@
-# Created by: Michael Johnson <ahze@FreeBSD.org>
+# Created by: Ben Woods <woodsb02@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/multimedia/gstreamermm/Makefile,v 1.6 2009/09/26 13:42:00 marcus Exp $
 
 PORTNAME=	gstreamermm
-PORTVERSION=	0.10.10.2
-PORTREVISION=	4
+PORTVERSION=	1.10.0
 CATEGORIES=	multimedia
 MASTER_SITES=	GNOME
+PKGNAMESUFFIX=	1
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	C++ wrapper library for the multimedia library GStreamer
 
 LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lang gmake libtool pathfix pkgconfig tar:xz
 USE_CXXSTD=	c++11
-USE_GSTREAMER=	theora vorbis cdparanoia gio pango
-USE_GNOME=	gnomeprefix gtkmm24
+USE_GSTREAMER1=	cairo pango
+USE_GNOME=	gnomeprefix gtkmm30
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-documentation
 INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
-PLIST_SUB=	GST_VERSION="${GST_VERSION}"
+
+PLIST_SUB=	GST_VERSION="${mm_GST1_VERSION}"
+
+PORTSCOUT=	limitw:1,even
 
 post-patch:
 # Fix the build with clang
Index: multimedia/gstreamermm1/distinfo
===================================================================
--- multimedia/gstreamermm1/distinfo
+++ multimedia/gstreamermm1/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gstreamermm-0.10.10.2.tar.xz) = 9094485085e08c85ef71832555a983e65f020d41b8b3a98d1288b64dace7c0f1
-SIZE (gstreamermm-0.10.10.2.tar.xz) = 5796428
+TIMESTAMP = 1535462164
+SHA256 (gstreamermm-1.10.0.tar.xz) = be58fe9ef7d7e392568ec85e80a84f4730adbf91fb0355ff7d7c616675ea8d60
+SIZE (gstreamermm-1.10.0.tar.xz) = 3529640
Index: multimedia/gstreamermm1/pkg-descr
===================================================================
--- multimedia/gstreamermm1/pkg-descr
+++ multimedia/gstreamermm1/pkg-descr
@@ -1 +1,5 @@
 C++ wrapper library for the multimedia library GStreamer
+
+This port is for the 1.x branch of GStreamer
+
+WWW: https://gstreamer.freedesktop.org/bindings/cplusplus.html
Index: multimedia/gstreamermm1/pkg-plist
===================================================================
--- multimedia/gstreamermm1/pkg-plist
+++ multimedia/gstreamermm1/pkg-plist
@@ -1,18 +1,24 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/adder.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/alsamixer.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/allocator.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/alsasink.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/alsasrc.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/appsink.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/appsrc.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/atomicqueue.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/audiobasesink.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/audiobasesrc.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/audiocdsrc.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/audioclock.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/audioconvert.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/audiofilter.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/audioformat.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/audioinfo.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/audiorate.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/audioresample.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/audioringbuffer.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/audiosink.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/audiosrc.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/audiotestsrc.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/baseaudiosink.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/baseaudiosrc.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/basesink.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/basesrc.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/basetransform.h
@@ -21,20 +27,26 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/bufferlist.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/bus.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/caps.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/capsfeatures.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/capsfilter.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/cddabasesrc.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/cdparanoiasrc.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/check.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/childproxy.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/clock.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/clockoverlay.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/clockutils.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/colorbalance.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/colorbalancechannel.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/concat.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/context.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/decodebin.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/decodebin2.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/discoverer.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/discovererinfo.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/downloadbuffer.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/element.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/elementfactory.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/encodebin.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/encodingprofile.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/enums.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/error.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/event.h
@@ -42,36 +54,29 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/fakesrc.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/fdsink.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/fdsrc.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/ffmpegcolorspace.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/filesink.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/filesrc.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/filter.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/format.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/funnel.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/gdpdepay.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/gdppay.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/ghostpad.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/giosink.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/giosrc.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/giostreamsink.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/giostreamsrc.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/gst_wrap_init.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/handle_error.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/identity.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/index.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/indexfactory.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/init.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/inputselector.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/interface.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/iterator.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/mapinfo.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/memory.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/message.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/miniobject.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/mixer.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/mixeroptions.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/mixertrack.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/multifdsink.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/multiqueue.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/multisocketsink.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/navigation.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/netclientclock.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/object.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/oggdemux.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/oggmux.h
@@ -81,24 +86,29 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/parse.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/pipeline.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/playbin.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/playbin2.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/playsink.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/plugin.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/pluginfeature.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/preset.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/adder_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/alsamixer_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/allocator_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/alsasink_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/alsasrc_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/appsink_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/appsrc_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audiobasesink_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audiobasesrc_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audiocdsrc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audioclock_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audioconvert_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audiofilter_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audioformat_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audioinfo_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audiorate_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audioresample_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audioringbuffer_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audiosink_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audiosrc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/audiotestsrc_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/baseaudiosink_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/baseaudiosrc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/basesink_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/basesrc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/basetransform_p.h
@@ -107,20 +117,25 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/bufferlist_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/bus_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/caps_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/capsfeatures_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/capsfilter_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/cddabasesrc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/cdparanoiasrc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/childproxy_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/clock_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/clockoverlay_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/clockutils_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/colorbalance_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/colorbalancechannel_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/decodebin2_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/concat_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/context_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/decodebin_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/discoverer_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/discovererinfo_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/downloadbuffer_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/element_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/elementfactory_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/encodebin_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/encodingprofile_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/enums_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/error_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/event_p.h
@@ -128,33 +143,27 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/fakesrc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/fdsink_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/fdsrc_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/ffmpegcolorspace_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/filesink_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/filesrc_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/filter_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/format_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/funnel_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/gdpdepay_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/gdppay_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/ghostpad_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/giosink_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/giosrc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/giostreamsink_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/giostreamsrc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/identity_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/index_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/indexfactory_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/inputselector_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/interface_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/iterator_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/mapinfo_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/memory_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/message_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/miniobject_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/mixer_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/mixeroptions_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/mixertrack_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/multifdsink_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/multiqueue_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/multisocketsink_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/navigation_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/netclientclock_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/object_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/oggdemux_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/oggmux_p.h
@@ -163,19 +172,22 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/padtemplate_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/parse_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pipeline_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/playbin2_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/playbin_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/playsink_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/plugin_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pluginfeature_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/preset_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/propertyprobe_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pushsrc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/query_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/queue_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/queue2_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/queue_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/registry_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/ringbuffer_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/sample_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/sdpmessage_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/segment_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/socketsrc_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/streamiddemux_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/streamsynchronizer_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/streamvolume_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/structure_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/subtitleoverlay_p.h
@@ -195,17 +207,23 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/theoraenc_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/theoraparse_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/timeoverlay_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tuner_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tunerchannel_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tunernorm_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/toc_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tocsetter_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/typefind_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/typefindelement_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/typefindfactory_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/uridecodebin_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/urihandler_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/value_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/valuelist_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/valve_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videochroma_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videoconvert_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videoformat_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videoframe_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videoinfo_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videoorientation_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videooverlay_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videorate_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videoscale_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videosink_p.h
@@ -216,17 +234,19 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/vorbisparse_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/vorbistag_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/ximagesink_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/xml_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/xoverlay_p.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/xvimagesink_p.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/propertyprobe.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/pushsrc.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/query.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/queue.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/queue2.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/register.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/registry.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/ringbuffer.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/sample.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/sdpmessage.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/segment.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/socketsrc.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/streamiddemux.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/streamsynchronizer.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/streamvolume.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/structure.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/subtitleoverlay.h
@@ -246,18 +266,24 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/theoraenc.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/theoraparse.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/timeoverlay.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/tuner.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/tunerchannel.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/tunernorm.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/toc.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/tocsetter.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/typefind.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/typefindelement.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/typefindfactory.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/uridecodebin.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/urihandler.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/value.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/valuelist.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/valve.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/version.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/videochroma.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/videoconvert.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/videoformat.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/videoframe.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/videoinfo.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/videoorientation.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/videooverlay.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/videorate.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/videoscale.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/videosink.h
@@ -267,27 +293,19 @@
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/vorbisenc.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/vorbisparse.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/vorbistag.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/wrap.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/wrap_init.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/ximagesink.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/xml.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm/xoverlay.h
 include/gstreamermm-%%GST_VERSION%%/gstreamermm/xvimagesink.h
-include/gstreamermm-%%GST_VERSION%%/gstreamermm_get_plugin_defs/get_plugin_defs.h
 lib/gstreamermm-%%GST_VERSION%%/gen/generate_plugin_gmmproc_file
+lib/gstreamermm-%%GST_VERSION%%/gen/m4/class_boxedtype_extra.m4
 lib/gstreamermm-%%GST_VERSION%%/gen/m4/convert.m4
 lib/gstreamermm-%%GST_VERSION%%/gen/m4/convert_gst.m4
-lib/gstreamermm-%%GST_VERSION%%/gen/m4/class_boxedtype_extra.m4
-lib/gstreamermm-%%GST_VERSION%%/gen/m4/class_gstminiobject.m4
-lib/gstreamermm-%%GST_VERSION%%/gen/m4/plugingen_base.m4
 lib/gstreamermm-%%GST_VERSION%%/gen/m4/plugingen.m4
+lib/gstreamermm-%%GST_VERSION%%/gen/m4/plugingen_base.m4
 lib/gstreamermm-%%GST_VERSION%%/gen/m4/plugingen_gstreamermm.m4
 lib/gstreamermm-%%GST_VERSION%%/gen/m4/shared.m4
 lib/gstreamermm-%%GST_VERSION%%/include/gstreamermmconfig.h
 lib/libgstreamermm-%%GST_VERSION%%.so
-lib/libgstreamermm-%%GST_VERSION%%.so.2
-lib/libgstreamermm-%%GST_VERSION%%.so.2.0.1
-lib/libgstreamermm_get_plugin_defs-%%GST_VERSION%%.so
-lib/libgstreamermm_get_plugin_defs-%%GST_VERSION%%.so.2
-lib/libgstreamermm_get_plugin_defs-%%GST_VERSION%%.so.2.0.1
+lib/libgstreamermm-%%GST_VERSION%%.so.1
+lib/libgstreamermm-%%GST_VERSION%%.so.1.0.0
 libdata/pkgconfig/gstreamermm-%%GST_VERSION%%.pc