diff options
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/mutter/Makefile | 42 | ||||
| -rw-r--r-- | wm/mutter/PLIST | 487 | ||||
| -rw-r--r-- | wm/mutter/buildlink3.mk | 4 | ||||
| -rw-r--r-- | wm/mutter/distinfo | 12 | ||||
| -rw-r--r-- | wm/mutter/files/90-mutter | 4 | ||||
| -rw-r--r-- | wm/mutter/patches/patch-src_backends_x11_meta-input-settings-x11.c | 40 | ||||
| -rw-r--r-- | wm/mutter/patches/patch-src_backends_x11_meta-seat-x11.c | 53 |
7 files changed, 380 insertions, 262 deletions
diff --git a/wm/mutter/Makefile b/wm/mutter/Makefile index 9846f7f70b8..8e2d6b466a3 100644 --- a/wm/mutter/Makefile +++ b/wm/mutter/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.7 2021/05/02 11:06:15 nia Exp $ +# $NetBSD: Makefile,v 1.8 2021/06/03 15:04:57 cirnatdan Exp $ -DISTNAME= mutter-3.38.1 +DISTNAME= mutter-40.1 CATEGORIES= wm gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz -MAINTAINER= dan@alt.md +MAINTAINER= cirnatdan@NetBSD.org HOMEPAGE= https://gitlab.gnome.org/GNOME/mutter COMMENT= GNOME window manager LICENSE= gnu-gpl-v2 -USE_TOOLS+= msgfmt pkg-config -USE_TOOLS+= gdbus-codegen +USE_TOOLS+= msgfmt pkg-config gdbus-codegen +BUILD_DEFS+= PKG_SYSCONFBASE .include "../../graphics/MesaLib/features.mk" @@ -39,22 +39,40 @@ TOOLS_PLATFORM.msgfmt= .endif PKGCONFIG_OVERRIDE_STAGE= pre-install -PKGCONFIG_OVERRIDE+= output/meson-private/mutter-cogl-7.pc -PKGCONFIG_OVERRIDE+= output/meson-private/mutter-cogl-pango-7.pc -PKGCONFIG_OVERRIDE+= output/meson-private/mutter-clutter-7.pc -PKGCONFIG_OVERRIDE+= output/meson-private/mutter-clutter-x11-7.pc -PKGCONFIG_OVERRIDE+= output/meson-private/libmutter-7.pc +PKGCONFIG_OVERRIDE+= output/meson-private/mutter-cogl-8.pc +PKGCONFIG_OVERRIDE+= output/meson-private/mutter-cogl-pango-8.pc +PKGCONFIG_OVERRIDE+= output/meson-private/mutter-clutter-8.pc +PKGCONFIG_OVERRIDE+= output/meson-private/mutter-clutter-x11-8.pc +PKGCONFIG_OVERRIDE+= output/meson-private/libmutter-8.pc -LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mutter-7 +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mutter-8 -PYTHON_FOR_BUILD_ONLY= tool +post-extract: + ${CP} ${FILESDIR}/90-mutter ${WRKSRC}/data + +SUBST_CLASSES+= paths +SUBST_STAGE.paths= pre-configure +SUBST_FILES.paths= data/90-mutter +SUBST_VARS.paths= PREFIX + +EGDIR= ${PREFIX}/share/examples/mutter +INSTALLATION_DIRS+= share/examples/mutter/X11/xinit/xinitrc.d + +post-install: + ${INSTALL_DATA} ${WRKSRC}/data/90-mutter \ + ${DESTDIR}${EGDIR}/X11/xinit/xinitrc.d/90-mutter + +REQD_FILES+= ${EGDIR}/X11/xinit/xinitrc.d/90-mutter \ + ${PKG_SYSCONFBASE}/X11/xinit/xinitrc.d/90-mutter .include "../../devel/meson/build.mk" +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.67.3 .include "../../devel/glib2/schemas.mk" .include "../../audio/libcanberra/buildlink3.mk" .include "../../devel/gobject-introspection/buildlink3.mk" .include "../../graphics/graphene/buildlink3.mk" .include "../../sysutils/gnome-settings-daemon/buildlink3.mk" +BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+= gsettings-desktop-schemas>=40.0 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" .include "../../textproc/json-glib/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" diff --git a/wm/mutter/PLIST b/wm/mutter/PLIST index 247cec75289..de2e9562292 100644 --- a/wm/mutter/PLIST +++ b/wm/mutter/PLIST @@ -1,251 +1,252 @@ -@comment $NetBSD: PLIST,v 1.1 2020/11/10 01:56:20 nia Exp $ +@comment $NetBSD: PLIST,v 1.2 2021/06/03 15:04:57 cirnatdan Exp $ bin/mutter -include/mutter-7/clutter/cally/cally-actor.h -include/mutter-7/clutter/cally/cally-clone.h -include/mutter-7/clutter/cally/cally-factory.h -include/mutter-7/clutter/cally/cally-main.h -include/mutter-7/clutter/cally/cally-root.h -include/mutter-7/clutter/cally/cally-stage.h -include/mutter-7/clutter/cally/cally-text.h -include/mutter-7/clutter/cally/cally-util.h -include/mutter-7/clutter/cally/cally.h -include/mutter-7/clutter/clutter/clutter-action.h -include/mutter-7/clutter/clutter/clutter-actor-meta.h -include/mutter-7/clutter/clutter/clutter-actor.h -include/mutter-7/clutter/clutter/clutter-align-constraint.h -include/mutter-7/clutter/clutter/clutter-animatable.h -include/mutter-7/clutter/clutter/clutter-autocleanups.h -include/mutter-7/clutter/clutter/clutter-backend.h -include/mutter-7/clutter/clutter/clutter-bin-layout.h -include/mutter-7/clutter/clutter/clutter-bind-constraint.h -include/mutter-7/clutter/clutter/clutter-binding-pool.h -include/mutter-7/clutter/clutter/clutter-blur-effect.h -include/mutter-7/clutter/clutter/clutter-box-layout.h -include/mutter-7/clutter/clutter/clutter-brightness-contrast-effect.h -include/mutter-7/clutter/clutter/clutter-cairo.h -include/mutter-7/clutter/clutter/clutter-canvas.h -include/mutter-7/clutter/clutter/clutter-child-meta.h -include/mutter-7/clutter/clutter/clutter-click-action.h -include/mutter-7/clutter/clutter/clutter-clone.h -include/mutter-7/clutter/clutter/clutter-color-static.h -include/mutter-7/clutter/clutter/clutter-color.h -include/mutter-7/clutter/clutter/clutter-colorize-effect.h -include/mutter-7/clutter/clutter/clutter-config.h -include/mutter-7/clutter/clutter/clutter-constraint.h -include/mutter-7/clutter/clutter/clutter-container.h -include/mutter-7/clutter/clutter/clutter-content.h -include/mutter-7/clutter/clutter/clutter-deform-effect.h -include/mutter-7/clutter/clutter/clutter-deprecated.h -include/mutter-7/clutter/clutter/clutter-desaturate-effect.h -include/mutter-7/clutter/clutter/clutter-effect.h -include/mutter-7/clutter/clutter/clutter-enum-types.h -include/mutter-7/clutter/clutter/clutter-enums.h -include/mutter-7/clutter/clutter/clutter-event.h -include/mutter-7/clutter/clutter/clutter-feature.h -include/mutter-7/clutter/clutter/clutter-fixed-layout.h -include/mutter-7/clutter/clutter/clutter-flow-layout.h -include/mutter-7/clutter/clutter/clutter-frame-clock.h -include/mutter-7/clutter/clutter/clutter-gesture-action.h -include/mutter-7/clutter/clutter/clutter-grid-layout.h -include/mutter-7/clutter/clutter/clutter-image.h -include/mutter-7/clutter/clutter/clutter-input-device-tool.h -include/mutter-7/clutter/clutter/clutter-input-device.h -include/mutter-7/clutter/clutter/clutter-input-focus.h -include/mutter-7/clutter/clutter/clutter-input-method.h -include/mutter-7/clutter/clutter/clutter-interval.h -include/mutter-7/clutter/clutter/clutter-keyframe-transition.h -include/mutter-7/clutter/clutter/clutter-keymap.h -include/mutter-7/clutter/clutter/clutter-keysyms.h -include/mutter-7/clutter/clutter/clutter-layout-manager.h -include/mutter-7/clutter/clutter/clutter-layout-meta.h -include/mutter-7/clutter/clutter/clutter-macros.h -include/mutter-7/clutter/clutter/clutter-main.h -include/mutter-7/clutter/clutter/clutter-marshal.h -include/mutter-7/clutter/clutter/clutter-mutter.h -include/mutter-7/clutter/clutter/clutter-offscreen-effect.h -include/mutter-7/clutter/clutter/clutter-page-turn-effect.h -include/mutter-7/clutter/clutter/clutter-paint-context.h -include/mutter-7/clutter/clutter/clutter-paint-node.h -include/mutter-7/clutter/clutter/clutter-paint-nodes.h -include/mutter-7/clutter/clutter/clutter-pan-action.h -include/mutter-7/clutter/clutter/clutter-path-constraint.h -include/mutter-7/clutter/clutter/clutter-path.h -include/mutter-7/clutter/clutter/clutter-pick-context.h -include/mutter-7/clutter/clutter/clutter-property-transition.h -include/mutter-7/clutter/clutter/clutter-rotate-action.h -include/mutter-7/clutter/clutter/clutter-script.h -include/mutter-7/clutter/clutter/clutter-scriptable.h -include/mutter-7/clutter/clutter/clutter-scroll-actor.h -include/mutter-7/clutter/clutter/clutter-seat.h -include/mutter-7/clutter/clutter/clutter-settings.h -include/mutter-7/clutter/clutter/clutter-shader-effect.h -include/mutter-7/clutter/clutter/clutter-shader-types.h -include/mutter-7/clutter/clutter/clutter-snap-constraint.h -include/mutter-7/clutter/clutter/clutter-stage-manager.h -include/mutter-7/clutter/clutter/clutter-stage-view.h -include/mutter-7/clutter/clutter/clutter-stage.h -include/mutter-7/clutter/clutter/clutter-swipe-action.h -include/mutter-7/clutter/clutter/clutter-tap-action.h -include/mutter-7/clutter/clutter/clutter-text-buffer.h -include/mutter-7/clutter/clutter/clutter-text.h -include/mutter-7/clutter/clutter/clutter-timeline.h -include/mutter-7/clutter/clutter/clutter-transition-group.h -include/mutter-7/clutter/clutter/clutter-transition.h -include/mutter-7/clutter/clutter/clutter-types.h -include/mutter-7/clutter/clutter/clutter-units.h -include/mutter-7/clutter/clutter/clutter-virtual-input-device.h -include/mutter-7/clutter/clutter/clutter-zoom-action.h -include/mutter-7/clutter/clutter/clutter.h -include/mutter-7/clutter/clutter/deprecated/clutter-container.h -include/mutter-7/clutter/clutter/deprecated/clutter-timeline.h -include/mutter-7/clutter/clutter/x11/clutter-x11.h -include/mutter-7/cogl/cogl-pango/cogl-pango.h -include/mutter-7/cogl/cogl/cogl-atlas-texture.h -include/mutter-7/cogl/cogl/cogl-attribute-buffer.h -include/mutter-7/cogl/cogl/cogl-attribute.h -include/mutter-7/cogl/cogl/cogl-bitmap.h -include/mutter-7/cogl/cogl/cogl-buffer.h -include/mutter-7/cogl/cogl/cogl-color.h -include/mutter-7/cogl/cogl/cogl-context.h -include/mutter-7/cogl/cogl/cogl-defines.h -include/mutter-7/cogl/cogl/cogl-depth-state.h -include/mutter-7/cogl/cogl/cogl-display.h -include/mutter-7/cogl/cogl/cogl-dma-buf-handle.h -include/mutter-7/cogl/cogl/cogl-egl-defines.h -include/mutter-7/cogl/cogl/cogl-egl.h -include/mutter-7/cogl/cogl/cogl-fence.h -include/mutter-7/cogl/cogl/cogl-frame-info.h -include/mutter-7/cogl/cogl/cogl-framebuffer.h -include/mutter-7/cogl/cogl/cogl-glib-source.h -include/mutter-7/cogl/cogl/cogl-glx.h -include/mutter-7/cogl/cogl/cogl-gtype-private.h -include/mutter-7/cogl/cogl/cogl-index-buffer.h -include/mutter-7/cogl/cogl/cogl-indices.h -include/mutter-7/cogl/cogl/cogl-macros.h -include/mutter-7/cogl/cogl/cogl-matrix-stack.h -include/mutter-7/cogl/cogl/cogl-matrix.h -include/mutter-7/cogl/cogl/cogl-meta-texture.h -include/mutter-7/cogl/cogl/cogl-object.h -include/mutter-7/cogl/cogl/cogl-offscreen.h -include/mutter-7/cogl/cogl/cogl-onscreen-template.h -include/mutter-7/cogl/cogl/cogl-onscreen.h -include/mutter-7/cogl/cogl/cogl-output.h -include/mutter-7/cogl/cogl/cogl-pipeline-layer-state.h -include/mutter-7/cogl/cogl/cogl-pipeline-state.h -include/mutter-7/cogl/cogl/cogl-pipeline.h -include/mutter-7/cogl/cogl/cogl-pixel-buffer.h -include/mutter-7/cogl/cogl/cogl-pixel-format.h -include/mutter-7/cogl/cogl/cogl-poll.h -include/mutter-7/cogl/cogl/cogl-primitive-texture.h -include/mutter-7/cogl/cogl/cogl-primitive.h -include/mutter-7/cogl/cogl/cogl-renderer.h -include/mutter-7/cogl/cogl/cogl-scanout.h -include/mutter-7/cogl/cogl/cogl-snippet.h -include/mutter-7/cogl/cogl/cogl-sub-texture.h -include/mutter-7/cogl/cogl/cogl-swap-chain.h -include/mutter-7/cogl/cogl/cogl-texture-2d-sliced.h -include/mutter-7/cogl/cogl/cogl-texture-2d.h -include/mutter-7/cogl/cogl/cogl-texture-pixmap-x11.h -include/mutter-7/cogl/cogl/cogl-texture.h -include/mutter-7/cogl/cogl/cogl-trace.h -include/mutter-7/cogl/cogl/cogl-types.h -include/mutter-7/cogl/cogl/cogl-version.h -include/mutter-7/cogl/cogl/cogl-xlib-renderer.h -include/mutter-7/cogl/cogl/cogl-xlib.h -include/mutter-7/cogl/cogl/cogl.h -include/mutter-7/cogl/cogl/cogl1-context.h -include/mutter-7/cogl/cogl/deprecated/cogl-auto-texture.h -include/mutter-7/cogl/cogl/deprecated/cogl-clutter.h -include/mutter-7/cogl/cogl/deprecated/cogl-material-compat.h -include/mutter-7/cogl/cogl/deprecated/cogl-shader.h -include/mutter-7/cogl/cogl/deprecated/cogl-type-casts.h -include/mutter-7/cogl/cogl/gl-prototypes/cogl-core-functions.h -include/mutter-7/cogl/cogl/gl-prototypes/cogl-gles2-functions.h -include/mutter-7/cogl/cogl/gl-prototypes/cogl-glsl-functions.h -include/mutter-7/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h -include/mutter-7/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h -include/mutter-7/meta/barrier.h -include/mutter-7/meta/boxes.h -include/mutter-7/meta/common.h -include/mutter-7/meta/compositor-mutter.h -include/mutter-7/meta/compositor.h -include/mutter-7/meta/display.h -include/mutter-7/meta/group.h -include/mutter-7/meta/keybindings.h -include/mutter-7/meta/main.h -include/mutter-7/meta/meta-backend.h -include/mutter-7/meta/meta-background-actor.h -include/mutter-7/meta/meta-background-content.h -include/mutter-7/meta/meta-background-group.h -include/mutter-7/meta/meta-background-image.h -include/mutter-7/meta/meta-background.h -include/mutter-7/meta/meta-close-dialog.h -include/mutter-7/meta/meta-cursor-tracker.h -include/mutter-7/meta/meta-dnd.h -include/mutter-7/meta/meta-enum-types.h -include/mutter-7/meta/meta-idle-monitor.h -include/mutter-7/meta/meta-inhibit-shortcuts-dialog.h -include/mutter-7/meta/meta-later.h -include/mutter-7/meta/meta-launch-context.h -include/mutter-7/meta/meta-monitor-manager.h -include/mutter-7/meta/meta-plugin.h -include/mutter-7/meta/meta-remote-access-controller.h -include/mutter-7/meta/meta-selection-source-memory.h -include/mutter-7/meta/meta-selection-source.h -include/mutter-7/meta/meta-selection.h -include/mutter-7/meta/meta-settings.h -include/mutter-7/meta/meta-shadow-factory.h -include/mutter-7/meta/meta-shaped-texture.h -include/mutter-7/meta/meta-sound-player.h -include/mutter-7/meta/meta-stage.h -include/mutter-7/meta/meta-startup-notification.h -include/mutter-7/meta/meta-version.h -include/mutter-7/meta/meta-window-actor.h -include/mutter-7/meta/meta-window-group.h -include/mutter-7/meta/meta-window-shape.h -include/mutter-7/meta/meta-workspace-manager.h -include/mutter-7/meta/meta-x11-display.h -include/mutter-7/meta/meta-x11-errors.h -include/mutter-7/meta/prefs.h -include/mutter-7/meta/theme.h -include/mutter-7/meta/types.h -include/mutter-7/meta/util.h -include/mutter-7/meta/window.h -include/mutter-7/meta/workspace.h -lib/libmutter-7.so -lib/libmutter-7.so.0 -lib/libmutter-7.so.0.0.0 -lib/mutter-7/Cally-7.gir -lib/mutter-7/Cally-7.typelib -lib/mutter-7/Clutter-7.gir -lib/mutter-7/Clutter-7.typelib -lib/mutter-7/ClutterX11-7.gir -lib/mutter-7/ClutterX11-7.typelib -lib/mutter-7/Cogl-7.gir -lib/mutter-7/Cogl-7.typelib -lib/mutter-7/CoglPango-7.gir -lib/mutter-7/CoglPango-7.typelib -lib/mutter-7/Meta-7.gir -lib/mutter-7/Meta-7.typelib -lib/mutter-7/libmutter-clutter-7.so -lib/mutter-7/libmutter-clutter-7.so.0 -lib/mutter-7/libmutter-clutter-7.so.0.0.0 -lib/mutter-7/libmutter-cogl-7.so -lib/mutter-7/libmutter-cogl-7.so.0 -lib/mutter-7/libmutter-cogl-7.so.0.0.0 -lib/mutter-7/libmutter-cogl-pango-7.so -lib/mutter-7/libmutter-cogl-pango-7.so.0 -lib/mutter-7/libmutter-cogl-pango-7.so.0.0.0 -lib/mutter-7/plugins/libdefault.so -lib/pkgconfig/libmutter-7.pc -lib/pkgconfig/mutter-clutter-7.pc -lib/pkgconfig/mutter-clutter-x11-7.pc -lib/pkgconfig/mutter-cogl-7.pc -lib/pkgconfig/mutter-cogl-pango-7.pc +include/mutter-8/clutter/cally/cally-actor.h +include/mutter-8/clutter/cally/cally-clone.h +include/mutter-8/clutter/cally/cally-factory.h +include/mutter-8/clutter/cally/cally-main.h +include/mutter-8/clutter/cally/cally-root.h +include/mutter-8/clutter/cally/cally-stage.h +include/mutter-8/clutter/cally/cally-text.h +include/mutter-8/clutter/cally/cally-util.h +include/mutter-8/clutter/cally/cally.h +include/mutter-8/clutter/clutter/clutter-action.h +include/mutter-8/clutter/clutter/clutter-actor-meta.h +include/mutter-8/clutter/clutter/clutter-actor.h +include/mutter-8/clutter/clutter/clutter-align-constraint.h +include/mutter-8/clutter/clutter/clutter-animatable.h +include/mutter-8/clutter/clutter/clutter-autocleanups.h +include/mutter-8/clutter/clutter/clutter-backend.h +include/mutter-8/clutter/clutter/clutter-bin-layout.h +include/mutter-8/clutter/clutter/clutter-bind-constraint.h +include/mutter-8/clutter/clutter/clutter-binding-pool.h +include/mutter-8/clutter/clutter/clutter-blur-effect.h +include/mutter-8/clutter/clutter/clutter-box-layout.h +include/mutter-8/clutter/clutter/clutter-brightness-contrast-effect.h +include/mutter-8/clutter/clutter/clutter-cairo.h +include/mutter-8/clutter/clutter/clutter-canvas.h +include/mutter-8/clutter/clutter/clutter-child-meta.h +include/mutter-8/clutter/clutter/clutter-click-action.h +include/mutter-8/clutter/clutter/clutter-clone.h +include/mutter-8/clutter/clutter/clutter-color-static.h +include/mutter-8/clutter/clutter/clutter-color.h +include/mutter-8/clutter/clutter/clutter-colorize-effect.h +include/mutter-8/clutter/clutter/clutter-config.h +include/mutter-8/clutter/clutter/clutter-constraint.h +include/mutter-8/clutter/clutter/clutter-container.h +include/mutter-8/clutter/clutter/clutter-content.h +include/mutter-8/clutter/clutter/clutter-deform-effect.h +include/mutter-8/clutter/clutter/clutter-deprecated.h +include/mutter-8/clutter/clutter/clutter-desaturate-effect.h +include/mutter-8/clutter/clutter/clutter-effect.h +include/mutter-8/clutter/clutter/clutter-enum-types.h +include/mutter-8/clutter/clutter/clutter-enums.h +include/mutter-8/clutter/clutter/clutter-event.h +include/mutter-8/clutter/clutter/clutter-feature.h +include/mutter-8/clutter/clutter/clutter-fixed-layout.h +include/mutter-8/clutter/clutter/clutter-flow-layout.h +include/mutter-8/clutter/clutter/clutter-frame-clock.h +include/mutter-8/clutter/clutter/clutter-frame.h +include/mutter-8/clutter/clutter/clutter-gesture-action.h +include/mutter-8/clutter/clutter/clutter-grid-layout.h +include/mutter-8/clutter/clutter/clutter-image.h +include/mutter-8/clutter/clutter/clutter-input-device-tool.h +include/mutter-8/clutter/clutter/clutter-input-device.h +include/mutter-8/clutter/clutter/clutter-input-focus.h +include/mutter-8/clutter/clutter/clutter-input-method.h +include/mutter-8/clutter/clutter/clutter-interval.h +include/mutter-8/clutter/clutter/clutter-keyframe-transition.h +include/mutter-8/clutter/clutter/clutter-keymap.h +include/mutter-8/clutter/clutter/clutter-keysyms.h +include/mutter-8/clutter/clutter/clutter-layout-manager.h +include/mutter-8/clutter/clutter/clutter-layout-meta.h +include/mutter-8/clutter/clutter/clutter-macros.h +include/mutter-8/clutter/clutter/clutter-main.h +include/mutter-8/clutter/clutter/clutter-marshal.h +include/mutter-8/clutter/clutter/clutter-mutter.h +include/mutter-8/clutter/clutter/clutter-offscreen-effect.h +include/mutter-8/clutter/clutter/clutter-page-turn-effect.h +include/mutter-8/clutter/clutter/clutter-paint-context.h +include/mutter-8/clutter/clutter/clutter-paint-node.h +include/mutter-8/clutter/clutter/clutter-paint-nodes.h +include/mutter-8/clutter/clutter/clutter-pan-action.h +include/mutter-8/clutter/clutter/clutter-path-constraint.h +include/mutter-8/clutter/clutter/clutter-path.h +include/mutter-8/clutter/clutter/clutter-pick-context.h +include/mutter-8/clutter/clutter/clutter-property-transition.h +include/mutter-8/clutter/clutter/clutter-rotate-action.h +include/mutter-8/clutter/clutter/clutter-script.h +include/mutter-8/clutter/clutter/clutter-scriptable.h +include/mutter-8/clutter/clutter/clutter-scroll-actor.h +include/mutter-8/clutter/clutter/clutter-seat.h +include/mutter-8/clutter/clutter/clutter-settings.h +include/mutter-8/clutter/clutter/clutter-shader-effect.h +include/mutter-8/clutter/clutter/clutter-shader-types.h +include/mutter-8/clutter/clutter/clutter-snap-constraint.h +include/mutter-8/clutter/clutter/clutter-stage-manager.h +include/mutter-8/clutter/clutter/clutter-stage-view.h +include/mutter-8/clutter/clutter/clutter-stage.h +include/mutter-8/clutter/clutter/clutter-swipe-action.h +include/mutter-8/clutter/clutter/clutter-tap-action.h +include/mutter-8/clutter/clutter/clutter-text-buffer.h +include/mutter-8/clutter/clutter/clutter-text.h +include/mutter-8/clutter/clutter/clutter-timeline.h +include/mutter-8/clutter/clutter/clutter-transition-group.h +include/mutter-8/clutter/clutter/clutter-transition.h +include/mutter-8/clutter/clutter/clutter-types.h +include/mutter-8/clutter/clutter/clutter-units.h +include/mutter-8/clutter/clutter/clutter-virtual-input-device.h +include/mutter-8/clutter/clutter/clutter-zoom-action.h +include/mutter-8/clutter/clutter/clutter.h +include/mutter-8/clutter/clutter/deprecated/clutter-container.h +include/mutter-8/clutter/clutter/deprecated/clutter-timeline.h +include/mutter-8/clutter/clutter/x11/clutter-x11.h +include/mutter-8/cogl/cogl-pango/cogl-pango.h +include/mutter-8/cogl/cogl/cogl-atlas-texture.h +include/mutter-8/cogl/cogl/cogl-attribute-buffer.h +include/mutter-8/cogl/cogl/cogl-attribute.h +include/mutter-8/cogl/cogl/cogl-bitmap.h +include/mutter-8/cogl/cogl/cogl-buffer.h +include/mutter-8/cogl/cogl/cogl-color.h +include/mutter-8/cogl/cogl/cogl-context.h +include/mutter-8/cogl/cogl/cogl-defines.h +include/mutter-8/cogl/cogl/cogl-depth-state.h +include/mutter-8/cogl/cogl/cogl-display.h +include/mutter-8/cogl/cogl/cogl-dma-buf-handle.h +include/mutter-8/cogl/cogl/cogl-egl-defines.h +include/mutter-8/cogl/cogl/cogl-egl.h +include/mutter-8/cogl/cogl/cogl-fence.h +include/mutter-8/cogl/cogl/cogl-frame-info.h +include/mutter-8/cogl/cogl/cogl-framebuffer.h +include/mutter-8/cogl/cogl/cogl-glib-source.h +include/mutter-8/cogl/cogl/cogl-glx.h +include/mutter-8/cogl/cogl/cogl-graphene.h +include/mutter-8/cogl/cogl/cogl-gtype-private.h +include/mutter-8/cogl/cogl/cogl-index-buffer.h +include/mutter-8/cogl/cogl/cogl-indices.h +include/mutter-8/cogl/cogl/cogl-macros.h +include/mutter-8/cogl/cogl/cogl-matrix-stack.h +include/mutter-8/cogl/cogl/cogl-meta-texture.h +include/mutter-8/cogl/cogl/cogl-object.h +include/mutter-8/cogl/cogl/cogl-offscreen.h +include/mutter-8/cogl/cogl/cogl-onscreen-template.h +include/mutter-8/cogl/cogl/cogl-onscreen.h +include/mutter-8/cogl/cogl/cogl-output.h +include/mutter-8/cogl/cogl/cogl-pipeline-layer-state.h +include/mutter-8/cogl/cogl/cogl-pipeline-state.h +include/mutter-8/cogl/cogl/cogl-pipeline.h +include/mutter-8/cogl/cogl/cogl-pixel-buffer.h +include/mutter-8/cogl/cogl/cogl-pixel-format.h +include/mutter-8/cogl/cogl/cogl-poll.h +include/mutter-8/cogl/cogl/cogl-primitive-texture.h +include/mutter-8/cogl/cogl/cogl-primitive.h +include/mutter-8/cogl/cogl/cogl-renderer.h +include/mutter-8/cogl/cogl/cogl-scanout.h +include/mutter-8/cogl/cogl/cogl-snippet.h +include/mutter-8/cogl/cogl/cogl-sub-texture.h +include/mutter-8/cogl/cogl/cogl-swap-chain.h +include/mutter-8/cogl/cogl/cogl-texture-2d-sliced.h +include/mutter-8/cogl/cogl/cogl-texture-2d.h +include/mutter-8/cogl/cogl/cogl-texture-pixmap-x11.h +include/mutter-8/cogl/cogl/cogl-texture.h +include/mutter-8/cogl/cogl/cogl-trace.h +include/mutter-8/cogl/cogl/cogl-types.h +include/mutter-8/cogl/cogl/cogl-version.h +include/mutter-8/cogl/cogl/cogl-xlib-renderer.h +include/mutter-8/cogl/cogl/cogl-xlib.h +include/mutter-8/cogl/cogl/cogl.h +include/mutter-8/cogl/cogl/cogl1-context.h +include/mutter-8/cogl/cogl/deprecated/cogl-auto-texture.h +include/mutter-8/cogl/cogl/deprecated/cogl-clutter.h +include/mutter-8/cogl/cogl/deprecated/cogl-material-compat.h +include/mutter-8/cogl/cogl/deprecated/cogl-shader.h +include/mutter-8/cogl/cogl/deprecated/cogl-type-casts.h +include/mutter-8/cogl/cogl/gl-prototypes/cogl-core-functions.h +include/mutter-8/cogl/cogl/gl-prototypes/cogl-gles2-functions.h +include/mutter-8/cogl/cogl/gl-prototypes/cogl-glsl-functions.h +include/mutter-8/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h +include/mutter-8/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h +include/mutter-8/meta/barrier.h +include/mutter-8/meta/boxes.h +include/mutter-8/meta/common.h +include/mutter-8/meta/compositor-mutter.h +include/mutter-8/meta/compositor.h +include/mutter-8/meta/display.h +include/mutter-8/meta/group.h +include/mutter-8/meta/keybindings.h +include/mutter-8/meta/main.h +include/mutter-8/meta/meta-backend.h +include/mutter-8/meta/meta-background-actor.h +include/mutter-8/meta/meta-background-content.h +include/mutter-8/meta/meta-background-group.h +include/mutter-8/meta/meta-background-image.h +include/mutter-8/meta/meta-background.h +include/mutter-8/meta/meta-close-dialog.h +include/mutter-8/meta/meta-cursor-tracker.h +include/mutter-8/meta/meta-dnd.h +include/mutter-8/meta/meta-enum-types.h +include/mutter-8/meta/meta-idle-monitor.h +include/mutter-8/meta/meta-inhibit-shortcuts-dialog.h +include/mutter-8/meta/meta-later.h +include/mutter-8/meta/meta-launch-context.h +include/mutter-8/meta/meta-monitor-manager.h +include/mutter-8/meta/meta-plugin.h +include/mutter-8/meta/meta-remote-access-controller.h +include/mutter-8/meta/meta-selection-source-memory.h +include/mutter-8/meta/meta-selection-source.h +include/mutter-8/meta/meta-selection.h +include/mutter-8/meta/meta-settings.h +include/mutter-8/meta/meta-shadow-factory.h +include/mutter-8/meta/meta-shaped-texture.h +include/mutter-8/meta/meta-sound-player.h +include/mutter-8/meta/meta-stage.h +include/mutter-8/meta/meta-startup-notification.h +include/mutter-8/meta/meta-window-actor.h +include/mutter-8/meta/meta-window-group.h +include/mutter-8/meta/meta-window-shape.h +include/mutter-8/meta/meta-workspace-manager.h +include/mutter-8/meta/meta-x11-display.h +include/mutter-8/meta/meta-x11-errors.h +include/mutter-8/meta/prefs.h +include/mutter-8/meta/theme.h +include/mutter-8/meta/types.h +include/mutter-8/meta/util.h +include/mutter-8/meta/window.h +include/mutter-8/meta/workspace.h +lib/libmutter-8.so +lib/libmutter-8.so.0 +lib/libmutter-8.so.0.0.0 +lib/mutter-8/Cally-8.gir +lib/mutter-8/Cally-8.typelib +lib/mutter-8/Clutter-8.gir +lib/mutter-8/Clutter-8.typelib +lib/mutter-8/ClutterX11-8.gir +lib/mutter-8/ClutterX11-8.typelib +lib/mutter-8/Cogl-8.gir +lib/mutter-8/Cogl-8.typelib +lib/mutter-8/CoglPango-8.gir +lib/mutter-8/CoglPango-8.typelib +lib/mutter-8/Meta-8.gir +lib/mutter-8/Meta-8.typelib +lib/mutter-8/libmutter-clutter-8.so +lib/mutter-8/libmutter-clutter-8.so.0 +lib/mutter-8/libmutter-clutter-8.so.0.0.0 +lib/mutter-8/libmutter-cogl-8.so +lib/mutter-8/libmutter-cogl-8.so.0 +lib/mutter-8/libmutter-cogl-8.so.0.0.0 +lib/mutter-8/libmutter-cogl-pango-8.so +lib/mutter-8/libmutter-cogl-pango-8.so.0 +lib/mutter-8/libmutter-cogl-pango-8.so.0.0.0 +lib/mutter-8/plugins/libdefault.so +lib/pkgconfig/libmutter-8.pc +lib/pkgconfig/mutter-clutter-8.pc +lib/pkgconfig/mutter-clutter-x11-8.pc +lib/pkgconfig/mutter-cogl-8.pc +lib/pkgconfig/mutter-cogl-pango-8.pc libexec/mutter-restart-helper man/man1/mutter.1 share/GConf/gsettings/mutter-schemas.convert share/applications/mutter.desktop +share/examples/mutter/X11/xinit/xinitrc.d/90-mutter share/glib-2.0/schemas/org.gnome.mutter.gschema.xml share/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml share/gnome-control-center/keybindings/50-mutter-navigation.xml diff --git a/wm/mutter/buildlink3.mk b/wm/mutter/buildlink3.mk index 82ef285f60b..5150e2bb200 100644 --- a/wm/mutter/buildlink3.mk +++ b/wm/mutter/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.1 2020/11/10 01:56:20 nia Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2021/06/03 15:04:57 cirnatdan Exp $ BUILDLINK_TREE+= mutter .if !defined(MUTTER_BUILDLINK3_MK) MUTTER_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.mutter+= mutter>=3.36.3 +BUILDLINK_API_DEPENDS.mutter+= mutter>=40.0 BUILDLINK_PKGSRCDIR.mutter?= ../../wm/mutter .include "../../devel/gobject-introspection/buildlink3.mk" diff --git a/wm/mutter/distinfo b/wm/mutter/distinfo index deaaee90ce5..cf9e1a0b64d 100644 --- a/wm/mutter/distinfo +++ b/wm/mutter/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.1 2020/11/10 01:56:20 nia Exp $ +$NetBSD: distinfo,v 1.2 2021/06/03 15:04:57 cirnatdan Exp $ -SHA1 (mutter-3.38.1.tar.xz) = 1337658865e93d23baa3378386af244135c1c071 -RMD160 (mutter-3.38.1.tar.xz) = bef92552b0aa566ceb478bc56baa925c263c3260 -SHA512 (mutter-3.38.1.tar.xz) = 55a65d80c886b90da110de69fca8f2c92912b36d6244bd6fcb1e09507469b5d860fa888614a33170b2799574f521ee117fb289a768fa2af5059fe0da51835d31 -Size (mutter-3.38.1.tar.xz) = 2618944 bytes +SHA1 (mutter-40.1.tar.xz) = 695bcedee8b2462359b33bdae06a132a1c666d73 +RMD160 (mutter-40.1.tar.xz) = a99888904705fb184c5f7cf5ee5b6accdfff9a30 +SHA512 (mutter-40.1.tar.xz) = c2b6603e1d55492916f742f9cb8e15588cb30e78c37de987404ac40d3befa65e417184305ad87fdffc41052a094790f9e324a1ea7482e5de4f0439dceefed118 +Size (mutter-40.1.tar.xz) = 2680816 bytes SHA1 (patch-clutter_clutter_clutter-stage-view.c) = abba7a702a612457ba56acf1ecfd9396d28d1a2c SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.c) = 75547ffc2560860b6101a19165a3659bf799104e SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.h) = 311de2a52624c081bd5baf4a6f878a6f1ebd4015 +SHA1 (patch-src_backends_x11_meta-input-settings-x11.c) = 7064b65f4eff933157464a412bfbc2e3525c2472 +SHA1 (patch-src_backends_x11_meta-seat-x11.c) = 249e3d6060ac8faf4a0767acd7ef8e9b4d96a9fd diff --git a/wm/mutter/files/90-mutter b/wm/mutter/files/90-mutter new file mode 100644 index 00000000000..0ad4ada0eef --- /dev/null +++ b/wm/mutter/files/90-mutter @@ -0,0 +1,4 @@ +# -*- sh -*- +# Mutter needs XCURSOR_PATH set to a valid location of cursor themes + +export XCURSOR_PATH=@PREFIX@/share/icons diff --git a/wm/mutter/patches/patch-src_backends_x11_meta-input-settings-x11.c b/wm/mutter/patches/patch-src_backends_x11_meta-input-settings-x11.c new file mode 100644 index 00000000000..997a4872cad --- /dev/null +++ b/wm/mutter/patches/patch-src_backends_x11_meta-input-settings-x11.c @@ -0,0 +1,40 @@ +$NetBSD: patch-src_backends_x11_meta-input-settings-x11.c,v 1.1 2021/06/03 15:04:57 cirnatdan Exp $ + +Fix #ifdefs to avoid initialization error on non-Linux + +--- src/backends/x11/meta-input-settings-x11.c.orig 2021-03-20 12:08:54.064907300 +0000 ++++ src/backends/x11/meta-input-settings-x11.c +@@ -45,6 +45,7 @@ typedef struct _MetaInputSettingsX11Priv + #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_aspec + 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 (Meta + 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/wm/mutter/patches/patch-src_backends_x11_meta-seat-x11.c b/wm/mutter/patches/patch-src_backends_x11_meta-seat-x11.c new file mode 100644 index 00000000000..06fbd2437c6 --- /dev/null +++ b/wm/mutter/patches/patch-src_backends_x11_meta-seat-x11.c @@ -0,0 +1,53 @@ +$NetBSD: patch-src_backends_x11_meta-seat-x11.c,v 1.1 2021/06/03 15:04:57 cirnatdan Exp $ + +Hide Linux-specific evdev code under #ifdefs + +--- src/backends/x11/meta-seat-x11.c.orig 2021-03-20 12:08:54.069907200 +0000 ++++ 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> + +@@ -1731,7 +1732,7 @@ get_source_device_checked (MetaSeatX11 + + return source_device; + } +- ++#ifdef __linux__ + static uint32_t + evdev_button_code (uint32_t x_button) + { +@@ -1752,7 +1753,6 @@ evdev_button_code (uint32_t x_button) + case 3: + button = BTN_RIGHT; + break; +- + default: + button = x_button + (BTN_LEFT - 1) + 4; + break; +@@ -1760,7 +1760,7 @@ evdev_button_code (uint32_t x_button) + + return button; + } +- ++#endif + gboolean + meta_seat_x11_translate_event (MetaSeatX11 *seat, + XEvent *xevent, +@@ -2048,7 +2048,9 @@ meta_seat_x11_translate_event (MetaSeatX + 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, |