21 files changed, 246 insertions, 364 deletions

diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 85b6a634e8f5..bfce36baa902 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cheese
-PORTVERSION=	3.18.1
-PORTREVISION=	3
+PORTVERSION=	3.28.0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,11 +10,18 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Photobooth-inspired app for taking pictures and videos from webcam
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat \
 		gnome-video-effects>=0:graphics/gnome-video-effects \
 		vala>=0.14.0:lang/vala \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libcanberra.so:audio/libcanberra \
+		libclutter-1.0.so:graphics/clutter \
+		libcogl.so:graphics/cogl \
+		libjson-glib-1.0.so:devel/json-glib \
 		libhal.so:sysutils/hal \
 		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
 		libclutter-gst-3.0.so:multimedia/clutter-gst3
@@ -23,16 +29,17 @@ RUN_DEPENDS=	gnome-video-effects>=0:graphics/gnome-video-effects
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME=	intlhack evolutiondataserver3 librsvg2 \
+USES=		gettext gmake gnome libtool localbase pathfix \
+		pkgconfig tar:xz
+USE_GNOME=	cairo intlhack evolutiondataserver3 librsvg2 \
 		gnomedesktop3 libxml2:build introspection:build
-USE_XORG=	xxf86vm x11
+USE_GL=		egl
+USE_XORG=	xi xext xdamage xfixes xcomposite xrandr xxf86vm x11
 USE_GSTREAMER1=	bad good jpeg ogg theora v4l2 vorbis vpx
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -Wno-format-nonliteral
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-Wno-format-nonliteral
 INSTALL_TARGET=	install-strip
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS README
diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo
index e1b8910cb3e1..9a6f5baf26bc 100644
--- a/multimedia/cheese/distinfo
+++ b/multimedia/cheese/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/cheese-3.18.1.tar.xz) = fc9d8798b1f0c6b35731f063869a32c6910bab6d0386b9ea36386ebda0d57177
-SIZE (gnome3/cheese-3.18.1.tar.xz) = 1829408
+TIMESTAMP = 1524943812
+SHA256 (gnome3/cheese-3.28.0.tar.xz) = 5c1e7a2e1fccc1b0c7b636fb03f2ae83862e2feaebadb94be37c3758182eaa19
+SIZE (gnome3/cheese-3.28.0.tar.xz) = 1544904
diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist
index 5f0d59213761..08971df083e2 100644
--- a/multimedia/cheese/pkg-plist
+++ b/multimedia/cheese/pkg-plist
@@ -12,17 +12,15 @@ include/cheese/cheese.h
 lib/girepository-1.0/Cheese-3.0.typelib
 lib/libcheese-gtk.so
 lib/libcheese-gtk.so.25
-lib/libcheese-gtk.so.25.0.3
+lib/libcheese-gtk.so.25.1.0
 lib/libcheese.so
 lib/libcheese.so.8
-lib/libcheese.so.8.0.3
+lib/libcheese.so.8.0.10
 libdata/pkgconfig/cheese-gtk.pc
 libdata/pkgconfig/cheese.pc
-libexec/gnome-camera-service
 %%MANPAGES%%man/man1/cheese.1.gz
 share/appdata/org.gnome.Cheese.appdata.xml
 share/applications/org.gnome.Cheese.desktop
-share/dbus-1/services/org.gnome.Camera.service
 share/dbus-1/services/org.gnome.Cheese.service
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -40,7 +38,6 @@ share/gtk-doc/html/cheese/CheeseFileUtil.html
 share/gtk-doc/html/cheese/CheeseFlash.html
 share/gtk-doc/html/cheese/CheeseWidget.html
 share/gtk-doc/html/cheese/annotation-glossary.html
-share/gtk-doc/html/cheese/api-index-deprecated.html
 share/gtk-doc/html/cheese/api-index-full.html
 share/gtk-doc/html/cheese/cheese-Initializing-libcheese-gtk.html
 share/gtk-doc/html/cheese/cheese-Initializing-libcheese.html
@@ -63,16 +60,9 @@ share/gtk-doc/html/cheese/up-insensitive.png
 share/gtk-doc/html/cheese/up.png
 share/help/C/cheese/burst-mode.page
 share/help/C/cheese/effects-apply.page
-share/help/C/cheese/figures/cheese-delete.png
-share/help/C/cheese/figures/cheese-effects.png
-share/help/C/cheese/figures/cheese-introduction.png
-share/help/C/cheese/figures/cheese-record.png
-share/help/C/cheese/figures/cheese-save.png
-share/help/C/cheese/figures/cheese-take.png
 share/help/C/cheese/figures/cheese.png
 share/help/C/cheese/figures/effects.png
 share/help/C/cheese/figures/image-properties.png
-share/help/C/cheese/figures/settings.png
 share/help/C/cheese/index.page
 share/help/C/cheese/introduction.page
 share/help/C/cheese/legal.xml
@@ -88,16 +78,9 @@ share/help/C/cheese/pref-resolution.page
 share/help/C/cheese/video-record.page
 share/help/ca/cheese/burst-mode.page
 share/help/ca/cheese/effects-apply.page
-share/help/ca/cheese/figures/cheese-delete.png
-share/help/ca/cheese/figures/cheese-effects.png
-share/help/ca/cheese/figures/cheese-introduction.png
-share/help/ca/cheese/figures/cheese-record.png
-share/help/ca/cheese/figures/cheese-save.png
-share/help/ca/cheese/figures/cheese-take.png
 share/help/ca/cheese/figures/cheese.png
 share/help/ca/cheese/figures/effects.png
 share/help/ca/cheese/figures/image-properties.png
-share/help/ca/cheese/figures/settings.png
 share/help/ca/cheese/index.page
 share/help/ca/cheese/introduction.page
 share/help/ca/cheese/legal.xml
@@ -113,16 +96,9 @@ share/help/ca/cheese/pref-resolution.page
 share/help/ca/cheese/video-record.page
 share/help/cs/cheese/burst-mode.page
 share/help/cs/cheese/effects-apply.page
-share/help/cs/cheese/figures/cheese-delete.png
-share/help/cs/cheese/figures/cheese-effects.png
-share/help/cs/cheese/figures/cheese-introduction.png
-share/help/cs/cheese/figures/cheese-record.png
-share/help/cs/cheese/figures/cheese-save.png
-share/help/cs/cheese/figures/cheese-take.png
 share/help/cs/cheese/figures/cheese.png
 share/help/cs/cheese/figures/effects.png
 share/help/cs/cheese/figures/image-properties.png
-share/help/cs/cheese/figures/settings.png
 share/help/cs/cheese/index.page
 share/help/cs/cheese/introduction.page
 share/help/cs/cheese/legal.xml
@@ -138,16 +114,9 @@ share/help/cs/cheese/pref-resolution.page
 share/help/cs/cheese/video-record.page
 share/help/de/cheese/burst-mode.page
 share/help/de/cheese/effects-apply.page
-share/help/de/cheese/figures/cheese-delete.png
-share/help/de/cheese/figures/cheese-effects.png
-share/help/de/cheese/figures/cheese-introduction.png
-share/help/de/cheese/figures/cheese-record.png
-share/help/de/cheese/figures/cheese-save.png
-share/help/de/cheese/figures/cheese-take.png
 share/help/de/cheese/figures/cheese.png
 share/help/de/cheese/figures/effects.png
 share/help/de/cheese/figures/image-properties.png
-share/help/de/cheese/figures/settings.png
 share/help/de/cheese/index.page
 share/help/de/cheese/introduction.page
 share/help/de/cheese/legal.xml
