diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-03 22:39:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-03 22:39:47 +0100 |
| commit | 7f0ccc917c7abe6223784c703d86cd14755691fb (patch) | |
| tree | 8c6793f68896b341e22f33d7e6cef88e481f4a8b /x11-wm/mutter | |
| parent | 9aa80713372911cec499b3adb2cd746790920916 (diff) | |
gentoo resync : 03.07.2021
Diffstat (limited to 'x11-wm/mutter')
| -rw-r--r-- | x11-wm/mutter/Manifest | 2 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-40.2.1.ebuild | 18 |
2 files changed, 16 insertions, 4 deletions
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 071eed93a226..54a4a256316d 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -10,5 +10,5 @@ EBUILD mutter-3.36.7-r1.ebuild 4749 BLAKE2B 69075255e249f22d91a87e440d986cfbd125 EBUILD mutter-40.1-r2.ebuild 4700 BLAKE2B 0840633959f8e6e064a80a419c1bd5f160ca753b6f87294a07339c3402af285fe381cf5f7e4f235a84b5987382eda8303c2a9981e5c9a0685c2b6b71c9369d63 SHA512 db91adf7292964945e1149abc46b5d6d965e986d05a853865f21cb232eea2a62ecc6381f74dddfbbf718360c2832a950809e2da0652841373b2d0e7705b82983 EBUILD mutter-40.1-r4.ebuild 4797 BLAKE2B 90eb1c17eb99023d2fce023d5202bdc798cb43f28ccb7aee708a7c0e6575687058510274858f015ea2c41c1cc0ae5f6dec2d3bef3022493295a7dfbf079030a8 SHA512 b1942ad4a4fdf14ce1e6e64f0df7fbb7b7d7d71b97be3b78ffc66f2bd4e7232a9ef99984fad2ecf912265f354a490d22875fcc813e835ddad23fa068b5152caf EBUILD mutter-40.2-r1.ebuild 4703 BLAKE2B 2f64ebb4b184934c359f840110fe653845faf325dd84c34b6c1f1ebc265113d5211bebb8f9e3236df76e3e7e8b37ed340efa9448f03265156de02681154b64f2 SHA512 cda41d5512f32843338c52d5ca82e19d4a7d11cd1e6761243ca6dfa0e038db03dd181d95f5dfeaf5668a5dfc643a32f036df775ee37b31f0167a3d1a1a36dadd -EBUILD mutter-40.2.1.ebuild 4703 BLAKE2B 2f64ebb4b184934c359f840110fe653845faf325dd84c34b6c1f1ebc265113d5211bebb8f9e3236df76e3e7e8b37ed340efa9448f03265156de02681154b64f2 SHA512 cda41d5512f32843338c52d5ca82e19d4a7d11cd1e6761243ca6dfa0e038db03dd181d95f5dfeaf5668a5dfc643a32f036df775ee37b31f0167a3d1a1a36dadd +EBUILD mutter-40.2.1.ebuild 4760 BLAKE2B 77a50e5539c2bbd7f34a66e87cb59dd996380430b822c7d25416be130c620658ea5045909b94bea08adb3164d36fa64dff12aad252e1bc3a8a2b288a9c388e35 SHA512 e0a0c671457103d5cb308cb19513833382075bcb48cd37a301bdbfacce6d0a6ba02f5dc26f6186017bced21145c7d04c762045e7ad5d48f0a592866e7ef63094 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8 diff --git a/x11-wm/mutter/mutter-40.2.1.ebuild b/x11-wm/mutter/mutter-40.2.1.ebuild index 36f6f75bc571..62bbdb155ee3 100644 --- a/x11-wm/mutter/mutter-40.2.1.ebuild +++ b/x11-wm/mutter/mutter-40.2.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" LICENSE="GPL-2+" SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot -IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland" +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 ) @@ -65,6 +65,7 @@ DEPEND=" systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] + video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) @@ -109,8 +110,6 @@ src_configure() { $(meson_use wayland) $(meson_use wayland native_backend) $(meson_use screencast remote_desktop) - -Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there - -Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc $(meson_use udev) -Dudev_dir=$(get_udevdir) $(meson_use input_devices_wacom libwacom) @@ -130,6 +129,19 @@ src_configure() { # 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 + emsonargs+=( + -Degl_device=false + -Dwayland_eglstream=false + ) + fi + meson_src_configure } |