the modules carry the organization that owns the protocol

wayland.client / .server / .util become freedesktop.wayland.client / .server /
.util. A module name is global and permanent in a way a package name is not, so
it should say who owns the INTERFACE.

openkal already learned this the expensive way. Its 0.1.0 was withdrawn rather
than kept because it "placed the module a consumer imports under the control of
the implementation, which contradicts what the specification is for". wayland is
a protocol specification that freedesktop maintains and libwayland implements,
so freedesktop is the right owner to name -- and the sibling change in
mcpplibs/libglvnd names khronos.egl for exactly the same reason, since EGL is a
Khronos specification that libglvnd merely implements.

genmod.py generates the two protocol wrappers, so it changed with them; CI
regenerates and diffs, and the run was verified idempotent before pushing.

Also pins XLINGS_VERSION. Unpinned, the install step took whatever was newest
that morning, so a red run could not be told apart from an ecosystem change --
the one thing a fork's CI exists to rule out. mcpp itself stays unpinned on
purpose: these packages depend on the ecosystem, and a pinned mcpp tarball
carries a frozen snapshot of it.

BREAKING for anyone already importing the old names. Doing it now rather than
later because freedesktop.wayland 1.26.0 merged into mcpp-index today and the
only consumer is the graphics-stack example, which moves with it.

Author: speak-agent

.github/workflows/ci.yml

@@ -35,9 +35,22 @@ jobs:
       # /dev/tty` — and a runner has a /dev/tty that is readable but not
       # connected, so it dies with "No such device or address" before anything
       # is installed.
+      #
+      # XLINGS_VERSION PINS THE INSTALLER. Unpinned, this step installed
+      # whatever was newest that morning, so a red run could never be told
+      # apart from an ecosystem change — the one thing a fork's CI exists to
+      # rule out. The installer reads `${1:-${XLINGS_VERSION:-}}`, so the
+      # environment form pins it without changing the `curl | bash` shape.
+      #
+      # mcpp itself stays UNPINNED on purpose, and that is not an oversight:
+      # these packages depend on the ECOSYSTEM (`xim:mesa`'s GBM/EGL discovery
+      # rows, the toolchains), and a pinned mcpp tarball carries a frozen
+      # snapshot of it. Pinning the tool that installs, floating the ecosystem
+      # under test, is the split that makes a failure attributable.
       - name: Install xlings + mcpp
         env:
           XLINGS_NON_INTERACTIVE: "1"
+          XLINGS_VERSION: "2026.8.27.4"
         run: |
           curl -fsSL https://d2learn.org/xlings-install.sh | bash
           echo "$HOME/.xlings/bin" >> "$GITHUB_PATH"
@@ -159,12 +172,12 @@ jobs:
 
       - name: every module produced an interface
         run: |
-          for m in wayland.client wayland.server wayland.util; do
+          for m in freedesktop.wayland.client freedesktop.wayland.server freedesktop.wayland.util; do
             find . \( -name "$m.gcm" -o -name "$m.pcm" \) | head -1 | grep -q . \
               || { echo "::error::$m has no module interface"; find . -name '*.gcm' -o -name '*.pcm'; exit 1; }
             echo "$m ok"
           done
-          echo "wayland.client, wayland.server and wayland.util all have interfaces"
+          echo "freedesktop.wayland.client, freedesktop.wayland.server and freedesktop.wayland.util all have interfaces"
 
   upstream:
     # `upstream/` must be the release tarball, byte for byte.

README.mcpp.md

@@ -7,17 +7,17 @@ four packages, all out of this one tarball:
 | package | output |
 |---|---|
 | `freedesktop.wayland-scanner` | `wayland-scanner`, the protocol code generator |
