From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD1B313835A for ; Sun, 25 Apr 2021 17:15:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4148E0871; Sun, 25 Apr 2021 17:15:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D6BEE0870 for ; Sun, 25 Apr 2021 17:15:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73486340F8E for ; Sun, 25 Apr 2021 17:15:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10A564C3 for ; Sun, 25 Apr 2021 17:15:35 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1619370919.02543c33639993855d5c129f861abef7652b3b65.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/mutter/Manifest x11-wm/mutter/mutter-3.38.4-r1.ebuild X-VCS-Directories: x11-wm/mutter/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 02543c33639993855d5c129f861abef7652b3b65 X-VCS-Branch: master Date: Sun, 25 Apr 2021 17:15:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3a7048b0-c684-4984-b2ea-ce354ba917b8 X-Archives-Hash: 9689464c6167683d74daf2cc9a1a2bce commit: 02543c33639993855d5c129f861abef7652b3b65 Author: Mart Raudsepp gentoo org> AuthorDate: Sat Apr 24 12:43:49 2021 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Apr 25 17:15:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02543c33 x11-wm/mutter-3.38: add patchset with some upstream fixes Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Mart Raudsepp gentoo.org> x11-wm/mutter/Manifest | 1 + x11-wm/mutter/mutter-3.38.4-r1.ebuild | 149 ++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+) diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 8e1daa04211..1b062a1b356 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,4 +1,5 @@ DIST mutter-3.36.7-patchset.tar.xz 14232 BLAKE2B 90a289f7012e28607d487fd635b73683e657bfd8792dbf662f8822ac7f096d21add6fcd3b7092e4e82f2130226f5b1ff9afd1e026fec8333680c9b4e4712dea2 SHA512 74e3951358a02c552a45b590360b9a038283e983ff78daf433fea1589ca3e7824f21af3b786a06ba84fb400581dfc4f97f29d259afdaca2ae3e1456a49a96243 DIST mutter-3.36.7.tar.xz 2689176 BLAKE2B a3849b254dbe2029736ef760fe4225e63bf1d87bf2856a87682574904bd047822916485a3e00d2760118132466414b68764731ea4af9add5d734fd7ce3eac730 SHA512 6061cc8a3bdefe57049f9da757b9a33321b28ff7bc9543bc1db3abd75c7261bf233180fb1e8a2f76145dd67ebda91c48981f6e844a866ef6cbb66203af4b7ef7 +DIST mutter-3.38.4-r1-patchset.tar.xz 8188 BLAKE2B b9765fbb3514c5b6e0015b98bcb78381db8e5ea991fbb51e5df3e507fe1771e7bf8be8c927dc38fd05281c1019a91e71241f7c7492618cff685bd2a6c57e8b89 SHA512 a1b7e86991d42479b8791f6afe1866b8066bcfa1455907a1628a8a2ee6d231e2ca4d19170be3eb6850e9e2ae844e0ab296d4c914065ba0b3348be650395e1e6c DIST mutter-3.38.4.tar.xz 2623788 BLAKE2B 27ca701459b3b70c790c8fec02b5e34eebecf5b4bd11a706a25eea19af0ee5be278835d6f789c4f77df6ec2ab23ae58bb491a0591d1ff51c9dae4690b9dde73f SHA512 a80728a5bd99e727717cb49f0fbfa0db0bb02b64d7e287b4b7e5e848774ea2191db57f8c70d4b1852db201384ac413daa7108472610e8f8986d13744d800fe11 DIST mutter-40.0.tar.xz 2678364 BLAKE2B 3016216c396e5362a3c92dae44911ab67be6ad38b551ffef772f840fc1202ccd59a6800fe76526bab7ba1adf645a243bc000301ff6b331c949f660380143bcff SHA512 af4fd21e5ea7e2cf1004d6912771279cebb2fc60f51f5c7371fd5f6fefbfbd7e36841de98757b8f116b0d2006c1151ccf74ed03ee62836cf59d2a86eaf48084d diff --git a/x11-wm/mutter/mutter-3.38.4-r1.ebuild b/x11-wm/mutter/mutter-3.38.4-r1.ebuild new file mode 100644 index 00000000000..4a385513c5a --- /dev/null +++ b/x11-wm/mutter/mutter-3.38.4-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2021 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/${PF}-patchset.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/7" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-.pc) should use the subslot + +IUSE="elogind input_devices_wacom +introspection screencast 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-1.7.0 + >=media-libs/graphene-1.9.3[introspection?] + >=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.37.2[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 + sys-apps/dbus + media-libs/mesa[X(+),egl] + sysprof? ( >=dev-util/sysprof-capture-3.38.0:4 ) + wayland? ( + >=dev-libs/wayland-protocols-1.19 + >=dev-libs/wayland-1.18.0 + x11-libs/libdrm:= + >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] + >=dev-libs/libinput-1.7 + 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 + screencast? ( >=media-video/pipewire-0.3.0:0/0.3 ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +RDEPEND="${DEPEND} + gnome-extra/zenity +" +DEPEND="${DEPEND} + x11-base/xorg-proto + sysprof? ( >=dev-util/sysprof-common-3.38.0 ) +" +# wayland bdepend for wayland-scanner, xorg-server for cvt utility +BDEPEND=" + dev-libs/wayland + 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=( + # origin/gnome-3-38@8c43a8ce6494b + "${WORKDIR}"/patches +) + +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) + $(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) + $(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 +}