@@ -163,16 +132,9 @@ share/help/de/cheese/pref-resolution.page
 share/help/de/cheese/video-record.page
 share/help/el/cheese/burst-mode.page
 share/help/el/cheese/effects-apply.page
-share/help/el/cheese/figures/cheese-delete.png
-share/help/el/cheese/figures/cheese-effects.png
-share/help/el/cheese/figures/cheese-introduction.png
-share/help/el/cheese/figures/cheese-record.png
-share/help/el/cheese/figures/cheese-save.png
-share/help/el/cheese/figures/cheese-take.png
 share/help/el/cheese/figures/cheese.png
 share/help/el/cheese/figures/effects.png
 share/help/el/cheese/figures/image-properties.png
-share/help/el/cheese/figures/settings.png
 share/help/el/cheese/index.page
 share/help/el/cheese/introduction.page
 share/help/el/cheese/legal.xml
@@ -188,16 +150,9 @@ share/help/el/cheese/pref-resolution.page
 share/help/el/cheese/video-record.page
 share/help/es/cheese/burst-mode.page
 share/help/es/cheese/effects-apply.page
-share/help/es/cheese/figures/cheese-delete.png
-share/help/es/cheese/figures/cheese-effects.png
-share/help/es/cheese/figures/cheese-introduction.png
-share/help/es/cheese/figures/cheese-record.png
-share/help/es/cheese/figures/cheese-save.png
-share/help/es/cheese/figures/cheese-take.png
 share/help/es/cheese/figures/cheese.png
 share/help/es/cheese/figures/effects.png
 share/help/es/cheese/figures/image-properties.png
-share/help/es/cheese/figures/settings.png
 share/help/es/cheese/index.page
 share/help/es/cheese/introduction.page
 share/help/es/cheese/legal.xml
@@ -213,16 +168,9 @@ share/help/es/cheese/pref-resolution.page
 share/help/es/cheese/video-record.page
 share/help/fi/cheese/burst-mode.page
 share/help/fi/cheese/effects-apply.page
-share/help/fi/cheese/figures/cheese-delete.png
-share/help/fi/cheese/figures/cheese-effects.png
-share/help/fi/cheese/figures/cheese-introduction.png
-share/help/fi/cheese/figures/cheese-record.png
-share/help/fi/cheese/figures/cheese-save.png
-share/help/fi/cheese/figures/cheese-take.png
 share/help/fi/cheese/figures/cheese.png
 share/help/fi/cheese/figures/effects.png
 share/help/fi/cheese/figures/image-properties.png
-share/help/fi/cheese/figures/settings.png
 share/help/fi/cheese/index.page
 share/help/fi/cheese/introduction.page
 share/help/fi/cheese/legal.xml
@@ -238,16 +186,9 @@ share/help/fi/cheese/pref-resolution.page
 share/help/fi/cheese/video-record.page
 share/help/fr/cheese/burst-mode.page
 share/help/fr/cheese/effects-apply.page
-share/help/fr/cheese/figures/cheese-delete.png
-share/help/fr/cheese/figures/cheese-effects.png
-share/help/fr/cheese/figures/cheese-introduction.png
-share/help/fr/cheese/figures/cheese-record.png
-share/help/fr/cheese/figures/cheese-save.png
-share/help/fr/cheese/figures/cheese-take.png
 share/help/fr/cheese/figures/cheese.png
 share/help/fr/cheese/figures/effects.png
 share/help/fr/cheese/figures/image-properties.png
-share/help/fr/cheese/figures/settings.png
 share/help/fr/cheese/index.page
 share/help/fr/cheese/introduction.page
 share/help/fr/cheese/legal.xml
@@ -263,16 +204,9 @@ share/help/fr/cheese/pref-resolution.page
 share/help/fr/cheese/video-record.page
 share/help/gl/cheese/burst-mode.page
 share/help/gl/cheese/effects-apply.page
-share/help/gl/cheese/figures/cheese-delete.png
-share/help/gl/cheese/figures/cheese-effects.png
-share/help/gl/cheese/figures/cheese-introduction.png
-share/help/gl/cheese/figures/cheese-record.png
-share/help/gl/cheese/figures/cheese-save.png
-share/help/gl/cheese/figures/cheese-take.png
 share/help/gl/cheese/figures/cheese.png
 share/help/gl/cheese/figures/effects.png
 share/help/gl/cheese/figures/image-properties.png
-share/help/gl/cheese/figures/settings.png
 share/help/gl/cheese/index.page
 share/help/gl/cheese/introduction.page
 share/help/gl/cheese/legal.xml
@@ -288,16 +222,9 @@ share/help/gl/cheese/pref-resolution.page
 share/help/gl/cheese/video-record.page
 share/help/hu/cheese/burst-mode.page
 share/help/hu/cheese/effects-apply.page
-share/help/hu/cheese/figures/cheese-delete.png
-share/help/hu/cheese/figures/cheese-effects.png
-share/help/hu/cheese/figures/cheese-introduction.png
-share/help/hu/cheese/figures/cheese-record.png
-share/help/hu/cheese/figures/cheese-save.png
-share/help/hu/cheese/figures/cheese-take.png
 share/help/hu/cheese/figures/cheese.png
 share/help/hu/cheese/figures/effects.png
 share/help/hu/cheese/figures/image-properties.png
-share/help/hu/cheese/figures/settings.png
 share/help/hu/cheese/index.page
 share/help/hu/cheese/introduction.page
 share/help/hu/cheese/legal.xml
@@ -313,16 +240,9 @@ share/help/hu/cheese/pref-resolution.page
 share/help/hu/cheese/video-record.page
 share/help/id/cheese/burst-mode.page
 share/help/id/cheese/effects-apply.page
-share/help/id/cheese/figures/cheese-delete.png
-share/help/id/cheese/figures/cheese-effects.png
-share/help/id/cheese/figures/cheese-introduction.png
-share/help/id/cheese/figures/cheese-record.png
-share/help/id/cheese/figures/cheese-save.png
-share/help/id/cheese/figures/cheese-take.png
 share/help/id/cheese/figures/cheese.png
 share/help/id/cheese/figures/effects.png
 share/help/id/cheese/figures/image-properties.png
-share/help/id/cheese/figures/settings.png
 share/help/id/cheese/index.page
 share/help/id/cheese/introduction.page
 share/help/id/cheese/legal.xml
@@ -338,16 +258,9 @@ share/help/id/cheese/pref-resolution.page
 share/help/id/cheese/video-record.page
 share/help/ko/cheese/burst-mode.page
 share/help/ko/cheese/effects-apply.page
-share/help/ko/cheese/figures/cheese-delete.png
-share/help/ko/cheese/figures/cheese-effects.png
-share/help/ko/cheese/figures/cheese-introduction.png
-share/help/ko/cheese/figures/cheese-record.png
-share/help/ko/cheese/figures/cheese-save.png
-share/help/ko/cheese/figures/cheese-take.png
 share/help/ko/cheese/figures/cheese.png
 share/help/ko/cheese/figures/effects.png
 share/help/ko/cheese/figures/image-properties.png
-share/help/ko/cheese/figures/settings.png
 share/help/ko/cheese/index.page
 share/help/ko/cheese/introduction.page
 share/help/ko/cheese/legal.xml
@@ -361,18 +274,47 @@ share/help/ko/cheese/pref-fullscreen.page
 share/help/ko/cheese/pref-image-properties.page
 share/help/ko/cheese/pref-resolution.page
 share/help/ko/cheese/video-record.page
