diff --git a/disabled-packages/love10/build.sh b/disabled-packages/love10/build.sh
index ed9120f7b5..7013aeb5c5 100644
--- a/disabled-packages/love10/build.sh
+++ b/disabled-packages/love10/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_VERSION=0.10.2
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/love2d/love/releases/download/${TERMUX_PKG_VERSION}/love-${TERMUX_PKG_VERSION}-linux-src.tar.gz
 TERMUX_PKG_SHA256=b26b306b113158927ae12d2faadb606eb1db49ffdcd7592d6a0a3fc0af21a387
-TERMUX_PKG_DEPENDS="freetype, game-music-emu, libandroid-spawn, libc++, libluajit, libmodplug, libogg, libphysfs, libtheora, libvorbis, mesa, mpg123, openal-soft, sdl2, zlib"
+TERMUX_PKG_DEPENDS="freetype, game-music-emu, libandroid-spawn, libc++, libluajit, libmodplug, libogg, libphysfs, libtheora, libvorbis, mpg123, openal-soft, opengl, sdl2, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-gme
 --with-lua=luajit
diff --git a/disabled-packages/widelands/build.sh b/disabled-packages/widelands/build.sh
index 2e8af53d84..4afee3522b 100644
--- a/disabled-packages/widelands/build.sh
+++ b/disabled-packages/widelands/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.0
 TERMUX_PKG_SRCURL=https://github.com/widelands/widelands/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=1dab0c4062873cc72c5e0558f9e9620b0ef185f1a78923a77c4ce5b9ed76031a
-TERMUX_PKG_DEPENDS="glew, libandroid-execinfo, libandroid-glob, libcurl, libicu, libpng, mesa, sdl2, sdl2-image, sdl2-mixer, sdl2-ttf, widelands-data"
+TERMUX_PKG_DEPENDS="glew, libandroid-execinfo, libandroid-glob, libcurl, libicu, libpng, opengl, sdl2, sdl2-image, sdl2-mixer, sdl2-ttf, widelands-data"
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX/bin
diff --git a/packages/gst-plugins-base/build.sh b/packages/gst-plugins-base/build.sh
index 82450241b0..ec49f737e0 100644
--- a/packages/gst-plugins-base/build.sh
+++ b/packages/gst-plugins-base/build.sh
@@ -5,8 +5,9 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.22.0
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d
-TERMUX_PKG_DEPENDS="glib, graphene, gstreamer, libandroid-shmem, libglvnd, libjpeg-turbo, libogg, libopus, libpng, libtheora, libvorbis, libx11, libxcb, libxext, libxv, zlib"
-TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner"
+TERMUX_PKG_DEPENDS="glib, graphene, gstreamer, libandroid-shmem, libjpeg-turbo, libogg, libopus, libpng, libtheora, libvorbis, libx11, libxcb, libxext, libxv, zlib"
+TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, opengl"
+TERMUX_PKG_RECOMMENDS="opengl"
 TERMUX_PKG_BREAKS="gst-plugins-base-dev"
 TERMUX_PKG_REPLACES="gst-plugins-base-dev"
 TERMUX_PKG_DISABLE_GIR=false
diff --git a/x11-packages/cairo-dock-core/build.sh b/x11-packages/cairo-dock-core/build.sh
index e8543e74fc..21f839e19f 100644
--- a/x11-packages/cairo-dock-core/build.sh
+++ b/x11-packages/cairo-dock-core/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_VERSION=3.4.1
 TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://github.com/Cairo-Dock/cairo-dock-core/archive/${_COMMIT}.zip
 TERMUX_PKG_SHA256=e59e99147ce9c901b46d4b56b88bd53aeda34292b86fd9fbf2c55d158153f2ec
-TERMUX_PKG_DEPENDS="dbus-glib, gdk-pixbuf, glib, glu, gtk3, libcairo, libcurl, librsvg, libx11, libxcomposite, libxinerama, libxml2, libxrandr, libxrender, libxtst, mesa, pango"
+TERMUX_PKG_DEPENDS="dbus-glib, gdk-pixbuf, glib, glu, gtk3, libcairo, libcurl, librsvg, libx11, libxcomposite, libxinerama, libxml2, libxrandr, libxrender, libxtst, opengl, pango"
 TERMUX_PKG_BUILD_DEPENDS="valac"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DFORCE_NOT_LIB64=yes
