diff --git a/multimedia/libva-glx/Makefile b/multimedia/libva-glx/Makefile
index 0addf7913d30..b2176122e403 100644
--- a/multimedia/libva-glx/Makefile
+++ b/multimedia/libva-glx/Makefile
@@ -1,15 +1,15 @@
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-glx
 
 COMMENT=	VAAPI wrapper for GLX
 
 MASTERDIR=	${.CURDIR}/../libva
 
 OPTIONS_SLAVE=	GLX ${GLX_IMPLIES}
 OPTIONS_EXCLUDE=WAYLAND
 
 post-install:	slave-post-install
 slave-post-install:
 	@${REINPLACE_CMD} '/glx/!s/^/@comment /' ${TMPPLIST}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index bc54ac240689..21613f8f0469 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -1,41 +1,37 @@
 PORTNAME=	libva
-DISTVERSION=	2.16.0
+DISTVERSION=	2.17.0
 CATEGORIES=	multimedia
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	0c9e5f2fff22.patch:-p1 # https://github.com/intel/libva/pull/292
-PATCHFILES+=	657d77406161.patch:-p1 # https://github.com/intel/libva/pull/292
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT?=	VAAPI wrapper and dummy driver
 WWW=		https://github.com/intel/libva
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 
 USES=		meson pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	intel
 
 OPTIONS_DEFINE=	GLX WAYLAND X11
 OPTIONS_DEFAULT=GLX WAYLAND X11
 OPTIONS_EXCLUDE?=GLX # enslaved until subpackaging
 OPTIONS_SUB=	yes
 
 GLX_LIB_DEPENDS=	libva-x11.so:multimedia/libva
 GLX_USES=		gl
 GLX_USE=		GL=gl
 GLX_MESON_YES=		with_glx
 GLX_IMPLIES=		X11
 
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_MESON_YES=	with_wayland
 
 X11_USES=		xorg
-X11_USE=		XORG=x11,xorgproto,xext,xfixes
+X11_USE=		XORG=x11,xcb,xext,xfixes,xorgproto
 X11_MESON_YES=		with_x11
 
 .include <bsd.port.mk>
diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo
index 48e81b718a35..84d80387b994 100644
--- a/multimedia/libva/distinfo
+++ b/multimedia/libva/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1664264306
-SHA256 (intel-libva-2.16.0_GH0.tar.gz) = 766edf51fd86efe9e836a4467d4ec7c3af690a3c601b3c717237cee856302279
-SIZE (intel-libva-2.16.0_GH0.tar.gz) = 267735
-SHA256 (0c9e5f2fff22.patch) = ea769e0225befd4d0046f1f6f4d60bd85c24f9c96b519c414a1597f30185abd6
-SIZE (0c9e5f2fff22.patch) = 1715
-SHA256 (657d77406161.patch) = 0aa9cc936440e07ebc748829a139546acb01256065afea4a9f5cdc131d97db9d
-SIZE (657d77406161.patch) = 1107
+TIMESTAMP = 1671632939
+SHA256 (intel-libva-2.17.0_GH0.tar.gz) = 8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001
+SIZE (intel-libva-2.17.0_GH0.tar.gz) = 276993
diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist
index adfd3e0eb0ef..791e8fdf3aa2 100644
--- a/multimedia/libva/pkg-plist
+++ b/multimedia/libva/pkg-plist
@@ -1,55 +1,55 @@
 include/va/va.h
 include/va/va_backend.h
 %%GLX%%include/va/va_backend_glx.h
 include/va/va_backend_prot.h
 include/va/va_backend_vpp.h
 %%WAYLAND%%include/va/va_backend_wayland.h
 include/va/va_compat.h
 include/va/va_dec_av1.h
 include/va/va_dec_hevc.h
 include/va/va_dec_jpeg.h
 include/va/va_dec_vp8.h
 include/va/va_dec_vp9.h
 %%X11%%include/va/va_dri2.h
 %%X11%%include/va/va_dricommon.h
 include/va/va_drm.h
 include/va/va_drmcommon.h
 include/va/va_egl.h
 include/va/va_enc_av1.h
 include/va/va_enc_h264.h
 include/va/va_enc_hevc.h
 include/va/va_enc_jpeg.h
 include/va/va_enc_mpeg2.h
 include/va/va_enc_vp8.h
 include/va/va_enc_vp9.h
 include/va/va_fei_h264.h
 include/va/va_fei_hevc.h
 include/va/va_fei.h
 %%GLX%%include/va/va_glx.h
 include/va/va_prot.h
 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
 %%X11%%include/va/va_x11.h
 lib/libva-drm.so
 lib/libva-drm.so.2
-lib/libva-drm.so.2.1600.0
+lib/libva-drm.so.2.1700.0
 %%GLX%%lib/libva-glx.so
 %%GLX%%lib/libva-glx.so.2
-%%GLX%%lib/libva-glx.so.2.1600.0
+%%GLX%%lib/libva-glx.so.2.1700.0
 %%WAYLAND%%lib/libva-wayland.so
 %%WAYLAND%%lib/libva-wayland.so.2
-%%WAYLAND%%lib/libva-wayland.so.2.1600.0
+%%WAYLAND%%lib/libva-wayland.so.2.1700.0
 %%X11%%lib/libva-x11.so
 %%X11%%lib/libva-x11.so.2
-%%X11%%lib/libva-x11.so.2.1600.0
+%%X11%%lib/libva-x11.so.2.1700.0
 lib/libva.so
 lib/libva.so.2
-lib/libva.so.2.1600.0
+lib/libva.so.2.1700.0
 libdata/pkgconfig/libva-drm.pc
 %%GLX%%libdata/pkgconfig/libva-glx.pc
 %%WAYLAND%%libdata/pkgconfig/libva-wayland.pc
 %%X11%%libdata/pkgconfig/libva-x11.pc
 libdata/pkgconfig/libva.pc