+share/help/nl/cheese/burst-mode.page
+share/help/nl/cheese/effects-apply.page
+share/help/nl/cheese/figures/cheese.png
+share/help/nl/cheese/figures/effects.png
+share/help/nl/cheese/figures/image-properties.png
+share/help/nl/cheese/index.page
+share/help/nl/cheese/introduction.page
+share/help/nl/cheese/legal.xml
+share/help/nl/cheese/photo-delete.page
+share/help/nl/cheese/photo-save.page
+share/help/nl/cheese/photo-take.page
+share/help/nl/cheese/photo-view.page
+share/help/nl/cheese/pref-countdown.page
+share/help/nl/cheese/pref-flash.page
+share/help/nl/cheese/pref-fullscreen.page
+share/help/nl/cheese/pref-image-properties.page
+share/help/nl/cheese/pref-resolution.page
+share/help/nl/cheese/video-record.page
+share/help/pl/cheese/burst-mode.page
+share/help/pl/cheese/effects-apply.page
+share/help/pl/cheese/figures/cheese.png
+share/help/pl/cheese/figures/effects.png
+share/help/pl/cheese/figures/image-properties.png
+share/help/pl/cheese/index.page
+share/help/pl/cheese/introduction.page
+share/help/pl/cheese/legal.xml
+share/help/pl/cheese/photo-delete.page
+share/help/pl/cheese/photo-save.page
+share/help/pl/cheese/photo-take.page
+share/help/pl/cheese/photo-view.page
+share/help/pl/cheese/pref-countdown.page
+share/help/pl/cheese/pref-flash.page
+share/help/pl/cheese/pref-fullscreen.page
+share/help/pl/cheese/pref-image-properties.page
+share/help/pl/cheese/pref-resolution.page
+share/help/pl/cheese/video-record.page
 share/help/pt_BR/cheese/burst-mode.page
 share/help/pt_BR/cheese/effects-apply.page
-share/help/pt_BR/cheese/figures/cheese-delete.png
-share/help/pt_BR/cheese/figures/cheese-effects.png
-share/help/pt_BR/cheese/figures/cheese-introduction.png
-share/help/pt_BR/cheese/figures/cheese-record.png
-share/help/pt_BR/cheese/figures/cheese-save.png
-share/help/pt_BR/cheese/figures/cheese-take.png
 share/help/pt_BR/cheese/figures/cheese.png
 share/help/pt_BR/cheese/figures/effects.png
 share/help/pt_BR/cheese/figures/image-properties.png
-share/help/pt_BR/cheese/figures/settings.png
 share/help/pt_BR/cheese/index.page
 share/help/pt_BR/cheese/introduction.page
 share/help/pt_BR/cheese/legal.xml
@@ -388,16 +330,9 @@ share/help/pt_BR/cheese/pref-resolution.page
 share/help/pt_BR/cheese/video-record.page
 share/help/ru/cheese/burst-mode.page
 share/help/ru/cheese/effects-apply.page
-share/help/ru/cheese/figures/cheese-delete.png
-share/help/ru/cheese/figures/cheese-effects.png
-share/help/ru/cheese/figures/cheese-introduction.png
-share/help/ru/cheese/figures/cheese-record.png
-share/help/ru/cheese/figures/cheese-save.png
-share/help/ru/cheese/figures/cheese-take.png
 share/help/ru/cheese/figures/cheese.png
 share/help/ru/cheese/figures/effects.png
 share/help/ru/cheese/figures/image-properties.png
-share/help/ru/cheese/figures/settings.png
 share/help/ru/cheese/index.page
 share/help/ru/cheese/introduction.page
 share/help/ru/cheese/legal.xml
@@ -413,16 +348,9 @@ share/help/ru/cheese/pref-resolution.page
 share/help/ru/cheese/video-record.page
 share/help/sl/cheese/burst-mode.page
 share/help/sl/cheese/effects-apply.page
-share/help/sl/cheese/figures/cheese-delete.png
-share/help/sl/cheese/figures/cheese-effects.png
-share/help/sl/cheese/figures/cheese-introduction.png
-share/help/sl/cheese/figures/cheese-record.png
-share/help/sl/cheese/figures/cheese-save.png
-share/help/sl/cheese/figures/cheese-take.png
 share/help/sl/cheese/figures/cheese.png
 share/help/sl/cheese/figures/effects.png
 share/help/sl/cheese/figures/image-properties.png
-share/help/sl/cheese/figures/settings.png
 share/help/sl/cheese/index.page
 share/help/sl/cheese/introduction.page
 share/help/sl/cheese/legal.xml
@@ -436,18 +364,29 @@ share/help/sl/cheese/pref-fullscreen.page
 share/help/sl/cheese/pref-image-properties.page
 share/help/sl/cheese/pref-resolution.page
 share/help/sl/cheese/video-record.page
+share/help/sv/cheese/burst-mode.page
+share/help/sv/cheese/effects-apply.page
+share/help/sv/cheese/figures/cheese.png
+share/help/sv/cheese/figures/effects.png
+share/help/sv/cheese/figures/image-properties.png
+share/help/sv/cheese/index.page
+share/help/sv/cheese/introduction.page
+share/help/sv/cheese/legal.xml
+share/help/sv/cheese/photo-delete.page
+share/help/sv/cheese/photo-save.page
+share/help/sv/cheese/photo-take.page
+share/help/sv/cheese/photo-view.page
+share/help/sv/cheese/pref-countdown.page
+share/help/sv/cheese/pref-flash.page
+share/help/sv/cheese/pref-fullscreen.page
+share/help/sv/cheese/pref-image-properties.page
+share/help/sv/cheese/pref-resolution.page
+share/help/sv/cheese/video-record.page
 share/help/zh_CN/cheese/burst-mode.page
 share/help/zh_CN/cheese/effects-apply.page
-share/help/zh_CN/cheese/figures/cheese-delete.png
-share/help/zh_CN/cheese/figures/cheese-effects.png
-share/help/zh_CN/cheese/figures/cheese-introduction.png
-share/help/zh_CN/cheese/figures/cheese-record.png
-share/help/zh_CN/cheese/figures/cheese-save.png
-share/help/zh_CN/cheese/figures/cheese-take.png
 share/help/zh_CN/cheese/figures/cheese.png
 share/help/zh_CN/cheese/figures/effects.png
 share/help/zh_CN/cheese/figures/image-properties.png
-share/help/zh_CN/cheese/figures/settings.png
 share/help/zh_CN/cheese/index.page
 share/help/zh_CN/cheese/introduction.page
 share/help/zh_CN/cheese/legal.xml
@@ -461,13 +400,13 @@ share/help/zh_CN/cheese/pref-fullscreen.page
 share/help/zh_CN/cheese/pref-image-properties.page
 share/help/zh_CN/cheese/pref-resolution.page
 share/help/zh_CN/cheese/video-record.page
