diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> | 2025-06-20 22:14:51 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-24 13:51:31 +0100 |
| commit | 67bc6419f05252a017b5148da2fc85a6dd0546cb (patch) | |
| tree | dbf59015b0f426723e854eee539b760d3daf1b31 | |
| parent | 160c0711ffce7da74fe32ef5e8eb543a114359fa (diff) | |
| download | poky-67bc6419f05252a017b5148da2fc85a6dd0546cb.tar.gz | |
default-providers: fix GLVND providers to be selected at runtime
The virtual-{libegl,libglx}-icd names are RPROVIDES, not PROVIDES,
because they are a runtime dependency of libglvnd. Make
default-providers follow that and specify PREFERRED_RPROVIDER instead of
PREFERRED_PROVIDER for those names.
Fixes: 9d3b4c9bc403 ("mesa: sort out PROVIDES for the glvnd case")
(From OE-Core rev: c2b4971e79ece23c43639865a617ee4c248fa981)
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/distro/include/default-providers.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 4f09416354..274ad0c4f6 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc | |||
| @@ -7,9 +7,7 @@ PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" | |||
| 7 | PREFERRED_PROVIDER_virtual/libsdl2 ?= "libsdl2" | 7 | PREFERRED_PROVIDER_virtual/libsdl2 ?= "libsdl2" |
| 8 | PREFERRED_PROVIDER_virtual/libsdl2-native ?= "libsdl2-native" | 8 | PREFERRED_PROVIDER_virtual/libsdl2-native ?= "libsdl2-native" |
| 9 | PREFERRED_PROVIDER_virtual/egl ?= "mesa" | 9 | PREFERRED_PROVIDER_virtual/egl ?= "mesa" |
| 10 | PREFERRED_PROVIDER_virtual/libegl-icd ?= "mesa" | ||
| 11 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | 10 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" |
| 12 | PREFERRED_PROVIDER_virtual/libglx-icd ?= "mesa" | ||
| 13 | PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native" | 11 | PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native" |
| 14 | PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa" | 12 | PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa" |
| 15 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | 13 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" |
| @@ -68,4 +66,6 @@ PREFERRED_RPROVIDER_initd-functions ?= "initscripts" | |||
| 68 | PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa" | 66 | PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa" |
| 69 | PREFERRED_PROVIDER_virtual/nativesdk-libsdl2 ?= "nativesdk-libsdl2" | 67 | PREFERRED_PROVIDER_virtual/nativesdk-libsdl2 ?= "nativesdk-libsdl2" |
| 70 | 68 | ||
| 69 | PREFERRED_RPROVIDER_virtual-libegl-icd ?= "mesa" | ||
| 70 | PREFERRED_RPROVIDER_virtual-libglx-icd ?= "mesa" | ||
| 71 | PREFERRED_RPROVIDER_virtual-x-terminal-emulator ?= "rxvt-unicode" | 71 | PREFERRED_RPROVIDER_virtual-x-terminal-emulator ?= "rxvt-unicode" |