cogl, clutter, champlain: update, optionalize x11, enable kms etc.

Author: valpackett

graphics/clutter-gtk3/Makefile

@@ -22,8 +22,14 @@ LIB_DEPENDS=	libcogl.so:graphics/cogl \
 
 USES=		gettext gl gnome localbase meson pkgconfig tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build
-USE_XORG=	x11 xcomposite xdamage xext xfixes xi xrandr
 USE_GL=		egl
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=		X11
+OPTIONS_DEFAULT=	X11
+OPTIONS_SUB=		yes
+
+X11_USES=		xorg
+X11_USE=		XORG=x11,xcomposite,xdamage,xext,xfixes,xi,xrandr
+
 .include <bsd.port.mk>

graphics/clutter/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clutter
-PORTVERSION=	1.26.2
+PORTVERSION=	1.26.4
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -17,24 +17,31 @@ LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		libfreetype.so:print/freetype2 \
 		libwayland-egl.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon \
+		libgudev-1.0.so:devel/libgudev \
+		libudev.so:devel/libudev-devd \
+		libinput.so:x11/libinput \
 		libcogl.so:graphics/cogl
 
 PORTSCOUT=	limit:1,even
 
-USES=		gettext gl gmake gnome libtool localbase pathfix pkgconfig \
+USES=		gettext gl gnome localbase meson pkgconfig \
 		tar:xz
-USE_GNOME=	atk cairo gdkpixbuf2 pango introspection:build
+USE_GNOME=	atk cairo gdkpixbuf2 gtk30 pango introspection:build
 USE_GL=		egl
-USE_XORG=	x11 xcomposite xdamage xext xfixes xi xrandr
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--with-x --enable-conformance=no \
-		--disable-evdev-input \
-		--enable-egl-backend=yes \
-		--enable-x11-backend=yes \
-		--enable-gdk-backend=no \
-		--enable-wayland-backend=yes \
-		--enable-wayland-compositor=no
-INSTALL_TARGET=	install-strip
+MESON_ARGS=	-Dwayland_compositor=false \
+		-Ddocumentation=false \
+		-Dbuild_examples=false
+
+# TODO: fix compositor support in cogl
+
+OPTIONS_DEFINE=		X11
+OPTIONS_DEFAULT=	X11
+OPTIONS_SUB=		yes
+
+X11_USES=		xorg
+X11_USE=		XORG=x11,xcomposite,xdamage,xext,xfixes,xi,xrandr
+X11_MESON_ON=	-Dbackends=x11,gdk,wayland,eglnative
+X11_MESON_OFF=	-Dbackends=gdk,wayland,eglnative
 
 .include <bsd.port.mk>

graphics/clutter/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1495454944
-SHA256 (clutter-1.26.2.tar.xz) = e7233314983055e9018f94f56882e29e7fc34d8d35de030789fdcd9b2d0e2e56
-SIZE (clutter-1.26.2.tar.xz) = 5353736
+TIMESTAMP = 1586803804
+SHA256 (clutter-1.26.4.tar.xz) = 8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6
+SIZE (clutter-1.26.4.tar.xz) = 5403168