summaryrefslogtreecommitdiffstats
path: root/recipes-graphics
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-09-04 18:20:57 +0200
committerDenys Dmytriyenko <denys@ti.com>2012-09-18 18:33:36 -0400
commitbef66dc21a80d237028e003abdc71c66eb0078f9 (patch)
treeea10655a4ecaf2d90a5be36aac525c1b4462b1dd /recipes-graphics
parent9ef35da0c8ff3be8f37214e09d0fc1d4987a11fc (diff)
downloadmeta-ti-bef66dc21a80d237028e003abdc71c66eb0078f9.tar.gz
mesa: add appends to avoid providing conflicts
For libgles-omap3 compatible machines mesa should only provide libgl. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Rebased to squash removal of mesa-xlib. Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-graphics')
-rw-r--r--recipes-graphics/mesa/mesa-dri_8.0.4.bbappend1
-rw-r--r--recipes-graphics/mesa/mesa-dri_git.bbappend1
-rw-r--r--recipes-graphics/mesa/mesa-omap3-common.inc7
3 files changed, 9 insertions, 0 deletions
diff --git a/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend b/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
new file mode 100644
index 00000000..164ec1b2
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
@@ -0,0 +1 @@
require mesa-omap3-common.inc
diff --git a/recipes-graphics/mesa/mesa-dri_git.bbappend b/recipes-graphics/mesa/mesa-dri_git.bbappend
new file mode 100644
index 00000000..164ec1b2
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-dri_git.bbappend
@@ -0,0 +1 @@
require mesa-omap3-common.inc
diff --git a/recipes-graphics/mesa/mesa-omap3-common.inc b/recipes-graphics/mesa/mesa-omap3-common.inc
new file mode 100644
index 00000000..0340770a
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-omap3-common.inc
@@ -0,0 +1,7 @@
1PRINC := "${@int(PRINC) + 1}"
2
3# avoid providing conflicts for libgles-omap3 compatibles
4PROVIDES_omap3 = "virtual/libgl"
5PROVIDES_ti814x = "virtual/libgl"
6PROVIDES_ti816x = "virtual/libgl"
7PROVIDES_ti33x = "virtual/libgl"