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 82833138335 for ; Tue, 17 Sep 2019 17:08:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79327E0969; Tue, 17 Sep 2019 17:08:17 +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 4BCB9E0969 for ; Tue, 17 Sep 2019 17:08:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7D36B34B2BB for ; Tue, 17 Sep 2019 17:08:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4288763 for ; Tue, 17 Sep 2019 17:08:12 +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: <1568738494.f00337de94f258c6773d5d326d9cdc0aff729170.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.30.2-r1.ebuild x11-wm/mutter/mutter-3.30.2-r3.ebuild X-VCS-Directories: x11-wm/mutter/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: f00337de94f258c6773d5d326d9cdc0aff729170 X-VCS-Branch: master Date: Tue, 17 Sep 2019 17:08:12 +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: 8c3a75dd-6b8f-481e-b916-6d9c7c01a0f8 X-Archives-Hash: 0c4ea0ca79260df87aee2313d9bc3549 commit: f00337de94f258c6773d5d326d9cdc0aff729170 Author: Mart Raudsepp gentoo org> AuthorDate: Tue Sep 17 16:41:34 2019 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Tue Sep 17 16:41:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f00337de x11-wm/mutter: remove old Package-Manager: Portage-2.3.69, Repoman-2.3.12 Signed-off-by: Mart Raudsepp gentoo.org> x11-wm/mutter/Manifest | 2 - x11-wm/mutter/mutter-3.30.2-r1.ebuild | 149 ---------------------------------- x11-wm/mutter/mutter-3.30.2-r3.ebuild | 149 ---------------------------------- 3 files changed, 300 deletions(-) diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 1c6c961ffdf..2cb1435f77b 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,7 +1,5 @@ DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b -DIST mutter-3.30.2-r1-patchset.tar.xz 14096 BLAKE2B 83f2e975a4404b878e832a70fe7a84a2a39d291dc1f6191e5805633327d21fb0796b8b0172a35602bec9c7e879819ebdb189f324cba3f4a4aee232d5e439ba0a SHA512 f842920d6855803b8712e1736399805ecd3266a61dd7baba1f80383978d00533e34fd742103b578f9f2969ab2059f9e0c7b3812d2ea2283b6ffa91810bf6094f -DIST mutter-3.30.2-r3-patchset.tar.xz 30208 BLAKE2B 502e9c1d005cf268548e2732d4574b0eb7491940531c77c357e73e2da23b60acfbb183f9e818edd86cf0d6abca4e43c2e687db27544bb4fe7e9a33a162df01da SHA512 22b66395ffae07b208efa3a1305c71ea2282470a08300a5c3de23a2a45f03afef7804d5943934028286406adedbb9851dc562f4e57fdff77df22591893f0908b DIST mutter-3.30.2-r4-patchset.tar.xz 44820 BLAKE2B 2448dcd6bca338dbe2b87a93ca4374fd5b4cc5d8834dd40739e74a65280b7f00b99d61361082673f5f41e44fb40e36f0889d5ee00fbc034efe87294540fba48e SHA512 a7024b95bc56ab25cfdb27003b4b1fc39925117795c05f78b2d473fdbcf3bb6ce870ee5bc030ec4ce5e10b42d94fa0007bf5870bd2a4e94de3885c9434a39835 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 026c87cc3859624bcfd273694a8a34661d97cc77776e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295 SHA512 e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5 diff --git a/x11-wm/mutter/mutter-3.30.2-r1.ebuild b/x11-wm/mutter/mutter-3.30.2-r1.ebuild deleted file mode 100644 index df0e1652d3d..00000000000 --- a/x11-wm/mutter/mutter-3.30.2-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -inherit gnome2 virtualx - -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/3" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-.pc) should use the subslot - -IUSE="debug elogind gles2 input_devices_wacom +introspection systemd test udev wayland" -# native backend requires gles3 for hybrid graphics blitting support and a logind provider -REQUIRED_USE=" - wayland? ( ^^ ( elogind systemd ) )" - -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -# libXi-1.7.4 or newer needed per: -# https://bugzilla.gnome.org/show_bug.cgi?id=738944 -# gl.pc package is required, which is only installed by mesa if glx is enabled; pre-emptively requiring USE=X on mesa, as hopefully eventually it'll support disabling glx for wayland-only systems -RDEPEND=" - >=dev-libs/atk-2.5.3 - >=x11-libs/gdk-pixbuf-2:2 - >=dev-libs/json-glib-0.12.0 - >=x11-libs/pango-1.30[introspection?] - >=x11-libs/cairo-1.14[X] - >=x11-libs/gtk+-3.19.8:3[X,introspection?] - >=dev-libs/glib-2.53.2:2 - >=media-libs/libcanberra-0.26[gtk3] - >=x11-libs/startup-notification-0.7 - >=x11-libs/libXcomposite-0.2 - >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] - =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/libXinerama - >=x11-libs/libXrandr-1.5 - x11-libs/libXrender - x11-libs/libxcb - x11-libs/libxkbfile - >=x11-libs/libxkbcommon-0.4.3[X] - x11-misc/xkeyboard-config - - gnome-extra/zenity - media-libs/mesa[X(+),egl,gles2?] - - input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) - introspection? ( >=dev-libs/gobject-introspection-1.42:= ) - udev? ( >=virtual/libgudev-232:= ) - wayland? ( - >=dev-libs/libinput-1.4 - >=dev-libs/wayland-1.13.0 - >=dev-libs/wayland-protocols-1.16 - >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] - systemd? ( sys-apps/systemd ) - elogind? ( sys-auth/elogind ) - >=virtual/libgudev-232:= - >=virtual/libudev-136:= - x11-base/xorg-server[wayland] - x11-libs/libdrm:= - ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=sys-devel/gettext-0.19.6 - virtual/pkgconfig - x11-base/xorg-proto - test? ( app-text/docbook-xml-dtd:4.5 ) - wayland? ( >=sys-kernel/linux-headers-4.4 ) -" - -PATCHES=( - # Some patches from gnome-3-30 branch on top of 3.30.2 - "${WORKDIR}"/patches/ - # Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2] - "${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf -) - -src_prepare() { - # Disable building of noinst_PROGRAM for tests - if ! use test; then - sed -e '/^noinst_PROGRAMS/d' \ - -i cogl/tests/conform/Makefile.{am,in} || die - sed -e '/noinst_PROGRAMS += testboxes/d' \ - -i src/Makefile-tests.am || die - sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \ - -i src/Makefile.in || die - fi - - gnome2_src_prepare - - # Leave the damn CFLAGS alone - sed -e 's/$CFLAGS -g/$CFLAGS /' \ - -i clutter/configure || die - sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \ - -i cogl/configure || die - sed -e 's/$CFLAGS -g -O/$CFLAGS /' \ - -i configure || die -} - -src_configure() { - # TODO: pipewire remote desktop support - # TODO: nvidia EGLDevice support - # TODO: elogind vs systemd is automagic in 3.28.3 - if elogind is found, it's used instead of systemd; but not a huge problem as elogind package blocks systemd package - # TODO: lack of --with-xwayland-grab-default-access-rules 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) - # Prefer gl driver by default - # GLX is forced by mutter but optional in clutter - # xlib-egl-platform required by mutter x11 backend - # native backend without wayland is useless - gnome2_src_configure \ - --disable-static \ - --enable-compile-warnings=minimum \ - --enable-gl \ - --enable-glx \ - --enable-sm \ - --enable-startup-notification \ - --enable-verbose-mode \ - --enable-xlib-egl-platform \ - --with-default-driver=gl \ - --with-libcanberra \ - --disable-remote-desktop \ - $(usex debug --enable-debug=yes "") \ - $(use_enable gles2) \ - $(use_enable gles2 cogl-gles2) \ - $(use_enable introspection) \ - $(use_enable wayland) \ - $(use_enable wayland kms-egl-platform) \ - $(use_enable wayland native-backend) \ - $(use_enable wayland wayland-egl-server) \ - $(use_with input_devices_wacom libwacom) \ - $(use_with udev gudev) -} - -src_test() { - virtx emake check -} diff --git a/x11-wm/mutter/mutter-3.30.2-r3.ebuild b/x11-wm/mutter/mutter-3.30.2-r3.ebuild deleted file mode 100644 index d18e0d664c8..00000000000 --- a/x11-wm/mutter/mutter-3.30.2-r3.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -inherit gnome2 virtualx - -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/3" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-.pc) should use the subslot - -IUSE="debug elogind gles2 input_devices_wacom +introspection systemd test udev wayland" -# native backend requires gles3 for hybrid graphics blitting support and a logind provider -REQUIRED_USE=" - wayland? ( ^^ ( elogind systemd ) )" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# libXi-1.7.4 or newer needed per: -# https://bugzilla.gnome.org/show_bug.cgi?id=738944 -# gl.pc package is required, which is only installed by mesa if glx is enabled; pre-emptively requiring USE=X on mesa, as hopefully eventually it'll support disabling glx for wayland-only systems -RDEPEND=" - >=dev-libs/atk-2.5.3 - >=x11-libs/gdk-pixbuf-2:2 - >=dev-libs/json-glib-0.12.0 - >=x11-libs/pango-1.30[introspection?] - >=x11-libs/cairo-1.14[X] - >=x11-libs/gtk+-3.19.8:3[X,introspection?] - >=dev-libs/glib-2.53.2:2 - >=media-libs/libcanberra-0.26[gtk3] - >=x11-libs/startup-notification-0.7 - >=x11-libs/libXcomposite-0.2 - >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] - =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/libXinerama - >=x11-libs/libXrandr-1.5 - x11-libs/libXrender - x11-libs/libxcb - x11-libs/libxkbfile - >=x11-libs/libxkbcommon-0.4.3[X] - x11-misc/xkeyboard-config - - gnome-extra/zenity - media-libs/mesa[X(+),egl,gles2?] - - input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) - introspection? ( >=dev-libs/gobject-introspection-1.42:= ) - udev? ( >=virtual/libgudev-232:= ) - wayland? ( - >=dev-libs/libinput-1.4 - >=dev-libs/wayland-1.13.0 - >=dev-libs/wayland-protocols-1.16 - >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] - systemd? ( sys-apps/systemd ) - elogind? ( sys-auth/elogind ) - >=virtual/libgudev-232:= - >=virtual/libudev-136:= - x11-base/xorg-server[wayland] - x11-libs/libdrm:= - ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=sys-devel/gettext-0.19.6 - virtual/pkgconfig - x11-base/xorg-proto - test? ( app-text/docbook-xml-dtd:4.5 ) - wayland? ( >=sys-kernel/linux-headers-4.4 ) -" - -PATCHES=( - # Some patches from gnome-3-30 branch on top of 3.30.2 - "${WORKDIR}"/patches/ - # Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2] - "${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf -) - -src_prepare() { - # Disable building of noinst_PROGRAM for tests - if ! use test; then - sed -e '/^noinst_PROGRAMS/d' \ - -i cogl/tests/conform/Makefile.{am,in} || die - sed -e '/noinst_PROGRAMS += testboxes/d' \ - -i src/Makefile-tests.am || die - sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \ - -i src/Makefile.in || die - fi - - gnome2_src_prepare - - # Leave the damn CFLAGS alone - sed -e 's/$CFLAGS -g/$CFLAGS /' \ - -i clutter/configure || die - sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \ - -i cogl/configure || die - sed -e 's/$CFLAGS -g -O/$CFLAGS /' \ - -i configure || die -} - -src_configure() { - # TODO: pipewire remote desktop support - # TODO: nvidia EGLDevice support - # TODO: elogind vs systemd is automagic in 3.28.3 - if elogind is found, it's used instead of systemd; but not a huge problem as elogind package blocks systemd package - # TODO: lack of --with-xwayland-grab-default-access-rules 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) - # Prefer gl driver by default - # GLX is forced by mutter but optional in clutter - # xlib-egl-platform required by mutter x11 backend - # native backend without wayland is useless - gnome2_src_configure \ - --disable-static \ - --enable-compile-warnings=minimum \ - --enable-gl \ - --enable-glx \ - --enable-sm \ - --enable-startup-notification \ - --enable-verbose-mode \ - --enable-xlib-egl-platform \ - --with-default-driver=gl \ - --with-libcanberra \ - --disable-remote-desktop \ - $(usex debug --enable-debug=yes "") \ - $(use_enable gles2) \ - $(use_enable gles2 cogl-gles2) \ - $(use_enable introspection) \ - $(use_enable wayland) \ - $(use_enable wayland kms-egl-platform) \ - $(use_enable wayland native-backend) \ - $(use_enable wayland wayland-egl-server) \ - $(use_with input_devices_wacom libwacom) \ - $(use_with udev gudev) -} - -src_test() { - virtx emake check -}