-share/icons/hicolor/16x16/apps/cheese.png
-share/icons/hicolor/22x22/apps/cheese.png
-share/icons/hicolor/24x24/apps/cheese.png
-share/icons/hicolor/256x256/apps/cheese.png
-share/icons/hicolor/32x32/apps/cheese.png
-share/icons/hicolor/48x48/apps/cheese.png
-share/icons/hicolor/symbolic/apps/cheese-symbolic.svg
+share/icons/hicolor/16x16/apps/org.gnome.Cheese.png
+share/icons/hicolor/22x22/apps/org.gnome.Cheese.png
+share/icons/hicolor/24x24/apps/org.gnome.Cheese.png
+share/icons/hicolor/256x256/apps/org.gnome.Cheese.png
+share/icons/hicolor/32x32/apps/org.gnome.Cheese.png
+share/icons/hicolor/48x48/apps/org.gnome.Cheese.png
+share/icons/hicolor/symbolic/apps/org.gnome.Cheese-symbolic.svg
 share/locale/af/LC_MESSAGES/cheese.mo
 share/locale/an/LC_MESSAGES/cheese.mo
 share/locale/ar/LC_MESSAGES/cheese.mo
@@ -514,6 +453,7 @@ share/locale/kn/LC_MESSAGES/cheese.mo
 share/locale/ko/LC_MESSAGES/cheese.mo
 share/locale/ku/LC_MESSAGES/cheese.mo
 share/locale/ky/LC_MESSAGES/cheese.mo
+share/locale/lo/LC_MESSAGES/cheese.mo
 share/locale/lt/LC_MESSAGES/cheese.mo
 share/locale/lv/LC_MESSAGES/cheese.mo
 share/locale/mai/LC_MESSAGES/cheese.mo
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 0f3b949b4f78..2fdd290085b4 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clutter-gst
-PORTVERSION=	2.0.16
-PORTREVISION=	1
+PORTVERSION=	2.0.18
 CATEGORIES=	multimedia
 MASTER_SITES=	GNOME
 
@@ -14,7 +13,8 @@ LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter
 
 PORTSCOUT=	ignore:1
 
-USES=		gmake libtool pathfix pkgconfig tar:xz
+USES=		gmake libtool localbase pathfix \
+		pkgconfig tar:xz
 USE_GNOME=	introspection gnomeprefix
 GNU_CONFIGURE=	yes
 USE_GL=		gl
@@ -23,8 +23,7 @@ USE_XORG=	xp x11
 USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CACHE_HOME=${WRKDIR}
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
+LDFLAGS+=	-lpthread
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/multimedia/clutter-gst/distinfo b/multimedia/clutter-gst/distinfo
index 3fe9c0151bdc..914dfd404708 100644
--- a/multimedia/clutter-gst/distinfo
+++ b/multimedia/clutter-gst/distinfo
@@ -1,2 +1,3 @@
-SHA256 (clutter-gst-2.0.16.tar.xz) = a944f84186937021aba6329c23954f6015d33bf151ba8994e13c59cefd742039
-SIZE (clutter-gst-2.0.16.tar.xz) = 357380
+TIMESTAMP = 1538308470
+SHA256 (clutter-gst-2.0.18.tar.xz) = 8d82bebf01b65d433bfb0f8da7bf7a8da42289f58b66bc4dfa775df0385bf8b5
+SIZE (clutter-gst-2.0.18.tar.xz) = 358936
diff --git a/multimedia/clutter-gst/pkg-plist b/multimedia/clutter-gst/pkg-plist
index 258301c4bd94..c1f0e7f07e60 100644
--- a/multimedia/clutter-gst/pkg-plist
+++ b/multimedia/clutter-gst/pkg-plist
@@ -10,7 +10,7 @@ lib/girepository-1.0/ClutterGst-2.0.typelib
 lib/gstreamer-1.0/libgstclutter.so
 lib/libclutter-gst-2.0.so
 lib/libclutter-gst-2.0.so.0
-lib/libclutter-gst-2.0.so.0.16.0
+lib/libclutter-gst-2.0.so.0.18.0
 libdata/pkgconfig/clutter-gst-2.0.pc
 %%DOCSDIR%%/ClutterGstPlayer.html
 %%DOCSDIR%%/ClutterGstVideoSink.html
diff --git a/multimedia/clutter-gst3/Makefile b/multimedia/clutter-gst3/Makefile
index 0ffd8e4c6bbb..df8bd3c2ca57 100644
--- a/multimedia/clutter-gst3/Makefile
+++ b/multimedia/clutter-gst3/Makefile
@@ -2,32 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	clutter-gst
-PORTVERSION=	3.0.14
-PORTREVISION=	1
+PORTVERSION=	3.0.26
 CATEGORIES=	multimedia
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Clutter GStreamer integration
 
-LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gnomeprefix introspection:build
+LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter \
+		libcogl-path.so:graphics/cogl \
+		libfribidi.so:converters/fribidi \
+		libjson-glib-1.0.so:devel/json-glib
+
+USES=		gettext-runtime gl gmake gnome libtool localbase pathfix \
+		pkgconfig tar:xz
+USE_GNOME=	atk cairo gdkpixbuf2 gnomeprefix introspection:build pango
 GNU_CONFIGURE=	yes
-USE_GL=		gl
+USE_GL=		gl egl
 USE_GSTREAMER1=	yes
-USE_XORG=	xp x11
+USE_XORG=	xcomposite xdamage xext xfixes xi xp xrandr x11
 USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CACHE_HOME=${WRKDIR}
+CONFIGURE_ARGS=	--disable-udev
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 INSTALL_TARGET=	install-strip
 
 # The clutter-gst gstreamer plugin is not parrallel installable with
-# the 2.0 version. Don't install it (see @comment in plist) until
-# all users can be ported (upstream task) to the 3.0 version.
+# the 2.0 version. But we install it anyway since all GNOME users
+# are switched.
 
 .include <bsd.port.mk>
diff --git a/multimedia/clutter-gst3/distinfo b/multimedia/clutter-gst3/distinfo
index 258ee3809a0a..7ff3f78db3ab 100644
--- a/multimedia/clutter-gst3/distinfo
+++ b/multimedia/clutter-gst3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (clutter-gst-3.0.14.tar.xz) = f7c8a7dc479759cad5ff7483cb5a1abbe3efd0b4f83ed0e443dc602430a82de2
-SIZE (clutter-gst-3.0.14.tar.xz) = 391596
+TIMESTAMP = 1526111723
+SHA256 (gnome/clutter-gst-3.0.26.tar.xz) = d8618a6d9accec0f2a8574c5e1220051f8505fb82b20336c26bdbd482aa6cb3a
+SIZE (gnome/clutter-gst-3.0.26.tar.xz) = 402976
diff --git a/multimedia/clutter-gst3/pkg-plist b/multimedia/clutter-gst3/pkg-plist
index c8ad2a83a124..5735c291ea64 100644
--- a/multimedia/clutter-gst3/pkg-plist
+++ b/multimedia/clutter-gst3/pkg-plist
@@ -13,37 +13,9 @@ include/clutter-gst-3.0/clutter-gst/clutter-gst-version.h
 include/clutter-gst-3.0/clutter-gst/clutter-gst-video-sink.h
 include/clutter-gst-3.0/clutter-gst/clutter-gst.h
 lib/girepository-1.0/ClutterGst-3.0.typelib
-@comment See Makefile for comments on this.
-@comment lib/gstreamer-1.0/libgstclutter-3.0.so
+lib/gstreamer-1.0/libcluttergst3.so
 lib/libclutter-gst-3.0.so
 lib/libclutter-gst-3.0.so.0
-lib/libclutter-gst-3.0.so.0.14.0
+lib/libclutter-gst-3.0.so.0.26.0
 libdata/pkgconfig/clutter-gst-3.0.pc
