diff options
| -rw-r--r-- | media-libs/clutter/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/clutter/clutter-1.18.4.ebuild | 96 | ||||
| -rw-r--r-- | media-libs/clutter/clutter-1.20.0.ebuild | 112 | ||||
| -rw-r--r-- | media-libs/clutter/clutter-1.22.4.ebuild (renamed from media-libs/clutter/clutter-1.22.2.ebuild) | 8 | ||||
| -rw-r--r-- | media-libs/clutter/metadata.xml | 8 |
5 files changed, 16 insertions, 217 deletions
diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog index 1f8be7315c6d..0e3308575294 100644 --- a/media-libs/clutter/ChangeLog +++ b/media-libs/clutter/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/clutter # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.99 2015/06/26 09:22:53 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.100 2015/07/04 13:45:13 pacho Exp $ + +*clutter-1.22.4 (04 Jul 2015) + + 04 Jul 2015; Pacho Ramos <pacho@gentoo.org> +clutter-1.22.4.ebuild, + -clutter-1.18.4.ebuild, -clutter-1.20.0.ebuild, -clutter-1.22.2.ebuild, + metadata.xml: + Version bump, drop old 26 Jun 2015; Agostino Sarubbo <ago@gentoo.org> clutter-1.20.2.ebuild: Stable for x86, wrt bug #551814 diff --git a/media-libs/clutter/clutter-1.18.4.ebuild b/media-libs/clutter/clutter-1.18.4.ebuild deleted file mode 100644 index 577b947e76f6..000000000000 --- a/media-libs/clutter/clutter-1.18.4.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.18.4.ebuild,v 1.4 2015/02/04 16:09:34 chithanh Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -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" - -# 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 -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] - >=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 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.20 - virtual/pkgconfig - >=sys-devel/gettext-0.17 - doc? ( - >=dev-util/gtk-doc-1.20 - >=app-text/docbook-sgml-utils-0.6.14[jadetex] - dev-libs/libxslt ) - test? ( x11-libs/gdk-pixbuf )" - -# Tests fail with both swrast and llvmpipe -# They pass under r600g or i965, so the bug is in mesa -#RESTRICT="test" - -src_prepare() { - # We only need conformance tests, the rest are useless for us - sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \ - -i tests/Makefile.am || die "am tests sed failed" - sed -e 's/^\(SUBDIRS =\)[^\]*/\1 accessibility conform/g' \ - -i tests/Makefile.in || die "in tests sed failed" - - gnome2_src_prepare -} - -src_configure() { - # 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? - 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 \ - $(usex debug --enable-debug=yes --enable-debug=minimum) \ - $(use_enable doc docs) \ - $(use_enable gtk gdk-backend) \ - $(use_enable introspection) \ - $(use_enable test gdk-pixbuf) -} - -src_test() { - Xemake check -C tests/conform -} diff --git a/media-libs/clutter/clutter-1.20.0.ebuild b/media-libs/clutter/clutter-1.20.0.ebuild deleted file mode 100644 index 7a51c87b8630..000000000000 --- a/media-libs/clutter/clutter-1.20.0.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.20.0.ebuild,v 1.4 2015/03/15 13:28:34 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -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="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 -# do not depend on tslib, it does not build and is disable by default upstream -# <dev-libs/libinput-0.8 due to Gnome bugzilla #742829 -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,wayland?] - >=x11-libs/cairo-1.12:=[aqua?,glib] - >=x11-libs/pango-1.30[introspection?] - - virtual/opengl - x11-libs/libdrm:= - - egl? ( - >=dev-libs/libinput-0.4 - <dev-libs/libinput-0.8 - 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 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - doc? ( - >=dev-util/gtk-doc-1.20 - >=app-text/docbook-sgml-utils-0.6.14[jadetex] - dev-libs/libxslt ) - test? ( x11-libs/gdk-pixbuf )" - -# Tests fail with both swrast and llvmpipe -# They pass under r600g or i965, so the bug is in mesa -#RESTRICT="test" - -src_prepare() { - # We only need conformance tests, the rest are useless for us - sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \ - -i tests/Makefile.am || die "am tests sed failed" - sed -e 's/^\(SUBDIRS =\)[^\]*/\1 accessibility conform/g' \ - -i tests/Makefile.in || die "in tests sed failed" - - gnome2_src_prepare -} - -src_configure() { - # 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/win32 backends? - gnome2_src_configure \ - --disable-profile \ - --disable-maintainer-flags \ - --disable-gcov \ - --disable-cex100-backend \ - --disable-win32-backend \ - --disable-tslib-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 wayland wayland-backend) \ - $(use_enable wayland wayland-compositor) \ - $(use_enable X xinput) \ - $(use_enable X x11-backend) -} - -src_test() { - Xemake check -C tests/conform -} diff --git a/media-libs/clutter/clutter-1.22.2.ebuild b/media-libs/clutter/clutter-1.22.4.ebuild index 01b4cb11bc0b..51b775d48a0c 100644 --- a/media-libs/clutter/clutter-1.22.2.ebuild +++ b/media-libs/clutter/clutter-1.22.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.22.2.ebuild,v 1.1 2015/06/08 22:23:32 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.22.4.ebuild,v 1.1 2015/07/04 13:45:13 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -41,7 +41,7 @@ RDEPEND=" x11-libs/libxkbcommon ) gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] ) - introspection? ( >=dev-libs/gobject-introspection-1.39 ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) X? ( media-libs/fontconfig >=x11-libs/libX11-1.3.1 @@ -62,8 +62,8 @@ DEPEND="${RDEPEND} >=dev-util/gtk-doc-1.20 >=app-text/docbook-sgml-utils-0.6.14[jadetex] dev-libs/libxslt ) - test? ( x11-libs/gdk-pixbuf )" - + test? ( x11-libs/gdk-pixbuf ) +" # Tests fail with both swrast and llvmpipe # They pass under r600g or i965, so the bug is in mesa #RESTRICT="test" diff --git a/media-libs/clutter/metadata.xml b/media-libs/clutter/metadata.xml index 845747c5f63a..e82af824d4b8 100644 --- a/media-libs/clutter/metadata.xml +++ b/media-libs/clutter/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>gnome</herd> - <use> +<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> + <flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image rendering backend</flag> +</use> </pkgmetadata> |