svn commit: r495465 - in head/multimedia/libva-utils: . files

[Guido Falsi]

Author: madpilot
Date: Tue Mar 12 16:00:23 2019
New Revision: 495465
URL: https://svnweb.freebsd.org/changeset/ports/495465

Log:
  Add option to disable X11 support.
  
  Requested by:	driesm.michiels at gmail.com

Added:
  head/multimedia/libva-utils/files/patch-Makefile.am   (contents, props changed)
Modified:
  head/multimedia/libva-utils/Makefile
  head/multimedia/libva-utils/pkg-plist

Modified: head/multimedia/libva-utils/Makefile
==============================================================================
--- head/multimedia/libva-utils/Makefile	Tue Mar 12 15:56:32 2019	(r495464)
+++ head/multimedia/libva-utils/Makefile	Tue Mar 12 16:00:23 2019	(r495465)
@@ -14,15 +14,15 @@ 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
 
@@ -31,5 +31,8 @@ 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>

Added: head/multimedia/libva-utils/files/patch-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libva-utils/files/patch-Makefile.am	Tue Mar 12 16:00:23 2019	(r495465)
@@ -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

Modified: head/multimedia/libva-utils/pkg-plist
==============================================================================
--- head/multimedia/libva-utils/pkg-plist	Tue Mar 12 15:56:32 2019	(r495464)
+++ head/multimedia/libva-utils/pkg-plist	Tue Mar 12 16:00:23 2019	(r495465)
@@ -6,9 +6,9 @@ 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