summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-11 11:33:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-17 20:48:09 +0100
commit442be3ef60394f46bdba9f747c46bff288a4d401 (patch)
tree432f25202929291e1571e0ec2f305a7fd09f9f56
parentac191eb9644bea8ee7843b8e976a63617882e47f (diff)
downloadpoky-442be3ef60394f46bdba9f747c46bff288a4d401.tar.gz
mesa: add virtual/mesa provider
As there are two alternative mesa recipes (mesa and mesa-gl), there needs to be a virtual provider that recipes that explicitly need Mesa (such as xserver-xorg) can depend on. (From OE-Core rev: 4a407568472d3c87cd2ce11baf199568249640b6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/default-providers.inc1
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index a804089e5c..d4b9db014e 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/egl ?= "mesa"
9PREFERRED_PROVIDER_virtual/libgl ?= "mesa" 9PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
10PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" 10PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
11PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 11PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
12PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
12PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" 13PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"
13PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" 14PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
14PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" 15PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 79605faa95..afc795c5d2 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -17,7 +17,7 @@ PE = "2"
17 17
18DEPENDS = "expat makedepend-native flex-native bison-native" 18DEPENDS = "expat makedepend-native flex-native bison-native"
19 19
20PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" 20PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa"
21 21
22inherit autotools pkgconfig pythonnative gettext distro_features_check 22inherit autotools pkgconfig pythonnative gettext distro_features_check
23 23