Index: head/multimedia/libva-utils/Makefile
===================================================================
--- head/multimedia/libva-utils/Makefile	(revision 495464)
+++ head/multimedia/libva-utils/Makefile	(revision 495465)
@@ -1,35 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	libva-utils
 PORTVERSION=	2.4.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Collection of tests and utilities for VAAPI
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libva.so:multimedia/libva \
 		libdrm.so:graphics/libdrm
 
 USES=		autoreconf compiler:c++11-lang gmake libtool pkgconfig tar:bzip2
-USE_XORG=	x11 xext xfixes
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	intel
 
-OPTIONS_DEFINE=	DEBUG WAYLAND
-OPTIONS_DEFAULT=WAYLAND
+OPTIONS_DEFINE=	DEBUG WAYLAND X11
+OPTIONS_DEFAULT=WAYLAND X11
 WAYLAND_DESC=	Support wayland protocol
 OPTIONS_SUB=	yes
 
 DEBUG_CFLAGS=		-D_DEBUG
 DEBUG_CFLAGS_OFF=	-DNDEBUG
 
 WAYLAND_CONFIGURE_ENABLE=	wayland
 WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland
+
+X11_CONFIGURE_ENABLE=		x11
+X11_USE=			XORG=x11,xext,xfixes
 
 .include <bsd.port.mk>
Index: head/multimedia/libva-utils/files/patch-Makefile.am
===================================================================
--- head/multimedia/libva-utils/files/patch-Makefile.am	(nonexistent)
+++ head/multimedia/libva-utils/files/patch-Makefile.am	(revision 495465)
@@ -0,0 +1,15 @@
+--- Makefile.am.orig	2019-02-01 23:11:33 UTC
++++ Makefile.am
+@@ -24,10 +24,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = common decode encode vainfo videoprocess vendor/intel vendor/intel/sfcsample
++SUBDIRS = common decode encode vainfo videoprocess vendor/intel
+ 
+ if USE_X11
+-SUBDIRS += putsurface
++SUBDIRS += putsurface vendor/intel/sfcsample
+ else
+ if USE_WAYLAND
+ SUBDIRS += putsurface

Property changes on: head/multimedia/libva-utils/files/patch-Makefile.am
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/libva-utils/pkg-plist
===================================================================
--- head/multimedia/libva-utils/pkg-plist	(revision 495464)
+++ head/multimedia/libva-utils/pkg-plist	(revision 495465)
@@ -1,20 +1,20 @@
 bin/avcenc
 bin/avcstreamoutdemo
 bin/h264encode
 bin/hevcencode
 bin/jpegenc
 bin/loadjpeg
 bin/mpeg2vaenc
 bin/mpeg2vldemo
-bin/putsurface
+%%X11%%bin/putsurface
 %%WAYLAND%%bin/putsurface_wayland
-bin/sfcsample
+%%X11%%bin/sfcsample
 bin/vainfo
 bin/vavpp
 bin/vp8enc
 bin/vp9enc
 bin/vppblending
 bin/vppchromasitting
 bin/vppdenoise
 bin/vppscaling_csc
 bin/vppsharpness