Patchwork mesa: clean up PACKAGECONFIG

login
register
mail settings
Submitter Ross Burton
Date Aug. 20, 2012, 10:25 a.m.
Message ID <1345458318-22072-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/34919/
State Accepted
Commit 821a38d71d7e15f5871f44a3ee08268d05ef610e
Headers show

Comments

Ross Burton - Aug. 20, 2012, 10:25 a.m.
Use machine overrides instead of machine features.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/mesa/mesa-common.inc |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
Saul Wold - Aug. 24, 2012, 6:28 p.m.
On 08/20/2012 03:25 AM, Ross Burton wrote:
> Use machine overrides instead of machine features.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-graphics/mesa/mesa-common.inc |    7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> index de171f0..cfe4a37 100644
> --- a/meta/recipes-graphics/mesa/mesa-common.inc
> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> @@ -12,7 +12,7 @@ SECTION = "x11"
>   LICENSE = "MIT"
>   LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
>
> -INC_PR = "r2"
> +INC_PR = "r3"
>   PE = "2"
>
>   DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
> @@ -29,9 +29,8 @@ EXTRA_OECONF = "--enable-glu \
>                   --disable-glut \
>                   --enable-shared-glapi"
>
> -PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \
> -                   ${@base_contains('MACHINE_FEATURES', 'x86', 'egl', '', d)} \
> -                   ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> +PACKAGECONFIG_append_x86 = " gles egl"
>
>   X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
>   PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index de171f0..cfe4a37 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@  SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
 
-INC_PR = "r2"
+INC_PR = "r3"
 PE = "2"
 
 DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
@@ -29,9 +29,8 @@  EXTRA_OECONF = "--enable-glu \
                 --disable-glut \
                 --enable-shared-glapi"
 
-PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \
-                   ${@base_contains('MACHINE_FEATURES', 'x86', 'egl', '', d)} \
-                   ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG_append_x86 = " gles egl"
 
 X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"