diff --git a/x11-packages/cogl/build.sh b/x11-packages/cogl/build.sh
index d421b055ac..6ba132b8a4 100644
--- a/x11-packages/cogl/build.sh
+++ b/x11-packages/cogl/build.sh
@@ -7,7 +7,7 @@ _MAJOR_VERSION=1.22
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.8
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/cogl/${_MAJOR_VERSION}/cogl-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759
-TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, harfbuzz, libcairo, libx11, libxcomposite, libxdamage, libxext, libxfixes, libxrandr, mesa, pango"
+TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, harfbuzz, libcairo, libx11, libxcomposite, libxdamage, libxext, libxfixes, libxrandr, opengl, pango"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner"
 TERMUX_PKG_DISABLE_GIR=false
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/dosbox-x/build.sh b/x11-packages/dosbox-x/build.sh
index 3d14db6bdd..073be5edff 100644
--- a/x11-packages/dosbox-x/build.sh
+++ b/x11-packages/dosbox-x/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.84.3
 TERMUX_PKG_SRCURL=https://github.com/joncampbell123/dosbox-x/archive/refs/tags/dosbox-x-v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=6c807e72ece5de6b038e5ff3a7f1bc2e3bd61901548ed027192f58ff19585881
-TERMUX_PKG_DEPENDS="dosbox-x-data, fluidsynth, freetype, libc++, libiconv, libpcap, libpng, libslirp, libx11, libxkbfile, libxrandr, mesa, sdl2, sdl2-net, zlib"
+TERMUX_PKG_DEPENDS="dosbox-x-data, fluidsynth, freetype, libc++, libiconv, libpcap, libpng, libslirp, libx11, libxkbfile, libxrandr, opengl, sdl2, sdl2-net, zlib"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_path_SDL2_CONFIG=$TERMUX_PREFIX/bin/sdl2-config
diff --git a/x11-packages/fltk/build.sh b/x11-packages/fltk/build.sh
index 6ea8fd0c2b..ad8c3ed742 100644
--- a/x11-packages/fltk/build.sh
+++ b/x11-packages/fltk/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.3.8
 TERMUX_PKG_SRCURL=https://www.fltk.org/pub/fltk/${TERMUX_PKG_VERSION}/fltk-${TERMUX_PKG_VERSION}-source.tar.gz
 TERMUX_PKG_SHA256=f3c1102b07eb0e7a50538f9fc9037c18387165bc70d4b626e94ab725b9d4d1bf
-TERMUX_PKG_DEPENDS="fontconfig, glu, libc++, libjpeg-turbo, libpng, libx11, libxcursor, libxext, libxfixes, libxft, libxinerama, libxrender, mesa, zlib"
+TERMUX_PKG_DEPENDS="fontconfig, glu, libc++, libjpeg-turbo, libpng, libx11, libxcursor, libxext, libxfixes, libxft, libxinerama, libxrender, opengl, zlib"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/freeglut/build.sh b/x11-packages/freeglut/build.sh
index ebe933ca7a..fec7bf0770 100644
--- a/x11-packages/freeglut/build.sh
+++ b/x11-packages/freeglut/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.4.0
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/freeglut/freeglut-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec
-TERMUX_PKG_DEPENDS="glu, libx11, libxi, libxrandr, mesa"
+TERMUX_PKG_DEPENDS="glu, libx11, libxi, libxrandr, opengl"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DANDROID_NO_TERMUX=OFF
diff --git a/x11-packages/glu/build.sh b/x11-packages/glu/build.sh
index cd2875333a..bc14f046e1 100644
--- a/x11-packages/glu/build.sh
+++ b/x11-packages/glu/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_VERSION=9.0.2
 TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/glu/glu-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65
-TERMUX_PKG_DEPENDS="libc++, mesa"
+TERMUX_PKG_DEPENDS="libc++, opengl"
 TERMUX_PKG_CONFLICTS="libglu"
 TERMUX_PKG_REPLACES="libglu"
 
