From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- x11-wm/mutter/Manifest | 5 +- .../files/3.34.6-tests-dontreq-gdkwayland.patch | 51 +++++++ x11-wm/mutter/mutter-3.34.6-r1.ebuild | 3 +- x11-wm/mutter/mutter-3.34.6-r2.ebuild | 147 +++++++++++++++++++++ 4 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch create mode 100644 x11-wm/mutter/mutter-3.34.6-r2.ebuild (limited to 'x11-wm/mutter') diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index dd8043c02160..12731eca4eff 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,8 +1,11 @@ AUX 3.32-eglmesaext-include.patch 2078 BLAKE2B cea9ba1a8d2749eb3590dd17a598aace69ad96897cbc5a6c1061c4041a8fe3809ff9f5bcc99cbdc33611a3a3319cda20f74f88434e71f03f2a1cac108185f3fb SHA512 23296f0e0b6ffd4610be3f0c6e1d524d15a5d259c5607a7ded4a8c39846f555dee92e5a8bb9c766211b758f8bc7483715a9640718bb9b7daa42905d802b2ee71 AUX 3.34.6-XInitThreads.patch 1625 BLAKE2B 5b9ff02d96643105d0b865da0821ed6d4a849c8a42d5787c0eadbee4f7943ba5028471bb8424b87ee716d7ae9581b29f6f219c65371a6307da8eb04e0a5a94a2 SHA512 b223845da63ddbba5eaffa9b2a85e1cdaaee9126707d10c902814d35596857fca733ac290b86648ec506cc7bea2432b95ed5c5ea18dd598e539fcd0670620065 +AUX 3.34.6-tests-dontreq-gdkwayland.patch 1730 BLAKE2B d796a4dc91d756ac4af24c411e9f6ef33fcd02443585a3662bf58f04498305aa6b458ab0ace5191a97d9c66ba81cec9ee75099d7e77436eb39c3bec33bb68e26 SHA512 841f59c00f061302f411ce5ed5c25ef041f13a57d44da011815cfb2c1f80cccea1963675dc023d82aac4824b620861876ca628b6165db74b150564222b786b22 DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a +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 EBUILD mutter-3.34.5.ebuild 4566 BLAKE2B a4550c12085dd8dedbe1d3652ab06475adee962d6006ded1506ff491773dacec9c50e1568e851418d2a95dbbcfbc104b50c771b1c2075190eab57c52f4fc473b SHA512 f5c4f35cbce4916d564e15d11a1a420c87cc695d24046d808e499916f01170709a546594e0ab1da2447ab1165d9bce287608644a24486897febe16135d781fda -EBUILD mutter-3.34.6-r1.ebuild 4608 BLAKE2B 58efbebcb5ac65a7322a4e8a937dffd81cab1e990107098a5513c9208860990f68a1bee76391a874e15bc83f1bd407fddf79e1cd1df9f78de9cbb53525ae649e SHA512 409eaed8766d29cb8ba588eaaf1faf9c904a3548f68516606319a2365d88766ebf31466a9176868b994c89fb17447d632e2e37b6b0065e473aca60f6fd17be89 +EBUILD mutter-3.34.6-r1.ebuild 4659 BLAKE2B c87832ef12a3eb2e5d1651cad6cfcaffd0842636b7c6130a222e9eeb2837008f295c481e0fc117f47393ce7f9f11e7c55419ebff5ff7ba6dcd5d707c2b840b63 SHA512 4e727cf5a0162c1a763cbd39be0a842488381bbc739d036c1bccc35f504366efaaa98698f9289c005840189f354962a51f1e9f3c7561ed91f1cf72e0e172f8ad +EBUILD mutter-3.34.6-r2.ebuild 4723 BLAKE2B a221269665384b0b9ae5f1814e8fbcef3e4e08dd9dd3cbcc9731a1c8977e30d37f326bc5095ee6e1d53cf99d933d5d12d5eb950991eab47c6c42b8a42038641f SHA512 4b672d356a53144795bb50da0de2f02a7e67f8c59d502208ce8a9ac4ec85e8e30f04e1d4fb4b3a2bd6410965a56ec40084a68dcbcee6e6bef1a5565e4134da7a EBUILD mutter-3.34.6.ebuild 4568 BLAKE2B d8cf3267696b61193efbe0189e45bf2c5e96e5d6f44e727c630a19b4b33b6796a23596b51171cb8bdbe40879d05a73f66a1438c828067086e279bc87a01e560c SHA512 b47cc0637b4a59e7a680dace7f3ca95b32c6ef9b903cfffcd34395dca037f88b859ac2905fb97d4ca6e91e4277d035d781cd257d471ccc9b25dfb9d71af15bf6 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8 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 new file mode 100644 index 000000000000..810801977af8 --- /dev/null +++ b/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch @@ -0,0 +1,51 @@ +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, + NULL)) ++#endif + g_print ("Fail to export handle for window id %s", argv[2]); + } + else if (strcmp (argv[0], "accept_focus") == 0) +-- +2.20.1 + diff --git a/x11-wm/mutter/mutter-3.34.6-r1.ebuild b/x11-wm/mutter/mutter-3.34.6-r1.ebuild index 722e7bb3d139..c6e568965e54 100644 --- a/x11-wm/mutter/mutter-3.34.6-r1.ebuild +++ b/x11-wm/mutter/mutter-3.34.6-r1.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE=" test? ( wayland )" RESTRICT="!test? ( test )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc 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 @@ -94,6 +94,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/3.32-eglmesaext-include.patch "${FILESDIR}"/${PV}-XInitThreads.patch + "${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.patch ) src_configure() { diff --git a/x11-wm/mutter/mutter-3.34.6-r2.ebuild b/x11-wm/mutter/mutter-3.34.6-r2.ebuild new file mode 100644 index 000000000000..d04f56b67e4a --- /dev/null +++ b/x11-wm/mutter/mutter-3.34.6-r2.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome.org gnome2-utils meson virtualx xdg + +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/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-.pc) should use the subslot + +IUSE="elogind input_devices_wacom +introspection +sysprof systemd test udev wayland" +# 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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~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 + >=x11-libs/gtk+-3.19.8:3[X,introspection?] + x11-libs/gdk-pixbuf:2 + >=x11-libs/pango-1.30[introspection?] + >=dev-libs/fribidi-1.0.0 + >=x11-libs/cairo-1.14[X] + >=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?] + >=dev-libs/glib-2.61.1:2 + gnome-base/gnome-settings-daemon + >=dev-libs/json-glib-0.12.0[introspection?] + gnome-base/gnome-desktop:3= + >=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 + media-libs/mesa[X(+),egl] + wayland? ( + >=dev-libs/wayland-protocols-1.18 + >=dev-libs/wayland-1.13.0 + x11-libs/libdrm:= + >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] + >=dev-libs/libinput-1.4 + systemd? ( sys-apps/systemd ) + elogind? ( sys-auth/elogind ) + x11-base/xorg-server[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 + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +RDEPEND="${DEPEND} + gnome-extra/zenity +" +DEPEND="${DEPEND} + x11-base/xorg-proto + sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3 ) +" +# wayland bdepend for wayland-scanner, xorg-server for cvt utility +BDEPEND=" + dev-libs/wayland + >=dev-util/meson-0.50.0 + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( app-text/docbook-xml-dtd:4.5 ) + wayland? ( >=sys-kernel/linux-headers-4.4 + x11-base/xorg-server ) +" + +PATCHES=( + "${WORKDIR}"/patches/ + "${FILESDIR}"/3.32-eglmesaext-include.patch + "${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.patch +) + +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 wayland native_backend) + -Dremote_desktop=false # not bothering with pipewire-0.2; to be reintroduced in newer mutter via pipewire-0.3 + -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) + $(meson_use input_devices_wacom libwacom) + -Dpango_ft2=true + -Dstartup_notification=true + -Dsm=true + $(meson_use introspection) + $(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 + $(meson_use test clutter_tests) + $(meson_use test tests) + $(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 + ) + meson_src_configure +} + +src_test() { + glib-compile-schemas "${BUILD_DIR}"/data + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} -- cgit v1.2.3