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 | |
parent | 9b6d8f4400c4c6c88744da30ae6a8d0e0b53ed47 (diff) | |
download | poky-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')
-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" | |||
23 | PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" | 23 | PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" |
24 | LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " | 24 | LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " |
25 | 25 | ||
26 | inherit autotools pkgconfig | 26 | inherit autotools pkgconfig gtk-doc |
27 | 27 | ||
28 | PACKAGES =+ "clutter-examples" | 28 | PACKAGES =+ "clutter-examples" |
29 | FILES_clutter-examples = "${bindir}/test-*" | 29 | FILES_clutter-examples = "${bindir}/test-*" |
@@ -33,7 +33,6 @@ require clutter-fpu.inc | |||
33 | 33 | ||
34 | #Fix up some weirdness in the docs | 34 | #Fix up some weirdness in the docs |
35 | do_configure_prepend() { | 35 | do_configure_prepend() { |
36 | touch ${S}/gtk-doc.make | ||
37 | sed -i s:doc/reference/Makefile::g ${S}/configure.ac | 36 | sed -i s:doc/reference/Makefile::g ${S}/configure.ac |
38 | sed -i s:doc::g ${S}/Makefile.am | 37 | sed -i s:doc::g ${S}/Makefile.am |
39 | } | 38 | } |
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 @@ | |||
1 | Index: clutter/doc/reference/clutter/Makefile.am | ||
2 | =================================================================== | ||
3 | --- clutter.orig/doc/reference/clutter/Makefile.am 2008-05-01 16:02:49.000000000 +0100 | ||
4 | +++ clutter/doc/reference/clutter/Makefile.am 2008-05-01 16:03:00.000000000 +0100 | ||
5 | @@ -124,7 +124,7 @@ | ||
6 | |||
7 | # Other files to distribute | ||
8 | # e.g. EXTRA_DIST += version.xml.in | ||
9 | -EXTRA_DIST += \ | ||
10 | +EXTRA_DIST = \ | ||
11 | version.xml.in \ | ||
12 | actor-box.png \ | ||
13 | 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 | |||
3 | DEFAULT_PREFERENCE = "-1" | 3 | DEFAULT_PREFERENCE = "-1" |
4 | 4 | ||
5 | PV = "0.7.0+svnr${SRCREV}" | 5 | PV = "0.7.0+svnr${SRCREV}" |
6 | PR = "r3" | 6 | PR = "r4" |
7 | 7 | ||
8 | SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ | 8 | SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ |
9 | file://configure_fix.patch;patch=1 \ | ||
10 | file://enable_tests.patch;patch=1 " | 9 | file://enable_tests.patch;patch=1 " |
11 | 10 | ||
12 | S = "${WORKDIR}/clutter" | 11 | S = "${WORKDIR}/clutter" |