diff --git a/extra/mesa/.SRCINFO b/extra/mesa/.SRCINFO
index c21873867..71fcfaf57 100644
--- a/extra/mesa/.SRCINFO
+++ b/extra/mesa/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa
 	pkgdesc = Open-source OpenGL drivers
-	pkgver = 24.2.6
+	pkgver = 24.2.7
 	pkgrel = 1
 	epoch = 1
 	url = https://www.mesa3d.org/
@@ -55,8 +55,8 @@ pkgbase = mesa
 	makedepends = python-sphinx
 	makedepends = python-sphinx-hawkmoth
 	options = !lto
-	source = https://mesa.freedesktop.org/archive/mesa-24.2.6.tar.xz
-	source = https://mesa.freedesktop.org/archive/mesa-24.2.6.tar.xz.sig
+	source = https://mesa.freedesktop.org/archive/mesa-24.2.7.tar.xz
+	source = https://mesa.freedesktop.org/archive/mesa-24.2.7.tar.xz.sig
 	source = ucd-trie-0.1.6.tar.gz::https://crates.io/api/v1/crates/ucd-trie/0.1.6/download
 	source = pest_meta-2.7.11.tar.gz::https://crates.io/api/v1/crates/pest_meta/2.7.11/download
 	source = indexmap-2.2.6.tar.gz::https://crates.io/api/v1/crates/indexmap/2.2.6/download
@@ -78,7 +78,7 @@ pkgbase = mesa
 	validpgpkeys = 57551DE15B968F6341C248F68D8E31AFC32428A6
 	validpgpkeys = A5CC9FEC93F2F837CB044912336909B6B25FADFA
 	validpgpkeys = E3E8F480C52ADD73B278EE78E1ECBE07D7D70895
-	sha256sums = 2b68c4a6f204c1999815a457299f81c41ba7bf48c4674b0b2d1d8864f41f3709
+	sha256sums = a0ce37228679647268a83b3652d859dcf23d6f6430d751489d4464f6de6459fd
 	sha256sums = SKIP
 	sha256sums = ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9
 	sha256sums = a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f
@@ -95,7 +95,7 @@ pkgbase = mesa
 	sha256sums = 3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183
 	sha256sums = 692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56
 	sha256sums = 901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9
-	b2sums = e49fc85c8a61315d86b253b7dd8052a1e46ea99d5188cf930c833317898c51b7b413286f57a53af3c2b1bb147ce2541ea80279ee9e237deeb499729bb7fd8381
+	b2sums = eb1b0285e14e77c3140275b322ff084fca74a1048e6df38f4b14cb03ed7fc436897f7b33d107d1e262d9d4944229fb1e85d02e731c645ead5a7b269dec9334b7
 	b2sums = SKIP
 	b2sums = a6d47c903be6094423d89b8ec3ca899d0a84df6dbd6e76632bb6c9b9f40ad9c216f8fa400310753d392f85072756b43ac3892e0a2c4d55f87ab6463002554823
 	b2sums = 9c34f1ab14ad5ae124882513e0f14b1d731d06a43203bdc37fa3b202dd3ce93dbe8ebb554d01bab475689fe6ffd3ec0cbc0d5365c9b984cb83fb34ea3e9e732e
@@ -133,40 +133,18 @@ pkgname = mesa
 	depends = zstd
 	depends = libomxil-bellagio
 	optdepends = opengl-man-pages: for the OpenGL API man pages
-	provides = mesa-libgl
-	provides = opengl-driver
-	conflicts = mesa-libgl
-	replaces = mesa-libgl
-
-pkgname = libva-mesa-driver
-	pkgdesc = Open-source VA-API drivers
-	depends = expat
-	depends = gcc-libs
-	depends = glibc
-	depends = libdrm
-	depends = libelf
-	depends = libx11
-	depends = libxcb
-	depends = libxshmfence
-	depends = llvm-libs
-	depends = zlib
-	depends = zstd
+	provides = libva-mesa-driver=1:24.2.7-1
+	provides = mesa-libgl=1:24.2.7-1
+	provides = mesa-vdpau=1:24.2.7-1
 	provides = libva-driver
-
-pkgname = mesa-vdpau
-	pkgdesc = Open-source VDPAU drivers
-	depends = expat
-	depends = gcc-libs
-	depends = glibc
-	depends = libdrm
-	depends = libelf
-	depends = libx11
-	depends = libxcb
-	depends = libxshmfence
-	depends = llvm-libs
-	depends = zlib
-	depends = zstd
+	provides = opengl-driver
 	provides = vdpau-driver
