commit: 48876a3a6d96c46f26a33523b59c13362bf3a51b
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 08:43:13 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 08:49:23 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=48876a3a
Add x11-wm/mutter-3.16.1.1
Package-Manager: portage-2.2.14
Manifest-Sign-Key: 7E8B4D42
x11-wm/mutter/files/mutter-3.14.2-automagic.patch | 90 ---------------------
.../mutter-3.2.1-ignore-shadow-and-padding.patch | 91 ----------------------
x11-wm/mutter/metadata.xml | 5 +-
.../{mutter-9999.ebuild => mutter-3.16.1.1.ebuild} | 44 ++++-------
x11-wm/mutter/mutter-9999.ebuild | 15 +---
5 files changed, 20 insertions(+), 225 deletions(-)
diff --git a/x11-wm/mutter/files/mutter-3.14.2-automagic.patch
b/x11-wm/mutter/files/mutter-3.14.2-automagic.patch
deleted file mode 100644
index 3956004..0000000
--- a/x11-wm/mutter/files/mutter-3.14.2-automagic.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From d723a752982e12b7a7fb7998c3e28efd9082abd9 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <[email protected]>
-Date: Mon, 8 Dec 2014 22:00:32 +0100
-Subject: [PATCH] Make wayland support optional
-
----
- configure.ac | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
- 1 file changed, 43 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0870afa..251f909 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -200,23 +200,49 @@ AC_SUBST(XWAYLAND_PATH)
-
- PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
-
--PKG_CHECK_MODULES(MUTTER_NATIVE_BACKEND, [clutter-egl-1.0 libdrm libsystemd
libinput gbm >= 10.3], [have_native_backend=yes], [have_native_backend=no])
--if test $have_native_backend = yes; then
-- AC_DEFINE([HAVE_NATIVE_BACKEND],[1],[Define if you want to enable the
native (KMS) backend based on systemd])
--fi
--AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test $have_native_backend = yes])
--
--PKG_CHECK_MODULES(MUTTER_WAYLAND, [clutter-wayland-1.0
clutter-wayland-compositor-1.0 wayland-server >= 1.5.90], [have_wayland=yes],
[have_wayland=no])
--if test $have_wayland = yes; then
-- AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
-- AS_IF([test $WAYLAND_SCANNER = "no"],
-- AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for
parsing wayland extension protocols]))
-- AC_SUBST([WAYLAND_SCANNER])
--
-- AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland
support])
--fi
-+have_wayland=no
-+AC_ARG_ENABLE(
-+ [wayland],
-+ AS_HELP_STRING([--disable-wayland], [disable mutter on wayland support]),
-+ [],
-+ enable_wayland=yes
-+)
-+AS_IF([test "$enable_wayland" != "no"],
-+ [
-+ PKG_CHECK_MODULES([MUTTER_WAYLAND],
-+ [clutter-wayland-1.0 clutter-wayland-compositor-1.0
wayland-server >= 1.5.90],
-+ [
-+ have_wayland=yes
-+
AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
-+ AS_IF([test $WAYLAND_SCANNER = "no"],
-+ [AC_MSG_ERROR([Could not find
wayland-scanner in your PATH, required for parsing wayland extension
protocols])])
-+ AC_SUBST([WAYLAND_SCANNER])
-+ AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want
to enable Wayland support])
-+ ],
-+ [have_wayland=no])
-+])
- AM_CONDITIONAL([HAVE_WAYLAND],[test $have_wayland = yes])
-
-+have_native_backend=no
-+AC_ARG_ENABLE(
-+ [native-backend],
-+ AS_HELP_STRING([--disable-native-backend], [disable mutter native (KMS)
backend]),
-+ [],
-+ enable_native_backend=yes
-+)
-+AS_IF([test "$enable_native_backend" != "no"],
-+ [
-+ PKG_CHECK_MODULES([MUTTER_NATIVE_BACKEND],
-+ [clutter-egl-1.0 libdrm libsystemd libinput
gudev-1.0 gbm >= 10.3],
-+ [
-+ have_native_backend=yes
-+ AC_DEFINE([HAVE_NATIVE_BACKEND],[1],
-+ [Define if you want to enable the
native (KMS) backend based on systemd])
-+ ],
-+ [have_native_backend=no])
-+])
-+AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test $have_native_backend = yes])
-+
- PKG_CHECK_EXISTS([xi >= 1.6.99.1],
- AC_DEFINE([HAVE_XI23],[1],[Define if you have support for
XInput 2.3 or greater]))
-
-@@ -416,6 +442,8 @@ mutter-$VERSION
- libcanberra: ${have_libcanberra}
- Introspection: ${found_introspection}
- Session management: ${found_sm}
-+ Wayland: ${have_wayland}
-+ Native (KMS) backend: ${have_native_backend}
- "
-
-
---
-2.2.0
-
diff --git a/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch
b/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch
deleted file mode 100644
index bf4649e..0000000
--- a/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Patch author: Timo Kluck <[email protected]> Wed, 21 Sep 2011 17:51:28 +0200
-
-Patch to silently ignore padding and shadow tags in Ubuntu metacity themes.
-
-https://bugs.launchpad.net/bugs/800315
-https://bugs.gentoo.org/show_bug.cgi?id=396673
-
-diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
-index 9063541..63a881f 100644
---- a/src/ui/theme-parser.c
-+++ b/src/ui/theme-parser.c
-@@ -90,7 +90,9 @@ typedef enum
- STATE_WINDOW,
- /* things we don't use any more but we can still parse: */
- STATE_MENU_ICON,
-- STATE_FALLBACK
-+ STATE_FALLBACK,
-+ /* an ubuntu specific ignore-this-element state */
-+ UBUNTU_STATE_IGNORE
- } ParseState;
-
- typedef struct
-@@ -1306,7 +1308,19 @@ parse_toplevel_element (GMarkupParseContext *context,
- */
- push_state (info, STATE_FALLBACK);
- }
-- else
-+ else if (ELEMENT_IS ("shadow"))
-+ {
-+ /* ubuntu specific, workaround for light-themes: silently ignore
shadow tag.
-+ */
-+ push_state (info, UBUNTU_STATE_IGNORE);
-+ }
-+ else if (ELEMENT_IS ("padding"))
-+ {
-+ /* ubuntu specific, workaround for light-themes: silently ignore
padding tag.
-+ */
-+ push_state (info, UBUNTU_STATE_IGNORE);
-+ }
-+ else
- {
- set_error (error, context,
- G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
-@@ -3027,6 +3041,18 @@ parse_style_element (GMarkupParseContext *context,
-
- push_state (info, STATE_BUTTON);
- }
-+ else if (ELEMENT_IS ("shadow"))
-+ {
-+ /* ubuntu specific, workaround for light-themes: silently ignore
shadow tag.
-+ */
-+ push_state (info, UBUNTU_STATE_IGNORE);
-+ }
-+ else if (ELEMENT_IS ("padding"))
-+ {
-+ /* ubuntu specific, workaround for light-themes: silently ignore
padding tag.
-+ */
-+ push_state (info, UBUNTU_STATE_IGNORE);
-+ }
- else
- {
- set_error (error, context,
-@@ -3671,6 +3697,8 @@ start_element_handler (GMarkupParseContext *context,
- _("Element <%s> is not allowed inside a <%s> element"),
- element_name, "fallback");
- break;
-+ case UBUNTU_STATE_IGNORE:
-+ break;
- }
- }
-
-@@ -3960,6 +3988,9 @@ end_element_handler (GMarkupParseContext *context,
- pop_state (info);
- g_assert (peek_state (info) == STATE_THEME);
- break;
-+ case UBUNTU_STATE_IGNORE:
-+ pop_state (info);
-+ break;
- }
-
- pop_required_version (info);
-@@ -4165,6 +4196,9 @@ text_handler (GMarkupParseContext *context,
- case STATE_FALLBACK:
- NO_TEXT ("fallback");
- break;
-+ case UBUNTU_STATE_IGNORE:
-+ NO_TEXT ("ignored_element");
-+ break;
- }
- }
-
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 6e0e2ec..31e8de5 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>gnome</herd>
+ <herd>gnome</herd>
+ <use>
+ <flag name="kms">Enable KMS support.</flag>
+ </use>
</pkgmetadata>
diff --git a/x11-wm/mutter/mutter-9999.ebuild
b/x11-wm/mutter/mutter-3.16.1.1.ebuild
similarity index 67%
copy from x11-wm/mutter/mutter-9999.ebuild
copy to x11-wm/mutter/mutter-3.16.1.1.ebuild
index f18cc50..23eee1c 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-3.16.1.1.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.14.4.ebuild,v 1.1
2015/03/28 09:21:51 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
-inherit autotools eutils gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit eutils gnome2
DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
HOMEPAGE="http://git.gnome.org/browse/mutter/";
@@ -16,25 +13,23 @@ HOMEPAGE="http://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
+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]
>=x11-libs/gtk+-3.9.11:3[X,introspection?]
- >=dev-libs/glib-2.36.0:2
- >=media-libs/clutter-1.19.5:1.0[introspection?]
+ >=dev-libs/glib-2.36.0:2[dbus]
+ >=media-libs/clutter-1.21.3:1.0[introspection?]
>=media-libs/cogl-1.17.1:1.0=[introspection?]
>=media-libs/libcanberra-0.26[gtk3]
>=x11-libs/startup-notification-0.7
>=x11-libs/libXcomposite-0.2
- >=gnome-base/gsettings-desktop-schemas-3.7.3[introspection?]
+ >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
gnome-base/gnome-desktop:3=
- >sys-power/upower-0.99
+ >sys-power/upower-0.99:=
x11-libs/libICE
x11-libs/libSM
@@ -44,7 +39,7 @@ COMMON_DEPEND="
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
- >=x11-libs/libXi-1.7
+ >=x11-libs/libXi-1.7.4
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
@@ -55,10 +50,10 @@ COMMON_DEPEND="
gnome-extra/zenity
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ introspection? ( >=dev-libs/gobject-introspection-1.42:= )
kms? (
dev-libs/libinput
- media-libs/clutter[egl]
+ >=media-libs/clutter-1.20[egl]
media-libs/cogl:1.0=[kms]
>=media-libs/mesa-10.3[gbm]
sys-apps/systemd
@@ -66,7 +61,7 @@ COMMON_DEPEND="
x11-libs/libdrm:= )
wayland? (
>=dev-libs/wayland-1.5.90
- media-libs/clutter[wayland]
+ >=media-libs/clutter-1.20[wayland]
x11-base/xorg-server[wayland] )
"
DEPEND="${COMMON_DEPEND}
@@ -83,17 +78,6 @@ RDEPEND="${COMMON_DEPEND}
!x11-misc/expocity
"
-src_prepare() {
- # Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
- epatch "${FILESDIR}"/${PN}-3.2.1-ignore-shadow-and-padding.patch
-
- # Automagic fixes
- epatch "${FILESDIR}"/${PN}-3.14.2-automagic.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
src_configure() {
gnome2_src_configure \
--disable-static \
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index f18cc50..aa58f3d 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
-inherit autotools eutils gnome2
+inherit eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -83,17 +83,6 @@ RDEPEND="${COMMON_DEPEND}
!x11-misc/expocity
"
-src_prepare() {
- # Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
- epatch "${FILESDIR}"/${PN}-3.2.1-ignore-shadow-and-padding.patch
-
- # Automagic fixes
- epatch "${FILESDIR}"/${PN}-3.14.2-automagic.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
src_configure() {
gnome2_src_configure \
--disable-static \