diff --git a/x11-packages/hugin/build.sh b/x11-packages/hugin/build.sh
index 228db85b5e..cc8bd5dde7 100644
--- a/x11-packages/hugin/build.sh
+++ b/x11-packages/hugin/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=1
 #TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/hugin/hugin-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SRCURL=https://ftp-osl.osuosl.org/pub/gentoo/distfiles/hugin-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7
-TERMUX_PKG_DEPENDS="boost, enblend, exiftool, exiv2, fftw, glew, glu, imath, libc++, libflann, libjpeg-turbo, liblz4, libpano13, libpng, libsqlite, libtiff, libvigra, libx11, littlecms, mesa, openexr, wxwidgets, zlib"
+TERMUX_PKG_DEPENDS="boost, enblend, exiftool, exiv2, fftw, glew, glu, imath, libc++, libflann, libjpeg-turbo, liblz4, libpano13, libpng, libsqlite, libtiff, libvigra, libx11, littlecms, openexr, opengl, wxwidgets, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DwxWidgets_CONFIG_EXECUTABLE=$TERMUX_PREFIX/bin/wx-config
diff --git a/x11-packages/kitty/build.sh b/x11-packages/kitty/build.sh
index 03bb6a22fd..d36a8220b6 100644
--- a/x11-packages/kitty/build.sh
+++ b/x11-packages/kitty/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/kovidgoyal/kitty/releases/download/v${TERMUX_PKG_VERSION}/kitty-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=5544a580314fec7711187ce28162909b5ecff6780071444fe96fb97f8be5c9ad
 # fontconfig is dlopen(3)ed:
-TERMUX_PKG_DEPENDS="dbus, fontconfig, harfbuzz, libpng, librsync, libx11, libxkbcommon, littlecms, mesa (>= 22.0.3), ncurses, openssl, python, zlib"
+TERMUX_PKG_DEPENDS="dbus, fontconfig, harfbuzz, libpng, librsync, libx11, libxkbcommon, littlecms, ncurses, opengl, openssl, python, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libxcursor, libxi, libxinerama, libxrandr, xorgproto"
 TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/x11-packages/libepoxy/build.sh b/x11-packages/libepoxy/build.sh
index 4f45ca869b..cb8cd0e125 100644
--- a/x11-packages/libepoxy/build.sh
+++ b/x11-packages/libepoxy/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=1.5.10
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/anholt/libepoxy/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
-TERMUX_PKG_DEPENDS="mesa"
+TERMUX_PKG_DEPENDS="opengl"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dglx=yes
diff --git a/x11-packages/love/build.sh b/x11-packages/love/build.sh
index 07af98865f..912186f619 100644
--- a/x11-packages/love/build.sh
+++ b/x11-packages/love/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=11.4
 TERMUX_PKG_SRCURL=https://github.com/love2d/love/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=eed6e388a0c3b14150d26c6c7f64288595f4c722ee9eda0d6797ea83f2c65d23
-TERMUX_PKG_DEPENDS="freetype, game-music-emu, libandroid-spawn, libc++, libluajit, libmodplug, libogg, libtheora, libvorbis, mesa, mpg123, openal-soft, sdl2, zlib"
+TERMUX_PKG_DEPENDS="freetype, game-music-emu, libandroid-spawn, libc++, libluajit, libmodplug, libogg, libtheora, libvorbis, mpg123, openal-soft, opengl, sdl2, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-gme
 "
diff --git a/x11-packages/mate-session-manager/build.sh b/x11-packages/mate-session-manager/build.sh
index 7ada439555..56eeb07492 100644
--- a/x11-packages/mate-session-manager/build.sh
+++ b/x11-packages/mate-session-manager/build.sh
@@ -5,5 +5,5 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.26.0
 TERMUX_PKG_SRCURL=https://github.com/mate-desktop/mate-session-manager/releases/download/v$TERMUX_PKG_VERSION/mate-session-manager-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=5915a2f6583c0e5e58afb3abae3f4adbbe6a003c174a5b6e3d204b4e398a1816
-TERMUX_PKG_DEPENDS="dbus, dbus-glib, gdk-pixbuf, glib, gtk3, libcairo, libepoxy, libice, libsm, libx11, libxau, libxcomposite, libxext, libxrender, libxtst, mesa"
+TERMUX_PKG_DEPENDS="dbus, dbus-glib, gdk-pixbuf, glib, gtk3, libcairo, libepoxy, libice, libsm, libx11, libxau, libxcomposite, libxext, libxrender, libxtst, opengl"
 TERMUX_PKG_RM_AFTER_INSTALL="share/glib-2.0/schemas/gschemas.compiled"
