diff options
| author |   Richard Purdie <richard@openedhand.com> | 2008-05-15 14:12:25 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-05-15 14:12:25 +0000 |
| commit | 0a4ca92efea823a25040a08f1d43afc37918222a (patch) | |
| tree | 7c39843a978969c0ee63399d4a0e3ede5433e704 /meta/packages/clutter | |
| parent | 9b6d8f4400c4c6c88744da30ae6a8d0e0b53ed47 (diff) | |
| download | openembedded-core-contrib-0a4ca92efea823a25040a08f1d43afc37918222a.tar.gz | |
clutter: Use gtk-doc.bbclass
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4480 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/clutter')
| -rw-r--r-- | meta/packages/clutter/clutter.inc | 3 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter/configure_fix.patch | 13 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter_svn.bb | 3 |
3 files changed, 2 insertions, 17 deletions
diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc index a3a00c03e7..76dfd08723 100644 --- a/meta/packages/clutter/clutter.inc +++ b/meta/packages/clutter/clutter.inc @@ -23,7 +23,7 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " -inherit autotools pkgconfig +inherit autotools pkgconfig gtk-doc PACKAGES =+ "clutter-examples" FILES_clutter-examples = "${bindir}/test-*" @@ -33,7 +33,6 @@ require clutter-fpu.inc #Fix up some weirdness in the docs do_configure_prepend() { - touch ${S}/gtk-doc.make sed -i s:doc/reference/Makefile::g ${S}/configure.ac sed -i s:doc::g ${S}/Makefile.am } diff --git a/meta/packages/clutter/clutter/configure_fix.patch b/meta/packages/clutter/clutter/configure_fix.patch deleted file mode 100644 index d37b64cd3a..0000000000 --- a/meta/packages/clutter/clutter/configure_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: clutter/doc/reference/clutter/Makefile.am -=================================================================== ---- clutter.orig/doc/reference/clutter/Makefile.am 2008-05-01 16:02:49.000000000 +0100 -+++ clutter/doc/reference/clutter/Makefile.am 2008-05-01 16:03:00.000000000 +0100 -@@ -124,7 +124,7 @@ - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in --EXTRA_DIST += \ -+EXTRA_DIST = \ - version.xml.in \ - actor-box.png \ - alpha-func.png \ diff --git a/meta/packages/clutter/clutter_svn.bb b/meta/packages/clutter/clutter_svn.bb index edc0259dff..f3afbd9bef 100644 --- a/meta/packages/clutter/clutter_svn.bb +++ b/meta/packages/clutter/clutter_svn.bb @@ -3,10 +3,9 @@ require clutter.inc DEFAULT_PREFERENCE = "-1" PV = "0.7.0+svnr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ - file://configure_fix.patch;patch=1 \ file://enable_tests.patch;patch=1 " S = "${WORKDIR}/clutter" |