Index: multimedia/libva-intel-driver/Makefile
===================================================================
--- multimedia/libva-intel-driver/Makefile
+++ multimedia/libva-intel-driver/Makefile
@@ -7,34 +7,37 @@
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org
-COMMENT=	VAAPI intel driver
+COMMENT=	VAAPI intel driver ${${FLAVOR}_COMMENT}
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS_REASON=	Only Intel GPUs on x86 are supported
+
 LIB_DEPENDS=	libva.so:multimedia/libva \
 		libdrm.so:graphics/libdrm
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
-GNU_CONFIGURE=	yes
+FLAVORS=	default hybrid
+default_CONFLICTS_INSTALL=	${PORTNAME}@*
+
 USES=		alias autoreconf compiler:c11 gmake libtool localbase \
 		pkgconfig tar:bzip2
 USE_GL=		gl
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	${${FLAVOR}_CONFIGURE_ARGS}
+PLIST_FILES=	lib/dri/i915_drv_video.so lib/dri/i965_drv_video.so
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	intel
 GH_PROJECT=	intel-vaapi-driver
 
-PLIST_FILES=	lib/dri/i915_drv_video.so lib/dri/i965_drv_video.so
-
-ONLY_FOR_ARCHS=	amd64 i386
-ONLY_FOR_ARCHS_REASON=	Driver for hardware present only on intel i386 and amd64 CPUs
-
-OPTIONS_DEFINE=	HYBRID
-
-HYBRID_DESC=	Hybrid codec support (e.g., VP9 decoding on Skylake)
-HYBRID_RUN_DEPENDS=	${LOCALBASE}/lib/dri/hybrid_drv_video.so:multimedia/libva-intel-hybrid-driver
-HYBRID_CONFIGURE_ENABLE=	hybrid-codec
+hybrid_COMMENT=		with Hybrid codec support
+hybrid_PKGNAMESUFFIX=	@${FLAVOR}
+hybrid_CONFLICTS_INSTALL=${PORTNAME}
+hybrid_RUN_DEPENDS=	${LOCALBASE}/lib/dri/hybrid_drv_video.so:multimedia/libva-intel-hybrid-driver
+hybrid_CONFIGURE_ARGS=	--enable-hybrid-codec
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's/-ldl//' \
Index: multimedia/libva-intel-driver/pkg-descr
===================================================================
--- multimedia/libva-intel-driver/pkg-descr
+++ multimedia/libva-intel-driver/pkg-descr
@@ -1,4 +1,8 @@
 Libva driver for intel graphics cards with hardware accelerated
 features for video encode/decode.
 
+@hybrid flavor has support for partial VP8 encoding on IvyBridge,
+BayTrail, Haswell and partial VP9 decoding on Haswell, Broadwell,
+Cherryview, Skylake.
+
 WWW: https://github.com/intel/intel-vaapi-driver