[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2023-12-18 Thread Pacho Ramos 
commit: 002602af135042ef47020a2b22478f82c9e1031a
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Dec 18 10:04:08 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Dec 18 10:19:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=002602af

x11-wm/mutter: Fix memory leak in fullscreen mode

Apply upstream patch to fix a leak when running apps in fullscreen.
It will be included in the next point release.

Signed-off-by: Pacho Ramos  gentoo.org>

 .../mutter/files/mutter-45.2-fullscreen-leak.patch | 37 ++
 x11-wm/mutter/mutter-45.2.ebuild   |  1 +
 2 files changed, 38 insertions(+)

diff --git a/x11-wm/mutter/files/mutter-45.2-fullscreen-leak.patch 
b/x11-wm/mutter/files/mutter-45.2-fullscreen-leak.patch
new file mode 100644
index ..adbd309c1b7c
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-45.2-fullscreen-leak.patch
@@ -0,0 +1,37 @@
+From bedf8df88f41c34c9824dccba507c8e333dd9ba6 Mon Sep 17 00:00:00 2001
+From: Robert Balas 
+Date: Mon, 4 Dec 2023 00:27:49 +0100
+Subject: [PATCH] clutter: Fix memory leak when running in fullscreen
+
+`clutter_stage_do_paint_view()` only gets called when leaving fullscreen
+and by that time enough calls to
+`clutter_actor_get_transformed_paint_volume()` can make the underlying
+GArray grow to a large size.
+
+To fix this, we call call the cleanup function in
+`clutter_stage_finish_layout()` to make it happen every frame.
+
+Co-authored-by: Sebastian Keller 
+
+Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3191
+Part-of: 
+---
+ clutter/clutter/clutter-stage.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
+index 55bb81c2b46..deb383fe216 100644
+--- a/clutter/clutter/clutter-stage.c
 b/clutter/clutter/clutter-stage.c
+@@ -970,6 +970,8 @@ clutter_stage_finish_layout (ClutterStage *stage)
+ }
+ 
+   g_warn_if_fail (!priv->actor_needs_immediate_relayout);
++
++  _clutter_stage_paint_volume_stack_free_all (stage);
+ }
+ 
+ void
+-- 
+GitLab
+