-%%DOCSDIR%%-3.0/ClutterGstAspectratio.html
-%%DOCSDIR%%-3.0/ClutterGstCamera.html
-%%DOCSDIR%%-3.0/ClutterGstCameraDevice.html
-%%DOCSDIR%%-3.0/ClutterGstContent.html
-%%DOCSDIR%%-3.0/ClutterGstCrop.html
-%%DOCSDIR%%-3.0/ClutterGstPlayback.html
-%%DOCSDIR%%-3.0/ClutterGstPlayer.html
-%%DOCSDIR%%-3.0/ch01.html
-%%DOCSDIR%%-3.0/ch02.html
-%%DOCSDIR%%-3.0/ch03.html
-%%DOCSDIR%%-3.0/ch04.html
-%%DOCSDIR%%-3.0/ch05.html
-%%DOCSDIR%%-3.0/clutter-gst-3.0.devhelp2
-%%DOCSDIR%%-3.0/clutter-gst-Utilities.html
-%%DOCSDIR%%-3.0/clutter-gst-Versioning-Macros.html
-%%DOCSDIR%%-3.0/clutter-gst-Video-Sink.html
-%%DOCSDIR%%-3.0/home.png
-%%DOCSDIR%%-3.0/index.html
-%%DOCSDIR%%-3.0/index.sgml
-%%DOCSDIR%%-3.0/left-insensitive.png
-%%DOCSDIR%%-3.0/left.png
-%%DOCSDIR%%-3.0/license.html
-%%DOCSDIR%%-3.0/right-insensitive.png
-%%DOCSDIR%%-3.0/right.png
-%%DOCSDIR%%-3.0/style.css
-%%DOCSDIR%%-3.0/up-insensitive.png
-%%DOCSDIR%%-3.0/up.png
 share/gir-1.0/ClutterGst-3.0.gir
diff --git a/multimedia/libmediaart/Makefile b/multimedia/libmediaart/Makefile
index 8b0bf7a8bb99..424409f32220 100644
--- a/multimedia/libmediaart/Makefile
+++ b/multimedia/libmediaart/Makefile
@@ -2,24 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	libmediaart
-PORTVERSION=	1.9.1
+PORTVERSION=	1.9.4
 CATEGORIES=	multimedia devel
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for handling media art
 
-BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc \
-		vala>=0:lang/vala
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	dual
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LESSER
 
-USES=		gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gdkpixbuf2 glib20 introspection
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	vala>=0:lang/vala
+
+USES=		gnome meson pathfix pkgconfig tar:xz
+USE_GNOME=	gdkpixbuf2 introspection:build
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS+=--enable-gtk-doc \
-		--enable-introspection \
-		--enable-vala
-INSTALL_TARGET=	install-strip
+
+MESON_ARGS=	-Dimage_library=gdk-pixbuf
+
+OPTIONS_DEFINE=	DOCS
+DOCS_BUILD_DEPENDS=	gtk-doc>=0:textproc/gtk-doc
+DOCS_MESON_ON=	-Dwith-docs=yes
+DOCS_MESON_OFF=	-Dwith-docs=no
+#option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'qt5'],
+#       description: 'Which image processing backend to use')
+#option('with-docs', type : 'combo', choices : ['auto', 'yes', 'no'], value : 'auto')
+
 
 .include <bsd.port.mk>
diff --git a/multimedia/libmediaart/distinfo b/multimedia/libmediaart/distinfo
index 9b72308841e1..c90cdf3911e5 100644
--- a/multimedia/libmediaart/distinfo
+++ b/multimedia/libmediaart/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491087912
-SHA256 (libmediaart-1.9.1.tar.xz) = 5b14aa4e0cc84eaec57b6cb28f39092d503fdaecf36d5d165fac37583b7fe949
-SIZE (libmediaart-1.9.1.tar.xz) = 5826128
+TIMESTAMP = 1506669087
+SHA256 (libmediaart-1.9.4.tar.xz) = a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d
+SIZE (libmediaart-1.9.4.tar.xz) = 5827928
diff --git a/multimedia/libmediaart/pkg-descr b/multimedia/libmediaart/pkg-descr
index 7c175ee895fc..47f91d26d107 100644
--- a/multimedia/libmediaart/pkg-descr
+++ b/multimedia/libmediaart/pkg-descr
@@ -1,3 +1,3 @@
 Library for handling media art
 
-WWW: https://github.com/GNOME/libmediaart
+WWW: https://www.gnome.org/
diff --git a/multimedia/libmediaart/pkg-plist b/multimedia/libmediaart/pkg-plist
index 4bc64a5c4347..0db6bf4aabe4 100644
--- a/multimedia/libmediaart/pkg-plist
+++ b/multimedia/libmediaart/pkg-plist
@@ -1,29 +1,31 @@
 include/libmediaart-2.0/libmediaart/cache.h
 include/libmediaart-2.0/libmediaart/extract.h
 include/libmediaart-2.0/libmediaart/extractgeneric.h
+include/libmediaart-2.0/libmediaart/mediaart-macros.h
 include/libmediaart-2.0/libmediaart/mediaart.h
+lib/girepository-1.0/MediaArt-2.0.typelib
 lib/libmediaart-2.0.so
 lib/libmediaart-2.0.so.0
-lib/libmediaart-2.0.so.0.901.0
-lib/girepository-1.0/MediaArt-2.0.typelib
+lib/libmediaart-2.0.so.0.904.0
 libdata/pkgconfig/libmediaart-2.0.pc
 share/gir-1.0/MediaArt-2.0.gir
-share/gtk-doc/html/libmediaart/annotation-glossary.html
-share/gtk-doc/html/libmediaart/ch02.html
-share/gtk-doc/html/libmediaart/home.png
-share/gtk-doc/html/libmediaart/index.html
-share/gtk-doc/html/libmediaart/left-insensitive.png
-share/gtk-doc/html/libmediaart/left.png
-share/gtk-doc/html/libmediaart/libmediaart-Cache.html
-share/gtk-doc/html/libmediaart/libmediaart-MediaArtProcess.html
-share/gtk-doc/html/libmediaart/libmediaart-Plugins.html
-share/gtk-doc/html/libmediaart/libmediaart-reference.html
-share/gtk-doc/html/libmediaart/libmediaart.devhelp2
-share/gtk-doc/html/libmediaart/overview-compiling.html
-share/gtk-doc/html/libmediaart/overview.html
-share/gtk-doc/html/libmediaart/right-insensitive.png
-share/gtk-doc/html/libmediaart/right.png
-share/gtk-doc/html/libmediaart/style.css
-share/gtk-doc/html/libmediaart/up-insensitive.png
-share/gtk-doc/html/libmediaart/up.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/ch02.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/home.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/index.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/left.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/libmediaart-Cache.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/libmediaart-MediaArtProcess.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/libmediaart-Plugins.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/libmediaart-reference.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/libmediaart.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/overview-compiling.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/overview.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/right.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/style.css
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/up.png
+share/vala/vapi/libmediaart-2.0.deps
 share/vala/vapi/libmediaart-2.0.vapi
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 215dc5b481af..6e4a632eb17e 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	totem-pl-parser
-PORTVERSION=	3.10.8
+PORTVERSION=	3.26.1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -13,27 +13,21 @@ COMMENT=	GObject-based library to parse a host of playlist formats
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
+LIB_DEPENDS=	libgmime-3.0.so:mail/gmime30 \
 		libsoup-2.4.so:devel/libsoup \
 		libgpg-error.so:security/libgpg-error \
 		libgcrypt.so:security/libgcrypt
 
