[gentoo-commits] proj/gnome:master commit in: x11-wm/mutter/

[Sobhan Mohammadpour]

commit:     4888703c90cb3a9b545a8f2df8b08a98f1bbe618
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 22:34:00 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Tue May 29 22:34:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4888703c

x11-wm/mutter: x11-base/xorg-proto and sync live ebuild

x11-proto/* dependencies should be updated to x11-base/xorg-proto

Bug:https://bugs.gentoo.org/656306

Package-Manager: Portage-2.3.36, Repoman-2.3.9
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 x11-wm/mutter/metadata.xml                         |   2 +-
 ...utter-3.26.1.ebuild => mutter-3.26.1-r1.ebuild} |   4 +-
 x11-wm/mutter/mutter-9999.ebuild                   | 119 ++++++++++++++-------
 3 files changed, 81 insertions(+), 44 deletions(-)

diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 59b7f540..73abedd9 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="kms">Enable KMS support.</flag>
+		<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-wm/mutter/mutter-3.26.1.ebuild b/x11-wm/mutter/mutter-3.26.1-r1.ebuild
similarity index 98%
rename from x11-wm/mutter/mutter-3.26.1.ebuild
rename to x11-wm/mutter/mutter-3.26.1-r1.ebuild
index 7d5a008b..ab9e1ae9 100644
--- a/x11-wm/mutter/mutter-3.26.1.ebuild
+++ b/x11-wm/mutter/mutter-3.26.1-r1.ebuild
@@ -70,9 +70,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
 	wayland? ( >=sys-kernel/linux-headers-4.4 )
 "

diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index ea948333..156bf46c 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -1,11 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
+EAPI=6
+inherit gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -14,41 +11,40 @@ DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="https://git.gnome.org/browse/mutter/"
 
 LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +kms test wayland"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+SLOT="0/0"
+#FIXME add remote desktop support
+IUSE="debug gles2 input_devices_wacom +introspection test udev wayland"
+
+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
 COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.10[X]
+	>=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.36.0:2[dbus]
-	>=media-libs/clutter-1.25.6:1.0[X,introspection?]
-	>=media-libs/cogl-1.17.1:1.0=[introspection?]
+	>=dev-libs/glib-2.53.2:2[dbus]
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
-	>=gnome-base/gsettings-desktop-schemas-3.19.3[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
 	gnome-base/gnome-desktop:3=
 	>sys-power/upower-0.99:=
 
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.2
+	>=x11-libs/libXcomposite-0.4
 	x11-libs/libXcursor
 	x11-libs/libXdamage
 	x11-libs/libXext
-	x11-libs/libXfixes
+	>=x11-libs/libXfixes-3
 	>=x11-libs/libXi-1.7.4
 	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.5.0
+	>=x11-libs/libXrandr-1.5
 	x11-libs/libXrender
 	x11-libs/libxcb
 	x11-libs/libxkbfile
@@ -56,42 +52,85 @@ COMMON_DEPEND="
 	x11-misc/xkeyboard-config
 
 	gnome-extra/zenity
+	media-libs/mesa[egl]
 
+	gles2? ( media-libs/mesa[gles2] )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
 	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-	kms? (
-		dev-libs/libinput
-		>=media-libs/clutter-1.20[egl]
-		media-libs/cogl:1.0=[kms]
-		>=media-libs/mesa-10.3[gbm]
-		sys-apps/systemd
-		virtual/libgudev
-		x11-libs/libdrm:= )
+	udev? ( >=virtual/libgudev-232:= )
 	wayland? (
-		>=dev-libs/wayland-1.6.90
-		>=media-libs/clutter-1.20[wayland]
-		x11-base/xorg-server[wayland] )
+		>=dev-libs/libinput-1.4
+		>=dev-libs/wayland-1.13
+		>=dev-libs/wayland-protocols-1.9
+		>=media-libs/mesa-10.3[egl,gbm,wayland]
+		sys-apps/systemd
+		>=virtual/libgudev-232:=
+		>=virtual/libudev-136:=
+		x11-base/xorg-server[wayland]
+		x11-libs/libdrm:=
+	)
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.41
-	sys-devel/gettext
+	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? ( >=sys-kernel/linux-headers-4.4 )
 "
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity
 "
 
+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() {
+	# 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 kms native-backend) \
-		$(use_enable wayland)
+		$(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
 }