diff options
| -rw-r--r-- | media-libs/clutter/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/clutter/clutter-1.20.0.ebuild (renamed from media-libs/clutter/clutter-1.18.2.ebuild) | 76 | ||||
| -rw-r--r-- | media-libs/clutter/files/clutter-1.16.4-buffer-age.patch | 34 | ||||
| -rw-r--r-- | media-libs/clutter/metadata.xml | 1 |
4 files changed, 50 insertions, 69 deletions
diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog index 17c94e2b2f71..58943de7de60 100644 --- a/media-libs/clutter/ChangeLog +++ b/media-libs/clutter/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/clutter # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.90 2014/12/19 13:39:56 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.91 2014/12/23 22:53:28 eva Exp $ + +*clutter-1.20.0 (23 Dec 2014) + + 23 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> -clutter-1.18.2.ebuild, + +clutter-1.20.0.ebuild, -files/clutter-1.16.4-buffer-age.patch, metadata.xml: + Version bump for Gnome 3.14. Clean up old revision. 19 Dec 2014; Pacho Ramos <pacho@gentoo.org> clutter-1.18.4.ebuild: amd64 stable, bug 529964 diff --git a/media-libs/clutter/clutter-1.18.2.ebuild b/media-libs/clutter/clutter-1.20.0.ebuild index 3d8eb0ced6d6..5762b3c63a99 100644 --- a/media-libs/clutter/clutter-1.18.2.ebuild +++ b/media-libs/clutter/clutter-1.20.0.ebuild @@ -1,50 +1,64 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.18.2.ebuild,v 1.3 2014/07/23 15:19:07 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.20.0.ebuild,v 1.1 2014/12/23 22:53:28 eva Exp $ EAPI="5" -CLUTTER_LA_PUNT="yes" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" -# Inherit gnome2 after clutter to download sources from gnome.org -# since clutter-project.org doesn't provide .xz tarballs -inherit clutter gnome2 virtualx +inherit gnome2 virtualx +HOMEPAGE="https://wiki.gnome.org/Projects/Clutter" DESCRIPTION="Clutter is a library for creating graphical user interfaces" LICENSE="LGPL-2.1+ FDL-1.1+" SLOT="1.0" -IUSE="debug doc gtk +introspection test" # evdev tslib -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" +IUSE="aqua debug doc egl gtk +introspection test wayland +X" +REQUIRED_USE=" + || ( aqua wayland X ) + wayland? ( egl ) +" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" # NOTE: glx flavour uses libdrm + >=mesa-7.3 # XXX: uprof needed for profiling # >=libX11-1.3.1 needed for X Generic Event support -# XXX: evdev input requires libinput and gudev >= 136 +# do not depend on tslib, it does not build and is disable by default upstream RDEPEND=" >=dev-libs/glib-2.37.3:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs/json-glib-0.12[introspection?] - >=media-libs/cogl-1.17.5:1.0=[introspection?,pango] - media-libs/fontconfig - >=x11-libs/cairo-1.12:=[glib] + >=media-libs/cogl-1.17.5:1.0=[introspection?,pango,wayland?] + >=x11-libs/cairo-1.12:=[aqua?,glib] >=x11-libs/pango-1.30[introspection?] virtual/opengl x11-libs/libdrm:= - >=x11-libs/libX11-1.3.1 - x11-libs/libXext - x11-libs/libXdamage - x11-proto/inputproto - >=x11-libs/libXi-1.3 - >=x11-libs/libXcomposite-0.4 - gtk? ( >=x11-libs/gtk+-3.3.18:3 ) + egl? ( + >=dev-libs/libinput-0.4 + media-libs/cogl[gles2,kms] + >=virtual/libgudev-136 + x11-libs/libxkbcommon + ) + gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) + X? ( + media-libs/fontconfig + >=x11-libs/libX11-1.3.1 + x11-libs/libXext + x11-libs/libXdamage + x11-proto/inputproto + >=x11-libs/libXi-1.3 + >=x11-libs/libXcomposite-0.4 ) + wayland? ( + dev-libs/wayland + x11-libs/gdk-pixbuf:2 ) " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.20 - virtual/pkgconfig >=sys-devel/gettext-0.17 + virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.20 >=app-text/docbook-sgml-utils-0.6.14[jadetex] @@ -66,37 +80,31 @@ src_prepare() { } src_configure() { - DOCS="README NEWS ChangeLog*" - # XXX: Conformance test suite (and clutter itself) does not work under Xvfb # (GLX error blabla) # XXX: Profiling, coverage disabled for now - # XXX: What about cex100/egl/osx/wayland/win32 backends? - # XXX: evdev/tslib input seem to be experimental? + # XXX: What about cex100/win32 backends? gnome2_src_configure \ - --enable-xinput \ - --enable-x11-backend=yes \ --disable-profile \ --disable-maintainer-flags \ --disable-gcov \ --disable-cex100-backend \ - --disable-egl-backend \ - --disable-quartz-backend \ - --disable-wayland-backend \ --disable-win32-backend \ --disable-tslib-input \ - --disable-evdev-input \ + $(use_enable aqua quartz-backend) \ $(usex debug --enable-debug=yes --enable-debug=minimum) \ $(use_enable doc docs) \ + $(use_enable egl egl-backend) \ + $(use_enable egl evdev-input) \ $(use_enable gtk gdk-backend) \ $(use_enable introspection) \ - $(use_enable test gdk-pixbuf) + $(use_enable test gdk-pixbuf) \ + $(use_enable wayland wayland-backend) \ + $(use_enable wayland wayland-compositor) \ + $(use_enable X xinput) \ + $(use_enable X x11-backend) } src_test() { Xemake check -C tests/conform } - -src_install() { - clutter_src_install -} diff --git a/media-libs/clutter/files/clutter-1.16.4-buffer-age.patch b/media-libs/clutter/files/clutter-1.16.4-buffer-age.patch deleted file mode 100644 index c42101e006d9..000000000000 --- a/media-libs/clutter/files/clutter-1.16.4-buffer-age.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6665f47d66a871b6e1a5f4200282f42da043a0e8 Mon Sep 17 00:00:00 2001 -From: Adel Gadllah <adel.gadllah@gmail.com> -Date: Sun, 16 Feb 2014 21:07:43 +0000 -Subject: stage-cogl: Fix buffer_age code path - -Currently we where checking whether the damage_history list contains -more or equal then buffer_age entries. This is wrong because we prepend -our current clip to the list just before the check. - -Fix that to check whether we have more entries instead of more or equal. - -https://bugzilla.gnome.org/show_bug.cgi?id=724788 ---- -diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c -index 86546b1..cff8444 100644 ---- a/clutter/cogl/clutter-stage-cogl.c -+++ b/clutter/cogl/clutter-stage-cogl.c -@@ -483,11 +483,12 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window) - - stage_cogl->damage_history = g_slist_prepend (stage_cogl->damage_history, current_damage); - -- if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) >= age) -+ if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) > age) - { - int i = 0; - GSList *tmp = NULL; -- for (tmp = stage_cogl->damage_history; tmp; tmp = tmp->next) -+ /* We skip the first entry because it is the clip_region itself */ -+ for (tmp = stage_cogl->damage_history->next; tmp; tmp = tmp->next) - { - _clutter_util_rectangle_union (clip_region, tmp->data, clip_region); - i++; --- -cgit v0.9.2 diff --git a/media-libs/clutter/metadata.xml b/media-libs/clutter/metadata.xml index 029117044a1d..845747c5f63a 100644 --- a/media-libs/clutter/metadata.xml +++ b/media-libs/clutter/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <herd>gnome</herd> <use> + <flag name="egl">Enable EGL backend.</flag> <flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image rendering backend</flag> </use> </pkgmetadata> |