diff options
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/Manifest.gz | bin | 9781 -> 9777 bytes | |||
| -rw-r--r-- | x11-wm/herbstluftwm/Manifest | 4 | ||||
| -rw-r--r-- | x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild | 4 | ||||
| -rw-r--r-- | x11-wm/herbstluftwm/herbstluftwm-9999.ebuild | 4 | ||||
| -rw-r--r-- | x11-wm/metacity/Manifest | 2 | ||||
| -rw-r--r-- | x11-wm/metacity/metacity-3.46.0.ebuild | 56 | ||||
| -rw-r--r-- | x11-wm/mutter/Manifest | 6 | ||||
| -rw-r--r-- | x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch | 30 | ||||
| -rw-r--r-- | x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch | 79 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-42.5.ebuild | 190 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-43.1.ebuild | 206 |
11 files changed, 6 insertions, 575 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex 16d15aa9e9d2..7dc174fb6bed 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest index 4a0fc7314a60..eb126f46e3e2 100644 --- a/x11-wm/herbstluftwm/Manifest +++ b/x11-wm/herbstluftwm/Manifest @@ -1,4 +1,4 @@ DIST herbstluftwm-0.9.5.tar.gz 556773 BLAKE2B db851f02ce249be74f0104dd0b335fb1ed50b4a19e5f7de17cdc34b7eba99ac2f348c5a4a4e0afd2c68576f650029203c735ccb293a60d321769d56f746d6593 SHA512 a85fd1ab16b873f512d6965cc4a93524e3ed4a15079d0d4ee54012e217bd41db3b54729c1b30ee361c34b38799f95bc537099056ba7a5f791bf2be6724bc92c3 -EBUILD herbstluftwm-0.9.5.ebuild 2986 BLAKE2B a2eb901d21217a3960324ddd2eccfcd8e26254ca9e88ac6de266e6e97629ec2cc9f53018d0683620044d348eb348bed2cc5f0f0a4329e815f00fad8dbadab991 SHA512 b7c7900c1f84c4a2e75c61a009d8d504a5f0009b3d1b61ac3a58fd0562b3661468d266975e2fb201143dd9ba6258e11dd51af376b288598a4abfece06a2a8a79 -EBUILD herbstluftwm-9999.ebuild 3400 BLAKE2B ebc8f10a0506aa602092455f0e51b8c1ca3c2a3d4a6c585a6210ffe240b1006b0dcebff3282b8c84eef02605679c86ccfb8900aa4f2c2486a7ca95d0dd39c446 SHA512 0b1be1854a4a331ded3929d4cbb9045a8a690b9da1d916c6cd1a67d12eac9f53c4bc6ae74bbd756d6193f11ad50127362445e2cba1d79dab375ccd7cc0e5456d +EBUILD herbstluftwm-0.9.5.ebuild 2992 BLAKE2B 72d653974516d0287ed3867ad139eb6dafb3b221369047d6c8574fb1f0048f0edd2f376da19e6153c2d4e344432cd97034233939aee5d3ecf61862e8070f1bd2 SHA512 cafb4c1db100bf654753d55776eefc2e7302a7a65a29cfe85ca881fc62a2a23b651cd108372badfa0d890dbf78a5c337cda69a78dc2897a146ea9d6b22024f64 +EBUILD herbstluftwm-9999.ebuild 3406 BLAKE2B 8fbd649e820dfc4aeef6dcf270f8465760acb4d4155e6b3a783a4e6e09e154a02383478cdda776224dc1420d7f45d8365e0614f53315bf05a90e3baeecac2250 SHA512 a0f3e12ac7c1535c0092ab40f36faa42038355f15d3f8651acb182b86118d8efb8935594a31c75cfa350781de63a158d194bedf910721b9e85bdd098138b4613 MISC metadata.xml 337 BLAKE2B 7ef28bc6ce30abb6c2f44524b4dd05a479cd5ca2b98901ffe570b870d0b98f94589cd1d3f197ee7e3fd90f4c73144e1dc44996df8b1b3ec28ce6950578ada74e SHA512 6e7cb80e1870901554ac0c2a4947cceb4e6284ccc84714bb0f42dbfa69cab5b32a8bd34fd384731b9462535d7e80feef606030be3e03babc80828a980050f333 diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild index d69cb69d2351..e732c8be90e1 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -80,7 +80,7 @@ src_configure() { # Ensure that 'python3' is in PATH. #765118 python_setup - mycmakeargs=( + local mycmakeargs=( -DWITH_DOCUMENTATION=$(usex doc) ) cmake_src_configure diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild index 4bb6c21b60f1..051f9ba720c9 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -89,7 +89,7 @@ src_configure() { # Ensure that 'python3' is in PATH. #765118 python_setup - mycmakeargs=( + local mycmakeargs=( -DWITH_DOCUMENTATION=$(usex doc) ) cmake_src_configure diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest index 38753dd1b030..9deba23d840a 100644 --- a/x11-wm/metacity/Manifest +++ b/x11-wm/metacity/Manifest @@ -1,5 +1,3 @@ -DIST metacity-3.46.0.tar.xz 1958124 BLAKE2B f7db5d38ab2c9aef8809f02ada76a453e712a471d59c3c991d0e1a5cfa1b9d37f901f38ef9057301a6232fca49846af0e80c6792bb5dcffa85694f64983d918f SHA512 5a203a4190dc919ec83fa3f4f7a86aa1594c82051b4e5afb76eb11acb38c573367deca85dead64564e2e96304903cd84eb5b4fc904ddc0672677114103d299b2 DIST metacity-3.46.1.tar.xz 1959060 BLAKE2B 84dbe09dd8d6c7ce1894ed806cdc6cc5cc6c302ddf3aae5f7ef479f6c02ef6c2091bb1d815603f5d6e52d583192d43f47d835327e9e75cd626081becbf84bd8e SHA512 f0d8424868edf8209eb4cbd003de68ab892a5b515a1aca7b3626bf52eb8451cb0477ab35f702177c9654604e06adce46471897edcb54931d95e60b36bef92b20 -EBUILD metacity-3.46.0.ebuild 1295 BLAKE2B a5074328f70255fc349b80bda1229498c7c45111f002978ef6d9af8bdff738fabd5932affbc3c37103494b9feb2fd1dbb094df31e437535c44a943c56e861648 SHA512 d508ed8fc03f232aab0d9a652ee264a1d729dac264e18835a8f0b8b31e1e08055043bd43aa764ecb8842dce17ac07b11b4a6d84210cf98e29b0f48885dfb6b4c EBUILD metacity-3.46.1.ebuild 1295 BLAKE2B a5074328f70255fc349b80bda1229498c7c45111f002978ef6d9af8bdff738fabd5932affbc3c37103494b9feb2fd1dbb094df31e437535c44a943c56e861648 SHA512 d508ed8fc03f232aab0d9a652ee264a1d729dac264e18835a8f0b8b31e1e08055043bd43aa764ecb8842dce17ac07b11b4a6d84210cf98e29b0f48885dfb6b4c MISC metadata.xml 587 BLAKE2B b3cf07b5d226dba9d333ca3c897727b165663ddbd112924fe6d751ded222054f560bbf3b541f3d884040a8e25ef672f912d20e4b8cb2290e9888567a2b418f9f SHA512 07f9e9ecdc9d2934c6ec6d2d314336a1887ac1a39b7384cc994a745113949850411c5b0707c61dd6c902dae5fb0578768cf1a03c76daf5ff1071a0b4bb42d6fb diff --git a/x11-wm/metacity/metacity-3.46.0.ebuild b/x11-wm/metacity/metacity-3.46.0.ebuild deleted file mode 100644 index c27fd8cb6d9d..000000000000 --- a/x11-wm/metacity/metacity-3.46.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit gnome2 - -DESCRIPTION="GNOME Flashback window manager" -HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+libcanberra vulkan xinerama" -KEYWORDS="~amd64 ~riscv" - -# TODO: libgtop could be optional, but no knob -RDEPEND=" - >=dev-libs/glib-2.67.3:2 - >=x11-libs/gtk+-3.24.6:3[X] - >=x11-libs/pango-1.2.0 - >=x11-libs/libXcomposite-0.3 - >=x11-libs/libXres-1.2 - >=gnome-base/gsettings-desktop-schemas-3.3.0 - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXdamage - x11-libs/libXpresent - libcanberra? ( media-libs/libcanberra[gtk3] ) - >=x11-libs/startup-notification-0.7 - x11-libs/libXcursor - gnome-base/libgtop:2= - x11-libs/libX11 - xinerama? ( x11-libs/libXinerama ) - x11-libs/libXrandr - x11-libs/libXext - x11-libs/libICE - x11-libs/libSM - gnome-extra/zenity - vulkan? ( media-libs/vulkan-loader ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - vulkan? ( dev-util/vulkan-headers ) - dev-util/glib-utils - >=sys-devel/gettext-0.19.6 - virtual/pkgconfig -" # autoconf-archive for eautoreconf - -src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_enable libcanberra canberra) \ - $(use_enable xinerama) \ - $(use_enable vulkan) -} diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index ad0d9f603e4b..5c4b80fdc723 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,10 +1,4 @@ -AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164 -AUX mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch 3102 BLAKE2B 8adfd306044014776bdfe46bcc45f1333af2ae5ee7ab195fed0c6f1f852723670f90aa0fd7476bd59f0b1c76a4b91521f3a19f9ba0f584f4699075b484aa0dfc SHA512 e751600b5f82ae1330f888c891f302c107fd5da1227392774e8ef2aa681c528be28c78ffd64f832e8aaf31179eeecc12575bc34e3d80d2ab638f3aae099c8cbf AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b -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 -EBUILD mutter-42.5.ebuild 5467 BLAKE2B 3920ecf49ae942051a6211d72fe2b06553446837e6d97beca4be50b9f4f3ce1b8675ae84bda39c30864b6c5c84f9ca25ff6032a53f85a95584f3bbb949bc52c4 SHA512 d88f49dced450e61b7b7472238d2543939a5eccf1b45cf4cf2150a5d8715444f89a1811d87af241a211c451db0ace8285506da74b322832ab8a9dce528ea87b0 -EBUILD mutter-43.1.ebuild 5793 BLAKE2B 444a74c57ac9385683c3105d20b9d4cef536a8ce0058c2f9c80b56e7973e0274edea1dd2dad0407048102fa6df2772567f63462b7ea172f347c5bbb1f7aa3207 SHA512 6ed94cc3411bb1481efab7242f8b1ee79b37e8fcd3940784dff2fc01525abc22e267111ed80e100708eeb49a2123b3c307c577dd94d75d66d73cc35042d15b95 EBUILD mutter-43.2.ebuild 5790 BLAKE2B e227c2cbbf1c5fb1356e2cb8afef4a9d1aac6f81f9e6ec3631ea427260795e7986181af0e623a4d3a129121a89107066c284ec6d93e38946b109deca681c254c SHA512 fad7de2804b3f8c7354a75650447c52cc3b8ba1601b889ba72401242c974634366343c501224c2e9590313368a4efe7a3e348e0e89ce3fce86bf71995997f207 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87 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..000000000000 --- 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 <mattst88@gmail.com> -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..000000000000 --- 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 <smcv@debian.org> -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 <smcv@debian.org> -Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2584> -(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, &error); - 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, -+ G_IO_ERROR_PERMISSION_DENIED)) -+ { -+ meta_topic (META_DEBUG_BACKEND, -+ "Ignoring unavailable secondary gpu '%s': %s", -+ device_path, error->message); -+ } -+ else -+ { -+ g_warning ("Failed to hotplug secondary gpu '%s': %s", -+ device_path, error->message); -+ } -+ - return; - } - -@@ -552,9 +564,22 @@ init_gpus (MetaBackendNative *native, - - if (!gpu_kms) - { -- g_warning ("Failed to open gpu '%s': %s", -- g_udev_device_get_device_file (device), -- local_error->message); -+ if (meta_backend_is_headless (backend) && -+ g_error_matches (local_error, G_IO_ERROR, -+ G_IO_ERROR_PERMISSION_DENIED)) -+ { -+ meta_topic (META_DEBUG_BACKEND, -+ "Ignoring unavailable gpu '%s': %s'", -+ g_udev_device_get_device_file (device), -+ local_error->message); -+ } -+ else -+ { -+ g_warning ("Failed to open gpu '%s': %s", -+ g_udev_device_get_device_file (device), -+ local_error->message); -+ } -+ - g_clear_error (&local_error); - continue; - } --- -2.35.1 - diff --git a/x11-wm/mutter/mutter-42.5.ebuild b/x11-wm/mutter/mutter-42.5.ebuild deleted file mode 100644 index 4ded64a18383..000000000000 --- a/x11-wm/mutter/mutter-42.5.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) -inherit gnome.org gnome2-utils meson python-any-r1 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-<api_version>.pc) should use the subslot - -IUSE="doc elogind gnome 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] - >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] - >=dev-libs/glib-2.69.0:2 - gnome-base/gnome-settings-daemon - >=dev-libs/json-glib-0.12.0[introspection?] - >=x11-libs/libXcomposite-0.4 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - >=x11-libs/libXfixes-3 - >=x11-libs/libXi-1.7.4 - x11-libs/libXtst - x11-libs/libxkbfile - x11-misc/xkeyboard-config - >=x11-libs/libxkbcommon-0.4.3[X] - x11-libs/libXrender - >=x11-libs/libXrandr-1.5.0 - x11-libs/libxcb:= - x11-libs/libXinerama - x11-libs/libXau - x11-libs/libICE - >=dev-libs/atk-2.5.3[introspection?] - >=media-libs/libcanberra-0.26 - sys-apps/dbus - gnome? ( gnome-base/gnome-desktop:3= ) - media-libs/mesa[X(+),egl(+)] - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - systemd? ( sys-apps/systemd ) - wayland? ( - >=dev-libs/wayland-protocols-1.21 - >=dev-libs/wayland-1.18.0 - x11-libs/libdrm - >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] - >=dev-libs/libinput-1.18.0:= - elogind? ( sys-auth/elogind ) - x11-base/xwayland - video_cards_nvidia? ( gui-libs/egl-wayland ) - ) - udev? ( >=dev-libs/libgudev-232 - >=virtual/libudev-232-r1:= - ) - x11-libs/libSM - input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) - >=x11-libs/startup-notification-0.7 - screencast? ( >=media-video/pipewire-0.3.21:= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - doc? ( >=dev-util/gi-docgen-2021.1 ) -" -RDEPEND="${DEPEND} - gnome-extra/zenity - - !<gui-libs/gtk-4.6.4:4 - !<x11-libs/gtk+-3.24.34:3 -" -DEPEND="${DEPEND} - x11-base/xorg-proto - sysprof? ( >=dev-util/sysprof-common-3.38.0 ) -" -BDEPEND=" - dev-util/wayland-scanner - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - app-text/docbook-xml-dtd:4.5 - x11-misc/xvfb-run - ) - wayland? ( - >=sys-kernel/linux-headers-4.4 - x11-libs/libxcvt - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-42.0-Disable-anonymous-file-test.patch - "${FILESDIR}"/${PN}-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch -) - -python_check_deps() { - if use test; then - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" - fi -} - -src_configure() { - # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain - local emesonargs=( - -Dopengl=true - #opengl_libname - #gles2_libname - $(meson_use wayland gles2) - -Degl=true - -Dglx=true - $(meson_use wayland) - $(meson_use systemd) - $(meson_use wayland native_backend) - $(meson_use screencast remote_desktop) - -Dlibgnome_desktop=true - $(meson_use udev) - -Dudev_dir=$(get_udevdir) - $(meson_use input_devices_wacom libwacom) - -Dpango_ft2=true - -Dstartup_notification=true - -Dsm=true - $(meson_use introspection) - $(meson_use doc docs) - $(meson_use test cogl_tests) - $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed - -Dnative_tests=false - $(meson_use test clutter_tests) - $(meson_use test tests) - -Dkvm_tests=false - -Dtty_tests=false - $(meson_use sysprof profiler) - -Dinstalled_tests=false - #verbose # Let upstream choose default for verbose mode - #xwayland_path - # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops) - #xwayland_grab_default_access_rules - ) - - if use wayland && use video_cards_nvidia; then - emesonargs+=( - -Degl_device=true - -Dwayland_eglstream=true - ) - else - emesonargs+=( - -Degl_device=false - -Dwayland_eglstream=false - ) - fi - - meson_src_configure -} - -src_test() { - gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed - glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI -} - -pkg_postinst() { - use udev && udev_reload - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - use udev && udev_reload - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/x11-wm/mutter/mutter-43.1.ebuild b/x11-wm/mutter/mutter-43.1.ebuild deleted file mode 100644 index 7da49c14e5e5..000000000000 --- a/x11-wm/mutter/mutter-43.1.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) -inherit gnome.org gnome2-utils meson python-any-r1 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-<api_version>.pc) should use the subslot - -IUSE="doc elogind gnome 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=" - >=media-libs/lcms-2.6:2 - >=x11-misc/colord-1.4.5:= - >=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] - >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] - >=dev-libs/glib-2.69.0:2 - gnome-base/gnome-settings-daemon - >=dev-libs/json-glib-0.12.0[introspection?] - >=x11-libs/libxkbcommon-0.4.3 - x11-libs/libICE - >=app-accessibility/at-spi2-core-2.46:2[introspection?] - >=media-libs/libcanberra-0.26 - sys-apps/dbus - gnome? ( gnome-base/gnome-desktop:3= ) - media-libs/libglvnd[X] - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - systemd? ( sys-apps/systemd ) - wayland? ( - >=dev-libs/wayland-protocols-1.26 - >=dev-libs/wayland-1.21.0 - x11-libs/libdrm - >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,gles2] - >=dev-libs/libinput-1.18.0:= - elogind? ( sys-auth/elogind ) - x11-base/xwayland - video_cards_nvidia? ( gui-libs/egl-wayland ) - ) - udev? ( >=dev-libs/libgudev-232 - >=virtual/libudev-232-r1:= - ) - x11-libs/libSM - input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) - >=x11-libs/startup-notification-0.7 - screencast? ( >=media-video/pipewire-0.3.21:= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - doc? ( >=dev-util/gi-docgen-2021.1 ) -" -# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional. -# X? ( -DEPEND+=" - >=x11-libs/libXcomposite-0.4 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - >=x11-libs/libXfixes-3 - >=x11-libs/libXi-1.7.4 - x11-libs/libXtst - x11-libs/libxkbfile - x11-misc/xkeyboard-config - >=x11-libs/libxkbcommon-0.4.3[X] - x11-libs/libXrender - >=x11-libs/libXrandr-1.5.0 - x11-libs/libxcb:= - x11-libs/libXinerama - x11-libs/libXau -" -# )" - -RDEPEND="${DEPEND} - gnome-extra/zenity - - !<gui-libs/gtk-4.6.4:4 - !<x11-libs/gtk+-3.24.34:3 -" -DEPEND="${DEPEND} - x11-base/xorg-proto - sysprof? ( >=dev-util/sysprof-common-3.38.0 ) -" -BDEPEND=" - dev-util/wayland-scanner - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep ' - >=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}] - ') - app-text/docbook-xml-dtd:4.5 - x11-misc/xvfb-run - ) - wayland? ( - >=sys-kernel/linux-headers-4.4 - x11-libs/libxcvt - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch -) - -python_check_deps() { - if use test; then - python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]" - fi -} - -src_prepare() { - default - - sed -i -e "s:#!/usr/bin/bash:#!$(command -v bash):" src/tests/x11-test.sh || die -} - -src_configure() { - # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain - local emesonargs=( - -Dopengl=true - #opengl_libname - #gles2_libname - $(meson_use wayland gles2) - -Degl=true - -Dglx=true - $(meson_use wayland) - $(meson_use systemd) - $(meson_use wayland native_backend) - $(meson_use screencast remote_desktop) - -Dlibgnome_desktop=true - $(meson_use udev) - -Dudev_dir=$(get_udevdir) - $(meson_use input_devices_wacom libwacom) - -Dsound_player=true - -Dpango_ft2=true - -Dstartup_notification=true - -Dsm=true - $(meson_use introspection) - $(meson_use doc docs) - $(meson_use test cogl_tests) - $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed - -Dnative_tests=false - $(meson_use test clutter_tests) - $(meson_use test tests) - -Dkvm_tests=false - -Dtty_tests=false - $(meson_use sysprof profiler) - -Dinstalled_tests=false - - #verbose # Let upstream choose default for verbose mode - #xwayland_path - # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops) - #xwayland_grab_default_access_rules - ) - - if use wayland && use video_cards_nvidia; then - emesonargs+=( - -Degl_device=true - -Dwayland_eglstream=true - ) - else - emesonargs+=( - -Degl_device=false - -Dwayland_eglstream=false - ) - fi - - meson_src_configure -} - -src_test() { - gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed - glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI -} - -pkg_postinst() { - use udev && udev_reload - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - use udev && udev_reload - xdg_pkg_postrm - gnome2_schemas_update -} |