From c55c2cf7b5e5e8ce7f21c53ee7996c2ea918279d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Mar 2023 21:51:32 +0100 Subject: gentoo auto-resync : 28:03:2023 - 21:51:31 --- x11-wm/Manifest.gz | Bin 9439 -> 9442 bytes x11-wm/mutter/Manifest | 2 +- x11-wm/mutter/mutter-44.0-r1.ebuild | 229 ++++++++++++++++++++++++++++++++++++ x11-wm/mutter/mutter-44.0.ebuild | 217 ---------------------------------- 4 files changed, 230 insertions(+), 218 deletions(-) create mode 100644 x11-wm/mutter/mutter-44.0-r1.ebuild delete mode 100644 x11-wm/mutter/mutter-44.0.ebuild (limited to 'x11-wm') diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index b080fa1de75d..aff79c22ec86 100644 Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index d15d21c8c1e0..ea4a66a958e8 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -6,7 +6,7 @@ DIST mutter-44.0.tar.xz 2838932 BLAKE2B 0a5ea5a45a8074face45727af5d332ef61d69180 DIST mutter-44.rc.tar.xz 2837848 BLAKE2B 7590afd00f6e6e65062675fd2478a8b7f41e7199f0ea0f77ccd8e62ba6e07bdefea57f8206a1f57cef101c97abe9f621cd4bf3cabca0d2bd0249f330c104072d SHA512 1d7659f9b4bb96ea50c32f122a8e621639007d023970cfeeb2afe5351abc38b9a697163019e26c85cad611f65eccbcd9f940ff1ff5ab10509fda8122c43f9a66 EBUILD mutter-43.2.ebuild 5790 BLAKE2B 07e491948f860c2d14f483bfb411e0e66ca17c1d418493745fc6fa670a5f64551f61178e8f9ceda91d0a5df7a475cd765fbae7bd821410da9cd182c339ba2d50 SHA512 82452dc041323ecd47ed843d330ef0d69a62e362ebea6b7947b192634dbb1fc5bbb97f4e0f26ebd60e1eadb4d59210dd0e90d170f57b96148a893b34649dfefb EBUILD mutter-43.3.ebuild 5793 BLAKE2B 98ebc3adbb9f1da7d3324e71672895f6f58bed985272840c2b5413fcf12b205ce99269a8ad111bee253938a5f8f55b0a607c316c327bf2254dbef746a1971069 SHA512 b4a94e29d42de754c15c0f002639cb7eba82cccdc7ab498a62c2532e5e034713376ebf9df3e05bce6b43f12e03c0df20a99c77213af6393ccbf8650c89bf42ff -EBUILD mutter-44.0.ebuild 5947 BLAKE2B 243753f7ca5043fd947203a843ac55af3ad260502b15526514f2d692504e77cd48a5615e9322796fd4e7c11532f4748f9de756ad1d26f050dab7dd5912585f24 SHA512 1992005382c57426b907a96b8fc729dc7f252143fc9aaa6817c4a151afc79d65e6fe57a4d1abe0513baab1a833cb05dfb356abbccb0859618f7b8053e4c1c29a +EBUILD mutter-44.0-r1.ebuild 6376 BLAKE2B 820f2afaf60485b0e0a42133ce08515ba4f3d2bd054f7460bd8d09f70508dcb6bae541ac4bff0cb4a9d1a5c6014a8f9a7e7bcf72408fab6209fa350998f7e64d SHA512 e091bbf0323377a6357b4a3206961ae5bc770ff2b3e88531b03d8d2be3b9f59ef4c44767372b78a7e3e48a83764bf3deb0844ca6a879c3706d74c226c86e9cc4 EBUILD mutter-44_rc.ebuild 5995 BLAKE2B 7112f6446602d3de9cf0f5ebabf1bc97769f98f3283889e2cca9d60d2d53a5e62c1094c3e3fccadc209eefa2d82c47954ce62a26667fa5ac6368b69c11bcc3dd SHA512 a9837f70a7f330805e1b4faff9c248da67b44dc494ec81bc9a0f82702cf6f95a835012a97adb04be6e09cef5e03be6089d05705440223490eff765e1fb7ff5d1 EBUILD mutter-9999.ebuild 6020 BLAKE2B 1ec3d11b595b9f20ee6f1ad10a719c35f7c5afbbf15072f60361a9ca25690872eeb4abb82ad1ff797128c9c35d0837f0aa16a1af3e8999235f261ec011200a60 SHA512 640926507981f62c4f5beab8378c43b7cffd49674ddb8f261a9c50de96c03f83e55a36a81786971bf344c735173060dd3294b9921b5ba91a61bdf7b364e2f04e MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87 diff --git a/x11-wm/mutter/mutter-44.0-r1.ebuild b/x11-wm/mutter/mutter-44.0-r1.ebuild new file mode 100644 index 000000000000..3ca6e7a5b72e --- /dev/null +++ b/x11-wm/mutter/mutter-44.0-r1.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..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-.pc) should use the subslot + +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 )" + +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/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 + + gnome? ( gnome-base/gnome-desktop:4= ) + + >=media-libs/libcanberra-0.26 + + media-libs/libglvnd[X] + + wayland? ( + >=dev-libs/wayland-protocols-1.31 + >=dev-libs/wayland-1.21.0 + + x11-libs/libdrm + media-libs/mesa[gbm(+)] + >=dev-libs/libinput-1.18.0:= + + elogind? ( sys-auth/elogind ) + x11-base/xwayland + 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.21:= ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] ) + 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-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 + + !=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() { + 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 + + --buildtype $(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) + -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 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() { + 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-44.0.ebuild b/x11-wm/mutter/mutter-44.0.ebuild deleted file mode 100644 index b53a43637e87..000000000000 --- a/x11-wm/mutter/mutter-44.0.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..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-.pc) should use the subslot - -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 )" - -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/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 - - gnome? ( gnome-base/gnome-desktop:4= ) - - >=media-libs/libcanberra-0.26 - - media-libs/libglvnd[X] - - wayland? ( - >=dev-libs/wayland-protocols-1.31 - >=dev-libs/wayland-1.21.0 - - x11-libs/libdrm - media-libs/mesa[gbm(+)] - >=dev-libs/libinput-1.18.0:= - - elogind? ( sys-auth/elogind ) - x11-base/xwayland - 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.21:= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] ) - 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-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 - - !=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() { - local emesonargs=( - --buildtype $(usex debug debug plain) - -Dopengl=true - -Dopengl_libname=libOpenGL - $(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) - -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 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() { - 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 -} -- cgit v1.2.3