mutter: pkglinted wip/mutter

[Dan Cîrnaț <dan%alt.md@localhost>]

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

Modified Files:
	mutter/DESCR
	mutter/Makefile
	mutter/distinfo
	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
Removed Files:
	mutter/patches/patch-src_meson.build

Log Message:
mutter: pkglinted wip/mutter

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

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

diffstat:
 mutter/DESCR                                              |  5 +++--
 mutter/Makefile                                           |  2 +-
 mutter/distinfo                                           |  6 +++---
 mutter/patches/patch-clutter_clutter_clutter-stage-view.c |  2 ++
 mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c      |  2 ++
 mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h      |  2 ++
 mutter/patches/patch-src_meson.build                      | 12 ------------
 7 files changed, 13 insertions(+), 18 deletions(-)

diffs:
diff --git a/mutter/DESCR b/mutter/DESCR
index 53232524bc..001442a50f 100644
--- a/mutter/DESCR
+++ b/mutter/DESCR
@@ -1,11 +1,12 @@
-Mutter is a Wayland display server and X11 window manager 
+Mutter is a Wayland display server and X11 window manager
 
 When used as a Wayland display server, it runs on top of KMS and libinput. 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.
+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
diff --git a/mutter/Makefile b/mutter/Makefile
index fdb2a3cd3e..b3a93800e2 100644
--- a/mutter/Makefile
+++ b/mutter/Makefile
@@ -40,7 +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-7
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mutter-7
 
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/mutter/distinfo b/mutter/distinfo
index b546e3480f..9c503d0f1f 100644
--- a/mutter/distinfo
+++ b/mutter/distinfo
@@ -4,6 +4,6 @@ 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
+SHA1 (patch-clutter_clutter_clutter-stage-view.c) = 07d6ad3095db86c8355c2e78b80d786afad7920f
+SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.c) = 35ad9c0f490eb7e4d356fff0902cf0546299fbfc
+SHA1 (patch-cogl_cogl_cogl-dma-buf-handle.h) = c9da9a06709343b9de6258f87f378a3f031f0b4e
diff --git a/mutter/patches/patch-clutter_clutter_clutter-stage-view.c b/mutter/patches/patch-clutter_clutter_clutter-stage-view.c
index 580d3a1e01..319b060ce9 100644
--- a/mutter/patches/patch-clutter_clutter_clutter-stage-view.c
+++ b/mutter/patches/patch-clutter_clutter_clutter-stage-view.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Disable Linux-only functions
+
 --- 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    
diff --git a/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c
index 4295079a92..deee6b29c1 100644
--- a/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c
+++ b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Disable Linux-only functions
+
 --- 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 @@
diff --git a/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h
index 3debf098da..0c1d9c3fea 100644
--- a/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h
+++ b/mutter/patches/patch-cogl_cogl_cogl-dma-buf-handle.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Disable Linux-only functions
+
 --- 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
diff --git a/mutter/patches/patch-src_meson.build b/mutter/patches/patch-src_meson.build
deleted file mode 100644
index 500674e810..0000000000
--- a/mutter/patches/patch-src_meson.build
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- src/meson.build.orig	2020-06-02 23:25:27.559633000 +0000
-+++ src/meson.build
-@@ -892,6 +892,7 @@ libmutter = shared_library(libmutter_nam
-   c_args: mutter_c_args,
-   dependencies: [
-     libmutter_cogl_dep,
-+    libmutter_cogl_path_dep,
-     libmutter_clutter_dep,
-     mutter_deps,
-   ],