Go back to using xlib for GLX instead of DRI

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

@@ -18,10 +18,11 @@ dependencies = [
 ]
 script = """
 DYNAMIC_INIT
+#TODO: use glx=dri
 cookbook_meson \
     -Ddri-drivers-path=/usr/lib/dri \
     -Degl=disabled \
-    -Dglx=dri \
+    -Dglx=xlib \
     -Dllvm=enabled \
     -Dplatforms=x11 \
     -Dshader-cache=disabled

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

@@ -21,7 +21,7 @@ dependencies = [
     "libxfont2",
     "libxkbfile",
     "libxxf86vm",
-    "mesa-x11",
+    #TODO: used for glx, which is currently broken: "mesa-x11",
     "openssl1",
     "pixman",
     "x11proto",
@@ -33,6 +33,7 @@ script = """
 DYNAMIC_INIT
 cookbook_meson \
     -Dglamor=false \
+    -Dglx=false \
     -Dint10=false \
     -Dpciaccess=false \
     -Dsecure-rpc=false \