From 64ae9c18e99cfcf94f587b8adc9bf9aae3f6d1fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Jun 2023 21:35:21 +0100 Subject: gentoo auto-resync : 04:06:2023 - 21:35:20 --- x11-wm/Manifest.gz | Bin 9123 -> 9114 bytes x11-wm/mutter/Manifest | 2 + x11-wm/mutter/mutter-44.2.ebuild | 235 +++++++++++++++++++++++++++++++++++++++ x11-wm/pekwm/Manifest | 6 +- x11-wm/pekwm/metadata.xml | 2 +- x11-wm/pekwm/pekwm-0.1.18.ebuild | 6 +- x11-wm/pekwm/pekwm-0.2.1.ebuild | 6 +- 7 files changed, 247 insertions(+), 10 deletions(-) create mode 100644 x11-wm/mutter/mutter-44.2.ebuild (limited to 'x11-wm') diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index e126b06c5fe1..daa09f32b6c2 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 3448350afebe..d49d9c1a97ff 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -2,7 +2,9 @@ AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e AUX mutter-44.1-frame-updates.patch 6835 BLAKE2B 2cac8771bc352f3532d2605c5f1c4210c2bb5449dbe40345d31bc72863ea81561749cc192a02c968cd57027ec93ff9319789776b55aaed645a8b363670db16a9 SHA512 26729acba9c143b7a101891ae33a76453f4c055668636e3657369d193f9b5d5abbc88a4161ce4de6ec1799d875c2174ee9e82e736b8127f82a574fe19aefd59d AUX mutter-44.1-xdnd-frame-window.patch 1782 BLAKE2B d2ac08ce4e3d54d2307280e7fcfd34b16e1cf885e53af6aea97bb466cd0c8d34ff97559d82cce2c7754cefc30848553f658dbb74b56ce3e4072d7f441fcb068e SHA512 a5d498104a7c395007270294c276a09b6fdfcbf9e7f515312b1874ae3f71a405fe0378ea5e18be90990dfd351df28b7bee878c097b565eb688a2546c3ea40c50 DIST mutter-44.1.tar.xz 2843780 BLAKE2B f148b96ebeeb5db9cb620ca0870862cde579fc6d5ca9ddf87d6b6ad982baf67326b931b4a43cc9c4c9aa3b7752faa6fbbac2254c75924f0fa33fb34ae16db8fe SHA512 42cf748d83736e4a3ba595329d784829c278ea74c2db816bad770976000ee1f5070e0caf756ba123178819fdec6ae9380017f3c44f08bbff19c8bcaa46b6f33c +DIST mutter-44.2.tar.xz 2848696 BLAKE2B 2adbda457c215dfb1889c9b42eb1c58b0d012f79287414da6f4a18ff92b082d872df344abdb72b5f193f1830c6f1002495ff9152c51ad3824c779ccd81e11310 SHA512 5c58cac46a571bd9fabca8326cf973c79d9d47bd223b39476e143f30e435900859e5cef1858bc343261ad9c026166647b940c5becc6d788d99d947bd003e12da EBUILD mutter-44.1-r1.ebuild 6634 BLAKE2B ccd82382437708d42726522fe215bdc733f58c56817ffb65cf09f3cffc0e3d503f3023aae887566c5be13438b19b37d7ed188511e81eef446fc9358456aef06c SHA512 879662e5076d15d85ac2c17fc3f613b891da87d34b41e1ec5a8b6e33f3e0abf79583b99e153cb3266e2505d85855b14823f4fd61db1ad30677da6dcc182a789a EBUILD mutter-44.1.ebuild 6460 BLAKE2B 664b2a09eeddc89762be49dc1d41fa5d36981094aa771d48c7aa8184598fe248618689321966ce03727464d6b770af503791b43eaf350f575287fa750b71dba3 SHA512 0c09c0f4a873610ecf0491d8ed4caae98aee0a347f9a9279133a84d43096930ca71871f7d1e81431c494045a8760831eb59bd04bfa1c58bb396f6fc7a084b5f4 +EBUILD mutter-44.2.ebuild 6464 BLAKE2B 9f1eef205504bf8678e002fe9f41d77b9b6008e1ac06da1cd1a9e3097fe5b60f386042205d661357a67e856be34403d50e2625962682a1652c4181586950d22f SHA512 2237c634e8f610377ac038ceb2752b319edaa4a3821aa5d4837218fc09a5b36c2ddc664d28f956978be3320353afa6a4917415401d74610c4e9f729e0347953a EBUILD mutter-9999.ebuild 6463 BLAKE2B 525a3e193ca4f8b4782979b40ae09f9d62cf3efd7a578b7aada665e0e04fe7e27a3bc5269d9add898af2cb88923cda2c325e70b5cf2823bef52b3e0e22e86450 SHA512 8c8f98e7d1aa2fabae2744b75d443aed4a2d6ce412ebd5d7e04a2170fa5821b05cc9419bdee2bb171f23105b7c038e2820b694db03a568559088089ab4bd8d74 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87 diff --git a/x11-wm/mutter/mutter-44.2.ebuild b/x11-wm/mutter/mutter-44.2.ebuild new file mode 100644 index 000000000000..f69f6fff42ab --- /dev/null +++ b/x11-wm/mutter/mutter-44.2.ebuild @@ -0,0 +1,235 @@ +# 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/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git" + SRC_URI="" +else + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +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 )" + +# 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) + $(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() { + 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/pekwm/Manifest b/x11-wm/pekwm/Manifest index 6dda90f8bdaf..c47de23d0e45 100644 --- a/x11-wm/pekwm/Manifest +++ b/x11-wm/pekwm/Manifest @@ -2,7 +2,7 @@ DIST pekwm-0.1.18.tar.gz 441810 BLAKE2B 8c3e98490681eed68e0f127c38c1653f8d643cec DIST pekwm-0.2.1.tar.gz 943072 BLAKE2B 61a278a42517de4b2924c6e0cffdd0b112c3a1a52b70e24d6ed852a8e5005f76b4eb9a342af073481404fae68265452b140ea19539723733ec860f7cbd615598 SHA512 cefb5abb43f88cff874f12586f0f2c0b88d30fd0ce22c6e18731b11055abea389819a08a4e85a9290021ffe30708ea210c66a0f3f8c263717c05abd798fdf297 DIST pekwm-0.3.0.tar.gz 1210295 BLAKE2B 2882d8f9103fbfdad12d3dc519b3468a3d85e622e1f4352ccf7849a02f9f7d2f6a1c039d0e9df75ffd58a063f866fe8998eb10bc7e1c2a1766a9056328b136de SHA512 7b59f6883cc449a4a4e11fa1d2629c76b26bac0ad12f7c7e02da2b79292dd5515915152e9955875d3335deca4cf590d7078645bcf59bdad7ce0f65929b315b43 DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d -EBUILD pekwm-0.1.18.ebuild 1839 BLAKE2B 5a44e02032b69d69a13c6af33ebaa59f4c75d886cc742e7680f26757f53624b4fc8290b05c08eadea70c3384a572ed4485a467a16d3adbde1b59483ddb5d7c61 SHA512 ef24ddf5aa9c3f6c2750ce000eeed1a4f3a2af2cadf82f345d1f193bf69a9f20a760df1a86685669f77ab26bfeaecfb7dbe2165f59a167b2fa0004ce5c8fd90d -EBUILD pekwm-0.2.1.ebuild 2153 BLAKE2B 5231376dd443a0c9dfd896ade2ed40d7794d2b7d8d8af28adfeb792c0f1c824cabc5fed0725c579378c5ccc606cbbfd822d5dc9dd5139cbcba15aadabe83856f SHA512 c82c4b536287f1bb53b35e2928067da55a50bd1341d5bc31118494fed5d0bfa6fcbf59a60bd7f37a171d4d1b02ab8559404eb7e36b99a3f6edb882f02d7b8a04 +EBUILD pekwm-0.1.18.ebuild 1837 BLAKE2B 418ee2a366dae08d67db6ed821f0d6b6d8e0a24050953c4e92ed19eb4876b764ecff26ee9aadf6ad8e60f71671270e217cab1742cb20236332acfec25ace647b SHA512 2f6b1c478480a13bbf92b1db197355b66897d3e42bcd845b0f89706476959b3bbcb066b3ea85b01f0d0c72b4a219eaef3a3f5c6679b3b14b7c12a6874a58dfef +EBUILD pekwm-0.2.1.ebuild 2151 BLAKE2B 0e16f0775d5cb748714c496a6b8aae570425e955e418edc139acd46d782c0face2a63c64ba8d040b6625e581f68c03385e6f98f139b98621eba830a239a278fe SHA512 a2e6a51717b25fe1625162fcbc0804c25f3274277cf3c218e0e874bb0c3c0ccca08916e151e62a70779f0d111602390a71a6fc86557205eaf5cc4ef85cb6fb25 EBUILD pekwm-0.3.0.ebuild 1930 BLAKE2B 7337a4b51f05eb692719b3b3f8ca8031b8419debff943d285db10bad61e4e87df65beee8c4f07cb908f4560a750cd54c88de55d0ebe39584063388085de86fbd SHA512 cd82117254097a0623f95ac32a0672ae14535ebda6e43f516aef4d19236bc8d759393688974f3f5d34480948d3019099c8ecc037cbea656d9dd47aca278c306e -MISC metadata.xml 891 BLAKE2B 4746a84a9468b24e9ff73a059b42d7232cbb2180671e1d1d91896ffb66eea272c8353403b2748d53569a799b0f6dccba4e0a47815d8487d9755dad4643d081b2 SHA512 d991e59f038ec3dbcdeecb0c02f3525c1387f7635203011cc3ad546331389307571c02071d27a8c736f04e75fddac82943083d0e99a903c98b1b8ac7ed523121 +MISC metadata.xml 890 BLAKE2B 42517a2d6344f328f958247c357c2c8cb135f093ecd60d7f09edfb01559eff14de8de0b2d5adef44fc2d2758e1c799a6e91c6224bb048e3e037c30ac1d1c848e SHA512 89c0f8a6484dbe2256e367d2760513be54a6896ab3e85ef4c80175838e3eccd7acc1d5123daea01944e66346a9bbf7e6147acc1821e9b6e574e1f7a37f883a65 diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml index e8269632a2e5..2a9cfd89dd02 100644 --- a/x11-wm/pekwm/metadata.xml +++ b/x11-wm/pekwm/metadata.xml @@ -16,6 +16,6 @@ Install additional themes - pekdon/pekwm + pekwm/pekwm diff --git a/x11-wm/pekwm/pekwm-0.1.18.ebuild b/x11-wm/pekwm/pekwm-0.1.18.ebuild index 7d866b5fa28c..3b59911447b0 100644 --- a/x11-wm/pekwm/pekwm-0.1.18.ebuild +++ b/x11-wm/pekwm/pekwm-0.1.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,10 +8,10 @@ inherit autotools desktop DESCRIPTION="A lightweight window manager initially based on aewm++" HOMEPAGE=" https://www.pekwm.se/ - https://github.com/pekdon/pekwm + https://github.com/pekwm/pekwm " SRC_URI=" - https://github.com/pekdon/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz + https://github.com/pekwm/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz themes? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-themes.tar.bz2 ) " S="${WORKDIR}"/${PN}-release-${PV} diff --git a/x11-wm/pekwm/pekwm-0.2.1.ebuild b/x11-wm/pekwm/pekwm-0.2.1.ebuild index 26496e8f9760..9171b886da0a 100644 --- a/x11-wm/pekwm/pekwm-0.2.1.ebuild +++ b/x11-wm/pekwm/pekwm-0.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,10 +8,10 @@ inherit cmake desktop optfeature DESCRIPTION="A lightweight window manager initially based on aewm++" HOMEPAGE=" https://www.pekwm.se/ - https://github.com/pekdon/pekwm + https://github.com/pekwm/pekwm " SRC_URI=" - https://github.com/pekdon/${PN}/releases/download/release-${PV}/pekwm-${PV}.tar.gz + https://github.com/pekwm/${PN}/releases/download/release-${PV}/pekwm-${PV}.tar.gz " LICENSE="GPL-2" -- cgit v1.2.3