diff --git a/x11-packages/mesa-demos/build.sh b/x11-packages/mesa-demos/build.sh
index bf92f4ab21..fa90ef5eb4 100644
--- a/x11-packages/mesa-demos/build.sh
+++ b/x11-packages/mesa-demos/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=8.5.0
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/demos/${TERMUX_PKG_VERSION}/mesa-demos-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1
-TERMUX_PKG_DEPENDS="freeglut, glu, libx11, libxext, mesa"
+TERMUX_PKG_DEPENDS="freeglut, glu, libx11, libxext, opengl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dlibdrm=disabled
 -Dwayland=disabled
diff --git a/x11-packages/mgba/build.sh b/x11-packages/mgba/build.sh
index 3fc6a06e61..cca3cceb11 100644
--- a/x11-packages/mgba/build.sh
+++ b/x11-packages/mgba/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION="0.10.1"
 TERMUX_PKG_SRCURL=https://github.com/mgba-emu/mgba/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=5fc1d7ac139fe51ef71782d5de12d11246563cdebd685354b6188fdc82a84bdf
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_DEPENDS="ffmpeg, libedit, libelf, liblua54, libpng, libsqlite, libzip, mesa, sdl2, zlib"
+TERMUX_PKG_DEPENDS="ffmpeg, libedit, libelf, liblua54, libpng, libsqlite, libzip, opengl, sdl2, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBUILD_GLES2=OFF
 -DBUILD_GLES3=OFF
diff --git a/x11-packages/opensubdiv/build.sh b/x11-packages/opensubdiv/build.sh
index 05c8176d73..a071f4f1b2 100644
--- a/x11-packages/opensubdiv/build.sh
+++ b/x11-packages/opensubdiv/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.5.0
 TERMUX_PKG_SRCURL=https://github.com/PixarAnimationStudios/OpenSubdiv/archive/refs/tags/v${TERMUX_PKG_VERSION//./_}.tar.gz
 TERMUX_PKG_SHA256=8f5044f453b94162755131f77c08069004f25306fd6dc2192b6d49889efb8095
-TERMUX_PKG_DEPENDS="libc++, libtbb, mesa"
+TERMUX_PKG_DEPENDS="libc++, libtbb, opengl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DNO_EXAMPLES=ON
 -DNO_TUTORIALS=ON
diff --git a/x11-packages/pcsx-rearmed/build.sh b/x11-packages/pcsx-rearmed/build.sh
index fdfd167637..9bc75b7150 100644
--- a/x11-packages/pcsx-rearmed/build.sh
+++ b/x11-packages/pcsx-rearmed/build.sh
@@ -7,8 +7,8 @@ TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=git+https://github.com/notaz/pcsx_rearmed
 TERMUX_PKG_GIT_BRANCH=r${TERMUX_PKG_VERSION}
 TERMUX_PKG_SHA256=887e9b5ee7b8115d35099c730372b4158fd3e215955a06d68e20928b339646af
-TERMUX_PKG_DEPENDS="libpng, mesa, pulseaudio, sdl, zlib"
-TERMUX_PKG_BUILD_DEPENDS="mesa-dev, binutils-cross"
+TERMUX_PKG_DEPENDS="libpng, opengl, pulseaudio, sdl, zlib"
+TERMUX_PKG_BUILD_DEPENDS="binutils-cross"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
diff --git a/x11-packages/picom/build.sh b/x11-packages/picom/build.sh
index 677ee82e0e..d0f67ccf60 100644
--- a/x11-packages/picom/build.sh
+++ b/x11-packages/picom/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_MAINTAINER="Rafael Kitover <rkitover@gmail.com>"
 TERMUX_PKG_VERSION=10.2
 TERMUX_PKG_SRCURL=https://github.com/yshui/picom/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=9741577df0136d8a2be48005ca2b93edc15913528e19bceb798535ca4683341c