-USES=		gettext gmake gnome libarchive libtool pathfix pkgconfig tar:xz
-USE_GNOME=	glib20 gnomeprefix intltool introspection:build libxml2
+USES=		gettext gnome libarchive localbase:ldflags meson pkgconfig tar:xz
+USE_GNOME=	glib20 introspection:build libxml2
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-libarchive
-INSTALL_TARGET=	install-strip
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	QUVI
 OPTIONS_DEFAULT=QUVI
+
 QUVI_DESC=	Flash media stream URL support
-QUVI_CONFIGURE_ENABLE=	quvi
+QUVI_MESON_YES=	enable-quvi
 QUVI_LIB_DEPENDS=	libquvi-0.9.so:multimedia/libquvi09
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|gmime-3.0|disabled-gmime-3.0|g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/multimedia/totem-pl-parser/distinfo b/multimedia/totem-pl-parser/distinfo
index 100e83d067e7..4e1ddf394f75 100644
--- a/multimedia/totem-pl-parser/distinfo
+++ b/multimedia/totem-pl-parser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498210013
-SHA256 (gnome2/totem-pl-parser-3.10.8.tar.xz) = ffc50a0713d5f3049912545169eea7d367483b2c4a868032940516ed1e78dd2b
-SIZE (gnome2/totem-pl-parser-3.10.8.tar.xz) = 1618992
+TIMESTAMP = 1529610555
+SHA256 (gnome2/totem-pl-parser-3.26.1.tar.xz) = 6ae2c4b8acaf052af21b8db256b6314385de031ba721a2dbdb361e90d4b4b74c
+SIZE (gnome2/totem-pl-parser-3.26.1.tar.xz) = 1312628
diff --git a/multimedia/totem-pl-parser/pkg-plist b/multimedia/totem-pl-parser/pkg-plist
index e6d282c8597d..d75018af9e76 100644
--- a/multimedia/totem-pl-parser/pkg-plist
+++ b/multimedia/totem-pl-parser/pkg-plist
@@ -4,33 +4,15 @@ include/totem-pl-parser/1/plparser/totem-pl-parser-mini.h
 include/totem-pl-parser/1/plparser/totem-pl-parser.h
 include/totem-pl-parser/1/plparser/totem-pl-playlist.h
 lib/girepository-1.0/TotemPlParser-1.0.typelib
-lib/libtotem-plparser-mini.a
 lib/libtotem-plparser-mini.so
 lib/libtotem-plparser-mini.so.18
-lib/libtotem-plparser-mini.so.18.1.0
-lib/libtotem-plparser.a
+lib/libtotem-plparser-mini.so.18.1.2
 lib/libtotem-plparser.so
 lib/libtotem-plparser.so.18
-lib/libtotem-plparser.so.18.1.0
+lib/libtotem-plparser.so.18.1.2
 libdata/pkgconfig/totem-plparser-mini.pc
 libdata/pkgconfig/totem-plparser.pc
-%%QUVI%%libexec/totem-pl-parser/99-totem-pl-parser-videosite
-%%DOCSDIR%%/TotemPlParser.html
-%%DOCSDIR%%/TotemPlPlaylist.html
-%%DOCSDIR%%/annotation-glossary.html
-%%DOCSDIR%%/api-index-full.html
-%%DOCSDIR%%/api-reference.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/left-insensitive.png
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right-insensitive.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/totem-pl-parser-TotemPlPlaylistIter.html
-%%DOCSDIR%%/totem-pl-parser.devhelp2
-%%DOCSDIR%%/up-insensitive.png
-%%DOCSDIR%%/up.png
+libexec/totem-pl-parser/99-totem-pl-parser-videosite
 share/gir-1.0/TotemPlParser-1.0.gir
 share/locale/af/LC_MESSAGES/totem-pl-parser.mo
 share/locale/am/LC_MESSAGES/totem-pl-parser.mo
@@ -54,9 +36,9 @@ share/locale/da/LC_MESSAGES/totem-pl-parser.mo
 share/locale/de/LC_MESSAGES/totem-pl-parser.mo
 share/locale/dz/LC_MESSAGES/totem-pl-parser.mo
 share/locale/el/LC_MESSAGES/totem-pl-parser.mo
+share/locale/en@shaw/LC_MESSAGES/totem-pl-parser.mo
 share/locale/en_CA/LC_MESSAGES/totem-pl-parser.mo
 share/locale/en_GB/LC_MESSAGES/totem-pl-parser.mo
-share/locale/en@shaw/LC_MESSAGES/totem-pl-parser.mo
 share/locale/eo/LC_MESSAGES/totem-pl-parser.mo
 share/locale/es/LC_MESSAGES/totem-pl-parser.mo
 share/locale/et/LC_MESSAGES/totem-pl-parser.mo
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 45792eee6a7e..abbda4d68c95 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	totem
-PORTVERSION=	3.18.1
-PORTREVISION=	6
+PORTVERSION=	3.26.1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,74 +10,61 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gstreamer-based video player for the GNOME 3 Desktop
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
-		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
-		pylint:devel/pylint1 \
+		pylint:devel/pylint \
 		appstream-glib>=0:devel/appstream-glib \
 		itstool:textproc/itstool \
-		grilo-plugins2>=0:net/grilo-plugins2
+		grilo-plugins>=0:net/grilo-plugins
 LIB_DEPENDS=	libgdata.so:devel/libgdata \
-		libdbus-glib-1.so:devel/dbus-glib \
+		libcogl.so:graphics/cogl \
+		libclutter-1.0.so:graphics/clutter \
 		libclutter-gst-3.0.so:multimedia/clutter-gst3 \
 		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
 		libpeas-1.0.so:devel/libpeas \
+		libjson-glib-1.0.so:devel/json-glib \
+		libgrilo-0.3.so:net/grilo \
+		libzeitgeist-2.0.so:sysutils/zeitgeist \
 		libtotem-plparser.so:multimedia/totem-pl-parser
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
-		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
 		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} \
 		gnome-settings-daemon>=2.91.0:sysutils/gnome-settings-daemon \
 		gnome-icon-theme-symbolic>=2.91.0:x11-themes/gnome-icon-theme-symbolic \
-		grilo-plugins2>=0:net/grilo-plugins2
+		grilo-plugins>=0:net/grilo-plugins
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gettext gmake gnome libtool \
-		pathfix pkgconfig python:2.7 tar:xz
-USE_GNOME=	gtk30 intlhack introspection:build libxml2 nautilus3 \
+USES=		desktop-file-utils gettext gnome localbase meson \
+		pkgconfig python:3.4+ tar:xz
+USE_GNOME=	cairo gtk30 intlhack introspection libxml2 nautilus3 \
 		pygobject3
 USE_XORG=	x11 xorgproto xtst ice sm
 USE_GSTREAMER1=	core good bad soup ugly
 INSTALLS_ICONS=	yes
-GNU_CONFIGURE=	yes
+USE_GL=		egl
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral
-CFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LIBS="-lXrandr"
-CONFIGURE_ARGS=	--with-plugins="${TOTEM_PLUGINS}"
-#CONFIGURE_ENV+=	APPDATA_VALIDATE="${LOCALBASE}/bin/appdata-validate --nonet"
-MAKE_ENV=	XDG_CACHE_HOME=${WRKDIR}
-INSTALL_TARGET=	install-strip
+
+BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 GLIB_SCHEMAS=	org.gnome.totem.enums.xml \
 		org.gnome.totem.gschema.xml \
