pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mutter: Update wip/mutter to version 3.38.1



Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Mon Nov 9 21:45:14 2020 +0100
Changeset:	92b7646235236b1bcf3fe890e5a6bf9ec36b24cc

Modified Files:
	mutter/Makefile
	mutter/PLIST
	mutter/distinfo
Added Files:
	mutter/patches/patch-clutter_clutter_clutter-stage-view.c
	mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c
	mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h

Log Message:
mutter: Update wip/mutter to version 3.38.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=92b7646235236b1bcf3fe890e5a6bf9ec36b24cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mutter/Makefile                                    |  13 +-
 mutter/PLIST                                       | 501 ++++++++++-----------
 mutter/distinfo                                    |  12 +-
 .../patch-clutter_clutter_clutter-stage-view.c     |  57 +++
 .../patches/patch-cogl_cogl_cogl-dma-buf-handle.c  |  32 ++
 .../patches/patch-cogl_cogl_cogl-dma-buf-handle.h  |  21 +
 6 files changed, 364 insertions(+), 272 deletions(-)

diffs:
diff --git a/mutter/Makefile b/mutter/Makefile
index 1820ed607c..fdb2a3cd3e 100644
--- a/mutter/Makefile
+++ b/mutter/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD$
 
-DISTNAME=	mutter-3.36.4
-PKGREVISION=	1
+DISTNAME=	mutter-3.38.1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mutter/3.36/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mutter/3.38/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	dan%alt.md@localhost
@@ -32,6 +31,8 @@ MESON_ARGS+=		-Dprofiler=false
 MESON_ARGS+=		-Dwayland=false
 MESON_ARGS+=		-Dtests=false #tests require Wayland support
 MESON_ARGS+=		-Dsm=true
+MESON_ARGS+=		-Dverbose=true
+MESON_ARGS+=		-Dopengl_libname=libGL.so.3
 
 PKGCONFIG_OVERRIDE+=	clutter/clutter/mutter-clutter.pc.in
 PKGCONFIG_OVERRIDE+=	cogl/cogl-pango/mutter-cogl-pango.pc.in
@@ -39,11 +40,7 @@ PKGCONFIG_OVERRIDE+=	cogl/cogl-path/mutter-cogl-path.pc.in
 PKGCONFIG_OVERRIDE+=	cogl/cogl/mutter-cogl.pc.in
 PKGCONFIG_OVERRIDE+=	src/libmutter.pc.in
 
-LDFLAGS+=       ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mutter-6
-
-# workaround for enums not being generated
-pre-build:
-	cd ${WRKSRC} && ninja -C output/ cogl/cogl-path/cogl-path-enum-types.h
+LDFLAGS+=       ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mutter-7
 
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/mutter/PLIST b/mutter/PLIST
index c1bfccc3be..f548799675 100644
--- a/mutter/PLIST
+++ b/mutter/PLIST
@@ -1,264 +1,247 @@
 @comment $NetBSD$
 bin/mutter