+	conflicts = libva-mesa-driver<1:24.2.7-1
+	conflicts = mesa-libgl<17.0.1-2
+	conflicts = mesa-vdpau<1:24.2.7-1
+	replaces = libva-mesa-driver<1:24.2.7-1
+	replaces = mesa-libgl<17.0.1-2
+	replaces = mesa-vdpau<1:24.2.7-1
 
 pkgname = opencl-clover-mesa
 	pkgdesc = Open-source OpenCL drivers - Clover variant
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 91f636c82..e618b012e 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -17,8 +17,6 @@ highmem=1
 pkgbase=mesa
 pkgname=(
   mesa
-  libva-mesa-driver
-  mesa-vdpau
   opencl-clover-mesa
   opencl-rusticl-mesa
   vulkan-mesa-layers
@@ -31,7 +29,7 @@ pkgname=(
   vulkan-freedreno
   mesa-docs
 )
-pkgver=24.2.6
+pkgver=24.2.7
 pkgrel=1
 epoch=1
 pkgdesc="Open-source OpenGL drivers"
@@ -146,7 +144,7 @@ for _crate in "${!_crates[@]}"; do
   )
 done
 
-b2sums=('e49fc85c8a61315d86b253b7dd8052a1e46ea99d5188cf930c833317898c51b7b413286f57a53af3c2b1bb147ce2541ea80279ee9e237deeb499729bb7fd8381'
+b2sums=('eb1b0285e14e77c3140275b322ff084fca74a1048e6df38f4b14cb03ed7fc436897f7b33d107d1e262d9d4944229fb1e85d02e731c645ead5a7b269dec9334b7'
         'SKIP'
         'a6d47c903be6094423d89b8ec3ca899d0a84df6dbd6e76632bb6c9b9f40ad9c216f8fa400310753d392f85072756b43ac3892e0a2c4d55f87ab6463002554823'
         '9c34f1ab14ad5ae124882513e0f14b1d731d06a43203bdc37fa3b202dd3ce93dbe8ebb554d01bab475689fe6ffd3ec0cbc0d5365c9b984cb83fb34ea3e9e732e'
@@ -165,7 +163,7 @@ b2sums=('e49fc85c8a61315d86b253b7dd8052a1e46ea99d5188cf930c833317898c51b7b413286
         '8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975')
 
 # https://docs.mesa3d.org/relnotes.html
-sha256sums=('2b68c4a6f204c1999815a457299f81c41ba7bf48c4674b0b2d1d8864f41f3709'
+sha256sums=('a0ce37228679647268a83b3652d859dcf23d6f6430d751489d4464f6de6459fd'
             'SKIP'
             'ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9'
             'a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f'
@@ -274,11 +272,23 @@ package_mesa() {
   )
   optdepends=("opengl-man-pages: for the OpenGL API man pages")
   provides=(
-    mesa-libgl
+    "libva-mesa-driver=$epoch:$pkgver-$pkgrel"
+    "mesa-libgl=$epoch:$pkgver-$pkgrel"
+    "mesa-vdpau=$epoch:$pkgver-$pkgrel"
+    libva-driver
     opengl-driver
+    vdpau-driver
+  )
+  conflicts=(
+    'libva-mesa-driver<1:24.2.7-1'
+    'mesa-libgl<17.0.1-2'
+    'mesa-vdpau<1:24.2.7-1'
+  )
+  replaces=(
+    'libva-mesa-driver<1:24.2.7-1'
+    'mesa-libgl<17.0.1-2'
+    'mesa-vdpau<1:24.2.7-1'
   )
-  conflicts=(mesa-libgl)
-  replaces=(mesa-libgl)
 
   meson install -C build --destdir "$pkgdir"
 
@@ -287,10 +297,6 @@ package_mesa() {
 
     cd "$pkgdir"
 
-    _pick libva $libdir/dri/*_drv_video.so
-
-    _pick vdpau $libdir/vdpau
-
     _pick clover $libdir/gallium-pipe
     _pick clover $libdir/libMesaOpenCL*
     _pick clover etc/OpenCL/vendors/mesa.icd
@@ -333,50 +339,6 @@ package_mesa() {
   install -Dm644 mesa-$pkgver/docs/license.rst -t "$pkgdir/usr/share/licenses/$pkgname"
 }
 
-package_libva-mesa-driver() {
-  pkgdesc="Open-source VA-API drivers"
-  depends=(
-    expat
-    gcc-libs
-    glibc
-    libdrm
-    libelf
-    libx11
-    libxcb
-    libxshmfence
-    llvm-libs
-    zlib
-    zstd
-  )
-  provides=(libva-driver)
-
-  mv libva/* "$pkgdir"
-
-  install -Dm644 mesa-$pkgver/docs/license.rst -t "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-package_mesa-vdpau() {
-  pkgdesc="Open-source VDPAU drivers"
-  depends=(
-    expat
-    gcc-libs
-    glibc
-    libdrm
-    libelf
-    libx11
-    libxcb
-    libxshmfence
-    llvm-libs
-    zlib
-    zstd
-  )
-  provides=(vdpau-driver)
-
-  mv vdpau/* "$pkgdir"
-
-  install -Dm644 mesa-$pkgver/docs/license.rst -t "$pkgdir/usr/share/licenses/$pkgname"
-}
-
 package_opencl-clover-mesa() {
   pkgdesc="Open-source OpenCL drivers - Clover variant"
   depends=(