commit: 4d6e0c8fe87969bb3683e7f0e79891c54e4197a8 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Mon Dec 23 21:23:56 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Mon Dec 23 21:25:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6e0c8f
x11-wm/mutter: remove old Package-Manager: Portage-2.3.79, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> x11-wm/mutter/Manifest | 2 - x11-wm/mutter/files/3.28.3-no-gles2-fix.patch | 43 ------ x11-wm/mutter/files/3.30-eglmesaext-include.patch | 69 ---------- x11-wm/mutter/mutter-3.30.2-r4.ebuild | 153 ---------------------- 4 files changed, 267 deletions(-) diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 2cb1435f77b..acdf8cbe590 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,6 +1,4 @@ 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-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 DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00 SHA512 e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269 diff --git a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch b/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch deleted file mode 100644 index 43bb05f5245..00000000000 --- a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 259544c4f4b47418885075c9531ce593c600401c Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <l...@gentoo.org> -Date: Fri, 1 Mar 2019 00:02:47 +0200 -Subject: [PATCH] build: Fix build without gles headers - -This is an ugly quick fix to hopefully fix non-wayland builds against -mesa[-gles2]. -It assumes gnome-shell package USE=wayland requires USE=gles2, which it -sort of does already at runtime already for hybrid graphics support, but -we ensure with REQUIRED_USE. -In meson upstream port for 3.32 this will be more properly conditional -on the gles2 option instead. ---- - src/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index bcb3505c7..a68661b21 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -118,9 +118,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \ - backends/meta-egl.c \ - backends/meta-egl.h \ - backends/meta-egl-ext.h \ -- backends/meta-gles3.c \ -- backends/meta-gles3.h \ -- backends/meta-gles3-table.h \ - backends/meta-gpu.c \ - backends/meta-gpu.h \ - backends/meta-display-config-shared.h \ -@@ -472,6 +469,9 @@ endif - - if HAVE_NATIVE_BACKEND - libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES += \ -+ backends/meta-gles3.c \ -+ backends/meta-gles3.h \ -+ backends/meta-gles3-table.h \ - backends/native/meta-backend-native.c \ - backends/native/meta-backend-native.h \ - backends/native/meta-backend-native-private.h \ --- -2.17.0 - diff --git a/x11-wm/mutter/files/3.30-eglmesaext-include.patch b/x11-wm/mutter/files/3.30-eglmesaext-include.patch deleted file mode 100644 index 884d57cc6f0..00000000000 --- a/x11-wm/mutter/files/3.30-eglmesaext-include.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 813ea4e5743920ecf325aac8efe420bd5fe3baf2 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Sun, 20 Oct 2019 12:04:31 +0200 -Subject: [PATCH] EGL: Include EGL/eglmesaext.h - -The eglext.h shipped by libglvnd does not include the Mesa extensions, -unlike the header shipped in Mesa. - -Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876 ---- - cogl/configure.ac | 3 ++- - src/backends/meta-egl-ext.h | 1 + - src/backends/meta-egl.c | 1 + - src/backends/meta-egl.h | 1 + - 4 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/cogl/configure.ac b/cogl/configure.ac -index 3be282fc2..f333b0512 100644 ---- a/cogl/configure.ac -+++ b/cogl/configure.ac -@@ -759,7 +759,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], - ) - - COGL_EGL_INCLUDES="#include <EGL/egl.h> --#include <EGL/eglext.h>" -+#include <EGL/eglext.h> -+#include <EGL/eglmesaext.h>" - AC_SUBST([COGL_EGL_INCLUDES]) - ]) - -diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h -index 8705e7d5b..db0b74f76 100644 ---- a/src/backends/meta-egl-ext.h -+++ b/src/backends/meta-egl-ext.h -@@ -29,6 +29,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - /* - * This is a little different to the tests shipped with EGL implementations, -diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c -index 755ec4908..bd253c956 100644 ---- a/src/backends/meta-egl.c -+++ b/src/backends/meta-egl.c -@@ -31,6 +31,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <gio/gio.h> - #include <glib.h> - #include <glib-object.h> -diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h -index 060c7cd2d..2fef2642e 100644 ---- a/src/backends/meta-egl.h -+++ b/src/backends/meta-egl.h -@@ -27,6 +27,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <glib-object.h> - - #define META_EGL_ERROR meta_egl_error_quark () --- -2.23.0 - diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild deleted file mode 100644 index 12b4bdab7b3..00000000000 --- a/x11-wm/mutter/mutter-3.30.2-r4.ebuild +++ /dev/null @@ -1,153 +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-<api_version>.pc) should use the subslot - -IUSE="debug elogind gles2 input_devices_wacom +introspection screencast systemd test udev wayland" -RESTRICT="!test? ( test )" -# 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?] - <gnome-base/gsettings-desktop-schemas-3.31 - gnome-base/gnome-desktop:3= - - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=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? ( >=dev-libs/libgudev-232:= ) - screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) - wayland? ( - >=dev-libs/libgudev-232:= - >=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/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 - - "${FILESDIR}"/3.30-eglmesaext-include.patch -) - -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 \ - $(usex debug --enable-debug=yes "") \ - $(use_enable gles2) \ - $(use_enable gles2 cogl-gles2) \ - $(use_enable introspection) \ - $(use_enable screencast remote-desktop) \ - $(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 -}