-include/mutter-6/clutter/cally/cally-actor.h
-include/mutter-6/clutter/cally/cally-clone.h
-include/mutter-6/clutter/cally/cally-factory.h
-include/mutter-6/clutter/cally/cally-group.h
-include/mutter-6/clutter/cally/cally-main.h
-include/mutter-6/clutter/cally/cally-rectangle.h
-include/mutter-6/clutter/cally/cally-root.h
-include/mutter-6/clutter/cally/cally-stage.h
-include/mutter-6/clutter/cally/cally-text.h
-include/mutter-6/clutter/cally/cally-util.h
-include/mutter-6/clutter/cally/cally.h
-include/mutter-6/clutter/clutter/clutter-action.h
-include/mutter-6/clutter/clutter/clutter-actor-meta.h
-include/mutter-6/clutter/clutter/clutter-actor.h
-include/mutter-6/clutter/clutter/clutter-align-constraint.h
-include/mutter-6/clutter/clutter/clutter-animatable.h
-include/mutter-6/clutter/clutter/clutter-autocleanups.h
-include/mutter-6/clutter/clutter/clutter-backend.h
-include/mutter-6/clutter/clutter/clutter-bin-layout.h
-include/mutter-6/clutter/clutter/clutter-bind-constraint.h
-include/mutter-6/clutter/clutter/clutter-binding-pool.h
-include/mutter-6/clutter/clutter/clutter-blur-effect.h
-include/mutter-6/clutter/clutter/clutter-box-layout.h
-include/mutter-6/clutter/clutter/clutter-brightness-contrast-effect.h
-include/mutter-6/clutter/clutter/clutter-cairo.h
-include/mutter-6/clutter/clutter/clutter-canvas.h
-include/mutter-6/clutter/clutter/clutter-child-meta.h
-include/mutter-6/clutter/clutter/clutter-click-action.h
-include/mutter-6/clutter/clutter/clutter-clone.h
-include/mutter-6/clutter/clutter/clutter-color-static.h
-include/mutter-6/clutter/clutter/clutter-color.h
-include/mutter-6/clutter/clutter/clutter-colorize-effect.h
-include/mutter-6/clutter/clutter/clutter-config.h
-include/mutter-6/clutter/clutter/clutter-constraint.h
-include/mutter-6/clutter/clutter/clutter-container.h
-include/mutter-6/clutter/clutter/clutter-content.h
-include/mutter-6/clutter/clutter/clutter-deform-effect.h
-include/mutter-6/clutter/clutter/clutter-deprecated.h
-include/mutter-6/clutter/clutter/clutter-desaturate-effect.h
-include/mutter-6/clutter/clutter/clutter-drag-action.h
-include/mutter-6/clutter/clutter/clutter-drop-action.h
-include/mutter-6/clutter/clutter/clutter-effect.h
-include/mutter-6/clutter/clutter/clutter-enum-types.h
-include/mutter-6/clutter/clutter/clutter-enums.h
-include/mutter-6/clutter/clutter/clutter-event.h
-include/mutter-6/clutter/clutter/clutter-feature.h
-include/mutter-6/clutter/clutter/clutter-fixed-layout.h
-include/mutter-6/clutter/clutter/clutter-flow-layout.h
-include/mutter-6/clutter/clutter/clutter-gesture-action.h
-include/mutter-6/clutter/clutter/clutter-grid-layout.h
-include/mutter-6/clutter/clutter/clutter-group.h
-include/mutter-6/clutter/clutter/clutter-image.h
-include/mutter-6/clutter/clutter/clutter-input-device-tool.h
-include/mutter-6/clutter/clutter/clutter-input-device.h
-include/mutter-6/clutter/clutter/clutter-input-focus.h
-include/mutter-6/clutter/clutter/clutter-input-method.h
-include/mutter-6/clutter/clutter/clutter-interval.h
-include/mutter-6/clutter/clutter/clutter-keyframe-transition.h
-include/mutter-6/clutter/clutter/clutter-keymap.h
-include/mutter-6/clutter/clutter/clutter-keysyms.h
-include/mutter-6/clutter/clutter/clutter-layout-manager.h
-include/mutter-6/clutter/clutter/clutter-layout-meta.h
-include/mutter-6/clutter/clutter/clutter-macros.h
-include/mutter-6/clutter/clutter/clutter-main.h
-include/mutter-6/clutter/clutter/clutter-marshal.h
-include/mutter-6/clutter/clutter/clutter-mutter.h
-include/mutter-6/clutter/clutter/clutter-offscreen-effect.h
-include/mutter-6/clutter/clutter/clutter-page-turn-effect.h
-include/mutter-6/clutter/clutter/clutter-paint-context.h
-include/mutter-6/clutter/clutter/clutter-paint-node.h
-include/mutter-6/clutter/clutter/clutter-paint-nodes.h
-include/mutter-6/clutter/clutter/clutter-pan-action.h
-include/mutter-6/clutter/clutter/clutter-path-constraint.h
-include/mutter-6/clutter/clutter/clutter-path.h
-include/mutter-6/clutter/clutter/clutter-pick-context.h
-include/mutter-6/clutter/clutter/clutter-property-transition.h
-include/mutter-6/clutter/clutter/clutter-rotate-action.h
-include/mutter-6/clutter/clutter/clutter-script.h
-include/mutter-6/clutter/clutter/clutter-scriptable.h
-include/mutter-6/clutter/clutter/clutter-scroll-actor.h
-include/mutter-6/clutter/clutter/clutter-seat.h
-include/mutter-6/clutter/clutter/clutter-settings.h
-include/mutter-6/clutter/clutter/clutter-shader-effect.h
-include/mutter-6/clutter/clutter/clutter-shader-types.h
-include/mutter-6/clutter/clutter/clutter-snap-constraint.h
-include/mutter-6/clutter/clutter/clutter-stage-manager.h
-include/mutter-6/clutter/clutter/clutter-stage-view.h
-include/mutter-6/clutter/clutter/clutter-stage.h
-include/mutter-6/clutter/clutter/clutter-swipe-action.h
-include/mutter-6/clutter/clutter/clutter-tap-action.h
-include/mutter-6/clutter/clutter/clutter-text-buffer.h
-include/mutter-6/clutter/clutter/clutter-text.h
-include/mutter-6/clutter/clutter/clutter-timeline.h
-include/mutter-6/clutter/clutter/clutter-transition-group.h
-include/mutter-6/clutter/clutter/clutter-transition.h
-include/mutter-6/clutter/clutter/clutter-types.h
-include/mutter-6/clutter/clutter/clutter-units.h
-include/mutter-6/clutter/clutter/clutter-virtual-input-device.h
-include/mutter-6/clutter/clutter/clutter-zoom-action.h
-include/mutter-6/clutter/clutter/clutter.h
-include/mutter-6/clutter/clutter/deprecated/clutter-actor.h
-include/mutter-6/clutter/clutter/deprecated/clutter-alpha.h
-include/mutter-6/clutter/clutter/deprecated/clutter-animation.h
-include/mutter-6/clutter/clutter/deprecated/clutter-box.h
-include/mutter-6/clutter/clutter/deprecated/clutter-container.h
-include/mutter-6/clutter/clutter/deprecated/clutter-group.h
-include/mutter-6/clutter/clutter/deprecated/clutter-rectangle.h
-include/mutter-6/clutter/clutter/deprecated/clutter-stage.h
-include/mutter-6/clutter/clutter/deprecated/clutter-state.h
-include/mutter-6/clutter/clutter/deprecated/clutter-timeline.h
-include/mutter-6/clutter/clutter/x11/clutter-x11.h
-include/mutter-6/cogl/cogl-pango/cogl-pango.h
-include/mutter-6/cogl/cogl-path/cogl-path-enum-types.h
-include/mutter-6/cogl/cogl-path/cogl-path-functions.h
-include/mutter-6/cogl/cogl-path/cogl-path-types.h
-include/mutter-6/cogl/cogl-path/cogl-path.h
-include/mutter-6/cogl/cogl/cogl-atlas-texture.h
-include/mutter-6/cogl/cogl/cogl-attribute-buffer.h
-include/mutter-6/cogl/cogl/cogl-attribute.h
-include/mutter-6/cogl/cogl/cogl-bitmap.h
-include/mutter-6/cogl/cogl/cogl-buffer.h
-include/mutter-6/cogl/cogl/cogl-color.h
-include/mutter-6/cogl/cogl/cogl-context.h
-include/mutter-6/cogl/cogl/cogl-defines.h
-include/mutter-6/cogl/cogl/cogl-depth-state.h
-include/mutter-6/cogl/cogl/cogl-display.h
-include/mutter-6/cogl/cogl/cogl-dma-buf-handle.h
-include/mutter-6/cogl/cogl/cogl-egl-defines.h
-include/mutter-6/cogl/cogl/cogl-egl.h
-include/mutter-6/cogl/cogl/cogl-fence.h
-include/mutter-6/cogl/cogl/cogl-frame-info.h
-include/mutter-6/cogl/cogl/cogl-framebuffer.h
-include/mutter-6/cogl/cogl/cogl-glib-source.h
-include/mutter-6/cogl/cogl/cogl-glx.h
-include/mutter-6/cogl/cogl/cogl-gtype-private.h
-include/mutter-6/cogl/cogl/cogl-index-buffer.h
-include/mutter-6/cogl/cogl/cogl-indices.h
-include/mutter-6/cogl/cogl/cogl-macros.h
-include/mutter-6/cogl/cogl/cogl-matrix-stack.h
-include/mutter-6/cogl/cogl/cogl-matrix.h
-include/mutter-6/cogl/cogl/cogl-meta-texture.h
-include/mutter-6/cogl/cogl/cogl-object.h
-include/mutter-6/cogl/cogl/cogl-offscreen.h
-include/mutter-6/cogl/cogl/cogl-onscreen-template.h
-include/mutter-6/cogl/cogl/cogl-onscreen.h
-include/mutter-6/cogl/cogl/cogl-output.h
-include/mutter-6/cogl/cogl/cogl-pipeline-layer-state.h
-include/mutter-6/cogl/cogl/cogl-pipeline-state.h
-include/mutter-6/cogl/cogl/cogl-pipeline.h
-include/mutter-6/cogl/cogl/cogl-pixel-buffer.h
-include/mutter-6/cogl/cogl/cogl-pixel-format.h
-include/mutter-6/cogl/cogl/cogl-poll.h
-include/mutter-6/cogl/cogl/cogl-primitive-texture.h
-include/mutter-6/cogl/cogl/cogl-primitive.h
-include/mutter-6/cogl/cogl/cogl-renderer.h
-include/mutter-6/cogl/cogl/cogl-snippet.h
-include/mutter-6/cogl/cogl/cogl-sub-texture.h
-include/mutter-6/cogl/cogl/cogl-swap-chain.h
-include/mutter-6/cogl/cogl/cogl-texture-2d-sliced.h
-include/mutter-6/cogl/cogl/cogl-texture-2d.h
-include/mutter-6/cogl/cogl/cogl-texture-pixmap-x11.h
-include/mutter-6/cogl/cogl/cogl-texture.h
-include/mutter-6/cogl/cogl/cogl-trace.h
-include/mutter-6/cogl/cogl/cogl-types.h
-include/mutter-6/cogl/cogl/cogl-version.h
-include/mutter-6/cogl/cogl/cogl-xlib-renderer.h
-include/mutter-6/cogl/cogl/cogl-xlib.h
-include/mutter-6/cogl/cogl/cogl.h
-include/mutter-6/cogl/cogl/cogl1-context.h
-include/mutter-6/cogl/cogl/deprecated/cogl-auto-texture.h
-include/mutter-6/cogl/cogl/deprecated/cogl-clutter.h
-include/mutter-6/cogl/cogl/deprecated/cogl-material-compat.h
-include/mutter-6/cogl/cogl/deprecated/cogl-shader.h
-include/mutter-6/cogl/cogl/deprecated/cogl-type-casts.h
-include/mutter-6/cogl/cogl/gl-prototypes/cogl-core-functions.h
-include/mutter-6/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
-include/mutter-6/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
-include/mutter-6/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
-include/mutter-6/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
-include/mutter-6/meta/barrier.h
-include/mutter-6/meta/boxes.h
-include/mutter-6/meta/common.h
-include/mutter-6/meta/compositor-mutter.h
-include/mutter-6/meta/compositor.h
-include/mutter-6/meta/display.h
-include/mutter-6/meta/group.h
-include/mutter-6/meta/keybindings.h
-include/mutter-6/meta/main.h
-include/mutter-6/meta/meta-backend.h
-include/mutter-6/meta/meta-background-actor.h
-include/mutter-6/meta/meta-background-group.h
-include/mutter-6/meta/meta-background-image.h
-include/mutter-6/meta/meta-background.h
-include/mutter-6/meta/meta-close-dialog.h
-include/mutter-6/meta/meta-cursor-tracker.h
-include/mutter-6/meta/meta-dnd.h
-include/mutter-6/meta/meta-enum-types.h
-include/mutter-6/meta/meta-idle-monitor.h
-include/mutter-6/meta/meta-inhibit-shortcuts-dialog.h
-include/mutter-6/meta/meta-launch-context.h
-include/mutter-6/meta/meta-monitor-manager.h
-include/mutter-6/meta/meta-plugin.h
-include/mutter-6/meta/meta-remote-access-controller.h
-include/mutter-6/meta/meta-selection-source-memory.h
-include/mutter-6/meta/meta-selection-source.h
-include/mutter-6/meta/meta-selection.h
-include/mutter-6/meta/meta-settings.h
-include/mutter-6/meta/meta-shadow-factory.h
-include/mutter-6/meta/meta-shaped-texture.h
-include/mutter-6/meta/meta-sound-player.h
-include/mutter-6/meta/meta-stage.h
-include/mutter-6/meta/meta-startup-notification.h
-include/mutter-6/meta/meta-version.h
-include/mutter-6/meta/meta-window-actor.h
-include/mutter-6/meta/meta-window-group.h
-include/mutter-6/meta/meta-window-shape.h
-include/mutter-6/meta/meta-workspace-manager.h
-include/mutter-6/meta/meta-x11-display.h
-include/mutter-6/meta/meta-x11-errors.h
-include/mutter-6/meta/prefs.h
-include/mutter-6/meta/theme.h
-include/mutter-6/meta/types.h
-include/mutter-6/meta/util.h
-include/mutter-6/meta/window.h
-include/mutter-6/meta/workspace.h
-lib/libmutter-6.so
-lib/libmutter-6.so.0
-lib/libmutter-6.so.0.0.0
-lib/mutter-6/Cally-6.gir
-lib/mutter-6/Cally-6.typelib
-lib/mutter-6/Clutter-6.gir
-lib/mutter-6/Clutter-6.typelib
-lib/mutter-6/ClutterX11-6.gir
-lib/mutter-6/ClutterX11-6.typelib
-lib/mutter-6/Cogl-6.gir
-lib/mutter-6/Cogl-6.typelib
-lib/mutter-6/CoglPango-6.gir
-lib/mutter-6/CoglPango-6.typelib
-lib/mutter-6/Meta-6.gir
-lib/mutter-6/Meta-6.typelib
-lib/mutter-6/libmutter-clutter-6.so
-lib/mutter-6/libmutter-clutter-6.so.0
-lib/mutter-6/libmutter-clutter-6.so.0.0.0
-lib/mutter-6/libmutter-cogl-6.so
-lib/mutter-6/libmutter-cogl-6.so.0
-lib/mutter-6/libmutter-cogl-6.so.0.0.0
-lib/mutter-6/libmutter-cogl-pango-6.so
-lib/mutter-6/libmutter-cogl-pango-6.so.0
-lib/mutter-6/libmutter-cogl-pango-6.so.0.0.0
-lib/mutter-6/libmutter-cogl-path-6.so
-lib/mutter-6/libmutter-cogl-path-6.so.0
-lib/mutter-6/libmutter-cogl-path-6.so.0.0.0
-lib/mutter-6/plugins/libdefault.so
-lib/pkgconfig/libmutter-6.pc
-lib/pkgconfig/mutter-clutter-6.pc
-lib/pkgconfig/mutter-clutter-x11-6.pc
-lib/pkgconfig/mutter-cogl-6.pc
-lib/pkgconfig/mutter-cogl-pango-6.pc
-lib/pkgconfig/mutter-cogl-path-6.pc
+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
 libexec/mutter-restart-helper
 man/man1/mutter.1
 share/GConf/gsettings/mutter-schemas.convert
