* [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/clutter/, profiles/
@ 2011-06-29 8:08 Alexandre Restovtsev
0 siblings, 0 replies; only message in thread
From: Alexandre Restovtsev @ 2011-06-29 8:08 UTC (permalink / raw
To: gentoo-commits
commit: f174e2c5be5091227a060dbc4d32801ea4de1411
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jun 29 08:06:52 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jun 29 08:06:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f174e2c5
media-libs/clutter-1.7.2
Add a new clutter-1.7.2 release (depends on cogl, no longer depends on
gdk-pixbuf), and update the live ebuild accordingly.
---
.../{clutter-9999.ebuild => clutter-1.7.2.ebuild} | 63 ++++++++++----------
media-libs/clutter/clutter-9999.ebuild | 63 ++++++++++----------
profiles/package.mask | 1 +
3 files changed, 65 insertions(+), 62 deletions(-)
diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-1.7.2.ebuild
similarity index 79%
copy from media-libs/clutter/clutter-9999.ebuild
copy to media-libs/clutter/clutter-1.7.2.ebuild
index 7c3f139..50f25f1 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-1.7.2.ebuild
@@ -2,11 +2,13 @@
# 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 $
-EAPI="2"
+EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
WANT_AUTOMAKE="1.11"
-# Inherit clutter after gnome2 to override src_install
-inherit gnome2 clutter
+# Inherit gnome2 after clutter to download sources from gnome.org
+# since clutter-project.org doesn't provide .xz tarballs
+inherit clutter gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -22,16 +24,15 @@ else
fi
# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# We always use the gdk-pixbuf backend now since it's been split out
+# XXX: uprof needed for profiling
RDEPEND="
>=dev-libs/glib-2.26:2
- >=x11-libs/cairo-1.10
- >=x11-libs/pango-1.20[introspection?]
+ >=dev-libs/atk-1.17[introspection?]
>=dev-libs/json-glib-0.12[introspection?]
- >=dev-libs/atk-1.17
-
- x11-libs/gdk-pixbuf:2
-
+ >=media-libs/cogl-1.6.0:1.0[introspection?,pango]
+ >=x11-libs/cairo-1.10[glib]
+ >=x11-libs/pango-1.20[introspection?]
+
virtual/opengl
x11-libs/libdrm
x11-libs/libX11
@@ -51,40 +52,40 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-1.13
>=app-text/docbook-sgml-utils-0.6.14[jadetex]
dev-libs/libxslt )"
-DOCS="AUTHORS README NEWS ChangeLog*"
-
-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
- sed -e 's/^\(SUBDIRS =\).*/\1/g' \
- -i tests/Makefile.am || die "am tests sed failed"
- sed -e 's/^\(SUBDIRS =\).*/\1/g' \
- -i tests/Makefile.in || die "in tests sed failed"
+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
- G2CONF="
- --enable-debug=minimum
- --enable-cogl-debug=minimum
+ 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
- --with-imagebackend=gdk-pixbuf
$(use_enable introspection)
$(use_enable doc docs)"
+}
+
+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
+ sed -e 's/^\(SUBDIRS =\).*/\1/g' \
+ -i tests/Makefile.am || die "am tests sed failed"
+ sed -e 's/^\(SUBDIRS =\).*/\1/g' \
+ -i tests/Makefile.in || die "in tests sed failed"
+}
- if use debug; then
- G2CONF="${myconf}
- --enable-debug=yes
- --enable-cogl-debug=yes"
- fi
+src_install() {
+ clutter_src_install
}
diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index 7c3f139..50f25f1 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -2,11 +2,13 @@
# 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 $
-EAPI="2"
+EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
WANT_AUTOMAKE="1.11"
-# Inherit clutter after gnome2 to override src_install
-inherit gnome2 clutter
+# Inherit gnome2 after clutter to download sources from gnome.org
+# since clutter-project.org doesn't provide .xz tarballs
+inherit clutter gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -22,16 +24,15 @@ else
fi
# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# We always use the gdk-pixbuf backend now since it's been split out
+# XXX: uprof needed for profiling
RDEPEND="
>=dev-libs/glib-2.26:2
- >=x11-libs/cairo-1.10
- >=x11-libs/pango-1.20[introspection?]
+ >=dev-libs/atk-1.17[introspection?]
>=dev-libs/json-glib-0.12[introspection?]
- >=dev-libs/atk-1.17
-
- x11-libs/gdk-pixbuf:2
-
+ >=media-libs/cogl-1.6.0:1.0[introspection?,pango]
+ >=x11-libs/cairo-1.10[glib]
+ >=x11-libs/pango-1.20[introspection?]
+
virtual/opengl
x11-libs/libdrm
x11-libs/libX11
@@ -51,40 +52,40 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-1.13
>=app-text/docbook-sgml-utils-0.6.14[jadetex]
dev-libs/libxslt )"
-DOCS="AUTHORS README NEWS ChangeLog*"
-
-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
- sed -e 's/^\(SUBDIRS =\).*/\1/g' \
- -i tests/Makefile.am || die "am tests sed failed"
- sed -e 's/^\(SUBDIRS =\).*/\1/g' \
- -i tests/Makefile.in || die "in tests sed failed"
+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
- G2CONF="
- --enable-debug=minimum
- --enable-cogl-debug=minimum
+ 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
- --with-imagebackend=gdk-pixbuf
$(use_enable introspection)
$(use_enable doc docs)"
+}
+
+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
+ sed -e 's/^\(SUBDIRS =\).*/\1/g' \
+ -i tests/Makefile.am || die "am tests sed failed"
+ sed -e 's/^\(SUBDIRS =\).*/\1/g' \
+ -i tests/Makefile.in || die "in tests sed failed"
+}
- if use debug; then
- G2CONF="${myconf}
- --enable-debug=yes
- --enable-cogl-debug=yes"
- fi
+src_install() {
+ clutter_src_install
}
diff --git a/profiles/package.mask b/profiles/package.mask
index f47fb3f..2b74f6c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -12,6 +12,7 @@
=dev-libs/glib-2.29*
=dev-libs/gobject-introspection-1*
=media-libs/cogl-1.7*
+=media-libs/clutter-1.7*
=x11-libs/gtk+-3.1*
=x11-libs/pango-1.29*
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-29 8:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-29 8:08 [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/clutter/, profiles/ Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox