diff options
author | Quentin Schulz <quentin.schulz@theobroma-systems.com> | 2021-12-13 10:16:26 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-14 22:46:38 +0000 |
commit | dcf07d0ac2d59406121fde4f1f71f7b7fadc1951 (patch) | |
tree | 7eb206578ef4b60a5e9add8239252daf61c90700 | |
parent | ccc8b556c00854494a76c188a14b333a4bfd1b12 (diff) | |
download | poky-dcf07d0ac2d59406121fde4f1f71f7b7fadc1951.tar.gz |
mesa: PROVIDES virtual/libgles3
It's assumed that not all OpenGL ES implementation are compliant with
the 3.x specification. Therefore an additional virtual providers is
created to explicit compatibility with OpenGL ES 3 specification.
Cc: Quentin Schulz <foss+yocto@0leil.net>
(From OE-Core rev: 405cd7a37988ced627fe6ad6fd3089c17f59367e)
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/distro/include/default-providers.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/qemu.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 1 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index ea88bd4876..6defdca12d 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc | |||
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native" | |||
9 | PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa" | 9 | PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa" |
10 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | 10 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" |
11 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | 11 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" |
12 | PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" | ||
12 | PREFERRED_PROVIDER_virtual/mesa ?= "mesa" | 13 | PREFERRED_PROVIDER_virtual/mesa ?= "mesa" |
13 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils" | 14 | PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils" |
14 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native" | 15 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native" |
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 642c322abc..0d71bcbbad 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
@@ -3,6 +3,7 @@ PREFERRED_PROVIDER_virtual/egl ?= "mesa" | |||
3 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | 3 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" |
4 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | 4 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" |
5 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | 5 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" |
6 | PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" | ||
6 | 7 | ||
7 | XSERVER ?= "xserver-xorg \ | 8 | XSERVER ?= "xserver-xorg \ |
8 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ | 9 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ |
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 978334d5bb..901353499c 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
@@ -6,6 +6,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | |||
6 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | 6 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" |
7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | 7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" |
8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | 8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" |
9 | PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" | ||
9 | 10 | ||
10 | require conf/machine/include/qemu.inc | 11 | require conf/machine/include/qemu.inc |
11 | DEFAULTTUNE ?= "core2-64" | 12 | DEFAULTTUNE ?= "core2-64" |
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index ad7f6e0ee4..1e072e1ae2 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
@@ -6,6 +6,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | |||
6 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | 6 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" |
7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | 7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" |
8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | 8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" |
9 | PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" | ||
9 | 10 | ||
10 | require conf/machine/include/qemu.inc | 11 | require conf/machine/include/qemu.inc |
11 | DEFAULTTUNE ?= "core2-32" | 12 | DEFAULTTUNE ?= "core2-32" |
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index c894c2dab5..6d6fc607f9 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -39,7 +39,7 @@ DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib | |||
39 | EXTRANATIVEPATH += "chrpath-native" | 39 | EXTRANATIVEPATH += "chrpath-native" |
40 | PROVIDES = " \ | 40 | PROVIDES = " \ |
41 | ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \ | 41 | ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \ |
42 | ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2', '', d)} \ | 42 | ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2 virtual/libgles3', '', d)} \ |
43 | ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \ | 43 | ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \ |
44 | ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \ | 44 | ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \ |
45 | virtual/mesa \ | 45 | virtual/mesa \ |