-		org.gnome.totem.plugins.opensubtitles.gschema.xml
-
-OPTIONS_DEFINE=	LIRC
-
-PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//}
-
-OPTIONS_DEFAULT=
-
-# check configure script for allowed_plugins="..." for new plugins
-TOTEM_PLUGINS=	apple-trailers autoload-subtitles brasero-disc-recorder chapters \
-		dbusservice im-status grilo gromit iplayer media-player-keys \
-		nautilus ontop opensubtitles properties recent \
-		save-file screensaver screenshot sidebar-test skipto vimeo \
-		youtube
+		org.gnome.totem.plugins.opensubtitles.gschema.xml \
+		org.gnome.totem.plugins.pythonconsole.gschema.xml
 
-# pythonconsole samplepython
-# vala sample-vala
-# iplayer zeitgeist-dp grilo
+# https://bugzilla.gnome.org/show_bug.cgi?id=786248
+# https://github.com/mesonbuild/meson/issues/1994
+MAKE_JOBS_UNSAFE=yes
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MLIRC}
-LIB_DEPENDS+=	liblirc_client.so:comms/lirc
-PLIST_SUB+=	LIRC=""
-TOTEM_PLUGINS:=	${TOTEM_PLUGINS} lirc
+.if ${ARCH} == i386 || ${OSVERSION} <= 1100000
+MESON_ARGS=	-Denable-vala=no
+PLIST_SUB+=	VALA="@comment "
 .else
-PLIST_SUB+=	LIRC="@comment "
+BUILD_DEPENDS+=	valac:lang/vala
+PLIST_SUB+=	VALA=""
 .endif
 
 .if defined(WITH_DVD_DEVICE)
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index c498e3262ce2..06effe458692 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/totem-3.18.1.tar.xz) = d7816eae9606846c44fd508902eae10bdaed28e6d4f621531990d473184107a2
-SIZE (gnome3/totem-3.18.1.tar.xz) = 3172416
+TIMESTAMP = 1529610772
+SHA256 (gnome3/totem-3.26.1.tar.xz) = 298160c9ee8d34f1ac6586c69e0440e3586a75fd4b1719d79f908edb9c00c382
+SIZE (gnome3/totem-3.26.1.tar.xz) = 3281392
diff --git a/multimedia/totem/pkg-descr b/multimedia/totem/pkg-descr
index 3f33f1f5f682..caf3b0955d44 100644
--- a/multimedia/totem/pkg-descr
+++ b/multimedia/totem/pkg-descr
@@ -1,7 +1,5 @@
-Totem is simple movie player for the Gnome 2 desktop based on xine.
+Totem is simple movie player for the Gnome 3 desktop based on xine.
 It features a simple playlist, a full-screen mode, seek and volume controls,
 as well as a pretty complete keyboard navigation.
 
 WWW: http://www.gnome.org/projects/totem/
-
--- Hendrik Scholz <hendrik@scholz.net>
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 76b427f5c625..ede38b87def6 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -1,111 +1,69 @@
 bin/totem
-bin/totem-audio-preview
 bin/totem-video-thumbnailer
 include/totem/1.0/totem-dirs.h
 include/totem/1.0/totem-interface.h
 include/totem/1.0/totem-plugin.h
 include/totem/1.0/totem.h
 lib/girepository-1.0/Totem-1.0.typelib
-lib/libtotem.a
 lib/libtotem.so
 lib/libtotem.so.0
 lib/libtotem.so.0.0.0
-lib/nautilus/extensions-3.0/libtotem-properties-page.a
 lib/nautilus/extensions-3.0/libtotem-properties-page.so
 lib/totem/plugins/apple-trailers/apple-trailers.plugin
-lib/totem/plugins/apple-trailers/libapple-trailers.a
 lib/totem/plugins/apple-trailers/libapple-trailers.so
 lib/totem/plugins/autoload-subtitles/autoload-subtitles.plugin
-lib/totem/plugins/autoload-subtitles/libautoload-subtitles.a
 lib/totem/plugins/autoload-subtitles/libautoload-subtitles.so
 lib/totem/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin
-lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.a
 lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.so
 lib/totem/plugins/dbus/dbusservice.plugin
 lib/totem/plugins/dbus/dbusservice.py
-lib/totem/plugins/dbus/dbusservice.pyc
-lib/totem/plugins/dbus/dbusservice.pyo
 lib/totem/plugins/gromit/gromit.plugin
-lib/totem/plugins/gromit/libgromit.a
 lib/totem/plugins/gromit/libgromit.so
-lib/totem/plugins/im-status/libtotem-im-status.a
 lib/totem/plugins/im-status/libtotem-im-status.so
 lib/totem/plugins/im-status/totem-im-status.plugin
-%%LIRC%%lib/totem/plugins/lirc/liblirc.a
-%%LIRC%%lib/totem/plugins/lirc/liblirc.so
-%%LIRC%%lib/totem/plugins/lirc/lirc.plugin
-%%LIRC%%lib/totem/plugins/lirc/totem_lirc_default
-lib/totem/plugins/media-player-keys/libmedia_player_keys.a
 lib/totem/plugins/media-player-keys/libmedia_player_keys.so
 lib/totem/plugins/media-player-keys/media-player-keys.plugin
-lib/totem/plugins/ontop/libontop.a
 lib/totem/plugins/ontop/libontop.so
 lib/totem/plugins/ontop/ontop.plugin
 lib/totem/plugins/opensubtitles/hash.py
-lib/totem/plugins/opensubtitles/hash.pyc
-lib/totem/plugins/opensubtitles/hash.pyo
 lib/totem/plugins/opensubtitles/opensubtitles.plugin
 lib/totem/plugins/opensubtitles/opensubtitles.py
-lib/totem/plugins/opensubtitles/opensubtitles.pyc
-lib/totem/plugins/opensubtitles/opensubtitles.pyo
 lib/totem/plugins/opensubtitles/opensubtitles.ui
-lib/totem/plugins/properties/libmovie-properties.a
 lib/totem/plugins/properties/libmovie-properties.so
 lib/totem/plugins/properties/movie-properties.plugin
-lib/totem/plugins/recent/librecent.a
+lib/totem/plugins/pythonconsole/console.py
+lib/totem/plugins/pythonconsole/pythonconsole.plugin
+lib/totem/plugins/pythonconsole/pythonconsole.py
 lib/totem/plugins/recent/librecent.so
 lib/totem/plugins/recent/recent.plugin
-lib/totem/plugins/save-file/libsave-file.a
+%%VALA%%lib/totem/plugins/rotation/librotation.so
+%%VALA%%lib/totem/plugins/rotation/rotation.plugin
 lib/totem/plugins/save-file/libsave-file.so
 lib/totem/plugins/save-file/save-file.plugin
-lib/totem/plugins/screensaver/libscreensaver.a
 lib/totem/plugins/screensaver/libscreensaver.so
 lib/totem/plugins/screensaver/screensaver.plugin
 lib/totem/plugins/screenshot/gallery.ui
-lib/totem/plugins/screenshot/libscreenshot.a
 lib/totem/plugins/screenshot/libscreenshot.so
 lib/totem/plugins/screenshot/screenshot.plugin
-lib/totem/plugins/skipto/libskipto.a
 lib/totem/plugins/skipto/libskipto.so
 lib/totem/plugins/skipto/skipto.plugin
 lib/totem/plugins/skipto/skipto.ui
-lib/totem/plugins/vimeo/libvimeo.a
+lib/totem/plugins/variable-rate/libvariable-rate.so
+lib/totem/plugins/variable-rate/variable-rate.plugin
 lib/totem/plugins/vimeo/libvimeo.so
 lib/totem/plugins/vimeo/vimeo.plugin
