Merge libxkbcommon and disable gles on mesa-x11

recipes/wip/libs/gnome/libepoxy/recipe.toml

@@ -13,7 +13,7 @@ dependencies = [
     "libxext",
     "libxfixes",
     "libxxf86vm",
-    "mesa-x11",
+    "mesa",
     "x11proto",
     "zlib",
 ]
@@ -21,6 +21,6 @@ script = """
 DYNAMIC_INIT
 cookbook_meson \
     -Degl=yes \
-    -Dglx=yes \
+    -Dglx=no \
     -Dtests=false
 """

recipes/wip/libs/other/libxkbcommon/recipe.toml

@@ -2,15 +2,25 @@
 [source]
 tar = "https://xkbcommon.org/download/libxkbcommon-1.7.0.tar.xz"
 blake3 = "5001ca0b8562feeef2010bf16c05657e3875fda3ed5fdedbf48b9135e5cdfcbc"
+patches = [
+    "redox.patch"
+]
 
 [build]
-template = "meson"
-mesonflags = [
-    "-Denable-wayland=false",
-    "-Denable-x11=false"
-]
+template = "custom"
 dependencies = [
     "libxml2",
     "xz",
     "zlib",
+    "libpthread-stubs",
+    "libxau",
+    "x11proto",
+    "xcb-proto",
+    "libxcb",
 ]
+script = """
+DYNAMIC_INIT
+cookbook_meson \
+    -Denable-wayland=false \
+    -Denable-x11=true
+"""

recipes/wip/libs/other/libxkbcommon/redox.patch

@@ -1,4 +1,4 @@
-diff --color -ruwN source/meson.build source-new/meson.build
+diff -ruwN source/meson.build source-new/meson.build
 --- source/meson.build	2024-03-24 04:23:43.000000000 +0700
 +++ source-new/meson.build	2025-10-29 10:55:30.355297899 +0700
 @@ -637,8 +637,6 @@
@@ -31,7 +31,7 @@ diff --color -ruwN source/meson.build source-new/meson.build
  if get_option('enable-xkbregistry')
      test(
          'registry',
-diff --color -ruwN source/src/x11/util.c source-new/src/x11/util.c
+diff -ruwN source/src/x11/util.c source-new/src/x11/util.c
 --- source/src/x11/util.c	2024-03-24 04:23:43.000000000 +0700
 +++ source-new/src/x11/util.c	2025-10-29 15:03:58.879274347 +0700
 @@ -39,7 +39,7 @@

recipes/wip/net/onion-routing/tor-browser/recipe.toml

@@ -15,7 +15,7 @@ dependencies = [
     # "glib",
     "gtk3",
     "pango",
-    "libxkbcommon-x11",
+    "libxkbcommon",
     "libice",
     "mesa-x11",
     "x11proto-kb",

recipes/wip/web/firefox-esr/recipe.toml

@@ -17,7 +17,7 @@ dependencies = [
     # "glib",
     "gtk3",
     "pango",
-    "libxkbcommon-x11",
+    "libxkbcommon",
     "libice",
     "mesa-x11",
     "x11proto-kb",

recipes/wip/web/firefox/recipe.toml

@@ -13,7 +13,7 @@ dependencies = [
     "freetype2",
     "gtk3",
     "pango",
-    "libxkbcommon-x11",
+    "libxkbcommon",
     "libice",
     "mesa-x11",
     "nspr",

recipes/wip/x11/i3/i3/recipe.toml

@@ -7,7 +7,7 @@ blake3 = "3b54ed52759339e545a7a5f602946abc0164c37eb801e79c0cb40f93dbae53d2"
 dependencies = [
     "cairo",
     "libev",
-    "libxkbcommon-x11",
+    "libxkbcommon",
     "pango",
     "pcre2",
     "startup-notification",

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

@@ -1,25 +0,0 @@
-# TODO: Conflict with libxkbcommon-x11
-# TODO: Keyboard not working, see patches
-[source]
-tar = "https://xkbcommon.org/download/libxkbcommon-1.7.0.tar.xz"
-blake3 = "5001ca0b8562feeef2010bf16c05657e3875fda3ed5fdedbf48b9135e5cdfcbc"
-patches = [ "redox.patch" ]
-
-[build]
-template = "custom"
-dependencies = [
-    "libxml2",
-    "xz",
-    "zlib",
-    "libpthread-stubs",
-    "libxau",
-    "x11proto",
-    "xcb-proto",
-    "libxcb",
-]
-script = """
-DYNAMIC_INIT
-cookbook_meson \
-    -Denable-wayland=false \
-    -Denable-x11=true
-"""

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

@@ -24,9 +24,11 @@ script = """
 DYNAMIC_INIT
 cookbook_meson \
     -Ddri-drivers-path=/usr/lib/dri \
-    -Degl=enabled \
+    -Degl=disabled \
     -Dglx=dri \
     -Dllvm=enabled \
+    -Dgles1=disabled \
+    -Dgles2=disabled \
     -Dplatforms=x11 \
     -Dshader-cache=disabled
 """