* [gentoo-commits] proj/gnome:master commit in: media-libs/clutter/, media-libs/clutter-gtk/
@ 2012-09-02 18:59 Nirbheek Chauhan
0 siblings, 0 replies; only message in thread
From: Nirbheek Chauhan @ 2012-09-02 18:59 UTC (permalink / raw
To: gentoo-commits
commit: 76fe6a393a4cce0a6f6241d685475b6a084b4e2b
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 2 05:04:55 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Sep 2 18:50:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=76fe6a39
Add media-libs-clutter{,-gtk} 1.11.12 and 1.3.2
---
media-libs/clutter-gtk/clutter-gtk-1.3.2.ebuild | 35 ++++++++++
media-libs/clutter-gtk/clutter-gtk-9999.ebuild | 42 ++++++++++++
...{clutter-9999.ebuild => clutter-1.11.12.ebuild} | 68 ++++++++++++-------
media-libs/clutter/clutter-9999.ebuild | 68 ++++++++++++-------
4 files changed, 163 insertions(+), 50 deletions(-)
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.3.2.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.3.2.ebuild
new file mode 100644
index 0000000..8fa5e49
--- /dev/null
+++ b/media-libs/clutter-gtk/clutter-gtk-1.3.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-1.2.0.ebuild,v 1.4 2012/07/14 13:21:33 blueness Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+CLUTTER_LA_PUNT="yes"
+
+# inherit clutter after gnome2 so that defaults aren't overriden
+inherit gnome2 clutter gnome.org
+
+DESCRIPTION="Clutter-GTK - GTK+3 Integration library for Clutter"
+
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="doc examples +introspection"
+
+# XXX: Needs gtk with X support (!directfb)
+RDEPEND="
+ >=x11-libs/gtk+-3.2.0:3[introspection?]
+ >=media-libs/clutter-1.9.16:1.0[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.18
+ doc? ( >=dev-util/gtk-doc-1.14 )"
+
+pkg_setup() {
+ DOCS="NEWS README"
+ EXAMPLES="examples/{*.c,redhand.png}"
+ G2CONF="${G2CONF}
+ --disable-maintainer-flags
+ --enable-deprecated
+ $(use_enable introspection)"
+}
diff --git a/media-libs/clutter-gtk/clutter-gtk-9999.ebuild b/media-libs/clutter-gtk/clutter-gtk-9999.ebuild
new file mode 100644
index 0000000..573fadf
--- /dev/null
+++ b/media-libs/clutter-gtk/clutter-gtk-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-1.2.0.ebuild,v 1.4 2012/07/14 13:21:33 blueness Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+CLUTTER_LA_PUNT="yes"
+
+# inherit clutter after gnome2 so that defaults aren't overriden
+inherit gnome2 clutter gnome.org
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
+
+DESCRIPTION="Clutter-GTK - GTK+3 Integration library for Clutter"
+
+SLOT="1.0"
+IUSE="doc examples +introspection"
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
+fi
+
+# XXX: Needs gtk with X support (!directfb)
+RDEPEND="
+ >=x11-libs/gtk+-3.2.0:3[introspection?]
+ >=media-libs/clutter-1.9.16:1.0[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.18
+ doc? ( >=dev-util/gtk-doc-1.14 )"
+
+pkg_setup() {
+ DOCS="NEWS README"
+ EXAMPLES="examples/{*.c,redhand.png}"
+ G2CONF="${G2CONF}
+ --disable-maintainer-flags
+ --enable-deprecated
+ $(use_enable introspection)"
+}
diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-1.11.12.ebuild
similarity index 55%
copy from media-libs/clutter/clutter-9999.ebuild
copy to media-libs/clutter/clutter-1.11.12.ebuild
index 40b96b9..49e9b65 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-1.11.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-9999.ebuild,v 1.3 2011/02/21 20:56:53 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.10.8.ebuild,v 1.2 2012/07/14 13:19:30 blueness Exp $
EAPI="4"
CLUTTER_LA_PUNT="yes"
@@ -8,7 +8,7 @@ WANT_AUTOMAKE="1.11"
# Inherit gnome2 after clutter to download sources from gnome.org
# since clutter-project.org doesn't provide .xz tarballs
-inherit clutter gnome2
+inherit clutter gnome2 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,25 +16,24 @@ fi
DESCRIPTION="Clutter is a library for creating graphical user interfaces"
SLOT="1.0"
-IUSE="debug doc +introspection"
+IUSE="debug doc gtk +introspection test" # evdev tslib
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
fi
# NOTE: glx flavour uses libdrm + >=mesa-7.3
# XXX: uprof needed for profiling
# >=libX11-1.3.1 needed for X Generic Event support
RDEPEND="
- >=dev-libs/glib-2.28:2
- >=dev-libs/atk-2.1.5[introspection?]
+ >=dev-libs/glib-2.31.19:2
+ >=dev-libs/atk-2.5.3[introspection?]
>=dev-libs/json-glib-0.12[introspection?]
- >=media-libs/cogl-1.8.0:1.0[introspection?,pango]
+ >=media-libs/cogl-1.9.6:1.0[introspection?,pango]
media-libs/fontconfig
>=x11-libs/cairo-1.10[glib]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/pango-1.20[introspection?]
+ >=x11-libs/pango-1.30[introspection?]
virtual/opengl
x11-libs/libdrm
@@ -46,40 +45,52 @@ RDEPEND="
>=x11-libs/libXfixes-3
>=x11-libs/libXcomposite-0.4
+ gtk? ( >=x11-libs/gtk+-3.3.18:3 )
introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
DEPEND="${RDEPEND}
- sys-devel/gettext
+ >=dev-util/gtk-doc-am-1.15
virtual/pkgconfig
- >=dev-util/gtk-doc-am-1.13
+ >=sys-devel/gettext-0.17
doc? (
- >=dev-util/gtk-doc-1.13
+ >=dev-util/gtk-doc-1.15
>=app-text/docbook-sgml-utils-0.6.14[jadetex]
- dev-libs/libxslt )"
+ dev-libs/libxslt )
+ test? ( x11-libs/gdk-pixbuf )"
+
+# Tests fail with both swrast and llvmpipe
+# They pass under r600g, so the bug is in mesa
+RESTRICT="test"
pkg_setup() {
DOCS="README NEWS ChangeLog*"
# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
# XXX: Profiling, coverage disabled for now
- # XXX: What about eglx/eglnative/opengl-egl-xlib/osx/wayland/etc flavours?
- # Uses gudev-1.0 and libxkbcommon for eglnative/cex1000
+ # XXX: What about cex100/egl/osx/wayland/win32 backends?
+ # XXX: evdev/tslib input seem to be experimental?
myconf="--enable-debug=minimum"
use debug && myconf="--enable-debug=yes"
G2CONF="${G2CONF} ${myconf}
- --enable-conformance=no
- --disable-gcov
- --enable-profile=no
- --enable-maintainer-flags=no
--enable-xinput
- --with-flavour=glx
+ --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 gtk gdk-backend)
$(use_enable introspection)
- $(use_enable doc docs)"
+ $(use_enable doc docs)
+ $(use_enable test conformance)
+ $(use_enable test gdk-pixbuf)"
}
src_prepare() {
- # Some gettext stuff, we can't run gettextize because that does too much
- [[ ${PV} = 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po"
-
gnome2_src_prepare
# We only need conformance tests, the rest are useless for us
@@ -89,6 +100,13 @@ src_prepare() {
-i tests/Makefile.in || die "in tests sed failed"
}
+src_test() {
+ # Run only the conformance tests
+ # The perf tests are useless because we run under sw rendering
+ cd tests/
+ Xemake test conform
+}
+
src_install() {
clutter_src_install
}
diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index 40b96b9..49e9b65 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-9999.ebuild,v 1.3 2011/02/21 20:56:53 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.10.8.ebuild,v 1.2 2012/07/14 13:19:30 blueness Exp $
EAPI="4"
CLUTTER_LA_PUNT="yes"
@@ -8,7 +8,7 @@ WANT_AUTOMAKE="1.11"
# Inherit gnome2 after clutter to download sources from gnome.org
# since clutter-project.org doesn't provide .xz tarballs
-inherit clutter gnome2
+inherit clutter gnome2 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,25 +16,24 @@ fi
DESCRIPTION="Clutter is a library for creating graphical user interfaces"
SLOT="1.0"
-IUSE="debug doc +introspection"
+IUSE="debug doc gtk +introspection test" # evdev tslib
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
fi
# NOTE: glx flavour uses libdrm + >=mesa-7.3
# XXX: uprof needed for profiling
# >=libX11-1.3.1 needed for X Generic Event support
RDEPEND="
- >=dev-libs/glib-2.28:2
- >=dev-libs/atk-2.1.5[introspection?]
+ >=dev-libs/glib-2.31.19:2
+ >=dev-libs/atk-2.5.3[introspection?]
>=dev-libs/json-glib-0.12[introspection?]
- >=media-libs/cogl-1.8.0:1.0[introspection?,pango]
+ >=media-libs/cogl-1.9.6:1.0[introspection?,pango]
media-libs/fontconfig
>=x11-libs/cairo-1.10[glib]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/pango-1.20[introspection?]
+ >=x11-libs/pango-1.30[introspection?]
virtual/opengl
x11-libs/libdrm
@@ -46,40 +45,52 @@ RDEPEND="
>=x11-libs/libXfixes-3
>=x11-libs/libXcomposite-0.4
+ gtk? ( >=x11-libs/gtk+-3.3.18:3 )
introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
DEPEND="${RDEPEND}
- sys-devel/gettext
+ >=dev-util/gtk-doc-am-1.15
virtual/pkgconfig
- >=dev-util/gtk-doc-am-1.13
+ >=sys-devel/gettext-0.17
doc? (
- >=dev-util/gtk-doc-1.13
+ >=dev-util/gtk-doc-1.15
>=app-text/docbook-sgml-utils-0.6.14[jadetex]
- dev-libs/libxslt )"
+ dev-libs/libxslt )
+ test? ( x11-libs/gdk-pixbuf )"
+
+# Tests fail with both swrast and llvmpipe
+# They pass under r600g, so the bug is in mesa
+RESTRICT="test"
pkg_setup() {
DOCS="README NEWS ChangeLog*"
# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
# XXX: Profiling, coverage disabled for now
- # XXX: What about eglx/eglnative/opengl-egl-xlib/osx/wayland/etc flavours?
- # Uses gudev-1.0 and libxkbcommon for eglnative/cex1000
+ # XXX: What about cex100/egl/osx/wayland/win32 backends?
+ # XXX: evdev/tslib input seem to be experimental?
myconf="--enable-debug=minimum"
use debug && myconf="--enable-debug=yes"
G2CONF="${G2CONF} ${myconf}
- --enable-conformance=no
- --disable-gcov
- --enable-profile=no
- --enable-maintainer-flags=no
--enable-xinput
- --with-flavour=glx
+ --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 gtk gdk-backend)
$(use_enable introspection)
- $(use_enable doc docs)"
+ $(use_enable doc docs)
+ $(use_enable test conformance)
+ $(use_enable test gdk-pixbuf)"
}
src_prepare() {
- # Some gettext stuff, we can't run gettextize because that does too much
- [[ ${PV} = 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po"
-
gnome2_src_prepare
# We only need conformance tests, the rest are useless for us
@@ -89,6 +100,13 @@ src_prepare() {
-i tests/Makefile.in || die "in tests sed failed"
}
+src_test() {
+ # Run only the conformance tests
+ # The perf tests are useless because we run under sw rendering
+ cd tests/
+ Xemake test conform
+}
+
src_install() {
clutter_src_install
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-09-02 19:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-02 18:59 [gentoo-commits] proj/gnome:master commit in: media-libs/clutter/, media-libs/clutter-gtk/ Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox