mesa: renamed from libGL; switch to glvnd by default.

Based on work by Stefano Ragni on #16497

Tested on x86_64-musl with and without elogind, as well
as with or without root rights on intel.

srcpkgs/MesaLib-devel

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/libEGL

@@ -1 +0,0 @@
-libGL

srcpkgs/libGLES

@@ -1 +0,0 @@
-libGL

srcpkgs/libOSMesa

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/libgbm

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/libglapi

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/libxatracker

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/mesa-ati-dri

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/mesa-intel-dri

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/mesa-nouveau-dri

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/mesa-opencl

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/mesa-tegra-dri

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/mesa-vc4-dri

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/mesa-vmwgfx-dri

@@ -1 +1 @@
-libGL
+mesa

srcpkgs/mesa/template

@@ -1,10 +1,10 @@
-# Template file for 'libGL'
-pkgname=libGL
+# Template file for 'mesa'
+pkgname=mesa
 version=19.2.5
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
-configure_args="-Dshared-glapi=true -Dgbm=true -Degl=true
+configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
  -Dgallium-vdpau=true -Dgallium-xvmc=true -Dosmesa=gallium
  -Dgles1=true -Dgles2=true -Dgallium-va=true -Dlmsensors=true
  -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless -Dllvm=true
@@ -15,7 +15,8 @@ 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-devel wayland-protocols') llvm
- libsensors-devel libXrandr-devel"
+ libsensors-devel libXrandr-devel libglvnd-devel"
+depends="libglvnd"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, LGPL-2.1-or-later"
@@ -28,7 +29,10 @@ build_options="wayland"
 build_options_default="wayland"
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
-subpackages="libglapi libgbm libEGL libGLES libOSMesa"
+subpackages="libglapi libgbm libOSMesa"
+
+# Replace old mesa pkgs, superseded by libglvnd.
+replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 
 case "$XBPS_TARGET_MACHINE" in
 i686*|x86_64*)
@@ -99,6 +103,7 @@ esac
 
 case "$XBPS_TARGET_MACHINE" in
 	# Disable TLS with musl: https://bugs.freedesktop.org/show_bug.cgi?id=35268
+	# TODO: maybe this is handled by libglvnd now
 	*-musl) configure_args+=" -Duse-elf-tls=false";;
 	*) configure_args+=" -Dglx=dri";;
 esac
@@ -115,8 +120,6 @@ post_configure() {
 
 post_install() {
 	vlicense docs/license.html
-	vmkdir usr/lib/xorg/modules/extensions
-	ln -s libglx-xorg.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so
 	case "$XBPS_TARGET_MACHINE" in
 		i686*)
 			vsed -e 's#/usr/lib/#/usr/lib32/#g' \
@@ -140,20 +143,6 @@ libgbm_package() {
 	}
 }
 
-libEGL_package() {
-	short_desc="Free implementation of the EGL API - runtime"
-	pkg_install() {
-		vmove "usr/lib/libEGL*.so.*"
-	}
-}
-
-libGLES_package() {
-	short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API"
-	pkg_install() {
-		vmove "usr/lib/libGLES*.so.*"
-	}
-}
-
 libOSMesa_package() {
 	short_desc="Mesa Off-Screen interface library"
 	pkg_install() {
@@ -164,9 +153,8 @@ libOSMesa_package() {
 MesaLib-devel_package() {
 	depends="xorgproto libxshmfence-devel libXext-devel libXxf86vm-devel
 	 libXdamage-devel expat-devel libXfixes-devel libX11-devel libxcb-devel
-	 libdrm-devel libGL>=${version}_${revision} libEGL>=${version}_${revision}
-	 libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
-	 libGLES>=${version}_${revision}"
+	 libdrm-devel libglvnd-devel
+	 libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}"
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*)  depends+=" libxatracker>=${version}_${revision}";;
 	esac
@@ -187,6 +175,7 @@ libxatracker_package() {
 
 mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs"
+	depends="mesa-${version}_${revision}"
 	lib32files="/usr/share/vulkan/icd.d/radeon_icd.i686.json"
 	pkg_install() {
 		vmove "usr/lib/libXvMCr[36]00.so.*"
@@ -204,6 +193,7 @@ mesa-ati-dri_package() {
 
 mesa-intel-dri_package() {
 	short_desc="Mesa DRI drivers for Intel GPUs"
+	depends="mesa-${version}_${revision}"
 	lib32files="/usr/share/vulkan/icd.d/intel_icd.i686.json"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.*"
@@ -214,6 +204,7 @@ mesa-intel-dri_package() {
 
 mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)"
+	depends="mesa-${version}_${revision}"
 	pkg_install() {
 		vmove "usr/lib/libXvMCnouveau.so.*"
 		vmove "usr/lib/vdpau/libvdpau_nouveau.so*"
@@ -228,6 +219,7 @@ mesa-nouveau-dri_package() {
 
 mesa-vmwgfx-dri_package() {
 	short_desc="Mesa DRI drivers for VMware"
+	depends="mesa-${version}_${revision}"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/vmwgfx*"
 		vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
@@ -236,6 +228,7 @@ mesa-vmwgfx-dri_package() {
 
 mesa-vc4-dri_package() {
 	short_desc="Mesa DRI drivers for Videocore IV GPU"
+	depends="mesa-${version}_${revision}"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/vc4*"
 	}
@@ -243,7 +236,7 @@ mesa-vc4-dri_package() {
 
 mesa-opencl_package() {
 	short_desc="Mesa implementation of OpenCL (r600+ only)"
-	depends="libclc libOpenCL"
+	depends="libclc libOpenCL mesa-${version}_${revision}"
 	pkg_install() {
 		vmove etc/OpenCL
 		vmove "usr/lib/libMesaOpenCL*"
@@ -252,7 +245,7 @@ mesa-opencl_package() {
 
 mesa-tegra-dri_package() {
 	short_desc="Mesa DRI drivers for Tegra GPU"
-	depends="mesa-nouveau-dri"
+	depends="mesa-nouveau-dri-${version}_${revision}"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/tegra*"
 	}