1 |
commit: 792bfb768f83e2a32339d333b36c9b6472d9d819 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 30 22:49:54 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 30 22:49:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792bfb76 |
7 |
|
8 |
x11-wm/mutter: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
x11-wm/mutter/Manifest | 2 - |
14 |
x11-wm/mutter/mutter-3.28.3-r1.ebuild | 152 ---------------------------------- |
15 |
2 files changed, 154 deletions(-) |
16 |
|
17 |
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest |
18 |
index 894ec4ed6bc..d22dacf44b3 100644 |
19 |
--- a/x11-wm/mutter/Manifest |
20 |
+++ b/x11-wm/mutter/Manifest |
21 |
@@ -1,7 +1,5 @@ |
22 |
DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3 |
23 |
DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90 |
24 |
DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b |
25 |
-DIST mutter-3.28.3-patchset.tar.xz 44308 BLAKE2B c9ecac6fc91d0f5d07be3f407332267ac6ee83d65ec7650461a990e87dd81c0b6bf37893441ebcd084730d6bbe4ecf851e5083660979aebce237d5fdd2485bb1 SHA512 3d057faf1dfbe5ea38c8207d16377c9024772fb2111f0cdc9867de63ed158534d6ae5a23413b2f258c1c85278abbf1ac0156f0322e9df717ea09ba45d5f8650f |
26 |
-DIST mutter-3.28.3.tar.xz 3693812 BLAKE2B 491a4cc47d54d2a72adffd808ac64d90914f5a5bd653ba2b147993ee4a0862fbe61a666a3adf322ed4fd4af99c4cf9890b7bb19f9f0451039d1d797cfd616e3b SHA512 1230e4489693188c4d9ffe5460b235cd018b16f27741451120c3acb6027901d5286d9793cc0c9ad50a2233ff20ea91e7a47c0df611bb4479f1e33af0d185f69a |
27 |
DIST mutter-3.30.2-patchset.tar.xz 9968 BLAKE2B 7b664f35eec3cb6f298d5628bc7c0dd9697076f4fcfca431d08581d2c3054fbad952802a3279b174f207b5c6fdea2f29811352c7b2b1119e87bf689c1cbc8ce1 SHA512 949acecf66cf9060527c2a3559f831cfbe9ed68007ae2ca94df920c8691bc28d5577d15fe1bd9c2fddef978b23b29d4e6dfef16c232a96fd5006ed844321b957 |
28 |
DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e |
29 |
|
30 |
diff --git a/x11-wm/mutter/mutter-3.28.3-r1.ebuild b/x11-wm/mutter/mutter-3.28.3-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 2e93942d855..00000000000 |
33 |
--- a/x11-wm/mutter/mutter-3.28.3-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,152 +0,0 @@ |
36 |
-# Copyright 1999-2019 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
-GNOME2_EAUTORECONF="yes" |
41 |
-inherit gnome2 virtualx |
42 |
- |
43 |
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter" |
44 |
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" |
45 |
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
46 |
- |
47 |
-LICENSE="GPL-2+" |
48 |
-SLOT="0/2" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot |
49 |
- |
50 |
-IUSE="debug elogind gles2 input_devices_wacom +introspection systemd test udev wayland" |
51 |
-# native backend requires gles3 for hybrid graphics blitting support and a logind provider |
52 |
-# gles2 may be avoidable, but probably not worth the effort before switching to meson; without it, it seems it'll have subtle lost features as well that isn't explained to user atm. |
53 |
-REQUIRED_USE=" |
54 |
- wayland? ( |
55 |
- ^^ ( elogind systemd ) |
56 |
- gles2 |
57 |
- )" |
58 |
- |
59 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
60 |
- |
61 |
-# libXi-1.7.4 or newer needed per: |
62 |
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944 |
63 |
-# 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 |
64 |
-RDEPEND=" |
65 |
- >=dev-libs/atk-2.5.3 |
66 |
- >=x11-libs/gdk-pixbuf-2:2 |
67 |
- >=dev-libs/json-glib-0.12.0 |
68 |
- >=x11-libs/pango-1.30[introspection?] |
69 |
- >=x11-libs/cairo-1.14[X] |
70 |
- >=x11-libs/gtk+-3.19.8:3[X,introspection?] |
71 |
- >=dev-libs/glib-2.53.2:2 |
72 |
- >=media-libs/libcanberra-0.26[gtk3] |
73 |
- >=x11-libs/startup-notification-0.7 |
74 |
- >=x11-libs/libXcomposite-0.2 |
75 |
- >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] |
76 |
- gnome-base/gnome-desktop:3= |
77 |
- >sys-power/upower-0.99:= |
78 |
- |
79 |
- x11-libs/libICE |
80 |
- x11-libs/libSM |
81 |
- x11-libs/libX11 |
82 |
- >=x11-libs/libXcomposite-0.4 |
83 |
- x11-libs/libXcursor |
84 |
- x11-libs/libXdamage |
85 |
- x11-libs/libXext |
86 |
- >=x11-libs/libXfixes-3 |
87 |
- >=x11-libs/libXi-1.7.4 |
88 |
- x11-libs/libXinerama |
89 |
- >=x11-libs/libXrandr-1.5 |
90 |
- x11-libs/libXrender |
91 |
- x11-libs/libxcb |
92 |
- x11-libs/libxkbfile |
93 |
- >=x11-libs/libxkbcommon-0.4.3[X] |
94 |
- x11-misc/xkeyboard-config |
95 |
- |
96 |
- gnome-extra/zenity |
97 |
- media-libs/mesa[X(+),egl,gles2?] |
98 |
- |
99 |
- input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) |
100 |
- introspection? ( >=dev-libs/gobject-introspection-1.42:= ) |
101 |
- udev? ( >=virtual/libgudev-232:= ) |
102 |
- wayland? ( |
103 |
- >=dev-libs/libinput-1.4 |
104 |
- >=dev-libs/wayland-1.13.0 |
105 |
- >=dev-libs/wayland-protocols-1.12 |
106 |
- >=media-libs/mesa-10.3[egl,gbm,wayland] |
107 |
- systemd? ( sys-apps/systemd ) |
108 |
- elogind? ( sys-auth/elogind ) |
109 |
- >=virtual/libgudev-232:= |
110 |
- >=virtual/libudev-136:= |
111 |
- x11-base/xorg-server[wayland] |
112 |
- x11-libs/libdrm:= |
113 |
- ) |
114 |
-" |
115 |
-DEPEND="${RDEPEND} |
116 |
- dev-util/glib-utils |
117 |
- >=sys-devel/gettext-0.19.6 |
118 |
- virtual/pkgconfig |
119 |
- x11-base/xorg-proto |
120 |
- test? ( app-text/docbook-xml-dtd:4.5 ) |
121 |
- wayland? ( >=sys-kernel/linux-headers-4.4 ) |
122 |
-" |
123 |
- |
124 |
-PATCHES=( |
125 |
- # Lots of patches from gnome-3-28 branch on top of 3.28.3 |
126 |
- "${WORKDIR}"/patches/ |
127 |
- # Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2] |
128 |
- "${FILESDIR}"/${PV}-no-gles2-fix.patch |
129 |
-) |
130 |
- |
131 |
-src_prepare() { |
132 |
- # Disable building of noinst_PROGRAM for tests |
133 |
- if ! use test; then |
134 |
- sed -e '/^noinst_PROGRAMS/d' \ |
135 |
- -i cogl/tests/conform/Makefile.{am,in} || die |
136 |
- sed -e '/noinst_PROGRAMS += testboxes/d' \ |
137 |
- -i src/Makefile-tests.am || die |
138 |
- sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \ |
139 |
- -i src/Makefile.in || die |
140 |
- fi |
141 |
- |
142 |
- gnome2_src_prepare |
143 |
- |
144 |
- # Leave the damn CFLAGS alone |
145 |
- sed -e 's/$CFLAGS -g/$CFLAGS /' \ |
146 |
- -i clutter/configure || die |
147 |
- sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \ |
148 |
- -i cogl/configure || die |
149 |
- sed -e 's/$CFLAGS -g -O/$CFLAGS /' \ |
150 |
- -i configure || die |
151 |
-} |
152 |
- |
153 |
-src_configure() { |
154 |
- # TODO: pipewire remote desktop support; --disable-remote-desktop actually enables it due to upstream autotools bug in 3.26.2 (omitted means disabled) |
155 |
- # TODO: nvidia EGLDevice support |
156 |
- # 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 |
157 |
- # 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) |
158 |
- # Prefer gl driver by default |
159 |
- # GLX is forced by mutter but optional in clutter |
160 |
- # xlib-egl-platform required by mutter x11 backend |
161 |
- # native backend without wayland is useless |
162 |
- gnome2_src_configure \ |
163 |
- --disable-static \ |
164 |
- --enable-compile-warnings=minimum \ |
165 |
- --enable-gl \ |
166 |
- --enable-glx \ |
167 |
- --enable-sm \ |
168 |
- --enable-startup-notification \ |
169 |
- --enable-verbose-mode \ |
170 |
- --enable-xlib-egl-platform \ |
171 |
- --with-default-driver=gl \ |
172 |
- --with-libcanberra \ |
173 |
- $(usex debug --enable-debug=yes "") \ |
174 |
- $(use_enable gles2) \ |
175 |
- $(use_enable gles2 cogl-gles2) \ |
176 |
- $(use_enable introspection) \ |
177 |
- $(use_enable wayland) \ |
178 |
- $(use_enable wayland kms-egl-platform) \ |
179 |
- $(use_enable wayland native-backend) \ |
180 |
- $(use_enable wayland wayland-egl-server) \ |
181 |
- $(use_with input_devices_wacom libwacom) \ |
182 |
- $(use_with udev gudev) |
183 |
-} |
184 |
- |
185 |
-src_test() { |
186 |
- virtx emake check |
187 |
-} |