PORTREVISION=	1

OPTIONS_DEFINE=	WAYLAND

OPTIONS_DEFAULT=WAYLAND

OPTIONS_SUB=	yes

WAYLAND_BUILD_DEPENDS=	xwayland-devel>0:x11-servers/xwayland-devel

WAYLAND_LIB_DEPENDS=	libwayland-server.so:graphics/wayland

WAYLAND_RUN_DEPENDS=	xwayland-devel>0:x11-servers/xwayland-devel

WAYLAND_USE=		XORG=xau

WAYLAND_MESON_TRUE=	wayland

https://gitlab.gnome.org/GNOME/mutter/-/commit/e2123768f635

mutter-WARNING **: failed to bind to @/tmp/.X11-unix/X0: No such file or directory

--- src/wayland/meta-wayland-private.h.orig	2021-09-19 13:37:45 UTC

+++ src/wayland/meta-wayland-private.h

@@ -47,7 +47,6 @@ typedef struct

 {

   int display_index;

   char *lock_file;

-  int abstract_fd;

   int unix_fd;

   char *name;

 } MetaXWaylandConnection;

@@ -57,7 +56,6 @@ typedef struct

   MetaXWaylandConnection private_connection;

   MetaXWaylandConnection public_connection;

-  guint abstract_fd_watch_id;

   guint unix_fd_watch_id;

   guint xserver_grace_period_id;

--- src/wayland/meta-xwayland.c.orig	2021-09-19 13:37:45 UTC

+++ src/wayland/meta-xwayland.c

@@ -447,47 +447,6 @@ create_lock_file (int      display,

 }

 static int

-bind_to_abstract_socket (int      display,

-                         GError **error)

-{

-  struct sockaddr_un addr;

-  socklen_t size, name_size;

-  int fd;

-

-  fd = socket (PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0);

-  if (fd < 0)

-    {

-      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),

-                   "Failed to create socket: %s", g_strerror (errno));

-      return -1;

-    }

-

-  addr.sun_family = AF_LOCAL;

-  name_size = snprintf (addr.sun_path, sizeof addr.sun_path,

-                        "%c%s%d", 0, X11_TMP_UNIX_PATH, display);

-  size = offsetof (struct sockaddr_un, sun_path) + name_size;

-  if (bind (fd, (struct sockaddr *) &addr, size) < 0)

-    {

-      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),

-                   "Failed to bind to %s: %s",

-                   addr.sun_path + 1, g_strerror (errno));

-      close (fd);

-      return -1;

-    }

-

-  if (listen (fd, 1) < 0)

-    {

-      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),

-                   "Failed to listen to %s: %s",

-                   addr.sun_path + 1, g_strerror (errno));

-      close (fd);

-      return -1;

-    }

-

-  return fd;

-}

-

-static int

 bind_to_unix_socket (int      display,

                      GError **error)

 {

@@ -719,24 +678,17 @@ ensure_x11_unix_dir (GError **error)

 static gboolean

 open_display_sockets (MetaXWaylandManager  *manager,

                       int                   display_index,

-                      int                  *abstract_fd_out,

                       int                  *unix_fd_out,

                       GError              **error)

 {

-  int abstract_fd, unix_fd;

+  int unix_fd;

-  abstract_fd = bind_to_abstract_socket (display_index, error);

-  if (abstract_fd < 0)

-    return FALSE;

-

   unix_fd = bind_to_unix_socket (display_index, error);

   if (unix_fd < 0)

     {

-      close (abstract_fd);

       return FALSE;

     }

-  *abstract_fd_out = abstract_fd;

   *unix_fd_out = unix_fd;

   return TRUE;

@@ -767,7 +719,6 @@ choose_xdisplay (MetaXWaylandManager     *manager,

         }

       if (!open_display_sockets (manager, *display,

-                                 &connection->abstract_fd,

                                  &connection->unix_fd,

                                  &local_error))

         {

@@ -992,13 +943,11 @@ meta_xwayland_start_xserver (MetaXWaylandManager *mana

   g_subprocess_launcher_take_fd (launcher,

                                  steal_fd (&xwayland_client_fd[1]), 3);

   g_subprocess_launcher_take_fd (launcher,

-                                 steal_fd (&manager->public_connection.abstract_fd), 4);

+                                 steal_fd (&manager->public_connection.unix_fd), 4);

   g_subprocess_launcher_take_fd (launcher,

-                                 steal_fd (&manager->public_connection.unix_fd), 5);

+                                 steal_fd (&displayfd[1]), 5);

   g_subprocess_launcher_take_fd (launcher,

-                                 steal_fd (&displayfd[1]), 6);

-  g_subprocess_launcher_take_fd (launcher,

-                                 steal_fd (&manager->private_connection.abstract_fd), 7);

+                                 steal_fd (&manager->private_connection.unix_fd), 6);

   g_subprocess_launcher_setenv (launcher, "WAYLAND_SOCKET", "3", TRUE);

@@ -1013,16 +962,14 @@ meta_xwayland_start_xserver (MetaXWaylandManager *mana

   args[i++] = manager->auth_file;

   args[i++] = XWAYLAND_LISTENFD;

   args[i++] = "4";

-  args[i++] = XWAYLAND_LISTENFD;

-  args[i++] = "5";

   args[i++] = "-displayfd";

-  args[i++] = "6";

+  args[i++] = "5";

 #ifdef HAVE_XWAYLAND_INITFD

   args[i++] = "-initfd";

-  args[i++] = "7";

+  args[i++] = "6";

 #else

   args[i++] = XWAYLAND_LISTENFD;

-  args[i++] = "7";

+  args[i++] = "6";

 #endif

   for (j = 0; j <  G_N_ELEMENTS (x11_extension_names); j++)

     {

@@ -1084,7 +1031,6 @@ xdisplay_connection_activity_cb (gint         fd,

                          (GAsyncReadyCallback) on_init_x11_cb, NULL);

   /* Stop watching both file descriptors */

-  g_clear_handle_id (&manager->abstract_fd_watch_id, g_source_remove);

   g_clear_handle_id (&manager->unix_fd_watch_id, g_source_remove);

   return G_SOURCE_REMOVE;

@@ -1176,14 +1122,12 @@ meta_xwayland_init (MetaXWaylandManager    *manager,

     {

       if (!open_display_sockets (manager,

                                  manager->public_connection.display_index,

-                                 &manager->public_connection.abstract_fd,

                                  &manager->public_connection.unix_fd,

                                  error))

         return FALSE;

       if (!open_display_sockets (manager,

                                  manager->private_connection.display_index,

-                                 &manager->private_connection.abstract_fd,

                                  &manager->private_connection.unix_fd,

                                  error))

         return FALSE;

@@ -1198,9 +1142,6 @@ meta_xwayland_init (MetaXWaylandManager    *manager,

   if (policy == META_X11_DISPLAY_POLICY_ON_DEMAND)

     {

-      manager->abstract_fd_watch_id =

-        g_unix_fd_add (manager->public_connection.abstract_fd, G_IO_IN,

-                       xdisplay_connection_activity_cb, manager);

       manager->unix_fd_watch_id =

         g_unix_fd_add (manager->public_connection.unix_fd, G_IO_IN,

                        xdisplay_connection_activity_cb, manager);

ld: error: undefined symbol: sd_pid_get_user_unit

>>> referenced by meta-context-main.c

>>>               src/libmutter-9.so.0.0.0.p/core_meta-context-main.c.o:(meta_context_main_get_x11_display_policy)

--- src/core/meta-context-main.c.orig	2021-09-19 13:37:45 UTC

+++ src/core/meta-context-main.c

@@ -318,8 +318,10 @@ meta_context_main_get_x11_display_policy (MetaContext 

 #ifdef HAVE_WAYLAND

       if (context_main->options.no_x11)

         return META_X11_DISPLAY_POLICY_DISABLED;

+#ifdef HAVE_LIBSYSTEMD

       else if (sd_pid_get_user_unit (0, &unit) < 0)

         return META_X11_DISPLAY_POLICY_MANDATORY;

+#endif

       else

         return META_X11_DISPLAY_POLICY_ON_DEMAND;

 #else /* HAVE_WAYLAND */

../src/wayland/meta-wayland-buffer.c:53:10: fatal error: 'drm_fourcc.h' file not found

#include <drm_fourcc.h>

         ^~~~~~~~~~~~~~

--- src/meson.build.orig	2020-09-07 19:18:23 UTC

+++ src/meson.build

@@ -113,6 +113,9 @@ if have_x11

 endif

 if have_wayland

+  mutter_lib_deps += [

+    libdrm_dep, # drm_fourcc.h on non-Linux

+  ]

   mutter_pkg_deps += [

     wayland_server_dep,

   ]

../src/wayland/meta-wayland-buffer.c:288:23: error: unknown type name 'MetaDrmFormatBuf'

shm_format_to_string (MetaDrmFormatBuf *format_buf,

                      ^

../src/wayland/meta-wayland-buffer.c:302:16: warning: implicit declaration of function 'meta_drm_format_to_string' is invalid in C99 [-Wimplicit-function-declaration]

      result = meta_drm_format_to_string (format_buf, shm_format);

               ^

../src/wayland/meta-wayland-buffer.c:323:3: error: use of undeclared identifier 'MetaDrmFormatBuf'

  MetaDrmFormatBuf format_buf;

  ^

../src/wayland/meta-wayland-buffer.c:339:38: error: use of undeclared identifier 'format_buf'

              shm_format_to_string (&format_buf,

                                     ^

--- src/wayland/meta-wayland-buffer.c.orig	2021-09-19 13:37:45 UTC

+++ src/wayland/meta-wayland-buffer.c

@@ -284,6 +284,7 @@ shm_buffer_get_cogl_pixel_format (struct wl_shm_buffer

   return TRUE;

 }

+#ifdef HAVE_NATIVE_BACKEND

 static const char *

 shm_format_to_string (MetaDrmFormatBuf *format_buf,

                       uint32_t          shm_format)

@@ -305,6 +306,7 @@ shm_format_to_string (MetaDrmFormatBuf *format_buf,

   return result;

 }

+#endif

 static gboolean

 shm_buffer_attach (MetaWaylandBuffer  *buffer,

@@ -320,7 +322,9 @@ shm_buffer_attach (MetaWaylandBuffer  *buffer,

   CoglTextureComponents components;

   CoglBitmap *bitmap;

   CoglTexture *new_texture;

+#ifdef HAVE_NATIVE_BACKEND

   MetaDrmFormatBuf format_buf;

+#endif

   shm_buffer = wl_shm_buffer_get (buffer->resource);

   stride = wl_shm_buffer_get_stride (shm_buffer);

@@ -333,12 +337,14 @@ shm_buffer_attach (MetaWaylandBuffer  *buffer,

       return FALSE;

     }

+#ifdef HAVE_NATIVE_BACKEND

   meta_topic (META_DEBUG_WAYLAND,

               "[wl-shm] wl_buffer@%u wl_shm_format %s -> CoglPixelFormat %s",

               wl_resource_get_id (meta_wayland_buffer_get_resource (buffer)),

               shm_format_to_string (&format_buf,

                                     wl_shm_buffer_get_format (shm_buffer)),

               cogl_pixel_format_to_string (format));

+#endif

   if (*texture &&

       cogl_texture_get_width (*texture) == width &&

../src/wayland/meta-wayland-dma-buf.c:101:3: error: use of undeclared identifier 'MetaDrmFormatBuf'

  MetaDrmFormatBuf format_buf;

  ^

../src/wayland/meta-wayland-dma-buf.c:151:15: warning: implicit declaration of function 'meta_drm_format_to_string' is invalid in C99 [-Wimplicit-function-declaration]

              meta_drm_format_to_string (&format_buf, dma_buf->drm_format),

              ^

../src/wayland/meta-wayland-dma-buf.c:151:43: error: use of undeclared identifier 'format_buf'; did you mean 'dma_buf'?

              meta_drm_format_to_string (&format_buf, dma_buf->drm_format),

                                          ^~~~~~~~~~

                                          dma_buf

../src/meta/util.h:190:39: note: expanded from macro 'meta_topic'

        meta_topic_real (debug_topic, __VA_ARGS__); \

                                      ^

../src/wayland/meta-wayland-dma-buf.c:94:28: note: 'dma_buf' declared here

  MetaWaylandDmaBufBuffer *dma_buf = buffer->dma_buf.dma_buf;

                           ^

--- src/wayland/meta-wayland-dma-buf.c.orig	2021-09-19 13:37:45 UTC

+++ src/wayland/meta-wayland-dma-buf.c

@@ -98,7 +98,9 @@ meta_wayland_dma_buf_realize_texture (MetaWaylandBuffe

   EGLImageKHR egl_image;

   CoglEglImageFlags flags;

   CoglTexture2D *texture;

+#ifdef HAVE_NATIVE_BACKEND

   MetaDrmFormatBuf format_buf;

+#endif

   if (buffer->dma_buf.texture)

     return TRUE;

@@ -145,11 +147,13 @@ meta_wayland_dma_buf_realize_texture (MetaWaylandBuffe

       return FALSE;

     }

+#ifdef HAVE_NATIVE_BACKEND

   meta_topic (META_DEBUG_WAYLAND,

               "[dma-buf] wl_buffer@%u DRM format %s -> CoglPixelFormat %s",

               wl_resource_get_id (meta_wayland_buffer_get_resource (buffer)),

               meta_drm_format_to_string (&format_buf, dma_buf->drm_format),

               cogl_pixel_format_to_string (cogl_format));

+#endif

   for (n_planes = 0; n_planes < META_WAYLAND_DMA_BUF_MAX_FDS; n_planes++)

     {

%%WAYLAND%%include/mutter-9/cogl/cogl/cogl-wayland-server.h

%%WAYLAND%%include/mutter-9/meta/meta-wayland-client.h

%%WAYLAND%%share/gnome-control-center/keybindings/50-mutter-wayland.xml