diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index 76c03c7e012..1f04dd2b602 100644
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -4,9 +4,10 @@ TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # Please align version with `ffplay` package.
 TERMUX_PKG_VERSION="9.0.2"
+TERMUX_PKG_REVISION=90
 TERMUX_PKG_SRCURL="https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=8c3850283eb25fa026482078a04051e0be17347b09ef81a0849bec15a96e002e
-TERMUX_PKG_DEPENDS="fontconfig, freetype, fribidi, game-music-emu, harfbuzz, libaom, libandroid-glob, libandroid-shmem, libandroid-stub, libass, libbluray, libbs2b, libbz2, libdav1d, libdvdnav, libdvdread, libiconv, libjxl, liblzma, libmysofa, libmp3lame, libopencore-amr, libopenmpt, libopus, libplacebo, librav1e, libsoxr, libsrt, libssh, libtheora, libv4l, libvidstab, libvmaf, libvo-amrwbenc, libvorbis, libvpx, libwebp, libx264, libx265, libxcb, libxml2, libzimg, libzmq, littlecms, ocl-icd, openssl, rubberband, svt-av1, vulkan-icd, xvidcore, zlib"
+TERMUX_PKG_DEPENDS="fontconfig, freetype, fribidi, game-music-emu, harfbuzz, libaom, libandroid-glob, libandroid-shmem, libandroid-stub, libass, libbluray, libbs2b, libbz2, libdav1d, libdvdnav, libdvdread, libiconv, libjxl, liblzma, libmysofa, libmp3lame, libopencore-amr, libopenmpt, libopus, libplacebo, librav1e, libsoxr, libsrt, libssh, libtheora, libv4l, libva, libvidstab, libvmaf, libvo-amrwbenc, libvorbis, libvpx, libwebp, libx264, libx265, libxcb, libxml2, libzimg, libzmq, littlecms, ocl-icd, openssl, rubberband, svt-av1, vulkan-icd, xvidcore, zlib"
 TERMUX_PKG_BUILD_DEPENDS="glslang, opencl-headers, vulkan-headers"
 TERMUX_PKG_CONFLICTS="libav"
 TERMUX_PKG_BREAKS="ffmpeg-dev"
@@ -136,6 +137,7 @@ termux_step_configure() {
 		--enable-libzmq \
 		--enable-mediacodec \
 		--enable-opencl \
+		--enable-vaapi \
 		--enable-openssl \
 		--enable-shared \
 		--prefix="$TERMUX_PREFIX" \
diff --git a/x11-packages/libva/build.sh b/packages/libva/build.sh
similarity index 76%
rename from x11-packages/libva/build.sh
rename to packages/libva/build.sh
index 08faa9f3f61..0514d304713 100644
--- a/x11-packages/libva/build.sh
+++ b/packages/libva/build.sh
@@ -3,11 +3,13 @@ TERMUX_PKG_DESCRIPTION="Video Acceleration (VA) API for Linux"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.24.1"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/intel/libva/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=0b4a3649ee8d683b9cce2ef094df4fb039d276c0cef7e49337c43d3b297b9f42
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, libdrm, libx11, libxext, libxfixes, libwayland"
-TERMUX_PKG_BUILD_DEPENDS="libglvnd, mesa, mesa-dev"
+# Use GLVND directly to avoid a Mesa -> libva -> Mesa build dependency cycle.
+TERMUX_PKG_BUILD_DEPENDS="libglvnd, libglvnd-dev, libwayland-cross-scanner"
 termux_step_pre_configure() {
 	termux_setup_wayland_cross_pkg_config_wrapper
 }
diff --git a/x11-packages/libva/va-va_internal.h.patch b/packages/libva/va-va_internal.h.patch
similarity index 100%
rename from x11-packages/libva/va-va_internal.h.patch
rename to packages/libva/va-va_internal.h.patch