Re: [PATCH 2/8] clutter: DOLT isn't used anymore

[Saul Wold <sgw@linux.intel.com>]

On 08/13/2012 11:58 AM, Ross Burton wrote:
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb |    7 +------
>   meta/recipes-graphics/clutter/clutter-1.8_git.bb   |    7 +------
>   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 a370568..aceef96 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 @@
>   require recipes-graphics/clutter/clutter.inc
>   require recipes-graphics/clutter/clutter-package.inc
>
> -PR = "r1"
> +PR = "r2"
>
>   # We're API/ABI compatible and this may make things easier for layers
>   PROVIDES += "clutter-1.6"
> @@ -19,10 +19,5 @@ S = "${WORKDIR}/clutter-${PV}"
>
>   BASE_CONF += "--disable-introspection"
>
> -do_configure_prepend () {
> -	# Disable DOLT
> -	sed -i -e 's/^DOLT//' ${S}/configure.ac
> -}
> -
>   SRC_URI[md5sum] = "487f70f9b59e1328b47f1db4094ab662"
>   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 7d8bcb3..89d8026 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"
>   # the 1.8.4 tag
>   SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
>   PV = "1.8.4+git${SRCPV}"
> -PR = "r1"
> +PR = "r2"
>
>   DEFAULT_PREFERENCE = "-1"
>
> @@ -18,8 +18,3 @@ S = "${WORKDIR}/git"
>   BASE_CONF += "--disable-introspection"
>
>   AUTOTOOLS_AUXDIR = "${S}/build"
> -
> -do_configure_prepend () {
> -	# Disable DOLT
> -	sed -i -e 's/^DOLT//' ${S}/configure.ac
> -}
> diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
> index 682f931..a3e1903 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"
>   # the 1.8.2 tag
>   SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
>   PV = "1.8.2+git${SRCPV}"
> -PR = "r2"
> +PR = "r3"
>
>   DEFAULT_PREFERENCE = "-1"
>
> @@ -14,8 +14,3 @@ SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master \
>   S = "${WORKDIR}/git"
>
>   AUTOTOOLS_AUXDIR = "${S}/build"
> -
> -do_configure_prepend () {
> -	# Disable DOLT
> -	sed -i -e 's/^DOLT//' ${S}/configure.ac
> -}
>

Merged this into OE-Core

Thanks
	Sau!