From: Gilles Dartiguelongue Date: Tue, 23 Dec 2014 23:52:48 +0000 (+0000) Subject: Version bump for Gnome 3.14. Dropped keywords, bug #526914. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ac32d86c40fe0e18dbbfa992618bdc98fbce483;p=gentoo.git Version bump for Gnome 3.14. Dropped keywords, bug #526914. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xC6085806 --- diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog index 403ec8b2bb2a..51af3699ecad 100644 --- a/x11-wm/mutter/ChangeLog +++ b/x11-wm/mutter/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-wm/mutter # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.48 2014/09/26 20:39:59 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.49 2014/12/23 23:52:45 eva Exp $ + +*mutter-3.14.3 (23 Dec 2014) + + 23 Dec 2014; Gilles Dartiguelongue +mutter-3.14.3.ebuild, + +files/mutter-3.14.2-automagic.patch, metadata.xml: + Version bump for Gnome 3.14. Dropped keywords, bug #526914. 26 Sep 2014; Pacho Ramos -mutter-3.10.4.ebuild, -mutter-3.12.1.ebuild, mutter-3.12.2.ebuild: diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 2df04d5b3568..57f5df5a907d 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,15 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX mutter-3.14.2-automagic.patch 3729 SHA256 ecf81fe37f517451b9d207351a10d939f11ae42f2085e02336ed4b3164285717 SHA512 0bd1dd46dd7c7148ec7323d31962b6922be30d184a0ccb02311a69f029c21d9fc479eac6b6efb3bf48fca8b0ecb38487705bef9a93fdb6275bed393175b3c878 WHIRLPOOL aed80cb8c9724c38f3fe45ce07cd9e55570a5e706e27a69b369610179f44c60b11c2d04857306b740117910287badc4af19782df36b8e9bee88c22ea602b2d65 AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 SHA256 765c04ba4d177789407a25d3cbdf358e3fa125170cfd37c53095372bc4ec883d SHA512 ba04a2265be9b2816ada33cb2dcf71ff02eb8667ada7c41139fc9e44e85a37030b8f0b7eb8064af2b6e691539a6dae5a0f8e66e06e2e3b803287eec798f13b52 WHIRLPOOL e85a2e27c9f036156dca68276793ea4bee5381ca43acdd85e7a37b4f577c6ae581be70866fa390a62fa4edf57d78b133185062642c96f30053a0b36f8c946893 DIST mutter-3.12.2.tar.xz 1695316 SHA256 e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173 SHA512 f13dfe1498f6b1d34850a81aeafed5429ed2536c4f81bc83d9ee9bf0892d9db4a4cdb7022e3fe6454265c0f2d8d3d4a4df191cf477a356f5bab8cffe87a3dc25 WHIRLPOOL fdc12dc9e59f8c30a725fe8dd71bfc4d05ffcf5fbc7494b7142f4651bf6c7afd3cd78d6002324863bd69a31d087eb2b0c8917d8e6c7a60220c848ae390851c83 +DIST mutter-3.14.3.tar.xz 1608232 SHA256 0b23a2d31980d9de8e92ef940e6f63e3ac0f6446e2afc69ecbc80163f6af3a23 SHA512 95e09a8361dfa3dca000f0a245d2c33eb135ee603f368cc4e6c63c3d28830a68658cc43eb114af285b7d2efbce256cbac8db2db7c84578f563dcdcf4032d246d WHIRLPOOL 7e06c9013a360d42dddc7ba844a375d4a5c5be441f265623c9c352a18b3f7d2e085a4698f4f61cc2527aa1a3a78c23d002603cd7eebe95f7afbe732adcdef0f5 EBUILD mutter-3.12.2.ebuild 2054 SHA256 55a5feab3bafbb9496c955a131dfc827545100b35d3ca180e89ab92603c8679b SHA512 d139065543c4cfbfde296a069241ad2fd1b554f69fbf18627aaa0e3c92039ba3e6874b44bdc33d172c4c67cbfe0fcf5c587e9e6a15f6277d0376ac337ace7467 WHIRLPOOL 699b36bbcfc48979edc3dc036b37e5942d062360df4b5fe9c2a8154a41c1ee5e14608efc874d105779c5d700b00b0b6fe785423a822ea6c76e9ad9ae5ec3ba5b -MISC ChangeLog 7870 SHA256 f54a6fd7910222efa62d13615ec5deb5bbe3f917e13cca7c5a438ee062a83485 SHA512 d0527a2358913b735922dc9e2b1c5cde2bf408c074dd3dd61c88fc0c7f18a0ba10103a8d790f31fc9ae7c7fd59f5f220ab075dc9ded67cb36ebc6a8436d91004 WHIRLPOOL ad8fe52d7306f2ea7db098305efa4ea9b4c13b52c0a4e33349f54cfc8b7610f3f93a3f84c9b4469fd157bbbaffeb5adfc23d265ae09e6d7a40e5e2f080cdd998 -MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e +EBUILD mutter-3.14.3.ebuild 2459 SHA256 25f6d5d10bf86b4af6b9aca5c0c26d513ddaba16dadd380cb54648dad915c5cd SHA512 6304081c19f62bcb2aeb7fe9ebc1a75f1f90232a425bc2233e2aaa9ff023ff08089f44ce5af340e97ce4de839cf60f88e4f129df6cfc88e5462b4d36e5bbb184 WHIRLPOOL d6527b675eaaa5157fea587d410a6404185fd10c91a83d678c8b7d50e8ca922ad7c327b7548c4f7c5fb29617564bca00346bb758a6ef0cd709253338de9a9658 +MISC ChangeLog 8092 SHA256 18b69420850d7acf57c0651b63b08dad4de5b0b9abae59d6f4214a3c8e068085 SHA512 2f12ca569cefa9dc474d5eae5f30376781b84c7c9b21c66b08b9bbf11921f9247994d06bc924c890a8351118ecec0ea64ccaf39334db7687385efea2844bd319 WHIRLPOOL a129350a3ef8398ef4c33ec075a31002d17170441d1e140d4d445766d3b913fc13c01bfcd2a1dbfb07b7232cf6fa33165846c43bfe5b3df7c4cace276ffce483 +MISC metadata.xml 220 SHA256 c8529b9b3e1e8f43611e9431beebf801acec0d5df9fb467db8cb6ac17717bebb SHA512 0a65108bef9b975d46c24eda273bbb36457442275685140267285ea176fefe1bb53ff4c301e746cd2563805c26e11392413b02ffd67d9f4888c1026f10d77d38 WHIRLPOOL 9314aaf1e1d6554f10dc9751105f1eebd5d4d632bb56610d1fc8ff34032f2fd14d9df7b178cebc0bea1eaa27525634f95548d05498773aa5feb0dc46dd248049 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQlzyAACgkQCaWpQKGI+9ThbQCfYHT8rw1Fr3cU47qEDxWqHmF7 -Xm4An0YEigGndgKRFqV85A2DWrOOEDLW -=wfeG +iEYEAREIAAYFAlSaAE4ACgkQ1fmVwcYIWAZfnQCggH8I6MUqHTmIVe6PEt+PPWb1 +Dm4An1Ki5sRTNfp/WoB6jJNDuOZS0Jsb +=7Vyk -----END PGP SIGNATURE----- diff --git a/x11-wm/mutter/files/mutter-3.14.2-automagic.patch b/x11-wm/mutter/files/mutter-3.14.2-automagic.patch new file mode 100644 index 000000000000..3956004535a6 --- /dev/null +++ b/x11-wm/mutter/files/mutter-3.14.2-automagic.patch @@ -0,0 +1,90 @@ +From d723a752982e12b7a7fb7998c3e28efd9082abd9 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +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/metadata.xml b/x11-wm/mutter/metadata.xml index da6fd63d0085..31e8de5153d5 100644 --- a/x11-wm/mutter/metadata.xml +++ b/x11-wm/mutter/metadata.xml @@ -1,5 +1,8 @@ -gnome + gnome + + Enable KMS support. + diff --git a/x11-wm/mutter/mutter-3.14.3.ebuild b/x11-wm/mutter/mutter-3.14.3.ebuild new file mode 100644 index 000000000000..b108af3740f6 --- /dev/null +++ b/x11-wm/mutter/mutter-3.14.3.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.14.3.ebuild,v 1.1 2014/12/23 23:52:45 eva Exp $ + +EAPI="5" +GCONF_DEBUG="yes" + +inherit autotools eutils gnome2 + +DESCRIPTION="GNOME 3 compositing window manager based on Clutter" +HOMEPAGE="http://git.gnome.org/browse/mutter/" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="+introspection +kms test wayland" +KEYWORDS="~amd64 ~arm ~x86" + +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?] + >=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/gnome-desktop:3= + >sys-power/upower-0.99:= + + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + >=x11-libs/libXcomposite-0.2 + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + >=x11-libs/libXi-1.7 + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libxcb + x11-libs/libxkbfile + >=x11-libs/libxkbcommon-0.4.3[X] + x11-misc/xkeyboard-config + + gnome-extra/zenity + + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + 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:= ) + wayland? ( + >=dev-libs/wayland-1.5.90 + >=media-libs/clutter-1.20[wayland] + x11-base/xorg-server[wayland] ) +" +DEPEND="${COMMON_DEPEND} + >=dev-util/gtk-doc-am-1.15 + >=dev-util/intltool-0.41 + sys-devel/gettext + virtual/pkgconfig + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto + test? ( app-text/docbook-xml-dtd:4.5 ) +" +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 \ + --enable-sm \ + --enable-startup-notification \ + --enable-verbose-mode \ + --with-libcanberra \ + $(use_enable introspection) \ + $(use_enable kms native-backend) \ + $(use_enable wayland) +}