diff --git a/MOVED b/MOVED
--- a/MOVED
+++ b/MOVED
@@ -2963,3 +2963,4 @@
 x11-wm/larswm||2024-01-18|Has expired: Last upstream release was in 2010
 x11-wm/flwm||2024-01-19|Has expired: Last upstream release and activity was in 2015
 x11-wm/jewel||2024-01-19|Has expired: Last upstream release was in 2004
+multimedia/libva-glx|multimedia/libva~glx|2024-01-21|Subpackaged
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -120,7 +120,7 @@
 GNASH_RENDERERS+=	ogl
 LIB_DEPENDS+=		libgdkglext-x11-1.0.so:x11-toolkits/gtkglext
 . if ${PORT_OPTIONS:MVAAPI}
-LIB_DEPENDS+=		libva-glx.so:multimedia/libva-glx
+LIB_DEPENDS+=		libva-glx.so:multimedia/libva~glx
 . endif
 .endif
 
diff --git a/multimedia/Makefile b/multimedia/Makefile
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -189,7 +189,6 @@
     SUBDIR += libuvc
     SUBDIR += libv4l
     SUBDIR += libva
-    SUBDIR += libva-glx
     SUBDIR += libva-intel-driver
     SUBDIR += libva-intel-hybrid-driver
     SUBDIR += libva-intel-media-driver
diff --git a/multimedia/libva-glx/Makefile b/multimedia/libva-glx/Makefile
deleted file mode 100644
--- a/multimedia/libva-glx/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-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
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -8,13 +8,13 @@
 PATCHFILES+=	6b0efda45140.patch:-p1 # https://github.com/intel/libva/pull/758
 
 MAINTAINER=	jbeich@FreeBSD.org
-COMMENT?=	VAAPI wrapper and dummy driver
+COMMENT=	VAAPI wrapper and dummy driver
 WWW=		https://github.com/intel/libva
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS+=	libdrm.so:graphics/libdrm
+LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 USES=		meson pkgconfig
 USE_GITHUB=	yes
@@ -23,10 +23,13 @@
 
 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_SUBPACKAGES=	glx
+GLX_SELF_DEPENDS.glx=	main
+GLX_LIB_DEPENDS.glx=	${LIB_DEPENDS:M${_GL_gl_LIB_DEPENDS}}
+SELF_DEPENDS.glx+=	${"${PORT_OPTIONS:MGLX}":?${GLX_SELF_DEPENDS.glx}:} # XXX <opt>_*_DEPENDS.<subpkg> don't work
+LIB_DEPENDS.glx+=	${"${PORT_OPTIONS:MGLX}":?${GLX_LIB_DEPENDS.glx}:} # XXX <opt>_*_DEPENDS.<subpkg> don't work
 GLX_USES=		gl
 GLX_USE=		GL=gl
 GLX_MESON_YES=		with_glx
diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist
--- a/multimedia/libva/pkg-plist
+++ b/multimedia/libva/pkg-plist
@@ -1,6 +1,6 @@
 include/va/va.h
 include/va/va_backend.h
-%%GLX%%include/va/va_backend_glx.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
@@ -25,7 +25,7 @@
 include/va/va_fei_h264.h
 include/va/va_fei_hevc.h
 include/va/va_fei.h
-%%GLX%%include/va/va_glx.h
+@@glx@@include/va/va_glx.h
 include/va/va_prot.h
 include/va/va_str.h
 include/va/va_tpi.h
@@ -36,9 +36,9 @@
 lib/libva-drm.so
 lib/libva-drm.so.2
 lib/libva-drm.so.2.2000.0
-%%GLX%%lib/libva-glx.so
-%%GLX%%lib/libva-glx.so.2
-%%GLX%%lib/libva-glx.so.2.2000.0
+@@glx@@lib/libva-glx.so
+@@glx@@lib/libva-glx.so.2
+@@glx@@lib/libva-glx.so.2.2000.0
 %%WAYLAND%%lib/libva-wayland.so
 %%WAYLAND%%lib/libva-wayland.so.2
 %%WAYLAND%%lib/libva-wayland.so.2.2000.0
@@ -49,7 +49,7 @@
 lib/libva.so.2
 lib/libva.so.2.2000.0
 libdata/pkgconfig/libva-drm.pc
-%%GLX%%libdata/pkgconfig/libva-glx.pc
+@@glx@@libdata/pkgconfig/libva-glx.pc
 %%WAYLAND%%libdata/pkgconfig/libva-wayland.pc
 %%X11%%libdata/pkgconfig/libva-x11.pc
 libdata/pkgconfig/libva.pc
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -134,7 +134,7 @@
 SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=		sndio
 VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva \
-				libva-glx.so:multimedia/libva-glx
+				libva-glx.so:multimedia/libva~glx
 VAAPI_CONFIGURE_ENABLE=		vaapi
 V4L_BUILD_DEPENDS=		v4l_compat>=1.0.20100321:multimedia/v4l_compat
 V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -22,7 +22,7 @@
 		libtag.so:audio/taglib \
 		libexiv2.so:graphics/exiv2 \
 		libva.so:multimedia/libva \
-		libva-glx.so:multimedia/libva-glx \
+		libva-glx.so:multimedia/libva~glx \
 		libbluray.so:multimedia/libbluray \
 		libass.so:multimedia/libass \
 		libfftw3_threads.so:math/fftw3 \