-| `freedesktop.wayland` | `libwayland-client.so.0` + `import wayland.client;` |
-| `freedesktop.wayland-server` | `libwayland-server.so.0` + `import wayland.server;` |
-| `freedesktop.wayland-util` | `import wayland.util;` — the macros, as entities |
+| `freedesktop.wayland` | `libwayland-client.so.0` + `import freedesktop.wayland.client;` |
+| `freedesktop.wayland-server` | `libwayland-server.so.0` + `import freedesktop.wayland.server;` |
+| `freedesktop.wayland-util` | `import freedesktop.wayland.util;` — the macros, as entities |
 
 ```bash
 mcpp build --workspace
 ```
 
 ## The module wrappers add no API
 
-`import wayland.client;` replaces `#include <wayland-client.h>` and changes
+`import freedesktop.wayland.client;` replaces `#include <wayland-client.h>` and changes
 nothing else. Every exported name is upstream's, spelled upstream's way, with
 upstream's semantics — there are no wrapper types, no RAII, no renaming — so
 code written against the C headers ports by swapping one line.
@@ -48,7 +48,7 @@ rule decides the whole layout here:
 ## Macros are the one thing that could not cross
 
 `export` names entities, and a macro is not one. Wayland's public surface has
-fourteen, so `wayland.util` maps each to what it actually is:
+fourteen, so `freedesktop.wayland.util` maps each to what it actually is:
 
 | macro | in the module |
 |---|---|
@@ -111,8 +111,8 @@ mcpp/                 everything this fork adds
   scanner/            the generator
   util/               the macro mappings + their test
   generated/          wayland-scanner's output, checked in — see its README
