diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template
index 39d4eb5026..fd457172c4 100644
--- a/srcpkgs/libGL/template
+++ b/srcpkgs/libGL/template
@@ -1,27 +1,27 @@
 # Template build file for 'libGL'.
 pkgname=libGL
-version=10.4.5
+version=10.5.0
 revision=1
-wrksrc="Mesa-${version}"
+wrksrc="mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
  --enable-gles1 --enable-gles2 --enable-egl --enable-vdpau
- --disable-gallium-egl --enable-xvmc --enable-osmesa --enable-texture-float
+ --enable-xvmc --enable-osmesa --enable-texture-float
  --with-egl-platforms=x11,drm,wayland"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mesa3d.org/"
 license="MIT, LGPL-2.1"
-distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"
-checksum=bf60000700a9d58e3aca2bfeee7e781053b0d839e61a95b1883e05a2dee247a0
+distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
+checksum=d7ca9f9044bbdd674377e3eebceef1fae339c8817b9aa435c2053e4fea44e5d3
 
 hostmakedepends="
- automake libtool flex pkg-config llvm libxml2-python wayland-devel"
+ automake libtool flex pkg-config llvm python-Mako libxml2-python wayland-devel"
 makedepends="
  glproto dri2proto>=2.1 dri3proto presentproto libXext-devel libXxf86vm-devel
  libudev-devel libdrm-devel expat-devel talloc-devel libvdpau-devel libva-devel
  libXdamage-devel libXvMC-devel>=1.0.6 libxshmfence-devel wayland-devel
- elfutils-devel ncurses-devel zlib-devel libffi-devel"
+ elfutils-devel ncurses-devel zlib-devel libffi-devel libressl-devel"
 conf_files="/etc/drirc"
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
@@ -63,8 +63,8 @@ esac
 
 
 pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
 	libtoolize -f
+	NOCONFIGURE=1 ./autogen.sh
 }
 
 post_install() {
@@ -153,6 +153,7 @@ mesa-ati-dri_package() {
 		vmove "usr/lib/xorg/modules/drivers/r[236]00*"
 		vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
 		vmove usr/lib/gallium-pipe/pipe_radeonsi.so
+		vmove usr/lib/dri/r*
 	}
 }
 mesa-intel-dri_package() {
@@ -168,6 +169,7 @@ mesa-nouveau-dri_package() {
 		vmove "usr/lib/vdpau/libvdpau_nouveau.so*"
 		vmove "usr/lib/xorg/modules/drivers/nouveau*"
 		vmove usr/lib/gallium-pipe/pipe_nouveau.so
+		vmove usr/lib/dri/nouveau*
 	}
 }
 mesa-vmwgfx-dri_package() {
@@ -175,6 +177,7 @@ mesa-vmwgfx-dri_package() {
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/vmwgfx*"
 		vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
+		vmove usr/lib/dri/svga*
 	}
 }
 mesa-vc4-dri_package() {