+%%VALA%%lib/totem/plugins/zeitgeist-dp/libtotem-zeitgeist-dp-plugin.so
+%%VALA%%lib/totem/plugins/zeitgeist-dp/zeitgeist-dp.plugin
 libdata/pkgconfig/totem.pc
+libexec/totem-gallery-thumbnailer
 man/man1/totem-video-thumbnailer.1.gz
 man/man1/totem.1.gz
 share/GConf/gsettings/opensubtitles.convert
+share/GConf/gsettings/pythonconsole.convert
 share/GConf/gsettings/totem.convert
-share/appdata/org.gnome.Totem.appdata.xml
 share/applications/org.gnome.Totem.desktop
 share/dbus-1/services/org.gnome.Totem.service
 share/gir-1.0/Totem-1.0.gir
-share/gtk-doc/html/totem/BaconVideoWidget.html
-share/gtk-doc/html/totem/TotemObject.html
-share/gtk-doc/html/totem/annotation-glossary.html
-share/gtk-doc/html/totem/api-index-deprecated.html
-share/gtk-doc/html/totem/api-index-full.html
-share/gtk-doc/html/totem/core-api.html
-share/gtk-doc/html/totem/home.png
-share/gtk-doc/html/totem/index.html
-share/gtk-doc/html/totem/index.sgml
-share/gtk-doc/html/totem/ix02.html
-share/gtk-doc/html/totem/ix03.html
-share/gtk-doc/html/totem/ix04.html
-share/gtk-doc/html/totem/ix05.html
-share/gtk-doc/html/totem/left-insensitive.png
-share/gtk-doc/html/totem/left.png
-share/gtk-doc/html/totem/right-insensitive.png
-share/gtk-doc/html/totem/right.png
-share/gtk-doc/html/totem/style.css
-share/gtk-doc/html/totem/totem-Interface.html
-share/gtk-doc/html/totem/totem-TotemPlugin.html
-share/gtk-doc/html/totem/totem-plugins.html
-share/gtk-doc/html/totem/totem.devhelp2
-share/gtk-doc/html/totem/tutorials.html
-share/gtk-doc/html/totem/up-insensitive.png
-share/gtk-doc/html/totem/up.png
 share/help/C/totem/figures/totem_next_button.png
 share/help/C/totem/figures/totem_pause_button.png
 share/help/C/totem/figures/totem_play_button.png
@@ -236,6 +194,16 @@ share/help/gl/totem/figures/totem_volume_maximum_button.png
 share/help/gl/totem/figures/totem_volume_mute_button.png
 share/help/gl/totem/index.docbook
 share/help/gl/totem/legal.xml
+share/help/hr/totem/figures/totem_next_button.png
+share/help/hr/totem/figures/totem_pause_button.png
+share/help/hr/totem/figures/totem_play_button.png
+share/help/hr/totem/figures/totem_previous_button.png
+share/help/hr/totem/figures/totem_show_playlist_button.png
+share/help/hr/totem/figures/totem_start_window.png
+share/help/hr/totem/figures/totem_volume_maximum_button.png
+share/help/hr/totem/figures/totem_volume_mute_button.png
+share/help/hr/totem/index.docbook
+share/help/hr/totem/legal.xml
 share/help/id/totem/figures/totem_next_button.png
 share/help/id/totem/figures/totem_pause_button.png
 share/help/id/totem/figures/totem_play_button.png
@@ -266,6 +234,16 @@ share/help/ja/totem/figures/totem_volume_maximum_button.png
 share/help/ja/totem/figures/totem_volume_mute_button.png
 share/help/ja/totem/index.docbook
 share/help/ja/totem/legal.xml
+share/help/nb/totem/figures/totem_next_button.png
+share/help/nb/totem/figures/totem_pause_button.png
+share/help/nb/totem/figures/totem_play_button.png
+share/help/nb/totem/figures/totem_previous_button.png
+share/help/nb/totem/figures/totem_show_playlist_button.png
+share/help/nb/totem/figures/totem_start_window.png
+share/help/nb/totem/figures/totem_volume_maximum_button.png
+share/help/nb/totem/figures/totem_volume_mute_button.png
+share/help/nb/totem/index.docbook
+share/help/nb/totem/legal.xml
 share/help/oc/totem/figures/totem_next_button.png
 share/help/oc/totem/figures/totem_pause_button.png
 share/help/oc/totem/figures/totem_play_button.png
@@ -396,13 +374,13 @@ share/help/zh_TW/totem/figures/totem_volume_maximum_button.png
 share/help/zh_TW/totem/figures/totem_volume_mute_button.png
 share/help/zh_TW/totem/index.docbook
 share/help/zh_TW/totem/legal.xml
-share/icons/hicolor/16x16/apps/totem.png
-share/icons/hicolor/22x22/apps/totem.png
-share/icons/hicolor/24x24/apps/totem.png
-share/icons/hicolor/256x256/apps/totem.png
-share/icons/hicolor/32x32/apps/totem.png
-share/icons/hicolor/48x48/apps/totem.png
-share/icons/hicolor/scalable/apps/totem-symbolic.svg
+share/icons/hicolor/16x16/apps/org.gnome.Totem.png
+share/icons/hicolor/22x22/apps/org.gnome.Totem.png
+share/icons/hicolor/24x24/apps/org.gnome.Totem.png
+share/icons/hicolor/256x256/apps/org.gnome.Totem.png
+share/icons/hicolor/32x32/apps/org.gnome.Totem.png
+share/icons/hicolor/48x48/apps/org.gnome.Totem.png
+share/icons/hicolor/symbolic/apps/org.gnome.Totem-symbolic.svg
 share/locale/af/LC_MESSAGES/totem.mo
 share/locale/am/LC_MESSAGES/totem.mo
 share/locale/ar/LC_MESSAGES/totem.mo
@@ -435,6 +413,7 @@ share/locale/eu/LC_MESSAGES/totem.mo
 share/locale/fa/LC_MESSAGES/totem.mo
 share/locale/fi/LC_MESSAGES/totem.mo
 share/locale/fr/LC_MESSAGES/totem.mo
+share/locale/fur/LC_MESSAGES/totem.mo
 share/locale/ga/LC_MESSAGES/totem.mo
 share/locale/gd/LC_MESSAGES/totem.mo
 share/locale/gl/LC_MESSAGES/totem.mo
@@ -498,10 +477,12 @@ share/locale/zh_CN/LC_MESSAGES/totem.mo
 share/locale/zh_HK/LC_MESSAGES/totem.mo
 share/locale/zh_TW/LC_MESSAGES/totem.mo
 share/locale/zu/LC_MESSAGES/totem.mo
+share/metainfo/org.gnome.Totem.appdata.xml
 share/thumbnailers/totem.thumbnailer
 %%DATADIR%%/controls.ui
 %%DATADIR%%/playlist.ui
 %%DATADIR%%/preferences.ui
 %%DATADIR%%/properties.ui
+%%DATADIR%%/shortcuts.ui
 %%DATADIR%%/totem.ui
 %%DATADIR%%/uri.ui
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index c747e8a5c40b..f938b0afa625 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 
 USES=		desktop-file-utils gmake iconv jpeg pkgconfig readline \
 		shared-mime-info tar:xz
-USE_XORG=	x11 xext xinerama xscrnsaver xtst xv xxf86vm
+USE_XORG=	x11 xext xinerama xscrnsaver xt xtst xv xxf86vm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-vdr-keys \
 		--disable-nvtvsimple \