From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- x11-wm/mutter/Manifest | 7 +- x11-wm/mutter/metadata.xml | 1 + x11-wm/mutter/mutter-3.34.4.ebuild | 149 +++++++++++++++++++++++++++++++++++++ x11-wm/mutter/mutter-3.34.5.ebuild | 145 ++++++++++++++++++++++++++++++++++++ 4 files changed, 301 insertions(+), 1 deletion(-) create mode 100644 x11-wm/mutter/mutter-3.34.4.ebuild create mode 100644 x11-wm/mutter/mutter-3.34.5.ebuild (limited to 'x11-wm/mutter') diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 122d27ff58e1..b138f0ed7bd4 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -5,6 +5,11 @@ DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 026c87cc3859624bcfd273694a8a34661d97cc77776e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295 SHA512 e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5 DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00 SHA512 e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269 +DIST mutter-3.34.4-patchset.tar.xz 7216 BLAKE2B 6a9d503a8da80a9255649150c1256ea0d1459b11c0803728553f6699f0bb54b56161a411e9dec3725e5cd4230531c90b0160ef702083285443849c9ec4ca8278 SHA512 b592a6ded20c61c15fe8dc5a69fb73e81143975632237a32329bbf40239bdc2c392aef4676cd8800f7ad39eb16e8f159b0cec87c8bd035302db0a8001ddeda2e +DIST mutter-3.34.4.tar.xz 2791624 BLAKE2B cd7ea49333dc50574f993f15638504eac0d0a6f1e85f34a617accbabcec71f02244ce6cd292c968def302652707e21692d94dcccb01d59b3661220c90cefd802 SHA512 6cae8473071d9ab105a3635cee314157a268894fc3b18e53857e097223a9c2677e1cd51b10b501a3b85f74c83470c2ce87986972218f9833c9f6ad31b1910f6a +DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a EBUILD mutter-3.26.2-r1.ebuild 4109 BLAKE2B a4073e48c06b2185bf37a22c509c1959c0855cb838151d91d9b697e4679bc7ec9438b92eaa6499ecfa0f6e389415254b64621d24efa6df9c0abc1a8711ec7c14 SHA512 05266bd54e4bc87fc0bab475354dae4670da1c1d64a6db7cfae3dace6069b78515c5a904d6542cfc471f5cc056b2204dbf95cdabbdf5d49e7854b0c98d8e3592 EBUILD mutter-3.32.2.ebuild 4619 BLAKE2B 09a4dca8c10a02d8aa1b211ba2c453b60f75c2e307c5d261bd9ab9ad028ef7337ea83c66f6425eaf9d64415732498f781cef066b888ede050a3b42801b523fd3 SHA512 fc14e72a1e2ae68997c0c9f55265d1ebef27f4b016830e5d3902e004270eace97229f09657406e29475544d98471364485f365b5bd5abada0f12bbef388dbe04 -MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700 +EBUILD mutter-3.34.4.ebuild 4721 BLAKE2B 50eef6d2ec032e2a3d1079bf08d786920643e3eee7fc4ccbf0baa6f901ea3923f9fd8e351453e02cb0378ddcc72836346dda79276d19f195a3c635d0cb65a459 SHA512 ed1cb27b361d6203d2dfe2aedc7ce3867a2bb529513e0fbd5ed51f8e0197f1a0054f60e2ad9ac565f65ca05dcc463902ac4a5700756b46d9eede8630177cb281 +EBUILD mutter-3.34.5.ebuild 4568 BLAKE2B d8cf3267696b61193efbe0189e45bf2c5e96e5d6f44e727c630a19b4b33b6796a23596b51171cb8bdbe40879d05a73f66a1438c828067086e279bc87a01e560c SHA512 b47cc0637b4a59e7a680dace7f3ca95b32c6ef9b903cfffcd34395dca037f88b859ac2905fb97d4ca6e91e4277d035d781cd257d471ccc9b25dfb9d71af15bf6 +MISC metadata.xml 662 BLAKE2B 500aef5ca1856da7a8027c1f69c30639791430cf7e94302de37edca6b8c85aa10f244bb85dcd193c1bab65854652b1999219c35fbe8eab49c33647a3b6a0b486 SHA512 b36d65b3f0bd8bf904cc3270b963d997eebe188ee98425a2cffe9df2e15dc28106baea2d0437972c8c211045200b979cd9fb6a902527efe2f6640380bed15801 diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml index 4da93b48e48d..9bd58e53b934 100644 --- a/x11-wm/mutter/metadata.xml +++ b/x11-wm/mutter/metadata.xml @@ -9,5 +9,6 @@ Rely on sys-auth/elogind as logind provider for Wayland sessions Enable OpenGL ES 2.0 support Enable support for remote desktop and screen cast using media-video/pipewire + Enable profiling data capture support using dev-util/sysprof-capture diff --git a/x11-wm/mutter/mutter-3.34.4.ebuild b/x11-wm/mutter/mutter-3.34.4.ebuild new file mode 100644 index 000000000000..edd7e4a06986 --- /dev/null +++ b/x11-wm/mutter/mutter-3.34.4.ebuild @@ -0,0 +1,149 @@ +# 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/${PF}-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 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 + >=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 + screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) + 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=( + # Some patches from gnome-3-34 branch on top of 3.34.4 + "${WORKDIR}"/patches/ + + "${FILESDIR}"/3.32-eglmesaext-include.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) + $(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 +} diff --git a/x11-wm/mutter/mutter-3.34.5.ebuild b/x11-wm/mutter/mutter-3.34.5.ebuild new file mode 100644 index 000000000000..4703c77a3b87 --- /dev/null +++ b/x11-wm/mutter/mutter-3.34.5.ebuild @@ -0,0 +1,145 @@ +# 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/" + +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 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 + >=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 + screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) + 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=( + "${FILESDIR}"/3.32-eglmesaext-include.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) + $(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 +} -- cgit v1.2.3