diff --git a/mutter/distinfo b/mutter/distinfo
index 41ed2a7deb..b546e3480f 100644
--- a/mutter/distinfo
+++ b/mutter/distinfo
@@ -1,7 +1,9 @@
 $NetBSD$
 
-SHA1 (mutter-3.36.4.tar.xz) = a985279c53d4d95501e2b7074cca2b8e5443ca7b
-RMD160 (mutter-3.36.4.tar.xz) = 98f50048799f8bf973da0478f0edead858a71a68
-SHA512 (mutter-3.36.4.tar.xz) = e7130e59d5539a53ac8a349a38ce1ce757c6eee2ba672fc9eab9330bde32217674a9a206bd977db03195dc42b6c327147467407dd0159c4e8585332d9c1daabb
-Size (mutter-3.36.4.tar.xz) = 2687224 bytes
-SHA1 (patch-src_meson.build) = 3f19c844e0c0f16f3978b1c2a801adea699689a7
+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 (patch-clutter_clutter_clutter-stage-view.c) = ebc27754595bce537d37f24c7e57294ad3fd939d
+SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.c) = b9ffe6e24c24f66f3e50866ebef1a6e6c8091d07
+SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.h) = 57511df382e28a2133ca54d011219cb9ff75a959
diff --git a/mutter/patches/patch-clutter_clutter_clutter-stage-view.c b/mutter/patches/patch-clutter_clutter_clutter-stage-view.c
new file mode 100644
index 0000000000..580d3a1e01
--- /dev/null
+++ b/mutter/patches/patch-clutter_clutter_clutter-stage-view.c
@@ -0,0 +1,57 @@
+$NetBSD$
+
+--- clutter/clutter/clutter-stage-view.c.orig	2020-10-05 18:05:31.453278500 +0000
++++ clutter/clutter/clutter-stage-view.c
+@@ -529,13 +529,13 @@ find_damaged_tiles (ClutterStageView    
+   bpp = cogl_dma_buf_handle_get_bpp (current_dma_buf_handle);
+ 
+   cogl_framebuffer_finish (COGL_FRAMEBUFFER (priv->shadow.framebuffer));
+-
++#ifndef __NetBSD__
+   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;
+@@ -580,7 +580,7 @@ find_damaged_tiles (ClutterStageView    
+             cairo_region_union_rectangle (tile_damage_region, &tile);
+         }
+     }
+-
++#ifndef __NetBSD__
+   if (!cogl_dma_buf_handle_sync_read_end (prev_dma_buf_handle, error))
+     {
+       g_warning ("Failed to end DMA buffer read synchronization: %s",
+@@ -594,7 +594,7 @@ find_damaged_tiles (ClutterStageView    
+                  (*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);
+ 
+@@ -604,13 +604,16 @@ find_damaged_tiles (ClutterStageView    
+ 
+ err_mmap_current:
+   cogl_dma_buf_handle_munmap (prev_dma_buf_handle, prev_data, NULL);
+-
++#ifndef __NetBSD__
+ 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/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c
new file mode 100644
index 0000000000..4295079a92
--- /dev/null
+++ b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c
@@ -0,0 +1,32 @@
+$NetBSD$
+
+--- cogl/cogl/cogl-dma-buf-handle.c.orig	2020-10-05 18:05:31.474278000 +0000
++++ cogl/cogl/cogl-dma-buf-handle.c
+@@ -36,8 +36,10 @@
+ 
+ #include <errno.h>
+ #include <gio/gio.h>
++#ifndef __NetBSD__
+ #include <linux/dma-buf.h>
+ #include <sys/ioctl.h>
++#endif
+ #include <sys/mman.h>
+ #include <unistd.h>
+ 
+@@ -101,6 +103,8 @@ cogl_dma_buf_handle_free (CoglDmaBufHand
+   g_free (dmabuf_handle);
+ }
+ 
++
++#ifndef __NetBSD__
+ static gboolean
+ sync_read (CoglDmaBufHandle  *dmabuf_handle,
+            uint64_t           start_or_end,
+@@ -147,6 +151,7 @@ cogl_dma_buf_handle_sync_read_end (CoglD
+ {
+   return sync_read (dmabuf_handle, DMA_BUF_SYNC_END, error);
+ }
++#endif
+ 
+ gpointer
+ cogl_dma_buf_handle_mmap (CoglDmaBufHandle  *dmabuf_handle,
diff --git a/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h
new file mode 100644
index 0000000000..3debf098da
--- /dev/null
+++ b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- cogl/cogl/cogl-dma-buf-handle.h.orig	2020-10-05 18:05:31.474278000 +0000
++++ cogl/cogl/cogl-dma-buf-handle.h
+@@ -63,6 +63,7 @@ cogl_dma_buf_handle_new (CoglFramebuffer
+ COGL_EXPORT void
+ cogl_dma_buf_handle_free (CoglDmaBufHandle *dmabuf_handle);
+ 
++# ifndef __NetBSD__
+ 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 (Cog
+ 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);


Home | Main Index | Thread Index | Old Index