diff options
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/Manifest.gz | bin | 9133 -> 9130 bytes | |||
| -rw-r--r-- | x11-wm/mutter/Manifest | 12 | ||||
| -rw-r--r-- | x11-wm/mutter/metadata.xml | 2 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-45.5.ebuild | 237 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-45.6.ebuild | 239 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-47.4.ebuild (renamed from x11-wm/mutter/mutter-46.4-r1.ebuild) | 32 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-9999.ebuild | 24 |
7 files changed, 36 insertions, 510 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex 2ac025c1cc94..8e8897889840 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 1640e837145b..15f1ecc8461d 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,11 +1,7 @@ AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b -DIST mutter-45.5.tar.xz 2886412 BLAKE2B b5534943d41500a165de5242f73b9da145dd52a4b5168e863843ca5b08a6d726be9b7a94b94763e6b4c10b48355ed845accd9ae63704aefaf3f8e2bb361855b8 SHA512 15fb5589e2b971ac94b3d8f549643f2998375943c419114907c317761c8250089751dea65c35be44435350e6bb02bb238fcf2eef17bf7d6a5b41053a64ffba05 -DIST mutter-45.6.tar.xz 2886844 BLAKE2B f5658d0667cac04f290040e26cf8326d6d30130d0500b18b318269bae152b18a1e4867b9c749269e14b31fb8d7af7fb7a1d72f94df1dad1da0bd98462b9a29f0 SHA512 bfd918469450dd287b58c5e8c55969d9d3bb737898a5823175c15841e2d483faf2900f6c0d4b2bcdcbdb4e58fa16d4dee836084f1f4307fbbce3e7a8d6343738 -DIST mutter-46.4.tar.xz 6752800 BLAKE2B 330c8fd1537c6eea93af4413ec7ccf8c0ea478c5d11d8666b80c93e86eb3135782d365f5f7b449379e211f12d4172fc74b0c39026ab45064dbf18b50fe30a894 SHA512 b8d952da069230b2e10d82aaf87c7acca2a1436b0cc2e19b64012dc535690fdded931d905496dd668948330e553f863505c1aafb36b4ff4724f5ac0e9012f7db DIST mutter-46.7.tar.xz 6755308 BLAKE2B 69cb8457ec9ab905c8764ffa8fbd44050431b359e349697615b90d201402dffd2bd850e3fb0f393ab75800d148c2805ac791f69d356c6bfb26007a2394cbbd48 SHA512 0d9b159805b79f90d2cb06582c859b10e56bc22001d1e1b0090821914e18085749a54eb117b94788578b17894e4d28ec408144a09b29f94b7785f7538c4613a8 -EBUILD mutter-45.5.ebuild 7074 BLAKE2B be4c19f9fcea03f64e8faba3364b751f380c2fd865e0096cf5af32c17370f143467ab69e51827528cb7659a7e980afbd82f6222e279dd39e292d80e959940640 SHA512 fdc80858095dcb1122e79775fa7e6756cc0816bd9f75250b5630359b96b260ddc4db38bd6bc81b0937db955369d94f7afbb69c55e03ffd09474961282f18f7f7 -EBUILD mutter-45.6.ebuild 7329 BLAKE2B 0f1f364a4f9b549e606bddf92546d12361521c5e4c48e9ca2e55e45f2f7bf28ace17b1a1eb598d44157be76d10c22549d09bbbeaa2c84b42b880ab30d7015fc1 SHA512 428844a68e1b23bbb1639e7f615ddb24dc64634bbaf3c7cd053a9c5ed6cbe815f3588082bc6d69003c5b28cbd6e034586cfee3a76d9a713c314b32c9bf09c7f6 -EBUILD mutter-46.4-r1.ebuild 7034 BLAKE2B ee9c601e6fa869252814fbd0a029e28c57a0db7a104b9763d15e6f655fac0c8c26a9e9431980a1df37dfd78e4a60fce2844ecffb0220b5a4cd747e33aa9ed280 SHA512 f45fd2fe82970f3e588c68dc786676a71eccc4dd47c7672b1866bc9d8f2b8ca5723344fe1fd6101b607e6e85a921b9ddf3697a885b7c475573399cda96f821ea +DIST mutter-47.4.tar.xz 6857716 BLAKE2B 752e83e5d0e89eb31e577543619d3039c720a358cbad77e2be1abd7eabedd333ce86673b31e23cbeea446e335f64f83bd68ce12ed37c48eae22a4be6123f14b2 SHA512 f1d3c16830a5fd8225f62d37f583931d582ed1d09631b1d44321a162c14b4d99b2487f322a4c95954b154cdc205b0d20d5d12663f89675baff211e49067ef1ee EBUILD mutter-46.7-r1.ebuild 7031 BLAKE2B 95fef7af3e152829d3fee048a2ec6d9b5af29f5799b3d6f96a5bf3917eeb0ea2576812d21c1005bbcf3a8e3c0fa550ea5f168d191b71a2b9417c845c913119ae SHA512 3a728e3a716b3f8435eac52466fd0a551fc9592ac66be1bd6e990f367d9adaff5132885bc7e3e11251d1b835ba91b0d8d081b22a12f5a7b96f3ef1bfecb62eaa -EBUILD mutter-9999.ebuild 7036 BLAKE2B de86caf656aef1a8011ad176ce2e3188ddeeb3022e1ad528e4c4b40acb596dc9e069217e8fbe4618d8fc743c129af9430edbc32b030e0bc024f57ed1162b9b8a SHA512 dd526988d2a9de6c9f975e0f6ccbfff241a04e2d9613f21a1f301b4a88b816c8bc497893c31968028d3ad752c05bbb7093db05e10f005705e4c23a8786b9f361 -MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87 +EBUILD mutter-47.4.ebuild 7103 BLAKE2B 0d7a9a7eac3c66e80d90e39bd455cfd650d19eae64b5d81481cc38595722a1f918fedf6501d4b2c488c172ffce2abf00cb6260bceb14ec2b7241d76a39813166 SHA512 df21fe8d2a3a6c51bdc449b78aa6cf905ac8cbf9f126a8e46d5013e06ecb326806eac54b96e98a08c8257229196b7f6db1d337937b832b87470830da2965f117 +EBUILD mutter-9999.ebuild 7103 BLAKE2B 0d7a9a7eac3c66e80d90e39bd455cfd650d19eae64b5d81481cc38595722a1f918fedf6501d4b2c488c172ffce2abf00cb6260bceb14ec2b7241d76a39813166 SHA512 df21fe8d2a3a6c51bdc449b78aa6cf905ac8cbf9f126a8e46d5013e06ecb326806eac54b96e98a08c8257229196b7f6db1d337937b832b87470830da2965f117 +MISC metadata.xml 736 BLAKE2B 3935671f9ec84276ef747669d0baa2a292ece83fcc0e63aafd60a0e9f092b5df8b8b2cfc16eb85b2243347484b101639bdc368b43505473292d1c7ab9f7ec841 SHA512 add5b8c66da0cc7d4a7f61b46933622f46f441d4c0e97cfd4af0c382baa312943e84ed30acbe61c01f70143eea78d205f82f8f5cebee4941be7a259272f41021 diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml index ce29c97748be..64a8f25492c3 100644 --- a/x11-wm/mutter/metadata.xml +++ b/x11-wm/mutter/metadata.xml @@ -7,7 +7,9 @@ </maintainer> <use> <flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as logind provider for Wayland sessions</flag> + <flag name="libdisplay">Enable EDID and DisplayID using <pkg>media-libs/libdisplay-info</pkg></flag> <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag> + <flag name="x11">Enable X11 support</flag> </use> <upstream> <remote-id type="gnome-gitlab">GNOME/mutter</remote-id> diff --git a/x11-wm/mutter/mutter-45.5.ebuild b/x11-wm/mutter/mutter-45.5.ebuild deleted file mode 100644 index 4f7520c33542..000000000000 --- a/x11-wm/mutter/mutter-45.5.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -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+" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git" - SRC_URI="" - SLOT="0/13" # This can get easily out of date, but better than 9967 -else - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" - 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 -fi - -IUSE="debug elogind gnome gtk-doc 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=" - gtk-doc? ( introspection ) - wayland? ( ^^ ( elogind systemd ) udev ) - test? ( wayland )" -RESTRICT="!test? ( test )" - -# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema -# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with -# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future; -# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off -# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's -# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow). -# 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/graphene-1.10.2[introspection?] - x11-libs/gdk-pixbuf:2 - >=x11-libs/pango-1.46[introspection?] - >=x11-libs/cairo-1.14[X] - >=dev-libs/fribidi-1.0.0 - >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] - >=dev-libs/glib-2.75.1: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?] - sys-apps/dbus - >=x11-misc/colord-1.4.5:= - >=media-libs/lcms-2.6:2 - >=media-libs/harfbuzz-2.6.0:= - >=dev-libs/libei-1.0.901 - - gnome? ( gnome-base/gnome-desktop:4= ) - - >=media-libs/libcanberra-0.26 - - media-libs/libglvnd[X] - - wayland? ( - >=dev-libs/wayland-protocols-1.32 - >=dev-libs/wayland-1.21.0 - - x11-libs/libdrm - media-libs/mesa[gbm(+)] - >=dev-libs/libinput-1.19.0:= - - elogind? ( sys-auth/elogind ) - >=x11-base/xwayland-23.2.1[libei(+)] - video_cards_nvidia? ( gui-libs/egl-wayland ) - ) - udev? ( - >=virtual/libudev-232-r1:= - >=dev-libs/libgudev-232 - ) - systemd? ( sys-apps/systemd ) - x11-libs/libSM - input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) - >=x11-libs/startup-notification-0.7 - screencast? ( >=media-video/pipewire-0.3.33:= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 ) -" -# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional. -# X? ( -DEPEND+=" - >=gui-libs/gtk-4.0.0:4[X,introspection?] - >=x11-libs/libX11-1.7.0 - >=x11-libs/libXcomposite-0.4 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - >=x11-libs/libXfixes-6 - >=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} - !<gui-libs/gtk-4.6.4:4 - sys-auth/rtkit -" -DEPEND="${DEPEND} - x11-base/xorg-proto - sysprof? ( >=dev-util/sysprof-common-3.38.0 ) - test? ( - >=x11-libs/gtk+-3.19.8:3[X,introspection?,wayland] - gnome-extra/zenity - ) -" -BDEPEND=" - dev-util/wayland-scanner - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) - 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_configure() { - local emesonargs=( - # Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass - # - # -Dopengl_libname=libOpenGL.so.0 - # - # while we build the x11 renderer, as we currently enable gles2 only - # with USE=wayland and x11 renderer wouldn't find the needed GLX symbols - # in a configuration where wayland is disabled, as libOpenGL doesn't - # include them. - # - # See - # - https://bugs.gentoo.org/835786 - # - https://forums.gentoo.org/viewtopic-p-8695669.html - - -Dbuildtype=$(usex debug debug plain) - -Dopengl=true - $(meson_use wayland gles2) - #gles2_libname - -Degl=true - -Dglx=true - $(meson_use wayland) - $(meson_use wayland xwayland) - $(meson_use systemd) - $(meson_use wayland native_backend) - $(meson_use screencast remote_desktop) - $(meson_use gnome libgnome_desktop) - $(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 gtk-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() { - # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file - gnome2_environment_reset - export XDG_DATA_DIRS="${EPREFIX}"/usr/share - 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-45.6.ebuild b/x11-wm/mutter/mutter-45.6.ebuild deleted file mode 100644 index 9df346bc0a68..000000000000 --- a/x11-wm/mutter/mutter-45.6.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -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+" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git" - SRC_URI="" - SLOT="0/13" # This can get easily out of date, but better than 9967 -else - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" - 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 -fi - -IUSE="debug elogind gnome gtk-doc 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=" - gtk-doc? ( introspection ) - wayland? ( ^^ ( elogind systemd ) udev ) - test? ( wayland )" -RESTRICT="!test? ( test )" - -# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema -# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with -# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future; -# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off -# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's -# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow). -# 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/graphene-1.10.2[introspection?] - x11-libs/gdk-pixbuf:2 - >=x11-libs/pango-1.46[introspection?] - >=x11-libs/cairo-1.14[X] - >=dev-libs/fribidi-1.0.0 - >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] - >=dev-libs/glib-2.75.1: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?] - sys-apps/dbus - >=x11-misc/colord-1.4.5:= - >=media-libs/lcms-2.6:2 - >=media-libs/harfbuzz-2.6.0:= - >=dev-libs/libei-1.0.901 - - gnome? ( gnome-base/gnome-desktop:4= ) - - >=media-libs/libcanberra-0.26 - - media-libs/libglvnd[X] - - wayland? ( - >=dev-libs/wayland-protocols-1.32 - >=dev-libs/wayland-1.21.0 - - x11-libs/libdrm - media-libs/mesa[gbm(+)] - >=dev-libs/libinput-1.19.0:= - - elogind? ( sys-auth/elogind ) - >=x11-base/xwayland-23.2.1[libei(+)] - video_cards_nvidia? ( gui-libs/egl-wayland ) - ) - udev? ( - >=virtual/libudev-232-r1:= - >=dev-libs/libgudev-232 - ) - systemd? ( sys-apps/systemd ) - x11-libs/libSM - input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) - >=x11-libs/startup-notification-0.7 - screencast? ( >=media-video/pipewire-0.3.33:= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) -" -# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional. -# X? ( -DEPEND+=" - >=gui-libs/gtk-4.0.0:4[X,introspection?] - >=x11-libs/libX11-1.7.0 - >=x11-libs/libXcomposite-0.4 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - >=x11-libs/libXfixes-6 - >=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/libXrandr-1.5.0 - x11-libs/libxcb:= - x11-libs/libXinerama - x11-libs/libXau -" -# )" - -RDEPEND="${DEPEND} - !<gui-libs/gtk-4.6.4:4 - sys-auth/rtkit -" -# dev-util/sysprof just for sysprof-6.pc or sysprof-4.pc at build time: https://gitlab.gnome.org/GNOME/mutter/-/issues/3453 -# x11-libs/libXrender for an obsolete build dependency check: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3716 -DEPEND="${DEPEND} - x11-base/xorg-proto - x11-libs/libXrender - sysprof? ( >=dev-util/sysprof-common-3.38.0 >=dev-util/sysprof-3.46.0 ) - test? ( - >=x11-libs/gtk+-3.19.8:3[X,introspection?,wayland] - gnome-extra/zenity - ) -" -BDEPEND=" - dev-util/wayland-scanner - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) - 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_configure() { - local emesonargs=( - # Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass - # - # -Dopengl_libname=libOpenGL.so.0 - # - # while we build the x11 renderer, as we currently enable gles2 only - # with USE=wayland and x11 renderer wouldn't find the needed GLX symbols - # in a configuration where wayland is disabled, as libOpenGL doesn't - # include them. - # - # See - # - https://bugs.gentoo.org/835786 - # - https://forums.gentoo.org/viewtopic-p-8695669.html - - -Dbuildtype=$(usex debug debug plain) - -Dopengl=true - $(meson_use wayland gles2) - #gles2_libname - -Degl=true - -Dglx=true - $(meson_use wayland) - $(meson_use wayland xwayland) - $(meson_use systemd) - $(meson_use wayland native_backend) - $(meson_use screencast remote_desktop) - $(meson_use gnome libgnome_desktop) - $(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 gtk-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() { - # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file - gnome2_environment_reset - export XDG_DATA_DIRS="${EPREFIX}"/usr/share - 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-46.4-r1.ebuild b/x11-wm/mutter/mutter-47.4.ebuild index c923d571f568..f5d1d2344111 100644 --- a/x11-wm/mutter/mutter-46.4-r1.ebuild +++ b/x11-wm/mutter/mutter-47.4.ebuild @@ -15,11 +15,11 @@ if [[ ${PV} == 9999 ]]; then SRC_URI="" SLOT="0/14" # This can get easily out of date, but better than 9967 else - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" 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 fi -IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" +IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection +libdisplay screencast sysprof systemd test udev wayland X video_cards_nvidia" # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider REQUIRED_USE=" gtk-doc? ( introspection ) @@ -34,6 +34,7 @@ RESTRICT="!test? ( test )" # in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's # really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow). # v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order +# dev-libs/wayland is always needed at build time due to https://bugs.gentoo.org/937632 RDEPEND=" >=media-libs/graphene-1.10.2[introspection?] x11-libs/gdk-pixbuf:2 @@ -41,9 +42,10 @@ RDEPEND=" >=x11-libs/cairo-1.14[X] >=x11-libs/pixman-0.42 >=dev-libs/fribidi-1.0.0 - >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] - >=dev-libs/glib-2.75.1:2 + >=gnome-base/gsettings-desktop-schemas-47_beta[introspection?] + >=dev-libs/glib-2.81.1: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?] @@ -52,7 +54,6 @@ RDEPEND=" >=media-libs/lcms-2.6:2 >=media-libs/harfbuzz-2.6.0:= >=dev-libs/libei-1.0.901 - media-libs/libdisplay-info:= gnome? ( gnome-base/gnome-desktop:4= ) @@ -60,13 +61,13 @@ RDEPEND=" media-libs/libglvnd[X] + >=dev-libs/wayland-1.23.0 wayland? ( - >=dev-libs/wayland-protocols-1.33 - >=dev-libs/wayland-1.22.0 + >=dev-libs/wayland-protocols-1.36 >=x11-libs/libdrm-2.4.118 media-libs/mesa[gbm(+)] - >=dev-libs/libinput-1.19.0:= + >=dev-libs/libinput-1.26.0:= elogind? ( sys-auth/elogind ) >=x11-base/xwayland-23.2.1[libei(+)] @@ -74,14 +75,15 @@ RDEPEND=" ) udev? ( >=virtual/libudev-232-r1:= - >=dev-libs/libgudev-232 + >=dev-libs/libgudev-238 ) systemd? ( sys-apps/systemd ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) >=x11-libs/startup-notification-0.7 - screencast? ( >=media-video/pipewire-0.3.33:= ) + screencast? ( >=media-video/pipewire-1.2.0:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + libdisplay? ( media-libs/libdisplay-info ) test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] gnome-extra/zenity @@ -177,20 +179,20 @@ src_configure() { -Dudev_dir=$(get_udevdir) $(meson_use input_devices_wacom libwacom) -Dsound_player=true - -Dpango_ft2=true -Dstartup_notification=true + $(meson_feature libdisplay libdisplay_info) -Dsm=true $(meson_use introspection) $(meson_use gtk-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) + $(meson_use test mutter_tests) + $(meson_feature test tests) -Dkvm_tests=false -Dtty_tests=false $(meson_use sysprof profiler) -Dinstalled_tests=false + $(meson_use X x11) #verbose # Let upstream choose default for verbose mode #xwayland_path @@ -218,7 +220,7 @@ src_test() { gnome2_environment_reset export XDG_DATA_DIRS="${EPREFIX}"/usr/share glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test } pkg_postinst() { diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild index 60a229a50d19..f5d1d2344111 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -15,11 +15,11 @@ if [[ ${PV} == 9999 ]]; then SRC_URI="" SLOT="0/14" # This can get easily out of date, but better than 9967 else - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" 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 fi -IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" +IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection +libdisplay screencast sysprof systemd test udev wayland X video_cards_nvidia" # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider REQUIRED_USE=" gtk-doc? ( introspection ) @@ -34,6 +34,7 @@ RESTRICT="!test? ( test )" # in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's # really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow). # v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order +# dev-libs/wayland is always needed at build time due to https://bugs.gentoo.org/937632 RDEPEND=" >=media-libs/graphene-1.10.2[introspection?] x11-libs/gdk-pixbuf:2 @@ -41,9 +42,10 @@ RDEPEND=" >=x11-libs/cairo-1.14[X] >=x11-libs/pixman-0.42 >=dev-libs/fribidi-1.0.0 - >=gnome-base/gsettings-desktop-schemas-47.0[introspection?] + >=gnome-base/gsettings-desktop-schemas-47_beta[introspection?] >=dev-libs/glib-2.81.1: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?] @@ -52,7 +54,6 @@ RDEPEND=" >=media-libs/lcms-2.6:2 >=media-libs/harfbuzz-2.6.0:= >=dev-libs/libei-1.0.901 - >=media-libs/libdisplay-info-0.2:= gnome? ( gnome-base/gnome-desktop:4= ) @@ -60,9 +61,9 @@ RDEPEND=" media-libs/libglvnd[X] + >=dev-libs/wayland-1.23.0 wayland? ( - >=dev-libs/wayland-protocols-1.38 - >=dev-libs/wayland-1.23.0 + >=dev-libs/wayland-protocols-1.36 >=x11-libs/libdrm-2.4.118 media-libs/mesa[gbm(+)] @@ -82,6 +83,7 @@ RDEPEND=" >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-1.2.0:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + libdisplay? ( media-libs/libdisplay-info ) test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] gnome-extra/zenity @@ -177,20 +179,20 @@ src_configure() { -Dudev_dir=$(get_udevdir) $(meson_use input_devices_wacom libwacom) -Dsound_player=true - -Dpango_ft2=true -Dstartup_notification=true + $(meson_feature libdisplay libdisplay_info) -Dsm=true $(meson_use introspection) $(meson_use gtk-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) + $(meson_use test mutter_tests) + $(meson_feature test tests) -Dkvm_tests=false -Dtty_tests=false $(meson_use sysprof profiler) -Dinstalled_tests=false + $(meson_use X x11) #verbose # Let upstream choose default for verbose mode #xwayland_path @@ -218,7 +220,7 @@ src_test() { gnome2_environment_reset export XDG_DATA_DIRS="${EPREFIX}"/usr/share glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test } pkg_postinst() { |