diff options
Diffstat (limited to 'x11-wm')
26 files changed, 684 insertions, 494 deletions
diff --git a/x11-wm/lxqt-session/Makefile b/x11-wm/lxqt-session/Makefile index 3e716f86f63b..478cb8273be1 100644 --- a/x11-wm/lxqt-session/Makefile +++ b/x11-wm/lxqt-session/Makefile @@ -1,5 +1,6 @@ PORTNAME= lxqt-session PORTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= LXQT diff --git a/x11-wm/lxqt-wayland-session/Makefile b/x11-wm/lxqt-wayland-session/Makefile index ce8489f23ee3..dd685a230715 100644 --- a/x11-wm/lxqt-wayland-session/Makefile +++ b/x11-wm/lxqt-wayland-session/Makefile @@ -1,5 +1,6 @@ PORTNAME= lxqt-wayland-session PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= LXQT diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index ff814b16bbee..bdf12a7da83c 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -1,36 +1,43 @@ PORTNAME= metacity -PORTVERSION= 3.44.0 -PORTREVISION= 3 +PORTVERSION= 3.56.0 CATEGORIES= x11-wm MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org -COMMENT= Window manager for the adult in you +COMMENT= Window manager for GNOME Flashback +WWW= https://gitlab.gnome.org/GNOME/metacity LICENSE= GPLv2 -BUILD_DEPENDS= gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas \ - itstool:textproc/itstool \ - zenity>=3.0.0:x11/zenity -LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \ +BUILD_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ + zenity>0:x11/zenity +LIB_DEPENDS= libcanberra.so:audio/libcanberra \ + libcanberra-gtk3.so:audio/libcanberra-gtk3 \ + libharfbuzz.so:print/harfbuzz \ libgtop-2.0.so:devel/libgtop \ libstartup-notification-1.so:x11/startup-notification -RUN_DEPENDS= gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas \ - zenity>=3.0.0:x11/zenity - -PORTSCOUT= limitw:1,even +RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ + zenity>0:x11/zenity USES= compiler:c11 gettext gmake gnome libtool localbase pathfix \ pkgconfig tar:xz xorg GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -USE_XORG= x11 xcomposite xcursor xdamage xext xinerama xpresent xrandr \ - xrender xres -USE_GNOME= gnomeprefix gtk30 intlhack libxml2:build +USE_XORG= sm ice x11 xcomposite xcursor xdamage xext xfixes xinerama \ + xpresent xrandr xrender xres +USE_GNOME= glib20 gtk30 libxml2:build pango USE_LDCONFIG= yes INSTALL_TARGET= install-strip +OPTIONS_DEFINE= VULKAN +OPTIONS_DEFAULT= VULKAN +OPTIONS_SUB= yes + +VULKAN_DESC= Add support for Vulkan (compositor) +VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers +VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader +VULKAN_CONFIGURE_ENABLE= vulkan + GLIB_SCHEMAS= org.gnome.metacity.enums.xml \ org.gnome.metacity.gschema.xml \ org.gnome.metacity.keybindings.gschema.xml \ diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index c01af5a83ccb..07b9488b6562 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656342645 -SHA256 (gnome/metacity-3.44.0.tar.xz) = 19c3c5d79d2171f45baa0f632cc8995f8607bf1231a16014439bac9ba165a7c0 -SIZE (gnome/metacity-3.44.0.tar.xz) = 1973772 +TIMESTAMP = 1749549249 +SHA256 (gnome/metacity-3.56.0.tar.xz) = 7554997104b26ff0e79a02b37a2ba189bdf4e7ccd54226f0faf4b1a59006c901 +SIZE (gnome/metacity-3.56.0.tar.xz) = 1749348 diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index 1c9460d80548..dc8e01275b97 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -10,9 +10,6 @@ lib/libmetacity.so lib/libmetacity.so.3 lib/libmetacity.so.%%GTK3_VERSION%% libdata/pkgconfig/libmetacity.pc -share/man/man1/metacity-message.1.gz -share/man/man1/metacity-theme-viewer.1.gz -share/man/man1/metacity.1.gz share/applications/metacity.desktop share/gnome-control-center/keybindings/50-metacity-navigation.xml share/gnome-control-center/keybindings/50-metacity-system.xml @@ -111,3 +108,6 @@ share/locale/yo/LC_MESSAGES/metacity.mo share/locale/zh_CN/LC_MESSAGES/metacity.mo share/locale/zh_HK/LC_MESSAGES/metacity.mo share/locale/zh_TW/LC_MESSAGES/metacity.mo +share/man/man1/metacity-message.1.gz +share/man/man1/metacity-theme-viewer.1.gz +share/man/man1/metacity.1.gz diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile index c78ee2fa52bb..9e761f3cb3c4 100644 --- a/x11-wm/mutter/Makefile +++ b/x11-wm/mutter/Makefile @@ -1,27 +1,30 @@ PORTNAME= mutter -PORTVERSION= 42.4 -PORTREVISION= 4 +PORTVERSION= 47.8.1 +PORTREvISION= 1 CATEGORIES= x11-wm -MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Window and compositing manager based on Clutter -WWW= https://gitlab.gnome.org/GNOME/mutter +WWW= https://gnome.pages.gitlab.gnome.org/mutter/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +PORTSCOUT= limit:^47\. + BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ gnome-settings-daemon>0:sysutils/gnome-settings-daemon \ - gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas \ - xkeyboard-config>=0:x11/xkeyboard-config \ - zenity>=3.0.0:x11/zenity -LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \ - libcanberra.so:audio/libcanberra \ + gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ + xkeyboard-config>0:x11/xkeyboard-config \ + dbus>0:devel/dbus +LIB_DEPENDS= libcanberra.so:audio/libcanberra \ + libgudev-1.0.so:devel/libgudev \ libdrm.so:graphics/libdrm \ + libinput.so:x11/libinput \ + libgbm.so:graphics/mesa-libs \ libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libgraphene-1.0.so:graphics/graphene \ libjson-glib-1.0.so:devel/json-glib \ @@ -29,40 +32,53 @@ LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libstartup-notification-1.so:x11/startup-notification \ libupower-glib.so:sysutils/upower \ libxkbcommon.so:x11/libxkbcommon \ - libxkbfile.so:x11/libxkbfile + libxkbfile.so:x11/libxkbfile \ + liblcms2.so:graphics/lcms2 \ + libcolord.so:graphics/colord \ + libharfbuzz.so:print/harfbuzz \ + libei.so:x11/libei \ + libdisplay-info.so:sysutils/libdisplay-info RUN_DEPENDS= gnome-settings-daemon>0:sysutils/gnome-settings-daemon \ - gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas \ - xkeyboard-config>=0:x11/xkeyboard-config \ - zenity>=3.0.0:x11/zenity - -PORTSCOUT= limitw:1,even + gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ + xkeyboard-config>0:x11/xkeyboard-config USES= compiler:c++0x gettext gl gnome localbase meson pkgconfig \ tar:xz xorg USE_GL= egl gbm -USE_GNOME= cairo gdkpixbuf gnomedesktop3 introspection -USE_XORG= ice sm x11 xcb xcomposite xcursor xdamage xext xfixes xi \ - xinerama xrandr xrender xtst +USE_GNOME= atk cairo gdkpixbuf gnomedesktop4 gtk40 introspection:build +USE_XORG= ice pixman sm x11 xcb xcomposite xcursor xdamage xext \ + xfixes xi xinerama xrandr xrender xtst USE_LDCONFIG= yes CFLAGS+= -Wno-unknown-warning-option -Wno-format-nonliteral CPPFLAGS+= -fno-omit-frame-pointer -MESON_ARGS= -Dlibwacom=false \ +MESON_ARGS= -Dlibdisplay_info=enabled \ + -Dlibwacom=false \ -Dnative_backend=false \ -Dprofiler=false \ - -Dsm=true \ -Dsystemd=false \ - -Dtests=false \ - -Dudev=false \ - -Dwayland=false + -Dtests=disabled \ + -Dcogl_tests=false \ + -Dclutter_tests=false \ + -Dmutter_tests=false \ + -Dinstalled_tests=false # Required by embedded cogl/clutter forks. MESON_ARGS+= -Dgles2_libname=libGLESv2 \ -Dopengl_libname=libGL.so -# Disable remote_desktop for now because it requires memfd which only appears current -MESON_ARGS+= -Dremote_desktop=false - 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>0:graphics/wayland-protocols \ + xwayland>0:x11-servers/xwayland +WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland +WAYLAND_RUN_DEPENDS= xwayland>0:x11-servers/xwayland +WAYLAND_USE= XORG=xau +WAYLAND_MESON_TRUE= wayland \ + xwayland + .include <bsd.port.mk> diff --git a/x11-wm/mutter/distinfo b/x11-wm/mutter/distinfo index 17054975bc51..90da557f75c9 100644 --- a/x11-wm/mutter/distinfo +++ b/x11-wm/mutter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660859500 -SHA256 (gnome/mutter-42.4.tar.xz) = c22c7fa3d187061dbf280c3850e118b7b5009065d01de31616acd500c4982a40 -SIZE (gnome/mutter-42.4.tar.xz) = 2747580 +TIMESTAMP = 1748977789 +SHA256 (gnome/mutter-47.8.1.tar.xz) = cdcbf491f3fc4bdee3e89b168dec2dd198e4f243526831018b7f55bde546e699 +SIZE (gnome/mutter-47.8.1.tar.xz) = 6859284 diff --git a/x11-wm/mutter/files/patch-clutter_clutter_clutter-frame-clock.c b/x11-wm/mutter/files/patch-clutter_clutter_clutter-frame-clock.c new file mode 100644 index 000000000000..d17c08df52ba --- /dev/null +++ b/x11-wm/mutter/files/patch-clutter_clutter_clutter-frame-clock.c @@ -0,0 +1,23 @@ +--- clutter/clutter/clutter-frame-clock.c.orig 2023-10-31 18:35:00 UTC ++++ clutter/clutter/clutter-frame-clock.c +@@ -845,7 +845,7 @@ clutter_frame_clock_get_max_render_time_debug_info (Cl + GString *string; + + string = g_string_new (NULL); +- g_string_append_printf (string, "Max render time: %ld µs", ++ g_string_append_printf (string, "Max render time: %lld µs", + clutter_frame_clock_compute_max_render_time_us (frame_clock)); + + if (frame_clock->got_measurements_last_frame) +@@ -857,9 +857,9 @@ clutter_frame_clock_get_max_render_time_debug_info (Cl + MAX (frame_clock->longterm_max_update_duration_us, + frame_clock->shortterm_max_update_duration_us); + +- g_string_append_printf (string, "\nVblank duration: %ld µs +", ++ g_string_append_printf (string, "\nVblank duration: %lld µs +", + frame_clock->vblank_duration_us); +- g_string_append_printf (string, "\nUpdate duration: %ld µs +", ++ g_string_append_printf (string, "\nUpdate duration: %lld µs +", + max_update_duration_us); + g_string_append_printf (string, "\nConstant: %d µs", + clutter_max_render_time_constant_us); diff --git a/x11-wm/mutter/files/patch-clutter_clutter_clutter-stage-view.c b/x11-wm/mutter/files/patch-clutter_clutter_clutter-stage-view.c deleted file mode 100644 index e12a21f4fefb..000000000000 --- a/x11-wm/mutter/files/patch-clutter_clutter_clutter-stage-view.c +++ /dev/null @@ -1,58 +0,0 @@ -$OpenBSD: patch-clutter_clutter_clutter-stage-view_c,v 1.1 2021/06/04 10:56:17 ajacoutot Exp $ - -Index: clutter/clutter/clutter-stage-view.c ---- clutter/clutter/clutter-stage-view.c.orig -+++ clutter/clutter/clutter-stage-view.c -@@ -543,13 +543,13 @@ find_damaged_tiles (ClutterStageView *view, - bpp = cogl_dma_buf_handle_get_bpp (current_dma_buf_handle); - - cogl_framebuffer_finish (COGL_FRAMEBUFFER (priv->shadow.framebuffer)); -- -+#ifdef __linux__ - if (!cogl_dma_buf_handle_sync_read_start (prev_dma_buf_handle, error)) - return NULL; - - if (!cogl_dma_buf_handle_sync_read_start (current_dma_buf_handle, error)) - goto err_sync_read_current; -- -+#endif - prev_data = cogl_dma_buf_handle_mmap (prev_dma_buf_handle, error); - if (!prev_data) - goto err_mmap_prev; -@@ -594,7 +594,7 @@ find_damaged_tiles (ClutterStageView *view, - cairo_region_union_rectangle (tile_damage_region, &tile); - } - } -- -+#ifdef __linux__ - if (!cogl_dma_buf_handle_sync_read_end (prev_dma_buf_handle, error)) - { - g_warning ("Failed to end DMA buffer read synchronization: %s", -@@ -608,7 +608,7 @@ find_damaged_tiles (ClutterStageView *view, - (*error)->message); - g_clear_error (error); - } -- -+#endif - cogl_dma_buf_handle_munmap (prev_dma_buf_handle, prev_data, NULL); - cogl_dma_buf_handle_munmap (current_dma_buf_handle, current_data, NULL); - -@@ -618,13 +618,16 @@ find_damaged_tiles (ClutterStageView *view, - - err_mmap_current: - cogl_dma_buf_handle_munmap (prev_dma_buf_handle, prev_data, NULL); -- -+#ifdef __linux__ - err_mmap_prev: - cogl_dma_buf_handle_sync_read_end (current_dma_buf_handle, NULL); - - err_sync_read_current: - cogl_dma_buf_handle_sync_read_end (prev_dma_buf_handle, NULL); -- -+#else -+err_mmap_prev: -+err_sync_read_current: -+#endif - return NULL; - } - diff --git a/x11-wm/mutter/files/patch-cogl_cogl_cogl-dma-buf-handle.c b/x11-wm/mutter/files/patch-cogl_cogl_cogl-dma-buf-handle.c index a0739e3d4895..86768c36f809 100644 --- a/x11-wm/mutter/files/patch-cogl_cogl_cogl-dma-buf-handle.c +++ b/x11-wm/mutter/files/patch-cogl_cogl_cogl-dma-buf-handle.c @@ -1,32 +1,31 @@ -$OpenBSD: patch-cogl_cogl_cogl-dma-buf-handle_c,v 1.2 2021/06/04 10:56:17 ajacoutot Exp $ - Index: cogl/cogl/cogl-dma-buf-handle.c ---- cogl/cogl/cogl-dma-buf-handle.c.orig +--- cogl/cogl/cogl-dma-buf-handle.c.orig 2023-07-06 10:42:04 UTC +++ cogl/cogl/cogl-dma-buf-handle.c -@@ -36,8 +36,10 @@ - +@@ -37,7 +37,27 @@ #include <errno.h> #include <gio/gio.h> + #include <glib/gstdio.h> +#ifdef __linux__ #include <linux/dma-buf.h> - #include <sys/ioctl.h> ++#else ++typedef uint64_t __u64; ++ ++// From https://github.com/evadot/drm-subtree or https://reviews.freebsd.org/D23085 ++struct dma_buf_sync ++{ ++ __u64 flags; ++}; ++ ++#define DMA_BUF_SYNC_READ (1 << 0) ++#define DMA_BUF_SYNC_WRITE (2 << 0) ++#define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE) ++#define DMA_BUF_SYNC_START (0 << 2) ++#define DMA_BUF_SYNC_END (1 << 2) ++#define DMA_BUF_SYNC_VALID_FLAGS_MASK \ ++ (DMA_BUF_SYNC_RW | DMA_BUF_SYNC_END) ++#define DMA_BUF_BASE 'b' ++#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) +#endif + #include <sys/ioctl.h> #include <sys/mman.h> #include <unistd.h> - -@@ -101,6 +103,7 @@ cogl_dma_buf_handle_free (CoglDmaBufHandle *dmabuf_han - g_free (dmabuf_handle); - } - -+#ifdef __linux__ - static gboolean - sync_read (CoglDmaBufHandle *dmabuf_handle, - uint64_t start_or_end, -@@ -147,6 +150,7 @@ cogl_dma_buf_handle_sync_read_end (CoglDmaBufHandle * - { - return sync_read (dmabuf_handle, DMA_BUF_SYNC_END, error); - } -+#endif - - gpointer - cogl_dma_buf_handle_mmap (CoglDmaBufHandle *dmabuf_handle, diff --git a/x11-wm/mutter/files/patch-cogl_cogl_cogl-dma-buf-handle.h b/x11-wm/mutter/files/patch-cogl_cogl_cogl-dma-buf-handle.h deleted file mode 100644 index a7b5dcad6553..000000000000 --- a/x11-wm/mutter/files/patch-cogl_cogl_cogl-dma-buf-handle.h +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-cogl_cogl_cogl-dma-buf-handle_h,v 1.2 2021/06/04 10:56:17 ajacoutot Exp $ - -Index: cogl/cogl/cogl-dma-buf-handle.h ---- cogl/cogl/cogl-dma-buf-handle.h.orig -+++ cogl/cogl/cogl-dma-buf-handle.h -@@ -63,6 +63,7 @@ cogl_dma_buf_handle_new (CoglFramebuffer *framebuffer, - COGL_EXPORT void - cogl_dma_buf_handle_free (CoglDmaBufHandle *dmabuf_handle); - -+# ifdef __linux__ - COGL_EXPORT gboolean - cogl_dma_buf_handle_sync_read_start (CoglDmaBufHandle *dmabuf_handle, - GError **error); -@@ -70,7 +71,7 @@ cogl_dma_buf_handle_sync_read_start (CoglDmaBufHandle - COGL_EXPORT gboolean - cogl_dma_buf_handle_sync_read_end (CoglDmaBufHandle *dmabuf_handle, - GError **error); -- -+# endif - COGL_EXPORT gpointer - cogl_dma_buf_handle_mmap (CoglDmaBufHandle *dmabuf_handle, - GError **error); diff --git a/x11-wm/mutter/files/patch-da3ae7f0.patch b/x11-wm/mutter/files/patch-da3ae7f0.patch new file mode 100644 index 000000000000..3f26bf205ebe --- /dev/null +++ b/x11-wm/mutter/files/patch-da3ae7f0.patch @@ -0,0 +1,29 @@ +Revert: +From da3ae7f0e68d8fab424a260e8f8300a217ccf0ee Mon Sep 17 00:00:00 2001 +From: Kamil Szczęk <kamil@szczek.dev> +Date: Mon, 30 Sep 2024 11:24:32 +0200 +Subject: [PATCH] udev: Use current tags when looking for preferred primary + devices + +--- meson.build.orig 2024-11-25 14:05:12 UTC ++++ meson.build +@@ -42,7 +42,7 @@ udev_req = '>= 228' + + # optional version requirements + udev_req = '>= 228' +-gudev_req = '>= 238' ++gudev_req = '>= 232' + + # wayland version requirements + wayland_server_req = '>= 1.22' +--- src/backends/native/meta-udev.c.orig 2024-11-25 14:05:12 UTC ++++ src/backends/native/meta-udev.c +@@ -125,7 +125,7 @@ meta_is_udev_device_preferred_primary (GUdevDevice *de + { + const char * const *tags; + +- tags = g_udev_device_get_current_tags (device); ++ tags = g_udev_device_get_tags (device); + if (!tags) + return FALSE; + diff --git a/x11-wm/mutter/files/patch-meson.build b/x11-wm/mutter/files/patch-meson.build new file mode 100644 index 000000000000..29f3431e24d1 --- /dev/null +++ b/x11-wm/mutter/files/patch-meson.build @@ -0,0 +1,20 @@ +--- meson.build.orig 2023-07-06 10:42:04 UTC ++++ meson.build +@@ -226,11 +226,15 @@ have_libgudev = get_option('udev') + if have_libgudev + libudev_dep = dependency('libudev', version: udev_req) + gudev_dep = dependency('gudev-1.0', version: gudev_req) +- udev_dep = dependency('udev') ++ udev_dep = dependency('udev', required: false) + + udev_dir = get_option('udev_dir') + if udev_dir == '' +- udev_dir = udev_dep.get_variable('udevdir') ++ if udev_dep.found() ++ udev_dir = udev_dep.get_variable('udevdir') ++ else ++ udev_dir = libdir / 'udev' ++ endif + endif + endif + diff --git a/x11-wm/mutter/files/patch-src_backends_meta-stage-impl.c b/x11-wm/mutter/files/patch-src_backends_meta-stage-impl.c new file mode 100644 index 000000000000..14b366632ca8 --- /dev/null +++ b/x11-wm/mutter/files/patch-src_backends_meta-stage-impl.c @@ -0,0 +1,18 @@ +https://gitlab.gnome.org/GNOME/mutter/-/issues/2103 + +--- src/backends/meta-stage-impl.c.orig 2024-11-25 14:05:12 UTC ++++ src/backends/meta-stage-impl.c +@@ -612,9 +612,13 @@ meta_stage_impl_redraw_view_primary (MetaStageImpl + * artefacts. + */ + /* swap_region does not need damage history, set it up before that */ ++#if 0 + if (!use_clipped_redraw) + swap_region = mtk_region_create (); + else if (clutter_stage_view_has_shadowfb (stage_view)) ++#else ++ if (clutter_stage_view_has_shadowfb (stage_view)) ++#endif + swap_region = mtk_region_ref (fb_clip_region); + else + swap_region = mtk_region_copy (fb_clip_region); diff --git a/x11-wm/mutter/files/patch-src_backends_x11_meta-input-settings-x11.c b/x11-wm/mutter/files/patch-src_backends_x11_meta-input-settings-x11.c deleted file mode 100644 index 56be8ec7b216..000000000000 --- a/x11-wm/mutter/files/patch-src_backends_x11_meta-input-settings-x11.c +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-src_backends_x11_meta-input-settings-x11_c,v 1.5 2021/06/04 10:56:17 ajacoutot Exp $ - -Index: src/backends/x11/meta-input-settings-x11.c ---- src/backends/x11/meta-input-settings-x11.c.orig -+++ src/backends/x11/meta-input-settings-x11.c -@@ -45,6 +45,7 @@ typedef struct _MetaInputSettingsX11Private - #ifdef HAVE_LIBGUDEV - GUdevClient *udev_client; - #endif -+ bool dummy_field; // struct needs at least one element to compile - } MetaInputSettingsX11Private; - - G_DEFINE_TYPE_WITH_PRIVATE (MetaInputSettingsX11, meta_input_settings_x11, -@@ -765,11 +766,10 @@ meta_input_settings_x11_set_tablet_aspect_ratio (MetaI - static void - meta_input_settings_x11_dispose (GObject *object) - { --#ifdef HAVE_LIBGUDEV - MetaInputSettingsX11 *settings_x11 = META_INPUT_SETTINGS_X11 (object); - MetaInputSettingsX11Private *priv = - meta_input_settings_x11_get_instance_private (settings_x11); -- -+#ifdef HAVE_LIBGUDEV - g_clear_object (&priv->udev_client); - #endif - -@@ -938,11 +938,10 @@ meta_input_settings_x11_class_init (MetaInputSettingsX - static void - meta_input_settings_x11_init (MetaInputSettingsX11 *settings) - { --#ifdef HAVE_LIBGUDEV - MetaInputSettingsX11Private *priv = - meta_input_settings_x11_get_instance_private (settings); - const char *subsystems[] = { NULL }; -- -+#ifdef HAVE_LIBGUDEV - priv->udev_client = g_udev_client_new (subsystems); - #endif - } diff --git a/x11-wm/mutter/files/patch-src_backends_x11_meta-seat-x11.c b/x11-wm/mutter/files/patch-src_backends_x11_meta-seat-x11.c deleted file mode 100644 index 5845d2d285b2..000000000000 --- a/x11-wm/mutter/files/patch-src_backends_x11_meta-seat-x11.c +++ /dev/null @@ -1,44 +0,0 @@ -$OpenBSD: patch-src_backends_x11_meta-seat-x11_c,v 1.3 2021/06/04 10:56:17 ajacoutot Exp $ - -Index: src/backends/x11/meta-seat-x11.c ---- src/backends/x11/meta-seat-x11.c.orig -+++ src/backends/x11/meta-seat-x11.c -@@ -17,8 +17,9 @@ - * Author: Carlos Garnacho <carlosg@gnome.org> - */ - #include "config.h" -- -+#ifdef __linux__ - #include <linux/input-event-codes.h> -+#endif - #include <X11/extensions/XInput2.h> - #include <X11/extensions/XKB.h> - -@@ -1733,7 +1734,7 @@ get_source_device_checked (MetaSeatX11 *seat, - - return source_device; - } -- -+#ifdef __linux__ - static uint32_t - evdev_button_code (uint32_t x_button) - { -@@ -1762,7 +1763,7 @@ evdev_button_code (uint32_t x_button) - - return button; - } -- -+#endif - gboolean - meta_seat_x11_translate_event (MetaSeatX11 *seat, - XEvent *xevent, -@@ -2050,7 +2051,9 @@ meta_seat_x11_translate_event (MetaSeatX11 *seat, - event->button.time = xev->time; - translate_coords (stage_x11, xev->event_x, xev->event_y, &event->button.x, &event->button.y); - event->button.button = xev->detail; -+#ifdef __linux__ - event->button.evdev_code = evdev_button_code (xev->detail); -+#endif - meta_input_device_x11_translate_state (event, - &xev->mods, - &xev->buttons, diff --git a/x11-wm/mutter/files/patch-src_core_meta-context-main.c b/x11-wm/mutter/files/patch-src_core_meta-context-main.c new file mode 100644 index 000000000000..ed1fc10ad094 --- /dev/null +++ b/x11-wm/mutter/files/patch-src_core_meta-context-main.c @@ -0,0 +1,24 @@ +Based on https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258042 + +--- src/core/meta-context-main.c.orig 2025-03-04 18:56:53 UTC ++++ src/core/meta-context-main.c +@@ -25,7 +25,7 @@ + #include <glib.h> + #include <gio/gio.h> + +-#ifdef HAVE_WAYLAND ++#if defined(HAVE_LIBSYSTEMD) && defined(HAVE_WAYLAND) + #include <systemd/sd-login.h> + #endif + +@@ -348,8 +348,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 */ diff --git a/x11-wm/mutter/files/patch-src_wayland_meta-wayland-buffer.c b/x11-wm/mutter/files/patch-src_wayland_meta-wayland-buffer.c new file mode 100644 index 000000000000..4f2e3087ee4c --- /dev/null +++ b/x11-wm/mutter/files/patch-src_wayland_meta-wayland-buffer.c @@ -0,0 +1,46 @@ +Based on https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258042 + +--- src/wayland/meta-wayland-buffer.c.orig 2024-11-25 14:05:12 UTC ++++ src/wayland/meta-wayland-buffer.c +@@ -228,6 +228,7 @@ shm_to_drm_format (enum wl_shm_format format) + return format; + } + ++#ifdef HAVE_NATIVE_BACKEND + static const char * + shm_format_to_string (MetaDrmFormatBuf *format_buf, + enum wl_shm_format shm_format) +@@ -237,6 +238,7 @@ shm_format_to_string (MetaDrmFormatBuf *format_buf, + drm_format = shm_to_drm_format (shm_format); + return meta_drm_format_to_string (format_buf, drm_format); + } ++#endif + + static const MetaFormatInfo * + get_supported_shm_format_info (uint32_t shm_format) +@@ -409,7 +411,9 @@ shm_buffer_attach (MetaWaylandBuffer *buffer, + int stride, width, height; + MetaMultiTextureFormat multi_format; + CoglPixelFormat cogl_format; ++#ifdef HAVE_NATIVE_BACKEND + MetaDrmFormatBuf format_buf; ++#endif + uint32_t shm_format; + const MetaFormatInfo *format_info; + +@@ -430,6 +434,7 @@ shm_buffer_attach (MetaWaylandBuffer *buffer, + cogl_format = format_info->cogl_format; + multi_format = format_info->multi_texture_format; + ++#ifdef HAVE_NATIVE_BACKEND + meta_topic (META_DEBUG_WAYLAND, + "[wl-shm] wl_buffer@%u wl_shm_format %s " + "-> MetaMultiTextureFormat %s / CoglPixelFormat %s", +@@ -437,6 +442,7 @@ shm_buffer_attach (MetaWaylandBuffer *buffer, + shm_format_to_string (&format_buf, shm_format), + meta_multi_texture_format_to_string (multi_format), + cogl_pixel_format_to_string (cogl_format)); ++#endif + + if (*texture && + meta_multi_texture_get_width (*texture) == width && diff --git a/x11-wm/mutter/files/patch-src_wayland_meta-wayland-dma-buf.c b/x11-wm/mutter/files/patch-src_wayland_meta-wayland-dma-buf.c new file mode 100644 index 000000000000..723d17b181ba --- /dev/null +++ b/x11-wm/mutter/files/patch-src_wayland_meta-wayland-dma-buf.c @@ -0,0 +1,152 @@ +Adapt changes https://gitlab.gnome.org/GNOME/mutter/-/commit/c4773089 + +--- src/wayland/meta-wayland-dma-buf.c.orig 2024-11-25 14:05:12 UTC ++++ src/wayland/meta-wayland-dma-buf.c +@@ -39,7 +39,9 @@ + + #include <drm_fourcc.h> + #include <glib/gstdio.h> ++#ifdef __linux__ + #include <linux/dma-buf.h> ++#endif + #include <sys/ioctl.h> + #include <sys/stat.h> + #include <sys/types.h> +@@ -72,6 +74,26 @@ + + #define META_WAYLAND_DMA_BUF_MAX_FDS 4 + ++#ifndef __linux__ ++/* From https://reviews.freebsd.org/D23085 */ ++typedef uint64_t __u64; ++ ++struct dma_buf_sync ++{ ++ __u64 flags; ++}; ++ ++#define DMA_BUF_SYNC_READ (1 << 0) ++#define DMA_BUF_SYNC_WRITE (2 << 0) ++#define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE) ++#define DMA_BUF_SYNC_START (0 << 2) ++#define DMA_BUF_SYNC_END (1 << 2) ++#define DMA_BUF_SYNC_VALID_FLAGS_MASK \ ++ (DMA_BUF_SYNC_RW | DMA_BUF_SYNC_END) ++#define DMA_BUF_BASE 'b' ++#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) ++#endif ++ + /* Compatible with zwp_linux_dmabuf_feedback_v1.tranche_flags */ + typedef enum _MetaWaylandDmaBufTrancheFlags + { +@@ -863,7 +885,9 @@ typedef struct _MetaWaylandDmaBufSource + gpointer user_data; + + gpointer fd_tags[META_WAYLAND_DMA_BUF_MAX_FDS]; ++#ifdef __linux__ + int owned_sync_fd[META_WAYLAND_DMA_BUF_MAX_FDS]; ++#endif + } MetaWaylandDmaBufSource; + + static gboolean +@@ -898,11 +922,13 @@ meta_wayland_dma_buf_source_dispatch (GSource *bas + for (i = 0; i < META_WAYLAND_DMA_BUF_MAX_FDS; i++) + { + gpointer fd_tag = source->fd_tags[i]; +- int fd; + + if (!fd_tag) + continue; + ++#ifdef __linux__ ++ int fd; ++ + fd = source->owned_sync_fd[i]; + if (fd < 0) + fd = dma_buf->fds[i]; +@@ -912,10 +938,19 @@ meta_wayland_dma_buf_source_dispatch (GSource *bas + ready = FALSE; + continue; + } ++#else ++ if (!is_fd_readable (dma_buf->fds[i])) ++ { ++ ready = FALSE; ++ continue; ++ } ++#endif + + g_source_remove_unix_fd (&source->base, fd_tag); + source->fd_tags[i] = NULL; ++#ifdef __linux__ + g_clear_fd (&source->owned_sync_fd[i], NULL); ++#endif + } + + if (!ready) +@@ -942,7 +977,9 @@ meta_wayland_dma_buf_source_finalize (GSource *base) + { + g_source_remove_unix_fd (&source->base, fd_tag); + source->fd_tags[i] = NULL; ++#ifdef __linux__ + g_clear_fd (&source->owned_sync_fd[i], NULL); ++#endif + } + } + +@@ -960,7 +997,6 @@ create_source (MetaWaylandBuffer *buffer + gpointer user_data) + { + MetaWaylandDmaBufSource *source; +- int i; + + source = + (MetaWaylandDmaBufSource *) g_source_new (&meta_wayland_dma_buf_source_funcs, +@@ -971,12 +1007,17 @@ create_source (MetaWaylandBuffer *buffer + source->dispatch = dispatch; + source->user_data = user_data; + ++#ifdef __linux__ ++ int i; ++ + for (i = 0; i < META_WAYLAND_DMA_BUF_MAX_FDS; i++) + source->owned_sync_fd[i] = -1; ++#endif + + return source; + } + ++#ifdef __linux__ + static int + get_sync_file (int dma_buf_fd) + { +@@ -994,6 +1035,7 @@ get_sync_file (int dma_buf_fd) + + return -1; + } ++#endif + + /** + * meta_wayland_dma_buf_create_source: +@@ -1034,9 +1076,11 @@ meta_wayland_dma_buf_create_source (MetaWaylandBuffer + if (!source) + source = create_source (buffer, dispatch, user_data); + ++#ifdef __linux__ + source->owned_sync_fd[i] = get_sync_file (fd); + if (source->owned_sync_fd[i] >= 0) + fd = source->owned_sync_fd[i]; ++#endif + + source->fd_tags[i] = g_source_add_unix_fd (&source->base, fd, G_IO_IN); + } +@@ -1075,7 +1119,9 @@ meta_wayland_drm_syncobj_create_source (MetaWaylandBuf + return NULL; + + source->fd_tags[0] = g_source_add_unix_fd (&source->base, sync_fd, G_IO_IN); ++#ifdef __linux__ + source->owned_sync_fd[0] = g_steal_fd (&sync_fd); ++#endif + + return &source->base; + } diff --git a/x11-wm/mutter/files/patch-src_wayland_meta-xwayland.c b/x11-wm/mutter/files/patch-src_wayland_meta-xwayland.c new file mode 100644 index 000000000000..113a0dd6e2bd --- /dev/null +++ b/x11-wm/mutter/files/patch-src_wayland_meta-xwayland.c @@ -0,0 +1,27 @@ +Based on https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258042 + +--- src/wayland/meta-xwayland.c.orig 2024-11-25 14:05:12 UTC ++++ src/wayland/meta-xwayland.c +@@ -598,9 +598,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) +@@ -608,6 +610,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; diff --git a/x11-wm/mutter/pkg-descr b/x11-wm/mutter/pkg-descr index e1b5db0d2d3a..09fbc67a5170 100644 --- a/x11-wm/mutter/pkg-descr +++ b/x11-wm/mutter/pkg-descr @@ -1,5 +1,8 @@ -mutter is a minimal X window manager aimed at nontechnical users and is -designed to integrate well with the GNOME desktop. mutter lacks some -features that may be expected by traditional UNIX or other technical -users; these users may want to investigate other available window man- -agers for use with GNOME or standalone. +Mutter is a Wayland display server and X11 window manager and compositor +library. +It implements the compositor side of the Wayland core protocol as well +as various protocol extensions. It also has functionality related to +running X11 applications using Xwayland. When used on top of Xorg it acts +as a X11 window manager and compositing manager. It contains functionality +related to, among other things, window management, window compositing, +focus tracking, workspace management, keybindings and monitor configuration. diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist index d5f8a377672b..1a6b35cda85c 100644 --- a/x11-wm/mutter/pkg-plist +++ b/x11-wm/mutter/pkg-plist @@ -1,252 +1,237 @@ bin/mutter -include/mutter-10/clutter/cally/cally-actor.h -include/mutter-10/clutter/cally/cally-clone.h -include/mutter-10/clutter/cally/cally-factory.h -include/mutter-10/clutter/cally/cally-main.h -include/mutter-10/clutter/cally/cally-root.h -include/mutter-10/clutter/cally/cally-stage.h -include/mutter-10/clutter/cally/cally-text.h -include/mutter-10/clutter/cally/cally-util.h -include/mutter-10/clutter/cally/cally.h -include/mutter-10/clutter/clutter/clutter-action.h -include/mutter-10/clutter/clutter/clutter-actor-meta.h -include/mutter-10/clutter/clutter/clutter-actor.h -include/mutter-10/clutter/clutter/clutter-align-constraint.h -include/mutter-10/clutter/clutter/clutter-animatable.h -include/mutter-10/clutter/clutter/clutter-autocleanups.h -include/mutter-10/clutter/clutter/clutter-backend.h -include/mutter-10/clutter/clutter/clutter-bin-layout.h -include/mutter-10/clutter/clutter/clutter-bind-constraint.h -include/mutter-10/clutter/clutter/clutter-binding-pool.h -include/mutter-10/clutter/clutter/clutter-blur-effect.h -include/mutter-10/clutter/clutter/clutter-box-layout.h -include/mutter-10/clutter/clutter/clutter-brightness-contrast-effect.h -include/mutter-10/clutter/clutter/clutter-cairo.h -include/mutter-10/clutter/clutter/clutter-canvas.h -include/mutter-10/clutter/clutter/clutter-child-meta.h -include/mutter-10/clutter/clutter/clutter-click-action.h -include/mutter-10/clutter/clutter/clutter-clone.h -include/mutter-10/clutter/clutter/clutter-color-static.h -include/mutter-10/clutter/clutter/clutter-color.h -include/mutter-10/clutter/clutter/clutter-colorize-effect.h -include/mutter-10/clutter/clutter/clutter-constraint.h -include/mutter-10/clutter/clutter/clutter-container.h -include/mutter-10/clutter/clutter/clutter-content.h -include/mutter-10/clutter/clutter/clutter-deform-effect.h -include/mutter-10/clutter/clutter/clutter-deprecated.h -include/mutter-10/clutter/clutter/clutter-desaturate-effect.h -include/mutter-10/clutter/clutter/clutter-effect.h -include/mutter-10/clutter/clutter/clutter-enum-types.h -include/mutter-10/clutter/clutter/clutter-enums.h -include/mutter-10/clutter/clutter/clutter-event.h -include/mutter-10/clutter/clutter/clutter-feature.h -include/mutter-10/clutter/clutter/clutter-fixed-layout.h -include/mutter-10/clutter/clutter/clutter-flow-layout.h -include/mutter-10/clutter/clutter/clutter-frame-clock.h -include/mutter-10/clutter/clutter/clutter-frame.h -include/mutter-10/clutter/clutter/clutter-gesture-action.h -include/mutter-10/clutter/clutter/clutter-grab.h -include/mutter-10/clutter/clutter/clutter-grid-layout.h -include/mutter-10/clutter/clutter/clutter-image.h -include/mutter-10/clutter/clutter/clutter-input-device-tool.h -include/mutter-10/clutter/clutter/clutter-input-device.h -include/mutter-10/clutter/clutter/clutter-input-focus.h -include/mutter-10/clutter/clutter/clutter-input-method.h -include/mutter-10/clutter/clutter/clutter-interval.h -include/mutter-10/clutter/clutter/clutter-keyframe-transition.h -include/mutter-10/clutter/clutter/clutter-keymap.h -include/mutter-10/clutter/clutter/clutter-keysyms.h -include/mutter-10/clutter/clutter/clutter-layout-manager.h -include/mutter-10/clutter/clutter/clutter-layout-meta.h -include/mutter-10/clutter/clutter/clutter-macros.h -include/mutter-10/clutter/clutter/clutter-main.h -include/mutter-10/clutter/clutter/clutter-marshal.h -include/mutter-10/clutter/clutter/clutter-mutter.h -include/mutter-10/clutter/clutter/clutter-offscreen-effect.h -include/mutter-10/clutter/clutter/clutter-page-turn-effect.h -include/mutter-10/clutter/clutter/clutter-paint-context.h -include/mutter-10/clutter/clutter/clutter-paint-node.h -include/mutter-10/clutter/clutter/clutter-paint-nodes.h -include/mutter-10/clutter/clutter/clutter-pan-action.h -include/mutter-10/clutter/clutter/clutter-path-constraint.h -include/mutter-10/clutter/clutter/clutter-path.h -include/mutter-10/clutter/clutter/clutter-pick-context.h -include/mutter-10/clutter/clutter/clutter-property-transition.h -include/mutter-10/clutter/clutter/clutter-rotate-action.h -include/mutter-10/clutter/clutter/clutter-script.h -include/mutter-10/clutter/clutter/clutter-scriptable.h -include/mutter-10/clutter/clutter/clutter-scroll-actor.h -include/mutter-10/clutter/clutter/clutter-seat.h -include/mutter-10/clutter/clutter/clutter-settings.h -include/mutter-10/clutter/clutter/clutter-shader-effect.h -include/mutter-10/clutter/clutter/clutter-shader-types.h -include/mutter-10/clutter/clutter/clutter-snap-constraint.h -include/mutter-10/clutter/clutter/clutter-stage-manager.h -include/mutter-10/clutter/clutter/clutter-stage-view.h -include/mutter-10/clutter/clutter/clutter-stage.h -include/mutter-10/clutter/clutter/clutter-swipe-action.h -include/mutter-10/clutter/clutter/clutter-tap-action.h -include/mutter-10/clutter/clutter/clutter-text-buffer.h -include/mutter-10/clutter/clutter/clutter-text.h -include/mutter-10/clutter/clutter/clutter-texture-content.h -include/mutter-10/clutter/clutter/clutter-timeline.h -include/mutter-10/clutter/clutter/clutter-transition-group.h -include/mutter-10/clutter/clutter/clutter-transition.h -include/mutter-10/clutter/clutter/clutter-types.h -include/mutter-10/clutter/clutter/clutter-units.h -include/mutter-10/clutter/clutter/clutter-virtual-input-device.h -include/mutter-10/clutter/clutter/clutter-zoom-action.h -include/mutter-10/clutter/clutter/clutter.h -include/mutter-10/clutter/clutter/deprecated/clutter-box-layout.h -include/mutter-10/clutter/clutter/deprecated/clutter-container.h -include/mutter-10/clutter/clutter/deprecated/clutter-timeline.h -include/mutter-10/cogl/cogl-pango/cogl-pango.h -include/mutter-10/cogl/cogl/cogl-atlas-texture.h -include/mutter-10/cogl/cogl/cogl-attribute-buffer.h -include/mutter-10/cogl/cogl/cogl-attribute.h -include/mutter-10/cogl/cogl/cogl-bitmap.h -include/mutter-10/cogl/cogl/cogl-buffer.h -include/mutter-10/cogl/cogl/cogl-color.h -include/mutter-10/cogl/cogl/cogl-context.h -include/mutter-10/cogl/cogl/cogl-defines.h -include/mutter-10/cogl/cogl/cogl-depth-state.h -include/mutter-10/cogl/cogl/cogl-display.h -include/mutter-10/cogl/cogl/cogl-dma-buf-handle.h -include/mutter-10/cogl/cogl/cogl-egl-defines.h -include/mutter-10/cogl/cogl/cogl-egl.h -include/mutter-10/cogl/cogl/cogl-fence.h -include/mutter-10/cogl/cogl/cogl-frame-info.h -include/mutter-10/cogl/cogl/cogl-framebuffer.h -include/mutter-10/cogl/cogl/cogl-glib-source.h -include/mutter-10/cogl/cogl/cogl-glx.h -include/mutter-10/cogl/cogl/cogl-graphene.h -include/mutter-10/cogl/cogl/cogl-gtype-private.h -include/mutter-10/cogl/cogl/cogl-index-buffer.h -include/mutter-10/cogl/cogl/cogl-indices.h -include/mutter-10/cogl/cogl/cogl-macros.h -include/mutter-10/cogl/cogl/cogl-matrix-stack.h -include/mutter-10/cogl/cogl/cogl-meta-texture.h -include/mutter-10/cogl/cogl/cogl-object.h -include/mutter-10/cogl/cogl/cogl-offscreen.h -include/mutter-10/cogl/cogl/cogl-onscreen-template.h -include/mutter-10/cogl/cogl/cogl-onscreen.h -include/mutter-10/cogl/cogl/cogl-output.h -include/mutter-10/cogl/cogl/cogl-pipeline-layer-state.h -include/mutter-10/cogl/cogl/cogl-pipeline-state.h -include/mutter-10/cogl/cogl/cogl-pipeline.h -include/mutter-10/cogl/cogl/cogl-pixel-buffer.h -include/mutter-10/cogl/cogl/cogl-pixel-format.h -include/mutter-10/cogl/cogl/cogl-poll.h -include/mutter-10/cogl/cogl/cogl-primitive-texture.h -include/mutter-10/cogl/cogl/cogl-primitive.h -include/mutter-10/cogl/cogl/cogl-renderer.h -include/mutter-10/cogl/cogl/cogl-scanout.h -include/mutter-10/cogl/cogl/cogl-snippet.h -include/mutter-10/cogl/cogl/cogl-sub-texture.h -include/mutter-10/cogl/cogl/cogl-swap-chain.h -include/mutter-10/cogl/cogl/cogl-texture-2d-sliced.h -include/mutter-10/cogl/cogl/cogl-texture-2d.h -include/mutter-10/cogl/cogl/cogl-texture-pixmap-x11.h -include/mutter-10/cogl/cogl/cogl-texture.h -include/mutter-10/cogl/cogl/cogl-trace.h -include/mutter-10/cogl/cogl/cogl-types.h -include/mutter-10/cogl/cogl/cogl-version.h -include/mutter-10/cogl/cogl/cogl-xlib-renderer.h -include/mutter-10/cogl/cogl/cogl-xlib.h -include/mutter-10/cogl/cogl/cogl.h -include/mutter-10/cogl/cogl/cogl1-context.h -include/mutter-10/cogl/cogl/deprecated/cogl-auto-texture.h -include/mutter-10/cogl/cogl/deprecated/cogl-clutter.h -include/mutter-10/cogl/cogl/deprecated/cogl-shader.h -include/mutter-10/cogl/cogl/deprecated/cogl-type-casts.h -include/mutter-10/cogl/cogl/gl-prototypes/cogl-core-functions.h -include/mutter-10/cogl/cogl/gl-prototypes/cogl-gles2-functions.h -include/mutter-10/cogl/cogl/gl-prototypes/cogl-glsl-functions.h -include/mutter-10/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h -include/mutter-10/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h -include/mutter-10/meta/barrier.h -include/mutter-10/meta/boxes.h -include/mutter-10/meta/common.h -include/mutter-10/meta/compositor-mutter.h -include/mutter-10/meta/compositor.h -include/mutter-10/meta/display.h -include/mutter-10/meta/group.h -include/mutter-10/meta/keybindings.h -include/mutter-10/meta/main.h -include/mutter-10/meta/meta-backend.h -include/mutter-10/meta/meta-background-actor.h -include/mutter-10/meta/meta-background-content.h -include/mutter-10/meta/meta-background-group.h -include/mutter-10/meta/meta-background-image.h -include/mutter-10/meta/meta-background.h -include/mutter-10/meta/meta-close-dialog.h -include/mutter-10/meta/meta-context.h -include/mutter-10/meta/meta-cursor-tracker.h -include/mutter-10/meta/meta-dnd.h -include/mutter-10/meta/meta-enum-types.h -include/mutter-10/meta/meta-enums.h -include/mutter-10/meta/meta-idle-monitor.h -include/mutter-10/meta/meta-inhibit-shortcuts-dialog.h -include/mutter-10/meta/meta-later.h -include/mutter-10/meta/meta-launch-context.h -include/mutter-10/meta/meta-monitor-manager.h -include/mutter-10/meta/meta-plugin.h -include/mutter-10/meta/meta-remote-access-controller.h -include/mutter-10/meta/meta-selection-source-memory.h -include/mutter-10/meta/meta-selection-source.h -include/mutter-10/meta/meta-selection.h -include/mutter-10/meta/meta-settings.h -include/mutter-10/meta/meta-shadow-factory.h -include/mutter-10/meta/meta-shaped-texture.h -include/mutter-10/meta/meta-sound-player.h -include/mutter-10/meta/meta-stage.h -include/mutter-10/meta/meta-startup-notification.h -include/mutter-10/meta/meta-window-actor.h -include/mutter-10/meta/meta-window-group.h -include/mutter-10/meta/meta-window-shape.h -include/mutter-10/meta/meta-workspace-manager.h -include/mutter-10/meta/meta-x11-display.h -include/mutter-10/meta/meta-x11-errors.h -include/mutter-10/meta/prefs.h -include/mutter-10/meta/theme.h -include/mutter-10/meta/types.h -include/mutter-10/meta/util.h -include/mutter-10/meta/window.h -include/mutter-10/meta/workspace.h -lib/libmutter-10.so -lib/libmutter-10.so.0 -lib/libmutter-10.so.0.0.0 -lib/mutter-10/Cally-10.gir -lib/mutter-10/Cally-10.typelib -lib/mutter-10/Clutter-10.gir -lib/mutter-10/Clutter-10.typelib -lib/mutter-10/Cogl-10.gir -lib/mutter-10/Cogl-10.typelib -lib/mutter-10/CoglPango-10.gir -lib/mutter-10/CoglPango-10.typelib -lib/mutter-10/Meta-10.gir -lib/mutter-10/Meta-10.typelib -lib/mutter-10/libmutter-clutter-10.so -lib/mutter-10/libmutter-clutter-10.so.0 -lib/mutter-10/libmutter-clutter-10.so.0.0.0 -lib/mutter-10/libmutter-cogl-10.so -lib/mutter-10/libmutter-cogl-10.so.0 -lib/mutter-10/libmutter-cogl-10.so.0.0.0 -lib/mutter-10/libmutter-cogl-pango-10.so -lib/mutter-10/libmutter-cogl-pango-10.so.0 -lib/mutter-10/libmutter-cogl-pango-10.so.0.0.0 -lib/mutter-10/plugins/libdefault.so -libdata/pkgconfig/libmutter-10.pc -libdata/pkgconfig/mutter-clutter-10.pc -libdata/pkgconfig/mutter-cogl-10.pc -libdata/pkgconfig/mutter-cogl-pango-10.pc +include/mutter-15/clutter/clutter/clutter-action.h +include/mutter-15/clutter/clutter/clutter-actor-accessible.h +include/mutter-15/clutter/clutter/clutter-actor-meta.h +include/mutter-15/clutter/clutter/clutter-actor.h +include/mutter-15/clutter/clutter/clutter-align-constraint.h +include/mutter-15/clutter/clutter/clutter-animatable.h +include/mutter-15/clutter/clutter/clutter-backend.h +include/mutter-15/clutter/clutter/clutter-bin-layout.h +include/mutter-15/clutter/clutter/clutter-bind-constraint.h +include/mutter-15/clutter/clutter/clutter-binding-pool.h +include/mutter-15/clutter/clutter/clutter-blur-effect.h +include/mutter-15/clutter/clutter/clutter-box-layout.h +include/mutter-15/clutter/clutter/clutter-brightness-contrast-effect.h +include/mutter-15/clutter/clutter/clutter-click-action.h +include/mutter-15/clutter/clutter/clutter-clone.h +include/mutter-15/clutter/clutter/clutter-color-manager.h +include/mutter-15/clutter/clutter/clutter-color-state.h +include/mutter-15/clutter/clutter/clutter-colorize-effect.h +include/mutter-15/clutter/clutter/clutter-constraint.h +include/mutter-15/clutter/clutter/clutter-content.h +include/mutter-15/clutter/clutter/clutter-context.h +include/mutter-15/clutter/clutter/clutter-deform-effect.h +include/mutter-15/clutter/clutter/clutter-desaturate-effect.h +include/mutter-15/clutter/clutter/clutter-effect.h +include/mutter-15/clutter/clutter/clutter-enum-types.h +include/mutter-15/clutter/clutter/clutter-enums.h +include/mutter-15/clutter/clutter/clutter-event.h +include/mutter-15/clutter/clutter/clutter-fixed-layout.h +include/mutter-15/clutter/clutter/clutter-flow-layout.h +include/mutter-15/clutter/clutter/clutter-frame-clock.h +include/mutter-15/clutter/clutter/clutter-frame.h +include/mutter-15/clutter/clutter/clutter-gesture-action.h +include/mutter-15/clutter/clutter/clutter-gesture.h +include/mutter-15/clutter/clutter/clutter-grab.h +include/mutter-15/clutter/clutter/clutter-grid-layout.h +include/mutter-15/clutter/clutter/clutter-image.h +include/mutter-15/clutter/clutter/clutter-input-device-tool.h +include/mutter-15/clutter/clutter/clutter-input-device.h +include/mutter-15/clutter/clutter/clutter-input-focus.h +include/mutter-15/clutter/clutter/clutter-input-method.h +include/mutter-15/clutter/clutter/clutter-interval.h +include/mutter-15/clutter/clutter/clutter-keyframe-transition.h +include/mutter-15/clutter/clutter/clutter-keymap.h +include/mutter-15/clutter/clutter/clutter-keysyms.h +include/mutter-15/clutter/clutter/clutter-keyval.c +include/mutter-15/clutter/clutter/clutter-keyval.h +include/mutter-15/clutter/clutter/clutter-layout-manager.h +include/mutter-15/clutter/clutter/clutter-layout-meta.h +include/mutter-15/clutter/clutter/clutter-macros.h +include/mutter-15/clutter/clutter/clutter-main.h +include/mutter-15/clutter/clutter/clutter-marshal.h +include/mutter-15/clutter/clutter/clutter-mutter.h +include/mutter-15/clutter/clutter/clutter-offscreen-effect.h +include/mutter-15/clutter/clutter/clutter-page-turn-effect.h +include/mutter-15/clutter/clutter/clutter-paint-context.h +include/mutter-15/clutter/clutter/clutter-paint-node.h +include/mutter-15/clutter/clutter/clutter-paint-nodes.h +include/mutter-15/clutter/clutter/clutter-pan-action.h +include/mutter-15/clutter/clutter/clutter-pick-context.h +include/mutter-15/clutter/clutter/clutter-pipeline-cache.h +include/mutter-15/clutter/clutter/clutter-property-transition.h +include/mutter-15/clutter/clutter/clutter-rotate-action.h +include/mutter-15/clutter/clutter/clutter-seat.h +include/mutter-15/clutter/clutter/clutter-settings.h +include/mutter-15/clutter/clutter/clutter-shader-effect.h +include/mutter-15/clutter/clutter/clutter-shader-types.h +include/mutter-15/clutter/clutter/clutter-snap-constraint.h +include/mutter-15/clutter/clutter/clutter-stage-view.h +include/mutter-15/clutter/clutter/clutter-stage.h +include/mutter-15/clutter/clutter/clutter-swipe-action.h +include/mutter-15/clutter/clutter/clutter-tap-action.h +include/mutter-15/clutter/clutter/clutter-text-buffer.h +include/mutter-15/clutter/clutter/clutter-text.h +include/mutter-15/clutter/clutter/clutter-texture-content.h +include/mutter-15/clutter/clutter/clutter-timeline.h +include/mutter-15/clutter/clutter/clutter-transition-group.h +include/mutter-15/clutter/clutter/clutter-transition.h +include/mutter-15/clutter/clutter/clutter-types.h +include/mutter-15/clutter/clutter/clutter-virtual-input-device.h +include/mutter-15/clutter/clutter/clutter-zoom-action.h +include/mutter-15/clutter/clutter/clutter.h +include/mutter-15/cogl/cogl-pango/cogl-pango.h +include/mutter-15/cogl/cogl/cogl-atlas-texture.h +include/mutter-15/cogl/cogl/cogl-atlas.h +include/mutter-15/cogl/cogl/cogl-attribute-buffer.h +include/mutter-15/cogl/cogl/cogl-attribute.h +include/mutter-15/cogl/cogl/cogl-bitmap.h +include/mutter-15/cogl/cogl/cogl-buffer.h +include/mutter-15/cogl/cogl/cogl-color.h +include/mutter-15/cogl/cogl/cogl-context.h +include/mutter-15/cogl/cogl/cogl-depth-state.h +include/mutter-15/cogl/cogl/cogl-display.h +include/mutter-15/cogl/cogl/cogl-dma-buf-handle.h +include/mutter-15/cogl/cogl/cogl-enum-types.h +include/mutter-15/cogl/cogl/cogl-frame-info.h +include/mutter-15/cogl/cogl/cogl-framebuffer.h +include/mutter-15/cogl/cogl/cogl-glib-source.h +include/mutter-15/cogl/cogl/cogl-graphene.h +include/mutter-15/cogl/cogl/cogl-index-buffer.h +include/mutter-15/cogl/cogl/cogl-indices.h +include/mutter-15/cogl/cogl/cogl-macros.h +include/mutter-15/cogl/cogl/cogl-matrix-stack.h +include/mutter-15/cogl/cogl/cogl-meta-texture.h +include/mutter-15/cogl/cogl/cogl-offscreen.h +include/mutter-15/cogl/cogl/cogl-onscreen.h +include/mutter-15/cogl/cogl/cogl-pipeline-layer-state.h +include/mutter-15/cogl/cogl/cogl-pipeline-state.h +include/mutter-15/cogl/cogl/cogl-pipeline.h +include/mutter-15/cogl/cogl/cogl-pixel-buffer.h +include/mutter-15/cogl/cogl/cogl-pixel-format.h +include/mutter-15/cogl/cogl/cogl-primitive.h +include/mutter-15/cogl/cogl/cogl-renderer.h +include/mutter-15/cogl/cogl/cogl-scanout.h +include/mutter-15/cogl/cogl/cogl-snippet.h +include/mutter-15/cogl/cogl/cogl-sub-texture.h +include/mutter-15/cogl/cogl/cogl-texture-2d-sliced.h +include/mutter-15/cogl/cogl/cogl-texture-2d.h +include/mutter-15/cogl/cogl/cogl-texture-pixmap-x11.h +include/mutter-15/cogl/cogl/cogl-texture.h +include/mutter-15/cogl/cogl/cogl-trace.h +include/mutter-15/cogl/cogl/cogl-types.h +include/mutter-15/cogl/cogl/cogl-xlib-renderer.h +include/mutter-15/cogl/cogl/cogl.h +include/mutter-15/cogl/cogl/deprecated/cogl-program.h +include/mutter-15/cogl/cogl/deprecated/cogl-shader.h +include/mutter-15/cogl/cogl/gl-prototypes/cogl-core-functions.h +include/mutter-15/cogl/cogl/gl-prototypes/cogl-gles2-functions.h +include/mutter-15/cogl/cogl/gl-prototypes/cogl-glsl-functions.h +include/mutter-15/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h +include/mutter-15/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h +include/mutter-15/meta/barrier.h +include/mutter-15/meta/boxes.h +include/mutter-15/meta/common.h +include/mutter-15/meta/compositor-mutter.h +include/mutter-15/meta/compositor.h +include/mutter-15/meta/display.h +include/mutter-15/meta/keybindings.h +include/mutter-15/meta/main.h +include/mutter-15/meta/meta-backend.h +include/mutter-15/meta/meta-background-actor.h +include/mutter-15/meta/meta-background-content.h +include/mutter-15/meta/meta-background-group.h +include/mutter-15/meta/meta-background-image.h +include/mutter-15/meta/meta-background.h +include/mutter-15/meta/meta-base.h +include/mutter-15/meta/meta-close-dialog.h +include/mutter-15/meta/meta-context.h +include/mutter-15/meta/meta-cursor-tracker.h +include/mutter-15/meta/meta-debug-control.h +include/mutter-15/meta/meta-debug.h +include/mutter-15/meta/meta-dnd.h +include/mutter-15/meta/meta-enum-types.h +include/mutter-15/meta/meta-enums.h +include/mutter-15/meta/meta-idle-monitor.h +include/mutter-15/meta/meta-inhibit-shortcuts-dialog.h +include/mutter-15/meta/meta-later.h +include/mutter-15/meta/meta-launch-context.h +include/mutter-15/meta/meta-monitor-manager.h +include/mutter-15/meta/meta-multi-texture-format.h +include/mutter-15/meta/meta-multi-texture.h +include/mutter-15/meta/meta-orientation-manager.h +include/mutter-15/meta/meta-plugin.h +include/mutter-15/meta/meta-remote-access-controller.h +include/mutter-15/meta/meta-selection-source-memory.h +include/mutter-15/meta/meta-selection-source.h +include/mutter-15/meta/meta-selection.h +include/mutter-15/meta/meta-settings.h +include/mutter-15/meta/meta-shaped-texture.h +include/mutter-15/meta/meta-sound-player.h +include/mutter-15/meta/meta-stage.h +include/mutter-15/meta/meta-startup-notification.h +%%WAYLAND%%include/mutter-15/meta/meta-wayland-client.h +%%WAYLAND%%include/mutter-15/meta/meta-wayland-compositor.h +%%WAYLAND%%include/mutter-15/meta/meta-wayland-surface.h +include/mutter-15/meta/meta-window-actor.h +include/mutter-15/meta/meta-window-group.h +include/mutter-15/meta/meta-workspace-manager.h +include/mutter-15/meta/meta-x11-display.h +include/mutter-15/meta/meta-x11-group.h +include/mutter-15/meta/meta-x11-types.h +include/mutter-15/meta/prefs.h +include/mutter-15/meta/types.h +include/mutter-15/meta/util.h +include/mutter-15/meta/window.h +include/mutter-15/meta/workspace.h +include/mutter-15/mtk/mtk/mtk-macros.h +include/mutter-15/mtk/mtk/mtk-monitor-transform.h +include/mutter-15/mtk/mtk/mtk-rectangle.h +include/mutter-15/mtk/mtk/mtk-region.h +include/mutter-15/mtk/mtk/mtk-utils.h +include/mutter-15/mtk/mtk/mtk-x11-errors.h +include/mutter-15/mtk/mtk/mtk-x11.h +include/mutter-15/mtk/mtk/mtk.h +lib/libmutter-15.so +lib/libmutter-15.so.0 +lib/libmutter-15.so.0.0.0 +lib/mutter-15/Clutter-15.gir +lib/mutter-15/Clutter-15.typelib +lib/mutter-15/Cogl-15.gir +lib/mutter-15/Cogl-15.typelib +lib/mutter-15/CoglPango-15.gir +lib/mutter-15/CoglPango-15.typelib +lib/mutter-15/Meta-15.gir +lib/mutter-15/Meta-15.typelib +lib/mutter-15/Mtk-15.gir +lib/mutter-15/Mtk-15.typelib +lib/mutter-15/libmutter-clutter-15.so +lib/mutter-15/libmutter-clutter-15.so.0 +lib/mutter-15/libmutter-clutter-15.so.0.0.0 +lib/mutter-15/libmutter-cogl-15.so +lib/mutter-15/libmutter-cogl-15.so.0 +lib/mutter-15/libmutter-cogl-15.so.0.0.0 +lib/mutter-15/libmutter-cogl-pango-15.so +lib/mutter-15/libmutter-cogl-pango-15.so.0 +lib/mutter-15/libmutter-cogl-pango-15.so.0.0.0 +lib/mutter-15/libmutter-mtk-15.so +lib/mutter-15/libmutter-mtk-15.so.0 +lib/mutter-15/libmutter-mtk-15.so.0.0.0 +lib/mutter-15/plugins/libdefault.so +lib/udev/rules.d/61-mutter.rules +libdata/pkgconfig/libmutter-15.pc +libdata/pkgconfig/mutter-clutter-15.pc +libdata/pkgconfig/mutter-cogl-15.pc +libdata/pkgconfig/mutter-cogl-pango-15.pc +libdata/pkgconfig/mutter-mtk-15.pc libexec/mutter-restart-helper -share/man/man1/mutter.1.gz +libexec/mutter-x11-frames share/GConf/gsettings/mutter-schemas.convert -share/applications/mutter.desktop share/gnome-control-center/keybindings/50-mutter-navigation.xml share/gnome-control-center/keybindings/50-mutter-system.xml +%%WAYLAND%%share/gnome-control-center/keybindings/50-mutter-wayland.xml share/gnome-control-center/keybindings/50-mutter-windows.xml +share/locale/ab/LC_MESSAGES/mutter.mo share/locale/am/LC_MESSAGES/mutter.mo share/locale/ar/LC_MESSAGES/mutter.mo share/locale/as/LC_MESSAGES/mutter.mo @@ -293,6 +278,7 @@ share/locale/is/LC_MESSAGES/mutter.mo share/locale/it/LC_MESSAGES/mutter.mo share/locale/ja/LC_MESSAGES/mutter.mo share/locale/ka/LC_MESSAGES/mutter.mo +share/locale/kab/LC_MESSAGES/mutter.mo share/locale/kk/LC_MESSAGES/mutter.mo share/locale/kn/LC_MESSAGES/mutter.mo share/locale/ko/LC_MESSAGES/mutter.mo @@ -343,3 +329,4 @@ share/locale/yo/LC_MESSAGES/mutter.mo share/locale/zh_CN/LC_MESSAGES/mutter.mo share/locale/zh_HK/LC_MESSAGES/mutter.mo share/locale/zh_TW/LC_MESSAGES/mutter.mo +share/man/man1/mutter.1.gz diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index 41fd6062522a..9b0f8f7f029e 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,5 +1,5 @@ PORTNAME= sway -DISTVERSION= 1.11-rc4 +DISTVERSION= 1.11 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo index 525570b94901..cc3a65e6e973 100644 --- a/x11-wm/sway/distinfo +++ b/x11-wm/sway/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1748208837 -SHA256 (swaywm-sway-1.11-rc4_GH0.tar.gz) = 72edfde2ba111fae327ad42bd53d51d4d659ff61d6d1afd074250b14f2229064 -SIZE (swaywm-sway-1.11-rc4_GH0.tar.gz) = 5583807 +TIMESTAMP = 1749416947 +SHA256 (swaywm-sway-1.11_GH0.tar.gz) = 034ec4519326d6af5275814700dde46e852c5174614109affe4c86b2fbee062a +SIZE (swaywm-sway-1.11_GH0.tar.gz) = 5583731 diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile index 8715691e8412..4b1152132f20 100644 --- a/x11-wm/swayfx/Makefile +++ b/x11-wm/swayfx/Makefile @@ -1,5 +1,5 @@ PORTNAME= sway -DISTVERSION= 0.5 +DISTVERSION= 0.5.1 CATEGORIES= x11-wm wayland PKGNAMESUFFIX= ${GH_PROJECT:S/${PORTNAME}//} @@ -18,7 +18,7 @@ LIB_DEPENDS= libjson-c.so:devel/json-c \ libpcre2-8.so:devel/pcre2 \ libdrm.so:graphics/libdrm \ libwayland-egl.so:graphics/wayland \ - libscenefx-0.2.so:x11-toolkits/scenefx02 \ + libscenefx-0.3.so:x11-toolkits/scenefx03 \ libwlroots-0.18.so:x11-toolkits/wlroots018 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon diff --git a/x11-wm/swayfx/distinfo b/x11-wm/swayfx/distinfo index 88ef6125ec63..77c1f7511e03 100644 --- a/x11-wm/swayfx/distinfo +++ b/x11-wm/swayfx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1740508180 -SHA256 (WillPower3309-swayfx-0.5_GH0.tar.gz) = 68bff05a89da702bbca7df3c5c633a149cc59e9e8158c1bd60f0e9fe768f86b3 -SIZE (WillPower3309-swayfx-0.5_GH0.tar.gz) = 17594759 +TIMESTAMP = 1749449281 +SHA256 (WillPower3309-swayfx-0.5.1_GH0.tar.gz) = 99b6f4243c2a89d3ad0d78fa56d262ee92bdbd9965117d08bca2fed909586943 +SIZE (WillPower3309-swayfx-0.5.1_GH0.tar.gz) = 17595318 |