diff --git a/x11-wm/mutter/mutter-45.2.ebuild b/x11-wm/mutter/mutter-45.2.ebuild
index f6f42162b174..40a5b53d810c 100644
--- a/x11-wm/mutter/mutter-45.2.ebuild
+++ b/x11-wm/mutter/mutter-45.2.ebuild
@@ -141,6 +141,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
+   "${FILESDIR}"/${P}-fullscreen-leak.patch
 )
 
 python_check_deps() {

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2023-08-16 Thread Matt Turner 
commit: db6f330bd75323ca5ea796d67d1a5c8dd97ab8fd
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Aug 16 22:28:27 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Aug 16 22:32:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db6f330b

x11-wm/mutter: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-wm/mutter/Manifest |   1 -
 .../mutter/files/mutter-44.1-frame-updates.patch   | 158 --
 .../files/mutter-44.1-xdnd-frame-window.patch  |  50 -
 x11-wm/mutter/mutter-44.1-r1.ebuild| 240 -
 4 files changed, 449 deletions(-)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 3fced0e8bf66..bda942d26d0b 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,4 +1,3 @@
-DIST mutter-44.1.tar.xz 2843780 BLAKE2B 
f148b96ebeeb5db9cb620ca0870862cde579fc6d5ca9ddf87d6b6ad982baf67326b931b4a43cc9c4c9aa3b7752faa6fbbac2254c75924f0fa33fb34ae16db8fe
 SHA512 
42cf748d83736e4a3ba595329d784829c278ea74c2db816bad770976000ee1f5070e0caf756ba123178819fdec6ae9380017f3c44f08bbff19c8bcaa46b6f33c
 DIST mutter-44.2.tar.xz 2848696 BLAKE2B 
2adbda457c215dfb1889c9b42eb1c58b0d012f79287414da6f4a18ff92b082d872df344abdb72b5f193f1830c6f1002495ff9152c51ad3824c779ccd81e11310
 SHA512 
5c58cac46a571bd9fabca8326cf973c79d9d47bd223b39476e143f30e435900859e5cef1858bc343261ad9c026166647b940c5becc6d788d99d947bd003e12da
 DIST mutter-44.3.tar.xz 2848256 BLAKE2B 
42c00d4673cab5d119361c6eb2b78c33894c637b36a34f9b74eb5a19ca621d3458208be020216f9a8949e8b0a9c9de697662c5aebb11f70bc83173ce33c7a1eb
 SHA512 
d29bc6c7407ba81be0b5bfa2333bc77c09f7a084e09d6902cad8ca8e64ba75a22652b68a4e84b79b80481d9a7b6cb490128113dcd125ed5bcd5423d4ec88fb35
 DIST mutter-45.alpha.tar.xz 2850600 BLAKE2B 
92e03c1ba440eae9369cb344e003d3bbc619de6ee45debf51145a6729220879855faa75f2c4c7b21cf79f691981aaed39daf771c959f44d9c63572ff2aa43195
 SHA512 
c819fa6d1ee1e41f4dee702c6b8ee7b5ede3f689a6a55e245f40d3bc8013c8414eb7077224bd8e33c9536fdf089fbc4cd7fe7a7d071cafe392c6281169c28c4b

diff --git a/x11-wm/mutter/files/mutter-44.1-frame-updates.patch 
b/x11-wm/mutter/files/mutter-44.1-frame-updates.patch
deleted file mode 100644
index bc6f5411204b..
--- a/x11-wm/mutter/files/mutter-44.1-frame-updates.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 82bd40dcbcc3601da755678778f033bd9a30286d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= 
-Date: Thu, 4 May 2023 12:31:41 +0200
-Subject: [PATCH] screen-cast/src: Never dequeue pw_buffer's we refuse to
- record to
-
-The DMA buffer paths vs MemFd paths differ slightly in when content is
-recorded. This was in some places done by trying to record but bail if
-the dequeued buffer had the wrong type. This is problematic for two
-reasons: we'd update the timestamp even if we refused to record, making
-the follow-up attempt fail, and we'd dequeue and queue buffers that
-didn't get any content, meaning the receiving end would see empty
-buffers potentially with only cursor updates.
-
-Fix this by keeping track if a stream is DMA buffer able or not, and
-don't attempt to record at all in the places we would previously require
-DMA buffers. This avoids both issues: we don't dequeue/queue pw_buffers
-that we refuse to record to, and we won't update the recorded timestamp
-when we didn't intend to record to begin with.
-
-Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2783
-Part-of: 

- .../meta-screen-cast-monitor-stream-src.c | 25 ---
- src/backends/meta-screen-cast-stream-src.c| 22 ++--
- src/backends/meta-screen-cast-stream-src.h|  3 ++-
- 3 files changed, 32 insertions(+), 18 deletions(-)
-
-diff --git a/src/backends/meta-screen-cast-monitor-stream-src.c 
b/src/backends/meta-screen-cast-monitor-stream-src.c
-index efb458067e..073a4d101f 100644
 a/src/backends/meta-screen-cast-monitor-stream-src.c
-+++ b/src/backends/meta-screen-cast-monitor-stream-src.c
-@@ -158,8 +158,8 @@ stage_painted (MetaStage   *stage,
-   MetaScreenCastMonitorStreamSrc *monitor_src =
- META_SCREEN_CAST_MONITOR_STREAM_SRC (user_data);
-   MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (monitor_src);
--  MetaScreenCastRecordResult record_result;
--  MetaScreenCastRecordFlag flags;
-+  MetaScreenCastRecordResult record_result =
-+META_SCREEN_CAST_RECORD_RESULT_RECORDED_NOTHING;
-   int64_t presentation_time_us;
- 
-   if (monitor_src->maybe_record_idle_id)
-@@ -168,12 +168,16 @@ stage_painted (MetaStage   *stage,
-   if (!clutter_frame_get_target_presentation_time (frame, 
_time_us))
- presentation_time_us = g_get_monotonic_time ();
- 
--  flags = META_SCREEN_CAST_RECORD_FLAG_DMABUF_ONLY;
--  record_result =
--meta_screen_cast_stream_src_maybe_record_frame_with_timestamp (src,
--

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2023-05-07 Thread Pacho Ramos 
commit: f436be32835d022495ef58fc4a2d7e3b0906ecb6
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun May  7 12:37:03 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun May  7 12:38:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f436be32

x11-wm/mutter: Apply important fixes from upstream

One fixes drag with QT apps and the other makes RDP desktop sharing
usable again.

Signed-off-by: Pacho Ramos  gentoo.org>

 .../mutter/files/mutter-44.1-frame-updates.patch   | 158 ++
 .../files/mutter-44.1-xdnd-frame-window.patch  |  50 +
 x11-wm/mutter/mutter-44.1-r1.ebuild| 240 +
 3 files changed, 448 insertions(+)

diff --git a/x11-wm/mutter/files/mutter-44.1-frame-updates.patch 
b/x11-wm/mutter/files/mutter-44.1-frame-updates.patch
new file mode 100644
index ..bc6f5411204b
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-44.1-frame-updates.patch
@@ -0,0 +1,158 @@
+From 82bd40dcbcc3601da755678778f033bd9a30286d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= 
+Date: Thu, 4 May 2023 12:31:41 +0200
+Subject: [PATCH] screen-cast/src: Never dequeue pw_buffer's we refuse to
+ record to
+
+The DMA buffer paths vs MemFd paths differ slightly in when content is
+recorded. This was in some places done by trying to record but bail if
+the dequeued buffer had the wrong type. This is problematic for two
+reasons: we'd update the timestamp even if we refused to record, making
+the follow-up attempt fail, and we'd dequeue and queue buffers that
+didn't get any content, meaning the receiving end would see empty
+buffers potentially with only cursor updates.
+
+Fix this by keeping track if a stream is DMA buffer able or not, and
+don't attempt to record at all in the places we would previously require
+DMA buffers. This avoids both issues: we don't dequeue/queue pw_buffers
+that we refuse to record to, and we won't update the recorded timestamp
+when we didn't intend to record to begin with.
+
+Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2783
+Part-of: 
+---
+ .../meta-screen-cast-monitor-stream-src.c | 25 ---
+ src/backends/meta-screen-cast-stream-src.c| 22 ++--
+ src/backends/meta-screen-cast-stream-src.h|  3 ++-
+ 3 files changed, 32 insertions(+), 18 deletions(-)
+
+diff --git a/src/backends/meta-screen-cast-monitor-stream-src.c 
b/src/backends/meta-screen-cast-monitor-stream-src.c
+index efb458067e..073a4d101f 100644
+--- a/src/backends/meta-screen-cast-monitor-stream-src.c
 b/src/backends/meta-screen-cast-monitor-stream-src.c
+@@ -158,8 +158,8 @@ stage_painted (MetaStage   *stage,
+   MetaScreenCastMonitorStreamSrc *monitor_src =
+ META_SCREEN_CAST_MONITOR_STREAM_SRC (user_data);
+   MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (monitor_src);
+-  MetaScreenCastRecordResult record_result;
+-  MetaScreenCastRecordFlag flags;
++  MetaScreenCastRecordResult record_result =
++META_SCREEN_CAST_RECORD_RESULT_RECORDED_NOTHING;
+   int64_t presentation_time_us;
+ 
+   if (monitor_src->maybe_record_idle_id)
+@@ -168,12 +168,16 @@ stage_painted (MetaStage   *stage,
+   if (!clutter_frame_get_target_presentation_time (frame, 
_time_us))
+ presentation_time_us = g_get_monotonic_time ();
+ 
+-  flags = META_SCREEN_CAST_RECORD_FLAG_DMABUF_ONLY;
+-  record_result =
+-meta_screen_cast_stream_src_maybe_record_frame_with_timestamp (src,
+-   flags,
+-   NULL,
+-   
presentation_time_us);
++  if (meta_screen_cast_stream_src_uses_dma_bufs (src))
++{
++  MetaScreenCastRecordFlag flags = META_SCREEN_CAST_RECORD_FLAG_NONE;
++
++  record_result =
++meta_screen_cast_stream_src_maybe_record_frame_with_timestamp (src,
++   flags,
++   NULL,
++   
presentation_time_us);
++}
+ 
+   if (!(record_result & META_SCREEN_CAST_RECORD_RESULT_RECORDED_FRAME))
+ {
+@@ -200,13 +204,16 @@ before_stage_painted (MetaStage   *stage,
+   if (monitor_src->maybe_record_idle_id)
+ return;
+ 
++  if (!meta_screen_cast_stream_src_uses_dma_bufs (src))
++return;
++
+   if (!clutter_stage_view_peek_scanout (view))
+ return;
+ 
+   if (!clutter_frame_get_target_presentation_time (frame, 
_time_us))
+ presentation_time_us = g_get_monotonic_time ();
+ 
+-  flags = META_SCREEN_CAST_RECORD_FLAG_DMABUF_ONLY;
++  flags = META_SCREEN_CAST_RECORD_FLAG_NONE;
+   meta_screen_cast_stream_src_maybe_record_frame_with_timestamp (src,
+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2023-01-03 Thread Matt Turner 
commit: ae47f3cbcab490acce0b539a250d76ac6d9c7588
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Jan  3 04:00:30 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Jan  3 14:07:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae47f3cb

x11-wm/mutter: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-wm/mutter/Manifest |   2 -
 .../mutter-42.0-Disable-anonymous-file-test.patch  |  30 ---
 ...d-native-Don-t-warn-on-EACCES-if-headless.patch |  79 
 x11-wm/mutter/mutter-42.5.ebuild   | 190 ---
 x11-wm/mutter/mutter-43.1.ebuild   | 206 -
 5 files changed, 507 deletions(-)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 3453a13f8a7c..1cb303dcd3ae 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1 @@
-DIST mutter-42.5.tar.xz 2743636 BLAKE2B 
87ee26ccee6c21404ac069e7b35d2b93ef38d0eda0963107c08a72599915fba56a653968fe456afa42f4eeb28aed5526d23d344f7e1f9f4fdf9cf35b5a66fca5
 SHA512 
cd7ef29211a1568f5f8d43182da6569db22005c0b67204a300edb4952d9c18f73def1558843a009a7475a82d7ce9754bd8741b214a931764798dbeaaecbbec49
-DIST mutter-43.1.tar.xz 2779416 BLAKE2B 
1b7bf1ec44f6e47a859e84adb93a869be261ef3699ab773014e1497ea6c944e91d7a1766a2f126c79c1b21ba78e1ba25314c32113bc194f580d847e8617ae0d3
 SHA512 
6553ee855ebb3bb88bc12f823a5813c6b1b6ff983f1af716521b5e04903bc30112954e3e5d781516b087e247088cced1f560fce54eac28207a6cbc61d78b05b7
 DIST mutter-43.2.tar.xz 2781032 BLAKE2B 
cb4fc05ae9b53029649e9c80c8ce450d383a41f142ff1000bca6f9c1ddc707897511b5b54e8e28b4d263d19cffdfa699cef034d667cd8f166f8274c0f237d41a
 SHA512 
ae6afccdf6af99197072afabf0900e1a72f38acfa6c4d039e8db03d21e89513f8828f29eb292ca9dfdec64388dcc4a93db64139e3af66706aaac81461b5da96d

diff --git a/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch 
b/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch
deleted file mode 100644
index d0e07840d46e..
--- a/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8cb699dc59c64dc9f58873b3bbe2d17c3a08d2f9 Mon Sep 17 00:00:00 2001
-From: Matt Turner 
-Date: Fri, 18 Mar 2022 17:40:52 -0700
-Subject: [PATCH] Disable anonymous-file test
-
-It attempts to open /proc/self/fd/* (an fd created by memfd_create),
-which sandbox disallows.

- src/tests/meson.build | 5 -
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/tests/meson.build b/src/tests/meson.build
-index a19703288..50027d1f8 100644
 a/src/tests/meson.build
-+++ b/src/tests/meson.build
-@@ -180,11 +180,6 @@ test_cases += [
- 'suite': 'compositor',
- 'sources': [ 'stage-view-tests.c', ],
-   },
--  {
--'name': 'anonymous-file',
--'suite': 'unit',
--'sources': [ 'anonymous-file.c', ],
--  },
- ]
- 
- if have_native_tests
--- 
-2.34.1
-

diff --git 
a/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
 
b/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
deleted file mode 100644
index 98b58d3dfeff..
--- 
a/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From db854a8588c1164df2f54c5718930aadf353b948 Mon Sep 17 00:00:00 2001
-From: Simon McVittie 
-Date: Thu, 18 Aug 2022 10:41:01 +0100
-Subject: [PATCH] backend/native: Don't warn on EACCES if headless
-
-Since commit 1bf70334 "tests/runner: Make test runner use the headless
-backend", tests are run with the native backend in headless mode, which
-will attempt to open each GPU and show a warning (fatal during tests)
-if it cannot.
-
-However, in headless mode we might not be logged in on any seat (for
-example we might be logged in via ssh instead), which means we might
-legitimately not have permission to use any GPUs, even if they exist.
-Downgrade the warning to a debug message in this case.
-
-Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/2381
-Signed-off-by: Simon McVittie 
-Part-of: 
-(cherry picked from commit 64a67aa00bfe54fe7219d7f581950897fcbf9a75)

- src/backends/native/meta-backend-native.c | 35 +++
- 1 file changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/src/backends/native/meta-backend-native.c 
b/src/backends/native/meta-backend-native.c
-index 224538787..a2babb4b0 100644
 a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -514,8 +514,20 @@ on_udev_device_added (MetaUdev  *udev,
-   new_gpu_kms = create_gpu_from_udev_device (native, device, );
-   if (!new_gpu_kms)
- {
--  g_warning ("Failed to hotplug secondary gpu '%s': %s",
-- device_path, error->message);
-+  if (meta_backend_is_headless (backend) &&
-+  g_error_matches (error, G_IO_ERROR,
-+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2022-05-31 Thread Matt Turner 
commit: c0b78299ddff6fc4ca43107507da77a2d85640de
Author: Matt Turner  gentoo  org>
AuthorDate: Tue May 31 17:49:10 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue May 31 18:23:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b78299

x11-wm/mutter: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-wm/mutter/Manifest |   2 -
 .../mutter-40.0-Disable-anonymous-file-test.patch  |  32 
 x11-wm/mutter/mutter-41.4.ebuild   | 168 ---
 x11-wm/mutter/mutter-42.0-r1.ebuild| 184 -
 4 files changed, 386 deletions(-)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index aa867df08985..e67a6fa1c769 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,4 +1,2 @@
-DIST mutter-41.4.tar.xz 2717012 BLAKE2B 
2f9d144380072427c0ee65c1e3bb26e5caca76e0656f316459a77df09f9e8bda3ea9c17c6400d04abee9c7f82b36dbd035794cf31feef7ee4574ce308d627e55
 SHA512 
ee3881f9047f0b9ef8598609e9ac90294cb36a7549fcc6a647a80553045ed315998d0dbac247887ae06b32126bab1525f13f7f92655b9103cac77750e347e405
-DIST mutter-42.0.tar.xz 2742212 BLAKE2B 
4867d184fbf63f7624c907f941f1aa1ac8d66108554385c1500b6259958a3c2bf5dcd30cebed95cbafd4a1bbd5368b6078edec695884a0ee9eb48dbf0ad4cecf
 SHA512 
ffcfbb1b6d3add84adf2d67d459905d164dc272289b645994288c376bc656481526d445cdfe6df027b88ab590258ee9d9d4ba251e03c6ef93d17f0758f75520d
 DIST mutter-42.1.tar.xz 2747056 BLAKE2B 
7973e6178e3a61078c37c593a8ffabbd002b791b8251fdf9aa7c90b40efa76591f9946cdd31dd6f274c2a4455157c8661d63714619f3966250eeca5ddae34689
 SHA512 
b7c7011f1c3c4361ddfdcffc61057f8821c37cfb602d7f7ec97fdd1f0ab19dd331f396ca4f61c83253d003d1d866b0d2ff1e7f34bbc9e98b48aacb973aabd6d5
 DIST mutter-42.2.tar.xz 2747612 BLAKE2B 
39d83283dc04473e47263d463849030c1076bb5b8d6fbc37f03e1936cb999ab554784f02ad9a04cdbfa2f35ad95c74c0899ee44e9710e435e66de613628cc683
 SHA512 
e43bdc7c9183b2578ae1f777fdf84bfde550a26bfc28fd4a1a183c7f310d852110f3dcabd50a2fabdafba4cfb8aa6577aec4c65775075f0afff7bd1bb4dde957

diff --git a/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch 
b/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch
deleted file mode 100644
index 484c62c5a0c4..
--- a/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7353efd2f326b3f855db52ba8643ac4e793d5ffc Mon Sep 17 00:00:00 2001
-From: Matt Turner 
-Date: Sun, 21 Mar 2021 18:31:22 -0400
-Subject: [PATCH] Disable anonymous-file test
-
-It attempts to open /proc/self/fd/* (an fd created by memfd_create),
-which sandbox disallows.

- src/tests/meson.build | 7 ---
- 1 file changed, 7 deletions(-)
-
-diff --git a/src/tests/meson.build b/src/tests/meson.build
-index 8ee409e20..50c930c2a 100644
 a/src/tests/meson.build
-+++ b/src/tests/meson.build
-@@ -285,13 +285,6 @@ test('stage-view', stage_view_tests,
-   timeout: 60,
- )
- 
--test('anonymous-file', anonymous_file_test,
--  suite: ['core', 'mutter/unit'],
--  env: test_env,
--  is_parallel: false,
--  timeout: 60,
--)
--
- if have_native_tests
-   test('native-headless', native_headless_tests,
- suite: ['core', 'mutter/native/headless'],
--- 
-2.26.2
-

diff --git a/x11-wm/mutter/mutter-41.4.ebuild b/x11-wm/mutter/mutter-41.4.ebuild
deleted file mode 100644
index e32a368da43b..
--- a/x11-wm/mutter/mutter-41.4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/;
-
-LICENSE="GPL-2+"
-SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell 
(or anything using mutter-clutter-.pc) should use the subslot
-
-IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd 
test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and 
a logind provider
-REQUIRED_USE="
-   wayland? ( ^^ ( elogind systemd ) udev )
-   test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for 
org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus 
currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-   >=x11-libs/libX11-1.7.0
-   >=media-libs/graphene-1.10.2[introspection?]
-   >=x11-libs/gtk+-3.19.8:3[X,introspection?]
-   x11-libs/gdk-pixbuf:2
-   >=x11-libs/pango-1.46[introspection?]
-   >=dev-libs/fribidi-1.0.0
-   >=x11-libs/cairo-1.14[X]
-

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2021-07-26 Thread Matt Turner 
commit: d1c6362243d0314c808d4ae60778fa040a38431f
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 26 06:21:04 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul 26 07:15:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1c63622

x11-wm/mutter: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-wm/mutter/Manifest |   5 -
 .../files/3.34.6-tests-dontreq-gdkwayland.patch|  51 ---
 x11-wm/mutter/mutter-3.36.7-r1.ebuild  | 149 
 x11-wm/mutter/mutter-40.1-r2.ebuild| 149 
 x11-wm/mutter/mutter-40.1-r4.ebuild| 151 -
 x11-wm/mutter/mutter-40.2-r1.ebuild| 149 
 6 files changed, 654 deletions(-)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 01eac01f58e..eccfa0e3641 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,7 +1,2 @@
-DIST mutter-3.36.7-patchset.tar.xz 14232 BLAKE2B 
90a289f7012e28607d487fd635b73683e657bfd8792dbf662f8822ac7f096d21add6fcd3b7092e4e82f2130226f5b1ff9afd1e026fec8333680c9b4e4712dea2
 SHA512 
74e3951358a02c552a45b590360b9a038283e983ff78daf433fea1589ca3e7824f21af3b786a06ba84fb400581dfc4f97f29d259afdaca2ae3e1456a49a96243
-DIST mutter-3.36.7.tar.xz 2689176 BLAKE2B 
a3849b254dbe2029736ef760fe4225e63bf1d87bf2856a87682574904bd047822916485a3e00d2760118132466414b68764731ea4af9add5d734fd7ce3eac730
 SHA512 
6061cc8a3bdefe57049f9da757b9a33321b28ff7bc9543bc1db3abd75c7261bf233180fb1e8a2f76145dd67ebda91c48981f6e844a866ef6cbb66203af4b7ef7
-DIST mutter-40.1-r1-patchset.tar.xz 25312 BLAKE2B 
bcb58a50d63076ec012a2866dcbabaf417c094c3d7811f59e58273f7966f132fd51587b9374cee49b10e02207edc89bc0a4176de236330f4d9d9467f23a1d997
 SHA512 
511c9a315e29175109a8341ff608c94535579bc7e3145990405286fb47ee050a9ad90977ac18cd69f9baeeac283d3b94b1a0d4324ba3cc73fbb405443d82eb4d
-DIST mutter-40.1.tar.xz 2680816 BLAKE2B 
924fd977e1c6669abd5adea1855c3a0a4027ae7e96ab3c6ccbe3d54da5f431e386f9c2f8f060dc9cd066c7414a2bb90a05760fa3413c6805cd8b73cb5d3aed90
 SHA512 
c2b6603e1d55492916f742f9cb8e15588cb30e78c37de987404ac40d3befa65e417184305ad87fdffc41052a094790f9e324a1ea7482e5de4f0439dceefed118
 DIST mutter-40.2.1.tar.xz 2681780 BLAKE2B 
b273bc9979e285bd6c48afb367f0973114dbc9af086b5aadf41e6dc1cca54f7ca25975a4e2fe5b4acb020fa8f5fc136f0661be2b06deaacf25c363a187567b73
 SHA512 
f9b50b10f6a4ee8ba3d8d721734d25184675c2af1f14cb8da8cac6a6a60397c36bf39e87db06ac0ed8a0f3cbf78859e57fa965ac0d2593ed9c6aa9692d90d5b2
-DIST mutter-40.2.tar.xz 2681840 BLAKE2B 
7785086a9aff9f273735e0a0716a8535a7e69b35c5b4312d8a363b4058e84e499a15c1d9b085c40d1303e69e661fd74c286da89a83a27d86e1a56c537f7e2e18
 SHA512 
9582004efde7a4b2ad21c390f4a4558c99709e21bdcac3f161f185612de9aaeb60cbfcf5dd1684726ae18244540aa4b6bcd2b9f362b92eb8c74304c43c9e1113
 DIST mutter-40.3.tar.xz 2682460 BLAKE2B 
41e505adc9aa6ca53d1f43d71051bc09c0f4f528803f10c8f4ad8fe2cf28f5a02a3d3dca1a4a02b702a40177501663e20b68415295805b6c0503690dbb5e53fc
 SHA512 
beb9cb1b8dee153fe204aa5d799e4ba44380c8483362ab4f7b149c715be6fa929345386b78af73ca6ae7e864dd2923e5c0de88404f8ffe5d22f2ae9238bcc074

diff --git a/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch 
b/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch
deleted file mode 100644
index 810801977af..000
--- a/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From fd10425c598f7b3db16521c2709032fd2ea5a396 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp 
-Date: Sun, 28 Jun 2020 09:26:33 +0300
-Subject: [PATCH] test-client: Fix compilation without GDK_WINDOWING_WAYLAND
-

- src/tests/test-client.c | 6 ++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/tests/test-client.c b/src/tests/test-client.c
-index 83a5ce485..80c239310 100644
 a/src/tests/test-client.c
-+++ b/src/tests/test-client.c
-@@ -22,7 +22,9 @@
- #include 
- #include 
- #include 
-+#ifdef GDK_WINDOWING_WAYLAND
- #include 
-+#endif
- #include 
- #include 
- #include 
-@@ -46,8 +48,10 @@ window_export_handle_cb (GdkWindow  *window,
- {
-   GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (user_data));
- 
-+#ifdef GDK_WINDOWING_WAYLAND
-   if (!gdk_wayland_window_set_transient_for_exported (gdk_window,
-   (gchar *) handle_str))
-+#endif
- g_print ("Fail to set transient_for exported window handle %s", 
handle_str);
-   gdk_window_set_modal_hint (gdk_window, TRUE);
- }
-@@ -377,11 +381,13 @@ process_line (const char *line)
-   goto out;
- }
- 
-+#ifdef GDK_WINDOWING_WAYLAND
-   GdkWindow *parent_gdk_window = gtk_widget_get_window (parent_window);
-   if (!gdk_wayland_window_export_handle (parent_gdk_window,
-  window_export_handle_cb,
-  window,
-

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2020-11-07 Thread Mart Raudsepp 
commit: 86bff0c4558a3fe486aab5dea35152a43ef43097
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Nov  7 14:48:27 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Nov  7 15:21:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86bff0c4

x11-wm/mutter: remove old

Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 x11-wm/mutter/Manifest|   4 -
 x11-wm/mutter/files/3.32-eglmesaext-include.patch |  68 --
 x11-wm/mutter/files/3.34.6-XInitThreads.patch |  50 
 x11-wm/mutter/mutter-3.34.6-r1.ebuild | 148 -
 x11-wm/mutter/mutter-3.34.6-r2.ebuild | 148 -
 x11-wm/mutter/mutter-3.36.4-r1.ebuild | 149 --
 x11-wm/mutter/mutter-3.36.4.ebuild| 146 -
 7 files changed, 713 deletions(-)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index f0b626b6022..e9286aaa16b 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,5 +1 @@
-DIST mutter-3.34.6-patchset.tar.xz 4748 BLAKE2B 
103f17256c7a9f347aadd58119e0e92c844bf372723e1462ea343fe9a80d7ed9dd55ad04215216dd51f97143e23b201e056f2e17a1808a22fe2d4e0f8e8da659
 SHA512 
79e1d72d14643ef3b6d9da0532ca636e41a110bcc7e8fe1553940ca6c1e2cf6414923a707bdde7823449ef7b0535d8c97ae0ae57a02f55e90950e8c127340ade
-DIST mutter-3.34.6.tar.xz 2805328 BLAKE2B 
bba0e062ab81f8e88e7e59b6dbf51226b6e2d43932c7d61aca5a3e709119f909e30acea67a5444c95205ddf929a1f5bf7785eec7aed4f2da743c19543aa79962
 SHA512 
dd240fdcfc8ba0c62c0ff423a40ec6e0007d154f0be39e18cea543da7ff548e10a9b712f9b2cc09c58ad342b1e7eb50fb2a8790c55d284846bb6f1a76f8c6d6b
-DIST mutter-3.36.4-patchset.tar.xz 9064 BLAKE2B 
62a66010a2daf8584ae6bc79d81425e4283ebf3a97d9bbf4e52d486dc3460c9f501f1d18adcf95fc5016678b235931ed095c1edfa3f86374d826c8808927956a
 SHA512 
fb84a44e7676f14b906c54c36696f7c4c0b154ff8e08786d87ae2320ddec2aa8f275b7d5481e434d4ea6c4a06d3221cfe53f8642bc7e98037937f3ff921b33c8
-DIST mutter-3.36.4.tar.xz 2687224 BLAKE2B 
edf86573bcecaff67b666205460ce8748e0e58f03a14f3f04ae01e0afed6e2909d16d4c2bc53d2e95e9ad2d5b3a8223d06245e01c7dbcc51dc6e04b463767935
 SHA512 
e7130e59d5539a53ac8a349a38ce1ce757c6eee2ba672fc9eab9330bde32217674a9a206bd977db03195dc42b6c327147467407dd0159c4e8585332d9c1daabb
 DIST mutter-3.36.5.tar.xz 2687916 BLAKE2B 
15eedc6b1a7c5fdb3a355b8aa4b5586491d0fc50ef293b200b747e9d2a8540df9dcb5d492edb30d1a51b779bf4faceba9448535475c65864d08219eb94e71599
 SHA512 
cf02003578ebe4d025006b7dc8c277e5a2240373d41fd21e9e7a0ea3d7f323454925a09a5f77117e63a95d4f7663fc4ad7b6e21b042044a8a1a5238713f8d5ec

diff --git a/x11-wm/mutter/files/3.32-eglmesaext-include.patch 
b/x11-wm/mutter/files/3.32-eglmesaext-include.patch
deleted file mode 100644
index c91c56235f3..000
--- a/x11-wm/mutter/files/3.32-eglmesaext-include.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" 
-Date: Sun, 20 Oct 2019 12:04:31 +0200
-Subject: [PATCH] EGL: Include EGL/eglmesaext.h
-
-The eglext.h shipped by libglvnd does not include the Mesa extensions,
-unlike the header shipped in Mesa.
-
-Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876

- cogl/cogl/meson.build   | 2 +-
- src/backends/meta-egl-ext.h | 1 +
- src/backends/meta-egl.c | 1 +
- src/backends/meta-egl.h | 1 +
- 4 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
-index 261955796..b0e66bff3 100644
 a/cogl/cogl/meson.build
-+++ b/cogl/cogl/meson.build
-@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
- built_headers += [cogl_gl_header_h]
- 
- if have_egl
--  cogl_egl_includes_string = '#include \n#include '
-+  cogl_egl_includes_string = '#include \n#include 
\n#include '
- else
-   cogl_egl_includes_string = ''
- endif
-diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
-index 8705e7d5b..db0b74f76 100644
 a/src/backends/meta-egl-ext.h
-+++ b/src/backends/meta-egl-ext.h
-@@ -29,6 +29,7 @@
- 
- #include 
- #include 
-+#include 
- 
- /*
-  * This is a little different to the tests shipped with EGL implementations,
-diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
-index 6554be935..fdeff4f77 100644
 a/src/backends/meta-egl.c
-+++ b/src/backends/meta-egl.c
-@@ -27,6 +27,7 @@
- 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
-index f2a816445..4591e7d85 100644
 a/src/backends/meta-egl.h
-+++ b/src/backends/meta-egl.h
-@@ -28,6 +28,7 @@
- 
- #include 
- #include 
-+#include 
- #include 
- 
- #define META_EGL_ERROR meta_egl_error_quark ()
--- 
-2.22.0
-

diff --git a/x11-wm/mutter/files/3.34.6-XInitThreads.patch 
b/x11-wm/mutter/files/3.34.6-XInitThreads.patch
deleted file mode 100644
index f53f6ba9397..000

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2019-12-23 Thread Mart Raudsepp 
commit: 4d6e0c8fe87969bb3683e7f0e79891c54e4197a8
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Dec 23 21:23:56 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Dec 23 21:25:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6e0c8f

x11-wm/mutter: remove old

Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 x11-wm/mutter/Manifest|   2 -
 x11-wm/mutter/files/3.28.3-no-gles2-fix.patch |  43 --
 x11-wm/mutter/files/3.30-eglmesaext-include.patch |  69 --
 x11-wm/mutter/mutter-3.30.2-r4.ebuild | 153 --
 4 files changed, 267 deletions(-)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 2cb1435f77b..acdf8cbe590 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,6 +1,4 @@
 DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 
7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9
 SHA512 
2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90
 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B 
b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51
 SHA512 
95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
-DIST mutter-3.30.2-r4-patchset.tar.xz 44820 BLAKE2B 
2448dcd6bca338dbe2b87a93ca4374fd5b4cc5d8834dd40739e74a65280b7f00b99d61361082673f5f41e44fb40e36f0889d5ee00fbc034efe87294540fba48e
 SHA512 
a7024b95bc56ab25cfdb27003b4b1fc39925117795c05f78b2d473fdbcf3bb6ce870ee5bc030ec4ce5e10b42d94fa0007bf5870bd2a4e94de3885c9434a39835
-DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 
280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a
 SHA512 
3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
 DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 
026c87cc3859624bcfd273694a8a34661d97cc6e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295
 SHA512 
e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5
 DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 
8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00
 SHA512 
e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269

diff --git a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch 
b/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch
deleted file mode 100644
index 43bb05f5245..000
--- a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 259544c4f4b47418885075c9531ce593c600401c Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp 
-Date: Fri, 1 Mar 2019 00:02:47 +0200
-Subject: [PATCH] build: Fix build without gles headers
-
-This is an ugly quick fix to hopefully fix non-wayland builds against
-mesa[-gles2].
-It assumes gnome-shell package USE=wayland requires USE=gles2, which it
-sort of does already at runtime already for hybrid graphics support, but
-we ensure with REQUIRED_USE.
-In meson upstream port for 3.32 this will be more properly conditional
-on the gles2 option instead.

- src/Makefile.am | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index bcb3505c7..a68661b21 100644
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -118,9 +118,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \
-   backends/meta-egl.c \
-   backends/meta-egl.h \
-   backends/meta-egl-ext.h \
--  backends/meta-gles3.c   \
--  backends/meta-gles3.h   \
--  backends/meta-gles3-table.h \
-   backends/meta-gpu.c \
-   backends/meta-gpu.h \
-   backends/meta-display-config-shared.h   \
-@@ -472,6 +469,9 @@ endif
- 
- if HAVE_NATIVE_BACKEND
- libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=   \
-+  backends/meta-gles3.c   \
-+  backends/meta-gles3.h   \
-+  backends/meta-gles3-table.h \
-   backends/native/meta-backend-native.c   \
-   backends/native/meta-backend-native.h   \
-   backends/native/meta-backend-native-private.h   \
--- 
-2.17.0
-

diff --git a/x11-wm/mutter/files/3.30-eglmesaext-include.patch 
b/x11-wm/mutter/files/3.30-eglmesaext-include.patch
deleted file mode 100644
index 884d57cc6f0..000
---

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2019-11-23 Thread Matt Turner 
commit: 44dc733c0dc81aeb5f3476f0de495278eb8a449f
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 23 19:49:33 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 23 21:41:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44dc733c

x11-wm/mutter: Add patch to build with mesa-19.3

Closes: https://bugs.gentoo.org/698736
Signed-off-by: Matt Turner  gentoo.org>

 x11-wm/mutter/files/3.30-eglmesaext-include.patch | 69 +++
 x11-wm/mutter/files/3.32-eglmesaext-include.patch | 68 ++
 x11-wm/mutter/mutter-3.30.2-r4.ebuild |  2 +
 x11-wm/mutter/mutter-3.32.2.ebuild|  2 +
 4 files changed, 141 insertions(+)

diff --git a/x11-wm/mutter/files/3.30-eglmesaext-include.patch 
b/x11-wm/mutter/files/3.30-eglmesaext-include.patch
new file mode 100644
index 000..884d57cc6f0
--- /dev/null
+++ b/x11-wm/mutter/files/3.30-eglmesaext-include.patch
@@ -0,0 +1,69 @@
+From 813ea4e5743920ecf325aac8efe420bd5fe3baf2 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: [PATCH] EGL: Include EGL/eglmesaext.h
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+---
+ cogl/configure.ac   | 3 ++-
+ src/backends/meta-egl-ext.h | 1 +
+ src/backends/meta-egl.c | 1 +
+ src/backends/meta-egl.h | 1 +
+ 4 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/configure.ac b/cogl/configure.ac
+index 3be282fc2..f333b0512 100644
+--- a/cogl/configure.ac
 b/cogl/configure.ac
+@@ -759,7 +759,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" 
!= "xyes"],
+   )
+ 
+ COGL_EGL_INCLUDES="#include 
+-#include "
++#include 
++#include "
+ AC_SUBST([COGL_EGL_INCLUDES])
+   ])
+ 
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d5b..db0b74f76 100644
+--- a/src/backends/meta-egl-ext.h
 b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ /*
+  * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 755ec4908..bd253c956 100644
+--- a/src/backends/meta-egl.c
 b/src/backends/meta-egl.c
+@@ -31,6 +31,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index 060c7cd2d..2fef2642e 100644
+--- a/src/backends/meta-egl.h
 b/src/backends/meta-egl.h
+@@ -27,6 +27,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #define META_EGL_ERROR meta_egl_error_quark ()
+-- 
+2.23.0
+

diff --git a/x11-wm/mutter/files/3.32-eglmesaext-include.patch 
b/x11-wm/mutter/files/3.32-eglmesaext-include.patch
new file mode 100644
index 000..c91c56235f3
--- /dev/null
+++ b/x11-wm/mutter/files/3.32-eglmesaext-include.patch
@@ -0,0 +1,68 @@
+From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: [PATCH] EGL: Include EGL/eglmesaext.h
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+---
+ cogl/cogl/meson.build   | 2 +-
+ src/backends/meta-egl-ext.h | 1 +
+ src/backends/meta-egl.c | 1 +
+ src/backends/meta-egl.h | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
+index 261955796..b0e66bff3 100644
+--- a/cogl/cogl/meson.build
 b/cogl/cogl/meson.build
+@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
+ built_headers += [cogl_gl_header_h]
+ 
+ if have_egl
+-  cogl_egl_includes_string = '#include \n#include '
++  cogl_egl_includes_string = '#include \n#include 
\n#include '
+ else
+   cogl_egl_includes_string = ''
+ endif
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d5b..db0b74f76 100644
+--- a/src/backends/meta-egl-ext.h
 b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ /*
+  * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 6554be935..fdeff4f77 100644
+--- a/src/backends/meta-egl.c
 b/src/backends/meta-egl.c
+@@ -27,6 +27,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index f2a816445..4591e7d85 100644
+--- a/src/backends/meta-egl.h
 b/src/backends/meta-egl.h
+@@ -28,6 +28,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #define META_EGL_ERROR meta_egl_error_quark ()
+-- 
+2.22.0
+

diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2019-09-06 Thread Mart Raudsepp 
commit: 0c4e5ce467e59b8903b8e53047b751346040aaa4
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Sep  6 21:01:22 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Sep  6 21:44:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c4e5ce4

x11-wm/mutter: bump to 3.32.2

Closes: https://bugs.gentoo.org/685724
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 x11-wm/mutter/Manifest |   2 +
 x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch |  81 ++
 x11-wm/mutter/mutter-3.32.2.ebuild | 146 +
 3 files changed, 229 insertions(+)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index cf1fc2fed32..1c6c961ffdf 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -4,3 +4,5 @@ DIST mutter-3.30.2-r1-patchset.tar.xz 14096 BLAKE2B 
83f2e975a4404b878e832a70fe7a
 DIST mutter-3.30.2-r3-patchset.tar.xz 30208 BLAKE2B 
502e9c1d005cf268548e2732d4574b0eb7491940531c77c357e73e2da23b60acfbb183f9e818edd86cf0d6abca4e43c2e687db27544bb4fe7e9a33a162df01da
 SHA512 
22b66395ffae07b208efa3a1305c71ea2282470a08300a5c3de23a2a45f03afef7804d5943934028286406adedbb9851dc562f4e57fdff77df22591893f0908b
 DIST mutter-3.30.2-r4-patchset.tar.xz 44820 BLAKE2B 
2448dcd6bca338dbe2b87a93ca4374fd5b4cc5d8834dd40739e74a65280b7f00b99d61361082673f5f41e44fb40e36f0889d5ee00fbc034efe87294540fba48e
 SHA512 
a7024b95bc56ab25cfdb27003b4b1fc39925117795c05f78b2d473fdbcf3bb6ce870ee5bc030ec4ce5e10b42d94fa0007bf5870bd2a4e94de3885c9434a39835
 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 
280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a
 SHA512 
3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
+DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 
026c87cc3859624bcfd273694a8a34661d97cc6e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295
 SHA512 
e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5
+DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 
8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00
 SHA512 
e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269

diff --git a/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch 
b/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch
new file mode 100644
index 000..41c3e94d860
--- /dev/null
+++ b/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch
@@ -0,0 +1,81 @@
+From a00bd286724b3186c17d70f1b2fe98da2d90bf60 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Sun, 1 Sep 2019 14:42:04 +0300
+Subject: [PATCH] build: Allow building native backend without cogl-gles2
+
+Native backend already requires gles2, but was controlled by gles2
+meson option, even though it's hard required with native_backend
+already, and errored out if gles2 wasn't enabled too.
+Instead allow native_backend to be built without cogl-gles2 by simply
+checking for the gles2 hard requirement in case of have_native_backend
+too and not erroring out without -Dgles2=true, which is now used only
+for controlling cogl-gles2 build.
+---
+ meson.build | 10 +++---
+ src/meson.build |  4 ++--
+ 2 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 6160a4bb3..c85284ba2 100644
+--- a/meson.build
 b/meson.build
+@@ -150,12 +150,13 @@ endif
+ have_egl_xlib = have_egl and have_x11
+ 
+ have_gles2 = get_option('gles2')
+-if have_gles2
++have_native_backend = get_option('native_backend')
++if have_gles2 or have_native_backend
+   gles2_dep = dependency('glesv2')
+   gles2_libname = get_option('gles2_libname')
+ 
+   if not have_egl
+-error('GLESv2 support requires EGL to be enabled')
++error('GLESv2 and native backend support requires EGL to be enabled')
+   endif
+ endif
+ 
+@@ -177,7 +178,6 @@ if have_libgudev
+   gudev_dep = dependency('gudev-1.0', version: gudev_req)
+ endif
+ 
+-have_native_backend = get_option('native_backend')
+ if have_native_backend
+   libdrm_dep = dependency('libdrm')
+   libgbm_dep = dependency('gbm', version: gbm_req)
+@@ -194,10 +194,6 @@ if have_native_backend
+ error('The native backend requires EGL to be enabled')
+   endif
+ 
+-  if not have_gles2
+-error('The native backend requires GLESv2 to be enabled')
+-  endif
+-
+   if not have_libgudev
+ error('The native backend requires udev to be enabled')
+   endif
+diff --git a/src/meson.build b/src/meson.build
+index 182f7f5f5..af9776480 100644
+--- a/src/meson.build
 b/src/meson.build
+@@ -36,7 +36,7 @@ if have_gl
+   ]
+ endif
+ 
+-if have_gles2
++if have_native_backend
+   mutter_pkg_private_deps += [
+ gles2_dep,
+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2019-02-28 Thread Mart Raudsepp 
commit: f7cbaff73571787a03c54ceb8a7d1a2449ec341c
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 28 22:33:24 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 28 22:37:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7cbaff7

x11-wm/mutter: require gles2 for wayland, try to fix non-gles2 builds

Native backend makes use of gles3 for some features, and I'm not sure if
these gracefully degrade or not without gles3. So require gles2 with
wayland (which is when we  enable build of native backend), which also
allows for a simpler hacky patch for fixing non-gles2 builds when system
doesn't have USE=gles2 on mesa.
I consider this quite ugly, but
1) this is ~arch
2) this will be better in the meson port in mutter-3.32
3) it hopefully works well enough anyways, sans potentially unnecessary
mesa[gles2] dep and full gles2 cogl builds.
People who mind the gles2 requirement are welcome to come up with
something better. It should somehow express the feature dependency of
this, even if just metadata.xml descriptions.

Closes: https://bugs.gentoo.org/679074
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 x11-wm/mutter/files/3.28.3-no-gles2-fix.patch |  43 
 x11-wm/mutter/mutter-3.28.3-r1.ebuild | 152 ++
 2 files changed, 195 insertions(+)

diff --git a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch 
b/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch
new file mode 100644
index 000..43bb05f5245
--- /dev/null
+++ b/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch
@@ -0,0 +1,43 @@
+From 259544c4f4b47418885075c9531ce593c600401c Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Fri, 1 Mar 2019 00:02:47 +0200
+Subject: [PATCH] build: Fix build without gles headers
+
+This is an ugly quick fix to hopefully fix non-wayland builds against
+mesa[-gles2].
+It assumes gnome-shell package USE=wayland requires USE=gles2, which it
+sort of does already at runtime already for hybrid graphics support, but
+we ensure with REQUIRED_USE.
+In meson upstream port for 3.32 this will be more properly conditional
+on the gles2 option instead.
+---
+ src/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bcb3505c7..a68661b21 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -118,9 +118,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \
+   backends/meta-egl.c \
+   backends/meta-egl.h \
+   backends/meta-egl-ext.h \
+-  backends/meta-gles3.c   \
+-  backends/meta-gles3.h   \
+-  backends/meta-gles3-table.h \
+   backends/meta-gpu.c \
+   backends/meta-gpu.h \
+   backends/meta-display-config-shared.h   \
+@@ -472,6 +469,9 @@ endif
+ 
+ if HAVE_NATIVE_BACKEND
+ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=   \
++  backends/meta-gles3.c   \
++  backends/meta-gles3.h   \
++  backends/meta-gles3-table.h \
+   backends/native/meta-backend-native.c   \
+   backends/native/meta-backend-native.h   \
+   backends/native/meta-backend-native-private.h   \
+-- 
+2.17.0
+

diff --git a/x11-wm/mutter/mutter-3.28.3-r1.ebuild 
b/x11-wm/mutter/mutter-3.28.3-r1.ebuild
new file mode 100644
index 000..3a7b5381459
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.28.3-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 virtualx
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/;
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz;
+
+LICENSE="GPL-2+"
+SLOT="0/2" # 0/libmutter_api_version - ONLY gnome-shell (or anything using 
mutter-clutter-.pc) should use the subslot
+
+IUSE="debug elogind gles2 input_devices_wacom +introspection systemd test udev 
wayland"
+# native backend requires gles3 for hybrid graphics blitting support and a 
logind provider
+# gles2 may be avoidable, but probably not worth the effort before switching 
to meson; without it, it seems it'll have subtle lost features as well that 
isn't explained to user atm.
+REQUIRED_USE="
+   wayland? (
+   ?? ( elogind systemd )
+   gles2
+   )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# libXi-1.7.4 or newer needed per:
+# https://bugzilla.gnome.org/show_bug.cgi?id=738944
+# gl.pc package is required, which is only installed by mesa if glx is 
enabled; pre-emptively requiring USE=X on mesa, as hopefully eventually it'll 
support disabling glx for wayland-only systems
+RDEPEND="
+   >=dev-libs/atk-2.5.3
+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2018-01-25 Thread Gilles Dartiguelongue 
commit: 2a06072d9ebea366e0057e14b14aa0f06e2ea2cb
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu Jan 25 08:25:02 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Jan 25 08:35:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a06072d

x11-wm/mutter: fix build with USE=debug

Closes: https://bugs.gentoo.org/645412
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 x11-wm/mutter/files/3.24.4-build-debug.patch | 28 
 x11-wm/mutter/mutter-3.24.4.ebuild   |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/x11-wm/mutter/files/3.24.4-build-debug.patch 
b/x11-wm/mutter/files/3.24.4-build-debug.patch
new file mode 100644
index 000..6cb7b48856f
--- /dev/null
+++ b/x11-wm/mutter/files/3.24.4-build-debug.patch
@@ -0,0 +1,28 @@
+From c9937faf1e2c81005289e18974ed5d10b2dc37ab Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho 
+Date: Sat, 12 Aug 2017 11:52:28 +0200
+Subject: [PATCH] clutter: Fix build with --enable-debug
+
+Message was poking stage_x11, which doesn't exist in this context.
+Just print the Window that is receiving the event, the event will be
+emitted into the only existing stage anyway.
+---
+ clutter/clutter/x11/clutter-device-manager-xi2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/clutter/x11/clutter-device-manager-xi2.c 
b/clutter/clutter/x11/clutter-device-manager-xi2.c
+index 1ecec02..da3457a 100644
+--- a/clutter/clutter/x11/clutter-device-manager-xi2.c
 b/clutter/clutter/x11/clutter-device-manager-xi2.c
+@@ -1160,7 +1160,7 @@ translate_pad_event (ClutterEvent   *event,
+ event->any.type == CLUTTER_PAD_RING
+ ? "pad ring  "
+ : "pad strip",
+-(unsigned int) stage_x11->xwin,
++(unsigned int) xev->event,
+ device->id,
+ device->device_name,
+ event->any.time, value);
+--
+libgit2 0.26.0
+

diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild 
b/x11-wm/mutter/mutter-3.24.4.ebuild
index 4f727d079a1..f52fd7fb8eb 100644
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -83,6 +83,8 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
# Fix build with >=gudev-232, bug #630312
"${FILESDIR}"/3.24.4-gudev-232.patch
+   # Fix build with USE=debug, bug #645412
+   "${FILESDIR}"/3.24.4-build-debug.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2017-09-12 Thread Gilles Dartiguelongue 
commit: 9d6462925b8c9b3f5513f6c8150961b7e1bc3b58
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue Sep 12 22:01:58 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue Sep 12 22:03:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d646292

x11-wm/mutter: fix build with libgudev-232, bug #630312

Closes: https://bugs.gentoo.org/630312
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 x11-wm/mutter/files/3.24.4-gudev-232.patch | 33 ++
 x11-wm/mutter/mutter-3.24.4.ebuild |  9 ++--
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/x11-wm/mutter/files/3.24.4-gudev-232.patch 
b/x11-wm/mutter/files/3.24.4-gudev-232.patch
new file mode 100644
index 000..5808e977c73
--- /dev/null
+++ b/x11-wm/mutter/files/3.24.4-gudev-232.patch
@@ -0,0 +1,33 @@
+From 361bf847af82c7dca097302fe64c575079280c9c Mon Sep 17 00:00:00 2001
+From: Bastien Nocera 
+Date: Fri, 1 Sep 2017 02:06:38 +0200
+Subject: build: Require libgudev >= 232
+
+And remove the g_autoptr implementations in mutter itself.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=760670
+
+Gentoo: stripped configure.ac part to avoid autoreconf
+---
+ configure.ac| 4 ++--
+ src/backends/native/meta-launcher.c | 4 
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/backends/native/meta-launcher.c 
b/src/backends/native/meta-launcher.c
+index 90b4b98..eb35f88 100644
+--- a/src/backends/native/meta-launcher.c
 b/src/backends/native/meta-launcher.c
+@@ -49,10 +49,6 @@
+ 
+ #define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor"
+ 
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref)
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref)
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref)
+-
+ struct _MetaLauncher
+ {
+   Login1Session *session_proxy;
+-- 
+cgit v0.12
+

diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild 
b/x11-wm/mutter/mutter-3.24.4.ebuild
index cf11022b83b..c05bdb7e50c 100644
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -54,14 +54,14 @@ COMMON_DEPEND="
gles2? ( media-libs/mesa[gles2] )
input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-   udev? ( virtual/libgudev:= )
+   udev? ( >=virtual/libgudev-232:= )
wayland? (
>=dev-libs/libinput-1.4
>=dev-libs/wayland-1.6.90
>=dev-libs/wayland-protocols-1.7
>=media-libs/mesa-10.3[egl,gbm,wayland]
sys-apps/systemd
-   virtual/libgudev:=
+   >=virtual/libgudev-232:=
>=virtual/libudev-136:=
x11-base/xorg-server[wayland]
x11-libs/libdrm:=
@@ -80,6 +80,11 @@ RDEPEND="${COMMON_DEPEND}
!x11-misc/expocity
 "
 
+PATCHES=(
+   # Fix build with >=gudev-232, bug #630312
+   "${FILESDIR}"/3.24.4-gudev-232.patch
+)
+
 src_prepare() {
# Disable building of noinst_PROGRAM for tests
if ! use test; then

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2015-11-26 Thread Gilles Dartiguelongue 
commit: a898d3f2ba18dcc1461f5ba58ac3c1697467d817
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu Nov 26 10:47:45 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Nov 26 10:50:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a898d3f2

x11-wm/mutter: drop old revisions

Package-Manager: portage-2.2.25

 x11-wm/mutter/Manifest |   1 -
 x11-wm/mutter/files/mutter-3.14.2-automagic.patch  |  90 ---
 .../mutter-3.16.3-GL_EXT_x11_sync_object.patch | 840 -
 .../mutter/files/mutter-3.16.3-crash-border.patch  |  32 -
 x11-wm/mutter/files/mutter-3.16.3-fix-race.patch   | 114 ---
 x11-wm/mutter/files/mutter-3.16.3-fix-return.patch |  32 -
 x11-wm/mutter/files/mutter-3.16.3-flickering.patch | 114 ---
 .../mutter-3.2.1-ignore-shadow-and-padding.patch   |  91 ---
 x11-wm/mutter/mutter-3.16.3-r1.ebuild  | 114 ---
 x11-wm/mutter/mutter-3.16.3.ebuild |  91 ---
 10 files changed, 1519 deletions(-)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index a75354a..f16ae86 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1,2 @@
-DIST mutter-3.16.3.tar.xz 1550004 SHA256 
ee0098487d1bfb8f28e3927fbb9df227d846555142d352f8693f56a08441c755 SHA512 
31b6319c605d2576bf179e01534fe886a997677c63f19fa5d4a2d71e616a02de89d3edb069a444fb84c6fdf5a471afa2bda1d835c07e5d6dce712b2485e5937d
 WHIRLPOOL 
23cc5161edb108137c9c983551b57659fc02c179bc7e08abebd5b26b98dcc1a17e00579a6b1e9f6fc544a92a877282fa1202a6390a14ef92ca6374dae1750112
 DIST mutter-3.16.4.tar.xz 1535572 SHA256 
23e8601a594a207fcfdf570e10710539176d41dd43304ef7b274a59d09e305da SHA512 
b2d199ad883bb90adfbc96317f4ccc655ed6ff700307503551cb8a4d0a42b7dc9024d1b914935b57c6f50bed90e9ce592179b07a4061a3664443aa012e6b4fd9
 WHIRLPOOL 
8084e9e43643ce65947856fe81ce29619a2dae22866fb5c42d83563b10dfe55104f18cf8c7f06bce650681df94f658a5438be8fbcc8a0da8a2c2ceaa880f7ab2
 DIST mutter-3.18.2.tar.xz 1468660 SHA256 
8a69326f216c7575ed6cd53938b9cfc49b3b359cde95d3b6a7ed46c837261181 SHA512 
99c138187e28a152d44421e240a9e644c56c74142ab125a0bf208ffaa3e711df9c319b37bbb9827ee3c79abce908aaf4ae6b6cb271b92d90add2642a39b74726
 WHIRLPOOL 
3c4f1e45a7306dedf8c9350ef130139f69a8d6a56c24ad4c1b52fd9120e72901b2898df0684fabb33a17ceec5261adfc340e09a65cbb1f90045aa34b9ec13342

diff --git a/x11-wm/mutter/files/mutter-3.14.2-automagic.patch 
b/x11-wm/mutter/files/mutter-3.14.2-automagic.patch
deleted file mode 100644
index 3956004..000
--- a/x11-wm/mutter/files/mutter-3.14.2-automagic.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From d723a752982e12b7a7fb7998c3e28efd9082abd9 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue 
-Date: Mon, 8 Dec 2014 22:00:32 +0100
-Subject: [PATCH] Make wayland support optional
-

- configure.ac | 58 +++---
- 1 file changed, 43 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0870afa..251f909 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -200,23 +200,49 @@ AC_SUBST(XWAYLAND_PATH)
- 
- PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
- 
--PKG_CHECK_MODULES(MUTTER_NATIVE_BACKEND, [clutter-egl-1.0 libdrm libsystemd 
libinput gbm >= 10.3], [have_native_backend=yes], [have_native_backend=no])
--if test $have_native_backend = yes; then
--   AC_DEFINE([HAVE_NATIVE_BACKEND],[1],[Define if you want to enable the 
native (KMS) backend based on systemd])
--fi
--AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test $have_native_backend = yes])
--
--PKG_CHECK_MODULES(MUTTER_WAYLAND, [clutter-wayland-1.0 
clutter-wayland-compositor-1.0 wayland-server >= 1.5.90], [have_wayland=yes], 
[have_wayland=no])
--if test $have_wayland = yes; then
--   AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
--   AS_IF([test $WAYLAND_SCANNER = "no"],
-- AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for 
parsing wayland extension protocols]))
--   AC_SUBST([WAYLAND_SCANNER])
--
--   AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland 
support])
--fi
-+have_wayland=no
-+AC_ARG_ENABLE(
-+  [wayland],
-+  AS_HELP_STRING([--disable-wayland], [disable mutter on wayland support]),
-+  [],
-+  enable_wayland=yes
-+)
-+AS_IF([test "$enable_wayland" != "no"],
-+  [
-+PKG_CHECK_MODULES([MUTTER_WAYLAND],
-+  [clutter-wayland-1.0 clutter-wayland-compositor-1.0 
wayland-server >= 1.5.90],
-+  [
-+have_wayland=yes
-+
AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
-+AS_IF([test $WAYLAND_SCANNER = "no"],
-+  [AC_MSG_ERROR([Could not find 
wayland-scanner in your PATH, required for parsing wayland extension 
protocols])])
-+AC_SUBST([WAYLAND_SCANNER])
-+AC_DEFINE([HAVE_WAYLAND],[1],[Define if you

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2015-10-03 Thread Pacho Ramos 
commit: da3aadab245927722168f6d9adaa0513d39c1afb
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct  3 09:05:23 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct  3 09:05:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3aadab

x11-wm/mutter: Drop old

Package-Manager: portage-2.2.22

 x11-wm/mutter/Manifest |   1 -
 .../files/mutter-3.16.2-size-unredirected.patch| 151 -
 x11-wm/mutter/mutter-3.16.2-r1.ebuild  |  97 -
 x11-wm/mutter/mutter-3.16.2.ebuild |  91 -
 x11-wm/mutter/mutter-3.16.3-r1.ebuild  |  10 +-
 5 files changed, 5 insertions(+), 345 deletions(-)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 3633659..43311d2 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1,2 @@
 DIST mutter-3.14.4.tar.xz 1608836 SHA256 
b4fbcc0664484d6215fc1f2101e9b636303de63544b786f2f87ebf2f6a616a8b SHA512 
5b6e2d969e9a328e23bedb9fd0409da1af0d2ae8ded6a940992d4cff18a8cbfe2aa6582a56a2c8bd549a560a84d8cbffe953f151bcadf235315b8ec8bc7d1267
 WHIRLPOOL 
45c0329832999f14a5eaa77df3a6c7bbc72556b779fc55b3db9505594efec40252996bf8d96083da47fdb67b6bf5a9402f526d8bbb1e5436e5de16a8520e4acf
-DIST mutter-3.16.2.tar.xz 1549760 SHA256 
4a2b752f0b3aa59f50563190222623324f5154acbb6bf174213f5849e77d0763 SHA512 
f2cd350f8dbd03bc8e58f6c3f1b48cd51b38ae56e020d4e02100ef02f003d797a20095acf6a8874563fde42cfde49c4a28c418af151ee49f24ed391d5ae3caba
 WHIRLPOOL 
a88badf1f59c8c6ba8dcde4af207a2e66e66abbd6fd6c436289591bbb6eb3b017f50a7122282b69fd7d55127029e7623b7cbca3467d2d25d95c8ff6077dc371b
 DIST mutter-3.16.3.tar.xz 1550004 SHA256 
ee0098487d1bfb8f28e3927fbb9df227d846555142d352f8693f56a08441c755 SHA512 
31b6319c605d2576bf179e01534fe886a997677c63f19fa5d4a2d71e616a02de89d3edb069a444fb84c6fdf5a471afa2bda1d835c07e5d6dce712b2485e5937d
 WHIRLPOOL 
23cc5161edb108137c9c983551b57659fc02c179bc7e08abebd5b26b98dcc1a17e00579a6b1e9f6fc544a92a877282fa1202a6390a14ef92ca6374dae1750112

diff --git a/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch 
b/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch
deleted file mode 100644
index 0999ebd..000
--- a/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 351f444f9d16a90636feb217b15f0f376bf96d85 Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" 
-Date: Tue, 23 Jun 2015 16:23:45 -0700
-Subject: surface-actor-x11: Make sure to set a size when unredirected
-
-When we're unredirected, we don't have a pixmap, and thus our allocation
-becomes 0x0. So when events come in, they pass right through our actor,
-going to the one underneath in the stack.
-
-Fix this by having a fallback size on the shaped texture actor when
-we're unredirected, causing it to always have a valid allocation.
-
-This fixes clicking on stuff in sloppy / mouse mode focus.
-
-diff --git a/src/compositor/meta-shaped-texture-private.h 
b/src/compositor/meta-shaped-texture-private.h
-index 4ee8027..21c6335 100644
 a/src/compositor/meta-shaped-texture-private.h
-+++ b/src/compositor/meta-shaped-texture-private.h
-@@ -32,6 +32,9 @@
- ClutterActor *meta_shaped_texture_new (void);
- void meta_shaped_texture_set_texture (MetaShapedTexture *stex,
-   CoglTexture   *texture);
-+void meta_shaped_texture_set_fallback_size (MetaShapedTexture *stex,
-+guint  fallback_width,
-+guint  
fallback_height);
- gboolean meta_shaped_texture_is_obscured (MetaShapedTexture *self);
- 
- #endif
-diff --git a/src/compositor/meta-shaped-texture.c 
b/src/compositor/meta-shaped-texture.c
-index 163c5e6..8701d1b 100644
 a/src/compositor/meta-shaped-texture.c
-+++ b/src/compositor/meta-shaped-texture.c
-@@ -86,6 +86,7 @@ struct _MetaShapedTexturePrivate
-   cairo_region_t *unobscured_region;
- 
-   guint tex_width, tex_height;
-+  guint fallback_width, fallback_height;
- 
-   guint create_mipmaps : 1;
- };
-@@ -136,7 +137,20 @@ set_unobscured_region (MetaShapedTexture *self,
-   g_clear_pointer (>unobscured_region, (GDestroyNotify) 
cairo_region_destroy);
-   if (unobscured_region)
- {
--  cairo_rectangle_int_t bounds = { 0, 0, priv->tex_width, 
priv->tex_height };
-+  guint width, height;
-+
-+  if (priv->texture)
-+{
-+  width = priv->tex_width;
-+  height = priv->tex_height;
-+}
-+  else
-+{
-+  width = priv->fallback_width;
-+  height = priv->fallback_height;
-+}
-+
-+  cairo_rectangle_int_t bounds = { 0, 0, width, height };
-   priv->unobscured_region = cairo_region_copy (unobscured_region);
-   cairo_region_intersect_rectangle (priv->unobscured_region, );
- }
-@@ -499,16 +513,21 @@ meta_shaped_texture_get_preferred_width

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

2015-10-03 Thread Pacho Ramos 
commit: 2c00b2f8422f0ea593daa6792c3ec6caf83210ef
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct  3 09:02:56 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct  3 09:02:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c00b2f8

x11-wm/mutter: Apply some upstream fixes from 3.16 branch and also stop 
crashing when keymap cannot be get on a first try (from master)

Package-Manager: portage-2.2.22

 .../mutter-3.16.3-GL_EXT_x11_sync_object.patch | 840 +
 .../mutter/files/mutter-3.16.3-crash-border.patch  |  32 +
 .../files/mutter-3.16.3-fallback-keymap.patch  |  28 +
 x11-wm/mutter/files/mutter-3.16.3-fix-race.patch   | 114 +++
 x11-wm/mutter/files/mutter-3.16.3-fix-return.patch |  32 +
 x11-wm/mutter/files/mutter-3.16.3-flickering.patch | 114 +++
 x11-wm/mutter/mutter-3.16.3-r1.ebuild  | 114 +++
 7 files changed, 1274 insertions(+)

diff --git a/x11-wm/mutter/files/mutter-3.16.3-GL_EXT_x11_sync_object.patch 
b/x11-wm/mutter/files/mutter-3.16.3-GL_EXT_x11_sync_object.patch
new file mode 100644
index 000..401c175
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.16.3-GL_EXT_x11_sync_object.patch
@@ -0,0 +1,840 @@
+From 9cc80497a262edafc58062fd860ef7a9dcab688c Mon Sep 17 00:00:00 2001
+From: Rui Matos 
+Date: Fri, 18 Apr 2014 20:21:20 +0200
+Subject: compositor: Add support for GL_EXT_x11_sync_object
+
+If GL advertises this extension we'll use it to synchronize X with GL
+rendering instead of relying on the XSync() behavior with open source
+drivers.
+
+Some driver bugs were uncovered while working on this so if we have
+had to reboot the ring a few times, something is probably wrong and
+we're likely to just make things worse by continuing to try.  Let's
+err on the side of caution, disable ourselves and fallback to the
+XSync() path in the compositor.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=728464
+
+diff --git a/configure.ac b/configure.ac
+index 01d75cb..6eea6b2 100644
+--- a/configure.ac
 b/configure.ac
+@@ -332,6 +332,11 @@ fi
+ 
+ GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
+ 
++AC_CHECK_DECL([GL_EXT_x11_sync_object],
++  [],
++  [AC_MSG_ERROR([GL_EXT_x11_sync_object definition not found, 
please update your GL headers])],
++  [#include ])
++
+  Warnings (last since -Werror can disturb other tests)
+ 
+ # Stay command-line compatible with the gnome-common configure option. Here
+diff --git a/src/Makefile.am b/src/Makefile.am
+index baadb41..a4e07a9 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -139,6 +139,8 @@ libmutter_la_SOURCES = \
+   compositor/meta-surface-actor.h \
+   compositor/meta-surface-actor-x11.c \
+   compositor/meta-surface-actor-x11.h \
++  compositor/meta-sync-ring.c \
++  compositor/meta-sync-ring.h \
+   compositor/meta-texture-rectangle.c \
+   compositor/meta-texture-rectangle.h \
+   compositor/meta-texture-tower.c \
+diff --git a/src/backends/x11/meta-backend-x11.c 
b/src/backends/x11/meta-backend-x11.c
+index 3ff8431..ac38ffc 100644
+--- a/src/backends/x11/meta-backend-x11.c
 b/src/backends/x11/meta-backend-x11.c
+@@ -45,6 +45,7 @@
+ #include 
+ #include "display-private.h"
+ #include "compositor/compositor-private.h"
++#include "compositor/meta-sync-ring.h"
+ 
+ struct _MetaBackendX11Private
+ {
+@@ -255,6 +256,8 @@ handle_host_xevent (MetaBackend *backend,
+ MetaCompositor *compositor = display->compositor;
+ if (meta_plugin_manager_xevent_filter (compositor->plugin_mgr, event))
+   bypass_clutter = TRUE;
++if (compositor->have_x11_sync_object)
++  meta_sync_ring_handle_event (event);
+   }
+   }
+ 
+diff --git a/src/compositor/compositor-private.h 
b/src/compositor/compositor-private.h
+index 80fb4e2..9e3e73d 100644
+--- a/src/compositor/compositor-private.h
 b/src/compositor/compositor-private.h
+@@ -15,7 +15,8 @@ struct _MetaCompositor
+ {
+   MetaDisplay*display;
+ 
+-  guint   repaint_func_id;
++  guint   pre_paint_func_id;
++  guint   post_paint_func_id;
+ 
+   gint64  server_time_query_time;
+   gint64  server_time_offset;
+@@ -40,6 +41,7 @@ struct _MetaCompositor
+   MetaPluginManager *plugin_mgr;
+ 
+   gboolean frame_has_updated_xsurfaces;
++  gboolean have_x11_sync_object;
+ };
+ 
+ /* Wait 2ms after vblank before starting to draw next frame */
+diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
+index 250d489..554faa1 100644
+--- a/src/compositor/compositor.c
 b/src/compositor/compositor.c
+@@ -79,6 +79,7 @@
+ #include "frame.h"
+ #include 
+ #include 
++#include "meta-sync-ring.h"
+ 
+ #include "backends/x11/meta-backend-x11.h"
+ 
+@@ -125,7 +126,11 @@ meta_switch_workspace_completed (MetaCompositor 
*compositor)
+ void
+ meta_compositor_destroy