Attachment #242599 for bug #258042




PORTNAME=	mutter
PORTVERSION=	42.4
PORTREVISION=	5
CATEGORIES=	x11-wm
MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
DIST_SUBDIR=	gnome

		-Dsm=true \
		-Dsystemd=false \
		-Dtests=false \
		-Dwayland=false

# Required by embedded cogl/clutter forks.
MESON_ARGS+=	-Dgles2_libname=libGLESv2 \

GLIB_SCHEMAS=	org.gnome.mutter.gschema.xml \
		org.gnome.mutter.wayland.gschema.xml

OPTIONS_DEFINE=	WAYLAND
OPTIONS_DEFAULT=WAYLAND
OPTIONS_SUB=	yes

WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.25:graphics/wayland-protocols \
			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

.include <bsd.port.mk>

Lines 1-6 Link Here

(-)b/x11-wm/mutter/files/patch-meson.build (-1 / +9 lines)
1	--- meson.build.orig 2022-08-11 15:46:26 UTC	1	--- meson.build.orig 2022-08-11 15:46:26 UTC
2	+++ meson.build	2	+++ meson.build
3	@@ -199,11 +199,15 @@ if have_libgudev	3	@@ -184,6 +184,7 @@ if have_wayland
		4
		5	have_wayland = get_option('wayland')
		6	if have_wayland
		7	+ libdrm_dep = dependency('libdrm')
		8	wayland_server_dep = dependency('wayland-server', version: wayland_server_req)
		9	wayland_client_dep = dependency('wayland-client', version: wayland_server_req)
		10	wayland_protocols_dep = dependency('wayland-protocols',
		11	@@ -199,11 +200,15 @@ if have_libgudev
4	if have_libgudev	12	if have_libgudev
5	libudev_dep = dependency('libudev', version: udev_req)	13	libudev_dep = dependency('libudev', version: udev_req)
6	gudev_dep = dependency('gudev-1.0', version: gudev_req)	14	gudev_dep = dependency('gudev-1.0', version: gudev_req)




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	2022-08-11 15:46:26 UTC
+++ src/meson.build
@@ -118,6 +118,9 @@ if have_wayland
 endif
 
 if have_wayland
+  mutter_lib_deps += [
+    libdrm_dep, # drm_fourcc.h on non-Linux
+  ]
   mutter_pkg_deps += [
     wayland_server_dep,
   ]




https://gitlab.gnome.org/GNOME/mutter/-/commit/32affbf05a70

../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	2022-08-11 15:46:26 UTC
+++ src/wayland/meta-wayland-buffer.c
@@ -304,6 +304,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)
@@ -325,6 +326,7 @@ shm_format_to_string (MetaDrmFormatBuf *format_buf,
 
   return result;
 }
+#endif
 
 static gboolean
 shm_buffer_attach (MetaWaylandBuffer  *buffer,
@@ -340,7 +342,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);
@@ -353,12 +357,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 &&




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

