[1/3] mesa: Enable gallium-llvm on x86 and x86_64

Message ID e01f930a544e33f6ed0504e7cfac12e5da619fc3.1529075133.git.raj.khem@gmail.com
State Superseded
Headers show
Series
  • GCC fixes and enable llvmpipe in mesa for x86
Related show

Commit Message

Khem Raj June 15, 2018, 3:08 p.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 meta/recipes-graphics/cairo/cairo.inc | 3 ++-
 meta/recipes-graphics/mesa/mesa.inc   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

-- 
2.17.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Richard Purdie June 16, 2018, 9:30 p.m. | #1
On Fri, 2018-06-15 at 08:08 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>  meta/recipes-graphics/cairo/cairo.inc | 3 ++-

>  meta/recipes-graphics/mesa/mesa.inc   | 3 +++

>  2 files changed, 5 insertions(+), 1 deletion(-)


I think this patch breaks on multlib:

https://autobuilder.yocto.io/builders/nightly-multilib/builds/1085/steps/BuildImages_2/logs/stdio
https://autobuilder.yocto.io/builders/nightly-multilib/builds/1085/steps/BuildImages_3/logs/stdio
https://autobuilder.yocto.io/builders/nightly-multilib/builds/1085/steps/BuildImages_4/logs/stdio

and x32:

https://autobuilder.yocto.io/builders/nightly-x32/builds/1063/steps/BuildImages/logs/stdio

Cheers,

Richard
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 20e0d2c92a..7347f223ff 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -22,7 +22,8 @@  X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
 DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
-           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}"
+           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index fa99f7d50c..d1723e3506 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -45,6 +45,9 @@  PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
 		   "
 
+PACKAGECONFIG_append_x86 = " gallium-llvm gallium r600"
+PACKAGECONFIG_append_x86-64 = " gallium-llvm gallium r600"
+
 # "gbm" requires "dri", "opengl"
 PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"