From a0beccee737290ce0e2bd0907ec0be04e6511438 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 7 Jul 2018 17:32:25 -0700 Subject: mesa-demos,piglit,packagegroup-core-tools-testapps: Remove dependency on mesa-demos mesa-demos demand libgles1 and userland driver does not have it, therefore make it conditional on choice of graphics driver, remove it when using userland driver and keep it when using vc4 graphics driver. Signed-off-by: Khem Raj --- recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend | 2 ++ recipes-graphics/eglinfo/eglinfo-fb_%.bbappend | 2 +- recipes-graphics/mesa/mesa-demos_%.bbappend | 2 ++ recipes-graphics/piglit/piglit_%.bbappend | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend create mode 100644 recipes-graphics/mesa/mesa-demos_%.bbappend create mode 100644 recipes-graphics/piglit/piglit_%.bbappend diff --git a/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend new file mode 100644 index 0000000..500d871 --- /dev/null +++ b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend @@ -0,0 +1,2 @@ +# mesa-demos needs gles1 and userland driver does not have it, works ok with vc4 graphics driver +X11GLTOOLS_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" diff --git a/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend b/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend index 7692133..c152bd9 100644 --- a/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend +++ b/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend @@ -1,2 +1,2 @@ EGLINFO_DEVICE_rpi = "raspberrypi" -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '"(.*)"', d)}" +COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '(.*)', d)}" diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend new file mode 100644 index 0000000..c187ab9 --- /dev/null +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -0,0 +1,2 @@ +# mesa-demos need libgles1 and userland driver does not have it +COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend new file mode 100644 index 0000000..b058cf4 --- /dev/null +++ b/recipes-graphics/piglit/piglit_%.bbappend @@ -0,0 +1,2 @@ +# mesa-demos need libgles1 and userland driver does not have it so remove it from piglit rdeps +RDEPENDS_${PN}_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" -- cgit v1.2.3-54-g00ecf