-TERMUX_PKG_DEPENDS="dbus, libconfig, libev, libpixman, libx11, libxcb, mesa, pcre, xcb-util-image, xcb-util-renderutil"
+TERMUX_PKG_DEPENDS="dbus, libconfig, libev, libpixman, libx11, libxcb, opengl, pcre, xcb-util-image, xcb-util-renderutil"
 TERMUX_PKG_BUILD_DEPENDS="uthash, xorgproto"
 
 termux_step_pre_configure() {
diff --git a/x11-packages/pong2/build.sh b/x11-packages/pong2/build.sh
index 5d4c2f3aed..32799b9397 100644
--- a/x11-packages/pong2/build.sh
+++ b/x11-packages/pong2/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=0.1.3
 TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://download.sourceforge.net/pong2.berlios/pong2-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=7b3601b35a4f2d64e2a4e85b9d6ad2fe84a79d40a39be2909f3e52b094307639
-TERMUX_PKG_DEPENDS="glu, libc++, mesa, openssl, sdl, sdl-image"
+TERMUX_PKG_DEPENDS="glu, libc++, opengl, openssl, sdl, sdl-image"
 TERMUX_PKG_GROUPS="games"
 TERMUX_PKG_BUILD_IN_SRC=true
 
diff --git a/x11-packages/raylib/build.sh b/x11-packages/raylib/build.sh
index 8473edb562..aed50d7229 100644
--- a/x11-packages/raylib/build.sh
+++ b/x11-packages/raylib/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/raysan5/raylib/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=11f6087dc7bedf9efb3f69c0c872f637e421d914e5ecea99bbe7781f173dc38c
 TERMUX_PKG_DEPENDS="glfw"
-TERMUX_PKG_BUILD_DEPENDS="mesa"
+TERMUX_PKG_BUILD_DEPENDS="opengl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DPLATFORM=Desktop
 -DBUILD_EXAMPLES=OFF
diff --git a/x11-packages/sdl2-ttf/build.sh b/x11-packages/sdl2-ttf/build.sh
index 3c0631ddd9..e756dd6539 100644
--- a/x11-packages/sdl2-ttf/build.sh
+++ b/x11-packages/sdl2-ttf/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.20.1
 TERMUX_PKG_SRCURL=https://github.com/libsdl-org/SDL_ttf/releases/download/release-${TERMUX_PKG_VERSION}/SDL2_ttf-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=78cdad51f3cc3ada6932b1bb6e914b33798ab970a1e817763f22ddbfd97d0c57
-TERMUX_PKG_DEPENDS="freetype, mesa, sdl2"
+TERMUX_PKG_DEPENDS="freetype, opengl, sdl2"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-freetype-builtin
 --disable-harfbuzz
diff --git a/x11-packages/sdl2/build.sh b/x11-packages/sdl2/build.sh
index b74f35236d..e382b5bdcd 100644
--- a/x11-packages/sdl2/build.sh
+++ b/x11-packages/sdl2/build.sh
@@ -6,8 +6,8 @@ TERMUX_PKG_VERSION="2.26.2"
 TERMUX_PKG_SRCURL=https://www.libsdl.org/release/SDL2-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0
 TERMUX_PKG_DEPENDS="libx11, libxcursor, libxext, libxfixes, libxi, libxrandr, libxss, pulseaudio"
-TERMUX_PKG_BUILD_DEPENDS="mesa"
-TERMUX_PKG_RECOMMENDS="mesa"
+TERMUX_PKG_BUILD_DEPENDS="opengl"
+TERMUX_PKG_RECOMMENDS="opengl"
 TERMUX_PKG_CONFLICTS="libsdl2"
 TERMUX_PKG_REPLACES="libsdl2"
 
diff --git a/x11-packages/sfml/build.sh b/x11-packages/sfml/build.sh
index 89fd747b28..052cad44fd 100644
--- a/x11-packages/sfml/build.sh
+++ b/x11-packages/sfml/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=2.5.1
 TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/SFML/SFML/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=438c91a917cc8aa19e82c6f59f8714da353c488584a007d401efac8368e1c785
-TERMUX_PKG_DEPENDS="freetype, libc++, libflac, libogg, libvorbis, libx11, libxrandr, mesa, openal-soft"
+TERMUX_PKG_DEPENDS="freetype, libc++, libflac, libogg, libvorbis, libx11, libxrandr, openal-soft, opengl"
 
 termux_step_post_get_source() {
 	cp src/SFML/Window/Android/JoystickImpl.{cpp,hpp} src/SFML/Window/Unix/
diff --git a/x11-packages/tigervnc/build.sh b/x11-packages/tigervnc/build.sh
index 740037237e..0a3f031a1b 100644
--- a/x11-packages/tigervnc/build.sh
+++ b/x11-packages/tigervnc/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_SRCURL=(https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VE
 		   https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION[1]}.tar.xz)
 TERMUX_PKG_SHA256=(19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4
 		   1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484)
-TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libgnutls, libjpeg-turbo, libpixman, libx11, libxau, libxdamage, libxdmcp, libxext, libxfixes, libxfont2, mesa, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp, zlib"
+TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libgnutls, libjpeg-turbo, libpixman, libx11, libxau, libxdamage, libxdmcp, libxext, libxfixes, libxfont2, opengl, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp, zlib"
 TERMUX_PKG_BUILD_DEPENDS="xorg-font-util, xorg-server-xvfb, xorg-util-macros, xorgproto, xtrans"
 TERMUX_PKG_SUGGESTS="aterm, xorg-twm"
 
diff --git a/x11-packages/vlc-qt/build.sh b/x11-packages/vlc-qt/build.sh
index cd0c44a2ed..307c88d54b 100644
--- a/x11-packages/vlc-qt/build.sh
+++ b/x11-packages/vlc-qt/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=3.0.18
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://download.videolan.org/pub/videolan/vlc/${TERMUX_PKG_VERSION}/vlc-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec
-TERMUX_PKG_DEPENDS="avahi, chromaprint, dbus, ffmpeg, fluidsynth, fontconfig, freetype, fribidi, gdk-pixbuf, glib, gst-plugins-base, gstreamer, harfbuzz, liba52, libandroid-shmem, libandroid-spawn, libaom, libarchive, libass, libbluray, libc++, libcaca, libcairo, libcddb, libdav1d, libdvbpsi, libdvdnav, libdvdread, libebml, libflac, libgcrypt, libgnutls, libgpg-error, libice, libiconv, libidn, libjpeg-turbo, liblua52, libmad, libmatroska, libnfs, libogg, libopus, libpng, librsvg, libsecret, libsm, libsoxr, libssh2, libtheora, libtwolame, libvorbis, libvpx, libx11, libx264, libx265, libxcb, libxml2, mesa, mpg123, ncurses, pulseaudio, qt5-qtbase, qt5-qtsvg, qt5-qtx11extras, samba, taglib, xcb-util-keysyms, zlib"
+TERMUX_PKG_DEPENDS="avahi, chromaprint, dbus, ffmpeg, fluidsynth, fontconfig, freetype, fribidi, gdk-pixbuf, glib, gst-plugins-base, gstreamer, harfbuzz, liba52, libandroid-shmem, libandroid-spawn, libaom, libarchive, libass, libbluray, libc++, libcaca, libcairo, libcddb, libdav1d, libdvbpsi, libdvdnav, libdvdread, libebml, libflac, libgcrypt, libgnutls, libgpg-error, libice, libiconv, libidn, libjpeg-turbo, liblua52, libmad, libmatroska, libnfs, libogg, libopus, libpng, librsvg, libsecret, libsm, libsoxr, libssh2, libtheora, libtwolame, libvorbis, libvpx, libx11, libx264, libx265, libxcb, libxml2, mpg123, ncurses, opengl, pulseaudio, qt5-qtbase, qt5-qtsvg, qt5-qtx11extras, samba, taglib, xcb-util-keysyms, zlib"
 TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools, xorgproto"
 TERMUX_PKG_CONFLICTS="vlc"
 TERMUX_PKG_REPLACES="vlc"
diff --git a/x11-packages/wxwidgets/build.sh b/x11-packages/wxwidgets/build.sh
index cc06afe81b..ae1f6c1715 100644
--- a/x11-packages/wxwidgets/build.sh
+++ b/x11-packages/wxwidgets/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_VERSION=3.2.1
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/wxWidgets/wxWidgets/releases/download/v${TERMUX_PKG_VERSION}/wxWidgets-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=c229976bb413eb88e45cb5dfb68b27890d450149c09b331abd751e7ae0f5fa66
-TERMUX_PKG_DEPENDS="fontconfig, gdk-pixbuf, glib, glu, gtk3, libandroid-execinfo, libc++, libcairo, libcurl, libexpat, libiconv, libjpeg-turbo, libnotify, libpng, libsecret, libsm, libtiff, libx11, libxtst, libxxf86vm, mesa, pango, pcre2, sdl2, zlib"
+TERMUX_PKG_DEPENDS="fontconfig, gdk-pixbuf, glib, glu, gtk3, libandroid-execinfo, libc++, libcairo, libcurl, libexpat, libiconv, libjpeg-turbo, libnotify, libpng, libsecret, libsm, libtiff, libx11, libxtst, libxxf86vm, opengl, pango, pcre2, sdl2, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-option-checking
 --disable-mediactrl
diff --git a/x11-packages/xfce4-screensaver/build.sh b/x11-packages/xfce4-screensaver/build.sh
index 8d0c82d184..4e71e23b90 100644
--- a/x11-packages/xfce4-screensaver/build.sh
+++ b/x11-packages/xfce4-screensaver/build.sh
@@ -7,6 +7,6 @@ TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
 TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://archive.xfce.org/src/apps/xfce4-screensaver/${_MAJOR_VERSION}/xfce4-screensaver-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=6d4d143e3e62db679ce83ce7da97903390773ee0a8ceb05ff4c3dac36616268d
-TERMUX_PKG_DEPENDS="dbus, dbus-glib, garcon, gdk-pixbuf, glib, gtk3, libcairo, libwnck, libx11, libxext, libxfce4ui, libxklavier, libxss, mesa, pango, termux-auth, xfconf"
+TERMUX_PKG_DEPENDS="dbus, dbus-glib, garcon, gdk-pixbuf, glib, gtk3, libcairo, libwnck, libx11, libxext, libxfce4ui, libxklavier, libxss, opengl, pango, termux-auth, xfconf"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-locking --sysconfdir=$TERMUX_PREFIX/etc"
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/x11-packages/xorg-server-xvfb/build.sh b/x11-packages/xorg-server-xvfb/build.sh
index a62aad4421..313162cdbc 100644
--- a/x11-packages/xorg-server-xvfb/build.sh
+++ b/x11-packages/xorg-server-xvfb/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=21.1.6
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484
 
-TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-protocol-txt, xorg-xkbcomp"
+TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, opengl, openssl, xkeyboard-config, xorg-protocol-txt, xorg-xkbcomp"
 TERMUX_PKG_CONFLICTS="xorg-xvfb"
 TERMUX_PKG_REPLACES="xorg-xvfb"
 
diff --git a/x11-packages/xorg-server/build.sh b/x11-packages/xorg-server/build.sh
index e1a57786ac..2b373f8e8c 100644
--- a/x11-packages/xorg-server/build.sh
+++ b/x11-packages/xorg-server/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=21.1.6
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484
-TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libglvnd, libpciaccess, libpixman, libx11, libxau, libxcvt, libxfont2, libxinerama, libxkbfile, libxshmfence, openssl, xkeyboard-config, xorg-protocol-txt, xorg-xkbcomp"
+TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpciaccess, libpixman, libx11, libxau, libxcvt, libxfont2, libxinerama, libxkbfile, libxshmfence, opengl, openssl, xkeyboard-config, xorg-protocol-txt, xorg-xkbcomp"
 
 # Provided by xorg-protocol-txt (subpackage of xorg-server-xvfb):
 TERMUX_PKG_RM_AFTER_INSTALL="lib/xorg/protocol.txt"
diff --git a/x11-packages/xwayland/build.sh b/x11-packages/xwayland/build.sh
index 49b340ea5b..6ca276bf1e 100644
--- a/x11-packages/xwayland/build.sh
+++ b/x11-packages/xwayland/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=1.20.5
 TERMUX_PKG_REVISION=16
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d
-TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpciaccess, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp, libwayland, libwayland-protocols, libepoxy"
+TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpciaccess, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, opengl, openssl, xkeyboard-config, xorg-xkbcomp, libwayland, libwayland-protocols, libepoxy"
 TERMUX_PKG_BUILD_DEPENDS="libwayland-cross-scanner"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="