summaryrefslogtreecommitdiffstats
path: root/meta/packages/clutter
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-30 17:11:24 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-30 17:11:24 +0000
commit0ad571dde5df281c1b137c20c802fe43199e22ba (patch)
tree7e3fdbfeeb2e10f973167e922f5bbe3dc508da88 /meta/packages/clutter
parent66c952cbc258b1550f409ba93b83558a1f938d2e (diff)
downloadpoky-0ad571dde5df281c1b137c20c802fe43199e22ba.tar.gz
clutter-git: Disable DOLT
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/clutter')
-rw-r--r--meta/packages/clutter/clutter-1.0_git.bb6
-rw-r--r--meta/packages/clutter/clutter/nodolt-1.0.patch12
-rw-r--r--meta/packages/clutter/clutter_git.bb4
3 files changed, 9 insertions, 13 deletions
diff --git a/meta/packages/clutter/clutter-1.0_git.bb b/meta/packages/clutter/clutter-1.0_git.bb
index 8773e7204a..7e62954ee5 100644
--- a/meta/packages/clutter/clutter-1.0_git.bb
+++ b/meta/packages/clutter/clutter-1.0_git.bb
@@ -7,10 +7,14 @@ PACKAGES =+ "clutter-examples-1.0"
7FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png" 7FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
8 8
9SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-1.0 \ 9SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-1.0 \
10 file://nodolt-1.0.patch;patch=1 \
11 file://enable_tests-1.0.patch;patch=1 " 10 file://enable_tests-1.0.patch;patch=1 "
12 11
13S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
14 13
15BASE_CONF += "--disable-introspection" 14BASE_CONF += "--disable-introspection"
16 15
16
17do_configure_prepend () {
18 # Disable DOLT
19 sed -i -e 's/^DOLT//' ${S}/configure.ac
20}
diff --git a/meta/packages/clutter/clutter/nodolt-1.0.patch b/meta/packages/clutter/clutter/nodolt-1.0.patch
deleted file mode 100644
index 74c249666a..0000000000
--- a/meta/packages/clutter/clutter/nodolt-1.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: git/configure.ac
2===================================================================
3--- git.orig/configure.ac 2009-11-27 15:32:20.000000000 +0000
4+++ git/configure.ac 2009-11-27 15:32:28.000000000 +0000
5@@ -79,7 +79,6 @@
6 AM_PROG_CC_C_O
7 AC_DISABLE_STATIC
8 AC_PROG_LIBTOOL
9-DOLT
10
11 # Checks for header files.
12 AC_HEADER_STDC
diff --git a/meta/packages/clutter/clutter_git.bb b/meta/packages/clutter/clutter_git.bb
index c6204e1383..9432615e28 100644
--- a/meta/packages/clutter/clutter_git.bb
+++ b/meta/packages/clutter/clutter_git.bb
@@ -10,3 +10,7 @@ S = "${WORKDIR}/git"
10 10
11BASE_CONF += "--disable-introspection" 11BASE_CONF += "--disable-introspection"
12 12
13do_configure_prepend () {
14 # Disable DOLT
15 sed -i -e 's/^DOLT//' ${S}/configure.ac
16} \ No newline at end of file