diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template
index 7f135a08e8f..1ce10ce3ecd 100644
--- a/srcpkgs/libGL/template
+++ b/srcpkgs/libGL/template
@@ -1,35 +1,28 @@
 # Template file for 'libGL'
 pkgname=libGL
-version=18.1.3
+version=18.1.4
 revision=1
 wrksrc="mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-shared-glapi --enable-gbm
  --enable-egl --enable-vdpau --enable-xvmc --enable-osmesa
  --enable-texture-float --enable-gles1 --enable-gles2
- --with-platforms=x11,drm,$(vopt_if wayland wayland)"
+ --with-platforms=x11,drm"
 hostmakedepends="automake flex libtool libxml2-python llvm pkg-config
- python-Mako $(vopt_if wayland 'wayland-protocols wayland-devel')"
+ python-Mako"
 makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
- libvdpau-devel libxshmfence-devel ncurses-devel talloc-devel zlib-devel
- $(vopt_if wayland 'wayland-protocols wayland-devel')"
+ libvdpau-devel libxshmfence-devel ncurses-devel talloc-devel zlib-devel"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=54f08deeda0cd2f818e8d40140040ed013de7852573002453b7f50da9ea738ce
+checksum=3061488b5d85504092cf4343816cfb2d96f2ad9bc2edec31fc96933d184cf58b
 conf_files="/etc/drirc"
 
-# Package build options
-build_options="wayland"
-
-# Enable all options by default.
-build_options_default="wayland"
-
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="libglapi libgbm libEGL libGLES libOSMesa $(vopt_if wayland libwayland-egl)"
+subpackages="libglapi libgbm libEGL libGLES libOSMesa libwayland-egl"
 
 case "$XBPS_TARGET_MACHINE" in
 i686*|x86_64*)
@@ -144,10 +137,10 @@ libOSMesa_package() {
 }
 
 libwayland-egl_package() {
-	short_desc="Free implementation of the EGL API - wayland runtime"
-	pkg_install() {
-		vmove "usr/lib/libwayland-egl.so*"
-	}
+	short_desc="Wayland EGL api transitional dummy package"
+	depends="wayland>=1.15.0_4"
+	build_style=meta
+	noarch=yes
 }
 
 MesaLib-devel_package() {
@@ -155,7 +148,7 @@ MesaLib-devel_package() {
 	 libXdamage-devel expat-devel libXfixes-devel libX11-devel libxcb-devel
 	 libdrm-devel libGL>=${version}_${revision} libEGL>=${version}_${revision}
 	 libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
-	 $(vopt_if wayland "libwayland-egl>=${version}_${revision}")"
+	 libGLES>=${version}_${revision}"
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*)  depends+=" libxatracker>=${version}_${revision}";;
 	esac