--- src/wayland/meta-xwayland.c.orig	2022-08-11 15:46:26 UTC
+++ src/wayland/meta-xwayland.c
@@ -591,9 +591,11 @@ open_display_sockets (MetaXWaylandManager  *manager,
 {
   int abstract_fd, unix_fd;
 
+#ifdef __linux__
   abstract_fd = bind_to_abstract_socket (display_index, error);
   if (abstract_fd < 0)
     return FALSE;
+#endif
 
   unix_fd = bind_to_unix_socket (display_index, error);
   if (unix_fd < 0)
@@ -601,6 +603,10 @@ open_display_sockets (MetaXWaylandManager  *manager,
       close (abstract_fd);
       return FALSE;
     }
+
+#ifndef __linux__
+  abstract_fd = unix_fd;
+#endif
 
   *abstract_fd_out = abstract_fd;
   *unix_fd_out = unix_fd;

Return to bug 258042

Lines 1-6 Link Here

(-)b/x11-wm/mutter/Makefile (-2 / +12 lines)
1	PORTNAME= mutter	1	PORTNAME= mutter
2	PORTVERSION= 42.4	2	PORTVERSION= 42.4
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= x11-wm	4	CATEGORIES= x11-wm
5	MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}	5	MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
6	DIST_SUBDIR= gnome	6	DIST_SUBDIR= gnome
Lines 53-59 MESON_ARGS= -Dlibwacom=false \ Link Here
53	-Dsm=true \	53	-Dsm=true \
54	-Dsystemd=false \	54	-Dsystemd=false \
55	-Dtests=false \	55	-Dtests=false \
56	-Dwayland=false
57		56
58	# Required by embedded cogl/clutter forks.	57	# Required by embedded cogl/clutter forks.
59	MESON_ARGS+= -Dgles2_libname=libGLESv2 \	58	MESON_ARGS+= -Dgles2_libname=libGLESv2 \
Lines 65-68 MESON_ARGS+= -Dremote_desktop=false Link Here
65	GLIB_SCHEMAS= org.gnome.mutter.gschema.xml \	64	GLIB_SCHEMAS= org.gnome.mutter.gschema.xml \
66	org.gnome.mutter.wayland.gschema.xml	65	org.gnome.mutter.wayland.gschema.xml
67		66
		67	OPTIONS_DEFINE= WAYLAND
		68	OPTIONS_DEFAULT=WAYLAND
		69	OPTIONS_SUB= yes
		70
		71	WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.25:graphics/wayland-protocols \
		72	xwayland-devel>0:x11-servers/xwayland-devel
		73	WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland
		74	WAYLAND_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel
		75	WAYLAND_USE= XORG=xau
		76	WAYLAND_MESON_TRUE= wayland
		77
68	.include <bsd.port.mk>	78	.include <bsd.port.mk>

Added Link Here

(-)b/x11-wm/mutter/files/patch-src_core_meta-context-main.c (+17 lines)
1	ld: error: undefined symbol: sd_pid_get_user_unit
2	>>> referenced by meta-context-main.c
3	>>> src/libmutter-9.so.0.0.0.p/core_meta-context-main.c.o:(meta_context_main_get_x11_display_policy)
4
5	--- src/core/meta-context-main.c.orig 2021-09-19 13:37:45 UTC
6	+++ src/core/meta-context-main.c
7	@@ -318,8 +318,10 @@ meta_context_main_get_x11_display_policy (MetaContext
8	#ifdef HAVE_WAYLAND
9	if (context_main->options.no_x11)
10	return META_X11_DISPLAY_POLICY_DISABLED;
11	+#ifdef HAVE_LIBSYSTEMD
12	else if (sd_pid_get_user_unit (0, &unit) < 0)
13	return META_X11_DISPLAY_POLICY_MANDATORY;
14	+#endif
15	else
16	return META_X11_DISPLAY_POLICY_ON_DEMAND;
17	#else /* HAVE_WAYLAND */

Added Link Here

(-)b/x11-wm/mutter/files/patch-src_meson.build (+16 lines)
1	../src/wayland/meta-wayland-buffer.c:53:10: fatal error: 'drm_fourcc.h' file not found
2	#include <drm_fourcc.h>
3	^~~~~~~~~~~~~~
4
5	--- src/meson.build.orig 2022-08-11 15:46:26 UTC
6	+++ src/meson.build
7	@@ -118,6 +118,9 @@ if have_wayland
8	endif
9
10	if have_wayland
11	+ mutter_lib_deps += [
12	+ libdrm_dep, # drm_fourcc.h on non-Linux
13	+ ]
14	mutter_pkg_deps += [
15	wayland_server_dep,
16	]

Added Link Here

(-)b/x11-wm/mutter/files/patch-src_wayland_meta-wayland-buffer.c (+58 lines)
1	https://gitlab.gnome.org/GNOME/mutter/-/commit/32affbf05a70
2
3	../src/wayland/meta-wayland-buffer.c:288:23: error: unknown type name 'MetaDrmFormatBuf'
4	shm_format_to_string (MetaDrmFormatBuf *format_buf,
5	^
6	../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]
7	result = meta_drm_format_to_string (format_buf, shm_format);
8	^
9	../src/wayland/meta-wayland-buffer.c:323:3: error: use of undeclared identifier 'MetaDrmFormatBuf'
10	MetaDrmFormatBuf format_buf;
11	^
12	../src/wayland/meta-wayland-buffer.c:339:38: error: use of undeclared identifier 'format_buf'
13	shm_format_to_string (&format_buf,
14	^
15
16	--- src/wayland/meta-wayland-buffer.c.orig 2022-08-11 15:46:26 UTC
17	+++ src/wayland/meta-wayland-buffer.c
18	@@ -304,6 +304,7 @@ shm_buffer_get_cogl_pixel_format (struct wl_shm_buffer
19	return TRUE;
20	}
21
22	+#ifdef HAVE_NATIVE_BACKEND
23	static const char *
24	shm_format_to_string (MetaDrmFormatBuf *format_buf,
25	uint32_t shm_format)
26	@@ -325,6 +326,7 @@ shm_format_to_string (MetaDrmFormatBuf *format_buf,
27
28	return result;
29	}
30	+#endif
31
32	static gboolean
33	shm_buffer_attach (MetaWaylandBuffer *buffer,
34	@@ -340,7 +342,9 @@ shm_buffer_attach (MetaWaylandBuffer *buffer,
35	CoglTextureComponents components;
36	CoglBitmap *bitmap;
37	CoglTexture *new_texture;
38	+#ifdef HAVE_NATIVE_BACKEND
39	MetaDrmFormatBuf format_buf;
40	+#endif
41
42	shm_buffer = wl_shm_buffer_get (buffer->resource);
43	stride = wl_shm_buffer_get_stride (shm_buffer);
44	@@ -353,12 +357,14 @@ shm_buffer_attach (MetaWaylandBuffer *buffer,
45	return FALSE;
46	}
47
48	+#ifdef HAVE_NATIVE_BACKEND
49	meta_topic (META_DEBUG_WAYLAND,
50	"[wl-shm] wl_buffer@%u wl_shm_format %s -> CoglPixelFormat %s",
51	wl_resource_get_id (meta_wayland_buffer_get_resource (buffer)),
52	shm_format_to_string (&format_buf,
53	wl_shm_buffer_get_format (shm_buffer)),
54	cogl_pixel_format_to_string (format));
55	+#endif
56
57	if (*texture &&
58	cogl_texture_get_width (*texture) == width &&

Added Link Here

(-)b/x11-wm/mutter/files/patch-src_wayland_meta-xwayland.c (+27 lines)
1	mutter-WARNING **: failed to bind to @/tmp/.X11-unix/X0: No such file or directory
2
3	--- src/wayland/meta-xwayland.c.orig 2022-08-11 15:46:26 UTC
4	+++ src/wayland/meta-xwayland.c
5	@@ -591,9 +591,11 @@ open_display_sockets (MetaXWaylandManager *manager,
6	{
7	int abstract_fd, unix_fd;
8
9	+#ifdef __linux__
10	abstract_fd = bind_to_abstract_socket (display_index, error);
11	if (abstract_fd < 0)
12	return FALSE;
13	+#endif
14
15	unix_fd = bind_to_unix_socket (display_index, error);
16	if (unix_fd < 0)
17	@@ -601,6 +603,10 @@ open_display_sockets (MetaXWaylandManager *manager,
18	close (abstract_fd);
19	return FALSE;
20	}
21	+
22	+#ifndef __linux__
23	+ abstract_fd = unix_fd;
24	+#endif
25
26	*abstract_fd_out = abstract_fd;
27	*unix_fd_out = unix_fd;

Lines 201-206 include/mutter-10/meta/meta-shaped-texture.h Link Here

(-)b/x11-wm/mutter/pkg-plist (+2 lines)
201	include/mutter-10/meta/meta-sound-player.h	201	include/mutter-10/meta/meta-sound-player.h
202	include/mutter-10/meta/meta-stage.h	202	include/mutter-10/meta/meta-stage.h
203	include/mutter-10/meta/meta-startup-notification.h	203	include/mutter-10/meta/meta-startup-notification.h
		204	%%WAYLAND%%include/mutter-10/meta/meta-wayland-client.h
204	include/mutter-10/meta/meta-window-actor.h	205	include/mutter-10/meta/meta-window-actor.h
205	include/mutter-10/meta/meta-window-group.h	206	include/mutter-10/meta/meta-window-group.h
206	include/mutter-10/meta/meta-window-shape.h	207	include/mutter-10/meta/meta-window-shape.h
Lines 247-252 share/GConf/gsettings/mutter-schemas.convert Link Here
247	share/applications/mutter.desktop	248	share/applications/mutter.desktop
248	share/gnome-control-center/keybindings/50-mutter-navigation.xml	249	share/gnome-control-center/keybindings/50-mutter-navigation.xml
249	share/gnome-control-center/keybindings/50-mutter-system.xml	250	share/gnome-control-center/keybindings/50-mutter-system.xml
		251	%%WAYLAND%%share/gnome-control-center/keybindings/50-mutter-wayland.xml
250	share/gnome-control-center/keybindings/50-mutter-windows.xml	252	share/gnome-control-center/keybindings/50-mutter-windows.xml
251	share/locale/am/LC_MESSAGES/mutter.mo	253	share/locale/am/LC_MESSAGES/mutter.mo
252	share/locale/ar/LC_MESSAGES/mutter.mo	254	share/locale/ar/LC_MESSAGES/mutter.mo