| 1 |
commit: f174e2c5be5091227a060dbc4d32801ea4de1411 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Jun 29 08:06:52 2011 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Jun 29 08:06:52 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f174e2c5 |
| 7 |
|
| 8 |
media-libs/clutter-1.7.2 |
| 9 |
|
| 10 |
Add a new clutter-1.7.2 release (depends on cogl, no longer depends on |
| 11 |
gdk-pixbuf), and update the live ebuild accordingly. |
| 12 |
|
| 13 |
--- |
| 14 |
.../{clutter-9999.ebuild => clutter-1.7.2.ebuild} | 63 ++++++++++---------- |
| 15 |
media-libs/clutter/clutter-9999.ebuild | 63 ++++++++++---------- |
| 16 |
profiles/package.mask | 1 + |
| 17 |
3 files changed, 65 insertions(+), 62 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-1.7.2.ebuild |
| 20 |
similarity index 79% |
| 21 |
copy from media-libs/clutter/clutter-9999.ebuild |
| 22 |
copy to media-libs/clutter/clutter-1.7.2.ebuild |
| 23 |
index 7c3f139..50f25f1 100644 |
| 24 |
--- a/media-libs/clutter/clutter-9999.ebuild |
| 25 |
+++ b/media-libs/clutter/clutter-1.7.2.ebuild |
| 26 |
@@ -2,11 +2,13 @@ |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-9999.ebuild,v 1.3 2011/02/21 20:56:53 nirbheek Exp $ |
| 29 |
|
| 30 |
-EAPI="2" |
| 31 |
+EAPI="3" |
| 32 |
+GNOME_TARBALL_SUFFIX="xz" |
| 33 |
WANT_AUTOMAKE="1.11" |
| 34 |
|
| 35 |
-# Inherit clutter after gnome2 to override src_install |
| 36 |
-inherit gnome2 clutter |
| 37 |
+# Inherit gnome2 after clutter to download sources from gnome.org |
| 38 |
+# since clutter-project.org doesn't provide .xz tarballs |
| 39 |
+inherit clutter gnome2 |
| 40 |
if [[ ${PV} = 9999 ]]; then |
| 41 |
inherit gnome2-live |
| 42 |
fi |
| 43 |
@@ -22,16 +24,15 @@ else |
| 44 |
fi |
| 45 |
|
| 46 |
# NOTE: glx flavour uses libdrm + >=mesa-7.3 |
| 47 |
-# We always use the gdk-pixbuf backend now since it's been split out |
| 48 |
+# XXX: uprof needed for profiling |
| 49 |
RDEPEND=" |
| 50 |
>=dev-libs/glib-2.26:2 |
| 51 |
- >=x11-libs/cairo-1.10 |
| 52 |
- >=x11-libs/pango-1.20[introspection?] |
| 53 |
+ >=dev-libs/atk-1.17[introspection?] |
| 54 |
>=dev-libs/json-glib-0.12[introspection?] |
| 55 |
- >=dev-libs/atk-1.17 |
| 56 |
- |
| 57 |
- x11-libs/gdk-pixbuf:2 |
| 58 |
- |
| 59 |
+ >=media-libs/cogl-1.6.0:1.0[introspection?,pango] |
| 60 |
+ >=x11-libs/cairo-1.10[glib] |
| 61 |
+ >=x11-libs/pango-1.20[introspection?] |
| 62 |
+ |
| 63 |
virtual/opengl |
| 64 |
x11-libs/libdrm |
| 65 |
x11-libs/libX11 |
| 66 |
@@ -51,40 +52,40 @@ DEPEND="${RDEPEND} |
| 67 |
>=dev-util/gtk-doc-1.13 |
| 68 |
>=app-text/docbook-sgml-utils-0.6.14[jadetex] |
| 69 |
dev-libs/libxslt )" |
| 70 |
-DOCS="AUTHORS README NEWS ChangeLog*" |
| 71 |
- |
| 72 |
-src_prepare() { |
| 73 |
- # Some gettext stuff, we can't run gettextize because that does too much |
| 74 |
- [[ ${PV} = 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po" |
| 75 |
|
| 76 |
- gnome2_src_prepare |
| 77 |
- |
| 78 |
- # We only need conformance tests, the rest are useless for us |
| 79 |
- sed -e 's/^\(SUBDIRS =\).*/\1/g' \ |
| 80 |
- -i tests/Makefile.am || die "am tests sed failed" |
| 81 |
- sed -e 's/^\(SUBDIRS =\).*/\1/g' \ |
| 82 |
- -i tests/Makefile.in || die "in tests sed failed" |
| 83 |
+pkg_setup() { |
| 84 |
+ DOCS="README NEWS ChangeLog*" |
| 85 |
|
| 86 |
# XXX: Conformance test suite (and clutter itself) does not work under Xvfb |
| 87 |
# XXX: Profiling, coverage disabled for now |
| 88 |
# XXX: What about eglx/eglnative/opengl-egl-xlib/osx/wayland/etc flavours? |
| 89 |
# Uses gudev-1.0 and libxkbcommon for eglnative/cex1000 |
| 90 |
- G2CONF=" |
| 91 |
- --enable-debug=minimum |
| 92 |
- --enable-cogl-debug=minimum |
| 93 |
+ myconf="--enable-debug=minimum" |
| 94 |
+ use debug && myconf="--enable-debug=yes" |
| 95 |
+ G2CONF="${G2CONF} ${myconf} |
| 96 |
--enable-conformance=no |
| 97 |
--disable-gcov |
| 98 |
--enable-profile=no |
| 99 |
--enable-maintainer-flags=no |
| 100 |
--enable-xinput |
| 101 |
--with-flavour=glx |
| 102 |
- --with-imagebackend=gdk-pixbuf |
| 103 |
$(use_enable introspection) |
| 104 |
$(use_enable doc docs)" |
| 105 |
+} |
| 106 |
+ |
| 107 |
+src_prepare() { |
| 108 |
+ # Some gettext stuff, we can't run gettextize because that does too much |
| 109 |
+ [[ ${PV} = 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po" |
| 110 |
+ |
| 111 |
+ gnome2_src_prepare |
| 112 |
+ |
| 113 |
+ # We only need conformance tests, the rest are useless for us |
| 114 |
+ sed -e 's/^\(SUBDIRS =\).*/\1/g' \ |
| 115 |
+ -i tests/Makefile.am || die "am tests sed failed" |
| 116 |
+ sed -e 's/^\(SUBDIRS =\).*/\1/g' \ |
| 117 |
+ -i tests/Makefile.in || die "in tests sed failed" |
| 118 |
+} |
| 119 |
|
| 120 |
- if use debug; then |
| 121 |
- G2CONF="${myconf} |
| 122 |
- --enable-debug=yes |
| 123 |
- --enable-cogl-debug=yes" |
| 124 |
- fi |
| 125 |
+src_install() { |
| 126 |
+ clutter_src_install |
| 127 |
} |
| 128 |
|
| 129 |
diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild |
| 130 |
index 7c3f139..50f25f1 100644 |
| 131 |
--- a/media-libs/clutter/clutter-9999.ebuild |
| 132 |
+++ b/media-libs/clutter/clutter-9999.ebuild |
| 133 |
@@ -2,11 +2,13 @@ |
| 134 |
# Distributed under the terms of the GNU General Public License v2 |
| 135 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-9999.ebuild,v 1.3 2011/02/21 20:56:53 nirbheek Exp $ |
| 136 |
|
| 137 |
-EAPI="2" |
| 138 |
+EAPI="3" |
| 139 |
+GNOME_TARBALL_SUFFIX="xz" |
| 140 |
WANT_AUTOMAKE="1.11" |
| 141 |
|
| 142 |
-# Inherit clutter after gnome2 to override src_install |
| 143 |
-inherit gnome2 clutter |
| 144 |
+# Inherit gnome2 after clutter to download sources from gnome.org |
| 145 |
+# since clutter-project.org doesn't provide .xz tarballs |
| 146 |
+inherit clutter gnome2 |
| 147 |
if [[ ${PV} = 9999 ]]; then |
| 148 |
inherit gnome2-live |
| 149 |
fi |
| 150 |
@@ -22,16 +24,15 @@ else |
| 151 |
fi |
| 152 |
|
| 153 |
# NOTE: glx flavour uses libdrm + >=mesa-7.3 |
| 154 |
-# We always use the gdk-pixbuf backend now since it's been split out |
| 155 |
+# XXX: uprof needed for profiling |
| 156 |
RDEPEND=" |
| 157 |
>=dev-libs/glib-2.26:2 |
| 158 |
- >=x11-libs/cairo-1.10 |
| 159 |
- >=x11-libs/pango-1.20[introspection?] |
| 160 |
+ >=dev-libs/atk-1.17[introspection?] |
| 161 |
>=dev-libs/json-glib-0.12[introspection?] |
| 162 |
- >=dev-libs/atk-1.17 |
| 163 |
- |
| 164 |
- x11-libs/gdk-pixbuf:2 |
| 165 |
- |
| 166 |
+ >=media-libs/cogl-1.6.0:1.0[introspection?,pango] |
| 167 |
+ >=x11-libs/cairo-1.10[glib] |
| 168 |
+ >=x11-libs/pango-1.20[introspection?] |
| 169 |
+ |
| 170 |
virtual/opengl |
| 171 |
x11-libs/libdrm |
| 172 |
x11-libs/libX11 |
| 173 |
@@ -51,40 +52,40 @@ DEPEND="${RDEPEND} |
| 174 |
>=dev-util/gtk-doc-1.13 |
| 175 |
>=app-text/docbook-sgml-utils-0.6.14[jadetex] |
| 176 |
dev-libs/libxslt )" |
| 177 |
-DOCS="AUTHORS README NEWS ChangeLog*" |
| 178 |
- |
| 179 |
-src_prepare() { |
| 180 |
- # Some gettext stuff, we can't run gettextize because that does too much |
| 181 |
- [[ ${PV} = 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po" |
| 182 |
|
| 183 |
- gnome2_src_prepare |
| 184 |
- |
| 185 |
- # We only need conformance tests, the rest are useless for us |
| 186 |
- sed -e 's/^\(SUBDIRS =\).*/\1/g' \ |
| 187 |
- -i tests/Makefile.am || die "am tests sed failed" |
| 188 |
- sed -e 's/^\(SUBDIRS =\).*/\1/g' \ |
| 189 |
- -i tests/Makefile.in || die "in tests sed failed" |
| 190 |
+pkg_setup() { |
| 191 |
+ DOCS="README NEWS ChangeLog*" |
| 192 |
|
| 193 |
# XXX: Conformance test suite (and clutter itself) does not work under Xvfb |
| 194 |
# XXX: Profiling, coverage disabled for now |
| 195 |
# XXX: What about eglx/eglnative/opengl-egl-xlib/osx/wayland/etc flavours? |
| 196 |
# Uses gudev-1.0 and libxkbcommon for eglnative/cex1000 |
| 197 |
- G2CONF=" |
| 198 |
- --enable-debug=minimum |
| 199 |
- --enable-cogl-debug=minimum |
| 200 |
+ myconf="--enable-debug=minimum" |
| 201 |
+ use debug && myconf="--enable-debug=yes" |
| 202 |
+ G2CONF="${G2CONF} ${myconf} |
| 203 |
--enable-conformance=no |
| 204 |
--disable-gcov |
| 205 |
--enable-profile=no |
| 206 |
--enable-maintainer-flags=no |
| 207 |
--enable-xinput |
| 208 |
--with-flavour=glx |
| 209 |
- --with-imagebackend=gdk-pixbuf |
| 210 |
$(use_enable introspection) |
| 211 |
$(use_enable doc docs)" |
| 212 |
+} |
| 213 |
+ |
| 214 |
+src_prepare() { |
| 215 |
+ # Some gettext stuff, we can't run gettextize because that does too much |
| 216 |
+ [[ ${PV} = 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po" |
| 217 |
+ |
| 218 |
+ gnome2_src_prepare |
| 219 |
+ |
| 220 |
+ # We only need conformance tests, the rest are useless for us |
| 221 |
+ sed -e 's/^\(SUBDIRS =\).*/\1/g' \ |
| 222 |
+ -i tests/Makefile.am || die "am tests sed failed" |
| 223 |
+ sed -e 's/^\(SUBDIRS =\).*/\1/g' \ |
| 224 |
+ -i tests/Makefile.in || die "in tests sed failed" |
| 225 |
+} |
| 226 |
|
| 227 |
- if use debug; then |
| 228 |
- G2CONF="${myconf} |
| 229 |
- --enable-debug=yes |
| 230 |
- --enable-cogl-debug=yes" |
| 231 |
- fi |
| 232 |
+src_install() { |
| 233 |
+ clutter_src_install |
| 234 |
} |
| 235 |
|
| 236 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 237 |
index f47fb3f..2b74f6c 100644 |
| 238 |
--- a/profiles/package.mask |
| 239 |
+++ b/profiles/package.mask |
| 240 |
@@ -12,6 +12,7 @@ |
| 241 |
=dev-libs/glib-2.29* |
| 242 |
=dev-libs/gobject-introspection-1* |
| 243 |
=media-libs/cogl-1.7* |
| 244 |
+=media-libs/clutter-1.7* |
| 245 |
=x11-libs/gtk+-3.1* |
| 246 |
=x11-libs/pango-1.29* |
Archives