Do not use glvnd (it complicates things)

recipes/wip/x11/mesa-glu-x11/recipe.toml

@@ -4,7 +4,6 @@ blake3 = "beed1665ed983540e7502289ec50c7e66d840820af3e9ef21c9c4a7e9686ab9f"
 
 [build]
 dependencies = [
-    "libglvnd",
     "libpthread-stubs",
     "libx11",
     "libxau",
@@ -16,5 +15,5 @@ dependencies = [
 template = "custom"
 script = """
 DYNAMIC_INIT
-cookbook_meson -Dgl_provider=glvnd
+cookbook_meson -Dgl_provider=gl
 """

recipes/wip/x11/mesa-x11/recipe.toml

@@ -5,7 +5,6 @@ same_as = "../../../libs/mesa"
 template = "custom"
 dependencies = [
     "expat",
-    "libglvnd",
     "libpthread-stubs",
     "libx11",
     "libxau",
@@ -18,7 +17,6 @@ dependencies = [
 script = """
 DYNAMIC_INIT
 cookbook_meson \
-    -Dglvnd=true \
     -Dglx=xlib \
     -Dllvm=enabled \
     -Dplatforms=x11 \

recipes/wip/x11/xserver-xorg/recipe.toml

@@ -8,7 +8,6 @@ dependencies = [
     "font-util",
     "freetype2",
     "libfontenc",
-    "libglvnd",
     "libpng",
     "libpthread-stubs",
     #TODO: used for secure-rpc, needs syslog: "libtirpc",
@@ -20,6 +19,7 @@ dependencies = [
     "libxext",
     "libxfont2",
     "libxkbfile",
+    "mesa-x11",
     "openssl1",
     "pixman",
     "x11proto",