summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-07-07 17:32:25 -0700
committerAndrei Gherzan <andrei@gherzan.com>2018-07-16 16:57:38 +0100
commita0beccee737290ce0e2bd0907ec0be04e6511438 (patch)
treee3c5ad0bfdddeea4c57644ee75dc1127da5b94bc
parent52255ae3afa2d6720aceb4b20130f126768920ef (diff)
downloadmeta-raspberrypi-a0beccee737290ce0e2bd0907ec0be04e6511438.tar.gz
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 <raj.khem@gmail.com>
-rw-r--r--recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend2
-rw-r--r--recipes-graphics/eglinfo/eglinfo-fb_%.bbappend2
-rw-r--r--recipes-graphics/mesa/mesa-demos_%.bbappend2
-rw-r--r--recipes-graphics/piglit/piglit_%.bbappend2
4 files changed, 7 insertions, 1 deletions
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 @@
1# mesa-demos needs gles1 and userland driver does not have it, works ok with vc4 graphics driver
2X11GLTOOLS_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 @@
1EGLINFO_DEVICE_rpi = "raspberrypi" 1EGLINFO_DEVICE_rpi = "raspberrypi"
2COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '"(.*)"', d)}" 2COMPATIBLE_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 @@
1# mesa-demos need libgles1 and userland driver does not have it
2COMPATIBLE_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 @@
1# mesa-demos need libgles1 and userland driver does not have it so remove it from piglit rdeps
2RDEPENDS_${PN}_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}"