diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-08-06 13:14:09 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-17 18:04:19 +0100 |
| commit | 38adf05204ddbefd2a3119009646f47f1a5f505b (patch) | |
| tree | d8661923fc3639823c4dda6bf503fdbfcfb3c337 | |
| parent | 0baa0717b9afd421545ae4d4bdd73062fe3babec (diff) | |
| download | poky-38adf05204ddbefd2a3119009646f47f1a5f505b.tar.gz | |
clutter: DOLT isn't used anymore
(From OE-Core rev: fbff096fd1168ec8147fb348fb36ecafcaefef19)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.8_git.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/cogl_git.bb | 7 |
3 files changed, 3 insertions, 18 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb index a37056883d..aceef967ea 100644 --- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb +++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | require recipes-graphics/clutter/clutter.inc | 1 | require recipes-graphics/clutter/clutter.inc |
| 2 | require recipes-graphics/clutter/clutter-package.inc | 2 | require recipes-graphics/clutter/clutter-package.inc |
| 3 | 3 | ||
| 4 | PR = "r1" | 4 | PR = "r2" |
| 5 | 5 | ||
| 6 | # We're API/ABI compatible and this may make things easier for layers | 6 | # We're API/ABI compatible and this may make things easier for layers |
| 7 | PROVIDES += "clutter-1.6" | 7 | PROVIDES += "clutter-1.6" |
| @@ -19,10 +19,5 @@ S = "${WORKDIR}/clutter-${PV}" | |||
| 19 | 19 | ||
| 20 | BASE_CONF += "--disable-introspection" | 20 | BASE_CONF += "--disable-introspection" |
| 21 | 21 | ||
| 22 | do_configure_prepend () { | ||
| 23 | # Disable DOLT | ||
| 24 | sed -i -e 's/^DOLT//' ${S}/configure.ac | ||
| 25 | } | ||
| 26 | |||
| 27 | SRC_URI[md5sum] = "487f70f9b59e1328b47f1db4094ab662" | 22 | SRC_URI[md5sum] = "487f70f9b59e1328b47f1db4094ab662" |
| 28 | SRC_URI[sha256sum] = "0d567177facd6913ac9c894e230ae48933125f02354ef965bbbf0586f1f0df91" | 23 | SRC_URI[sha256sum] = "0d567177facd6913ac9c894e230ae48933125f02354ef965bbbf0586f1f0df91" |
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_git.bb b/meta/recipes-graphics/clutter/clutter-1.8_git.bb index 7d8bcb3f42..89d8026201 100644 --- a/meta/recipes-graphics/clutter/clutter-1.8_git.bb +++ b/meta/recipes-graphics/clutter/clutter-1.8_git.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
| 6 | # the 1.8.4 tag | 6 | # the 1.8.4 tag |
| 7 | SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459" | 7 | SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459" |
| 8 | PV = "1.8.4+git${SRCPV}" | 8 | PV = "1.8.4+git${SRCPV}" |
| 9 | PR = "r1" | 9 | PR = "r2" |
| 10 | 10 | ||
| 11 | DEFAULT_PREFERENCE = "-1" | 11 | DEFAULT_PREFERENCE = "-1" |
| 12 | 12 | ||
| @@ -18,8 +18,3 @@ S = "${WORKDIR}/git" | |||
| 18 | BASE_CONF += "--disable-introspection" | 18 | BASE_CONF += "--disable-introspection" |
| 19 | 19 | ||
| 20 | AUTOTOOLS_AUXDIR = "${S}/build" | 20 | AUTOTOOLS_AUXDIR = "${S}/build" |
| 21 | |||
| 22 | do_configure_prepend () { | ||
| 23 | # Disable DOLT | ||
| 24 | sed -i -e 's/^DOLT//' ${S}/configure.ac | ||
| 25 | } | ||
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb index 682f93101b..a3e1903134 100644 --- a/meta/recipes-graphics/clutter/cogl_git.bb +++ b/meta/recipes-graphics/clutter/cogl_git.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
| 5 | # the 1.8.2 tag | 5 | # the 1.8.2 tag |
| 6 | SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5" | 6 | SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5" |
| 7 | PV = "1.8.2+git${SRCPV}" | 7 | PV = "1.8.2+git${SRCPV}" |
| 8 | PR = "r2" | 8 | PR = "r3" |
| 9 | 9 | ||
| 10 | DEFAULT_PREFERENCE = "-1" | 10 | DEFAULT_PREFERENCE = "-1" |
| 11 | 11 | ||
| @@ -14,8 +14,3 @@ SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master \ | |||
| 14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
| 15 | 15 | ||
| 16 | AUTOTOOLS_AUXDIR = "${S}/build" | 16 | AUTOTOOLS_AUXDIR = "${S}/build" |
| 17 | |||
| 18 | do_configure_prepend () { | ||
| 19 | # Disable DOLT | ||
| 20 | sed -i -e 's/^DOLT//' ${S}/configure.ac | ||
| 21 | } | ||
