svn commit: r456203 - head/multimedia/libva

Guido Falsi madpilot at FreeBSD.org
Wed Dec 13 11:44:18 UTC 2017


Author: madpilot
Date: Wed Dec 13 11:44:16 2017
New Revision: 456203
URL: https://svnweb.freebsd.org/changeset/ports/456203

Log:
  - Fix build when compiling wayland support [1]
  - Add an explicit WAYLAND option to allow users enabling or disabling
    it, to avoid silent dependencies. Off by default
  
  Reported by:	"Alex V. Petrov" <alexvpetrov at gmail.com> [1]

Modified:
  head/multimedia/libva/Makefile
  head/multimedia/libva/pkg-plist

Modified: head/multimedia/libva/Makefile
==============================================================================
--- head/multimedia/libva/Makefile	Wed Dec 13 11:38:47 2017	(r456202)
+++ head/multimedia/libva/Makefile	Wed Dec 13 11:44:16 2017	(r456203)
@@ -29,11 +29,17 @@ LDFLAGS+=	-lpthread
 # prevent types conflict: videodev2.h vs. drm.h
 CFLAGS+=	-DHAVE_LINUX_INTEGER_TYPES
 
-OPTIONS_DEFINE=	DEBUG
+OPTIONS_DEFINE=	DEBUG WAYLAND
+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
+WAYLAND_BUILD_DEPENDS=	gsed:textproc/gsed
+
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \
 		-e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \
@@ -41,5 +47,9 @@ post-patch:	.SILENT
 	${REINPLACE_CMD} '/^export VA_HEADER_/d' \
 		${WRKSRC}/doc/Makefile.am
 	${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am
+
+post-configure-WAYLAND-on: .SILENT
+	${REINPLACE_CMD} -e 's|\(SED = \).*|\1${LOCALBASE}/bin/gsed|' \
+		${WRKSRC}/va/wayland/Makefile
 
 .include <bsd.port.mk>

Modified: head/multimedia/libva/pkg-plist
==============================================================================
--- head/multimedia/libva/pkg-plist	Wed Dec 13 11:38:47 2017	(r456202)
+++ head/multimedia/libva/pkg-plist	Wed Dec 13 11:44:16 2017	(r456203)
@@ -2,6 +2,7 @@ include/va/va.h
 include/va/va_backend.h
 include/va/va_backend_glx.h
 include/va/va_backend_vpp.h
+%%WAYLAND%%include/va/va_backend_wayland.h
 include/va/va_compat.h
 include/va/va_dec_hevc.h
 include/va/va_dec_jpeg.h
@@ -25,6 +26,7 @@ include/va/va_str.h
 include/va/va_tpi.h
 include/va/va_version.h
 include/va/va_vpp.h
+%%WAYLAND%%include/va/va_wayland.h
 include/va/va_x11.h
 lib/libva-drm.so
 lib/libva-drm.so.2
@@ -32,6 +34,9 @@ lib/libva-drm.so.2.0.0
 lib/libva-glx.so
 lib/libva-glx.so.2
 lib/libva-glx.so.2.0.0
+%%WAYLAND%%lib/libva-wayland.so
+%%WAYLAND%%lib/libva-wayland.so.2
+%%WAYLAND%%lib/libva-wayland.so.2.0.0
 lib/libva-x11.so
 lib/libva-x11.so.2
 lib/libva-x11.so.2.0.0
@@ -40,5 +45,6 @@ lib/libva.so.2
 lib/libva.so.2.0.0
 libdata/pkgconfig/libva-drm.pc
 libdata/pkgconfig/libva-glx.pc
+%%WAYLAND%%libdata/pkgconfig/libva-wayland.pc
 libdata/pkgconfig/libva-x11.pc
 libdata/pkgconfig/libva.pc


More information about the svn-ports-head mailing list