diff --git a/dev/python/mako/ympbuild b/dev/python/py3-mako/ympbuild
similarity index 93%
rename from dev/python/mako/ympbuild
rename to dev/python/py3-mako/ympbuild
index a79b62d8..ac6b3847 100644
--- a/dev/python/mako/ympbuild
+++ b/dev/python/py3-mako/ympbuild
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-name='mako'
+name='py3-mako'
 release='1'
 version='1.2.4'
 url='https://pypi.org/project/Mako/'
@@ -8,7 +8,7 @@ email='parduscix@yandex.ru'
 maintainer='sulincix'
 license=('GPLv3')
 source=('https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e/Mako-1.2.4.tar.gz')
-depends=()
+depends=(python py3-markupsafe)
 makedepends=()
 md5sums=('651f365616611fcd4f2702a9002e2195')
 group=(dev.python)
diff --git a/dev/python/py3-markupsafe/ympbuild b/dev/python/py3-markupsafe/ympbuild
new file mode 100644
index 00000000..c3eb7b89
--- /dev/null
+++ b/dev/python/py3-markupsafe/ympbuild
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+name='py3-markupsafe'
+release='1'
+version='2.1.2'
+url='https://example.org'
+description='https://pypi.org/project/MarkupSafe'
+email='aliriza.keskin@pardus.org.tr'
+maintainer='aliriza'
+license=('GPLv3')
+source=('https://files.pythonhosted.org/packages/95/7e/68018b70268fb4a2a605e2be44ab7b4dd7ce7808adae6c5ef32e34f4b55a/MarkupSafe-2.1.2.tar.gz')
+depends=(python)
+makedepends=()
+md5sums=('02f337b98aef11bd0fee9c5ae860173b')
+group=()
+uses=()
+arch=('x86_64')
+
+cd MarkupSafe-$version
+
+build(){
+    python3 setup.py build
+}
+
+package(){
+    python3 setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build
+}
+
diff --git a/media/libs/libglvnd/ympbuild b/media/libs/libglvnd/ympbuild
new file mode 100644
index 00000000..d3713606
--- /dev/null
+++ b/media/libs/libglvnd/ympbuild
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+name='libglvnd'
+release='1'
+version='1.6.0'
+url='https://gitlab.freedesktop.org/glvnd/libglvnd'
+description='The GL Vendor-Neutral Dispatch library'
+email='aliriza.keskin@pardus.org.tr'
+maintainer='aliriza'
+license=('GPLv3')
+source=("https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$version/libglvnd-v$version.tar.gz")
+depends=(libXext)
+makedepends=()
+md5sums=('239b1799a2fb82ffe0902b6b7afd469b')
+group=()
+uses=()
+arch=('x86_64')
+
+cd $name-v$version
+
+setup(){
+    meson setup build --prefix=/usr \
+        --libdir=/usr/lib64/
+}
+
+build(){
+    ninja -C build
+}
+
+package(){
+    ninja -C build install
+}
+
diff --git a/media/libs/mesa/ympbuild b/media/libs/mesa/ympbuild
index db280dda..40597aa6 100644
--- a/media/libs/mesa/ympbuild
+++ b/media/libs/mesa/ympbuild
@@ -14,6 +14,7 @@ md5sums=('ed193340000a3f32946d490ea53aaddd')
 group=(media.libs)
 uses=(wayland x11)
 wayland_depends=(wayland wayland-protocols)
+x11_depends=(libxshmfence libXxf86vm)
 arch=('x86_64')
 
 cd $name-$name-$version
@@ -39,18 +40,14 @@ setup(){
         -D gles2=enabled \
         -D glvnd=true \
         -D glx=dri \
-        -D libunwind=enabled \
         -D llvm=enabled \
-        -D lmsensors=enabled \
         -D osmesa=true \
         -D shared-glapi=enabled \
         -D microsoft-clc=disabled \
         -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \
-        -D valgrind=disabled
-        -D gallium-omx=bellagio \
-        -D gallium-rusticl=true \
-        -D rust_std=2021 \
-        -Dzstd=false \
+        -D valgrind=disabled \
+        -D lmsensors=disabled \
+        -Dzstd=false
 
 }