-  client/             libwayland-client + wayland.client
-  server/             libwayland-server + wayland.server
+  client/             libwayland-client + freedesktop.wayland.client
+  server/             libwayland-server + freedesktop.wayland.server
 mcpp.toml             the workspace root
 ```
 

mcpp/client/src/wayland-client.cppm

@@ -1,7 +1,7 @@
-// wayland.client — libwayland-client, as a C++23 module.
+// freedesktop.wayland.client — libwayland-client, as a C++23 module.
 //
 // A module wrapper and nothing more: every name below is upstream's, spelled
-// upstream's way, with upstream's signature. `import wayland.client;` replaces the
+// upstream's way, with upstream's signature. `import freedesktop.wayland.client;` replaces the
 // #include and changes nothing else, so code written against the C headers
 // ports by swapping one line.
 //
@@ -23,13 +23,13 @@
 // thing that changed is a linkage the caller cannot observe.
 //
 // MACROS ARE NOT HERE, and cannot be: `export` names entities and a macro is
-// not one. wayland's public macros live in the `wayland.util` module
+// not one. wayland's public macros live in the `freedesktop.wayland.util` module
 // (freedesktop.wayland-util), which maps each to the entity it actually is.
 module;
 
 #include <wayland-client-core.h>
 
-export module wayland.client;
+export module freedesktop.wayland.client;
 
 export {
 
@@ -116,7 +116,7 @@ using ::wl_proxy_wrapper_destroy;
 // -- interfaces / data --
 }
 
-// The protocol API: client-side wrappers and the interface objects,
+// The protocol API: wayland-side wrappers and the interface objects,
 // generated by wayland-scanner and included HERE — inside the module purview —
 // rather than in the global module fragment above.
 //

mcpp/server/src/wayland-server.cppm

@@ -1,7 +1,7 @@
-// wayland.server — libwayland-server, as a C++23 module.
+// freedesktop.wayland.server — libwayland-server, as a C++23 module.
 //
 // A module wrapper and nothing more: every name below is upstream's, spelled
-// upstream's way, with upstream's signature. `import wayland.server;` replaces the
+// upstream's way, with upstream's signature. `import freedesktop.wayland.server;` replaces the
 // #include and changes nothing else, so code written against the C headers
 // ports by swapping one line.
 //
@@ -23,13 +23,13 @@
 // thing that changed is a linkage the caller cannot observe.
 //
 // MACROS ARE NOT HERE, and cannot be: `export` names entities and a macro is
-// not one. wayland's public macros live in the `wayland.util` module
+// not one. wayland's public macros live in the `freedesktop.wayland.util` module
 // (freedesktop.wayland-util), which maps each to the entity it actually is.
 module;
 
 #include <wayland-server-core.h>
 
-export module wayland.server;
+export module freedesktop.wayland.server;
 
 export {
 
@@ -194,7 +194,7 @@ using ::wl_signal_emit_mutable;
 // -- interfaces / data --
 }
 
-// The protocol API: server-side wrappers and the interface objects,
+// The protocol API: wayland-side wrappers and the interface objects,
 // generated by wayland-scanner and included HERE — inside the module purview —
 // rather than in the global module fragment above.
 //

mcpp/tools/genmod.py

@@ -44,7 +44,7 @@ def plain(t):
     An elaborated-type-specifier in a module-purview declaration DECLARES the
     type there, and clang then rejects it:
 
-        error: declaration of 'wl_buffer' in module wayland.client follows
+        error: declaration of 'wl_buffer' in module freedesktop.wayland.client follows
                declaration in the global module
 
     The types are already declared by the global module fragment's includes, so
@@ -94,7 +94,7 @@ def scan(paths):
 // thing that changed is a linkage the caller cannot observe.
 //
 // MACROS ARE NOT HERE, and cannot be: `export` names entities and a macro is
-// not one. wayland's public macros live in the `wayland.util` module
+// not one. wayland's public macros live in the `freedesktop.wayland.util` module
 // (freedesktop.wayland-util), which maps each to the entity it actually is.
 module;
 
@@ -105,12 +105,12 @@ def scan(paths):
 '''
 
 for side, mod, incs, title in [
-    ("client", "wayland.client",
+    ("client", "freedesktop.wayland.client",
      ["<wayland-client-core.h>"],
-     "wayland.client — libwayland-client, as a C++23 module."),
-    ("server", "wayland.server",
+     "freedesktop.wayland.client — libwayland-client, as a C++23 module."),
+    ("server", "freedesktop.wayland.server",
      ["<wayland-server-core.h>"],
-     "wayland.server — libwayland-server, as a C++23 module."),
+     "freedesktop.wayland.server — libwayland-server, as a C++23 module."),
 ]:
     proto = GEN / f"wayland-{side}-protocol.h"
     hdrs = [F/"upstream/src/wayland-util.h", F/f"upstream/src/wayland-{side}-core.h"]

mcpp/util/mcpp.toml

@@ -1,7 +1,7 @@
 # freedesktop.wayland-util — wayland's public macros, as a module.
 #
 # A module cannot export a macro, so the fourteen in wayland's public headers
-# would simply be missing from `import wayland.client;`. This package carries
+# would simply be missing from `import freedesktop.wayland.client;`. This package carries
 # them as a constant, a function template and a set of ranges — see
 # src/wayland-util.cppm for the one-to-one table.
 #

mcpp/util/src/wayland-util.cppm

@@ -1,13 +1,13 @@
-// wayland.util — wayland's public MACROS, as things a module can export.
+// freedesktop.wayland.util — wayland's public MACROS, as things a module can export.
 //
 // `export` names entities, and a macro is not one, so the fourteen macros in
-// wayland's public headers cannot come through `import wayland.client;`. This
+// wayland's public headers cannot come through `import freedesktop.wayland.client;`. This
 // module carries them instead — as a constant, a function template and a set
 // of ranges, which is what each macro actually is once the preprocessor is out
 // of the way.
 //
 // This is the one place the C API's SPELLING changes, and it changes because
-// C++ has no way to keep it. Everything else in wayland.client / wayland.server
+// C++ has no way to keep it. Everything else in freedesktop.wayland.client / freedesktop.wayland.server
 // is upstream's name, unchanged.
 //
 //     macro                              here
@@ -40,7 +40,7 @@ module;
 #undef wl_array_for_each
 #undef WL_MARSHAL_FLAG_DESTROY
 
-export module wayland.util;
+export module freedesktop.wayland.util;
 
 export {
 

mcpp/util/tests/util.cpp

@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-import wayland.util;
+import freedesktop.wayland.util;
 
 namespace {