Patchwork [meta-ti,1/2] mesa: add appends to avoid providing conflicts

login
register
mail settings
Submitter Andreas Müller
Date Sept. 4, 2012, 4:20 p.m.
Message ID <1346775658-23370-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/35819/
State New
Headers show

Comments

Andreas Müller - Sept. 4, 2012, 4:20 p.m.
For libgles-omap3 compatible machines mesa should only provide libgl.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-graphics/mesa/mesa-dri_8.0.4.bbappend  |    1 +
 recipes-graphics/mesa/mesa-dri_git.bbappend    |    1 +
 recipes-graphics/mesa/mesa-omap3-common.inc    |    7 +++++++
 recipes-graphics/mesa/mesa-xlib_8.0.4.bbappend |    1 +
 recipes-graphics/mesa/mesa-xlib_git.bbappend   |    1 +
 5 files changed, 11 insertions(+), 0 deletions(-)
 create mode 100644 recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
 create mode 100644 recipes-graphics/mesa/mesa-dri_git.bbappend
 create mode 100644 recipes-graphics/mesa/mesa-omap3-common.inc
 create mode 100644 recipes-graphics/mesa/mesa-xlib_8.0.4.bbappend
 create mode 100644 recipes-graphics/mesa/mesa-xlib_git.bbappend

Patch

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 0000000..164ec1b
--- /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 0000000..164ec1b
--- /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 0000000..0340770
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-omap3-common.inc
@@ -0,0 +1,7 @@ 
+PRINC := "${@int(PRINC) + 1}"
+
+# avoid providing conflicts for libgles-omap3 compatibles
+PROVIDES_omap3 = "virtual/libgl"
+PROVIDES_ti814x = "virtual/libgl"
+PROVIDES_ti816x = "virtual/libgl"
+PROVIDES_ti33x = "virtual/libgl"
diff --git a/recipes-graphics/mesa/mesa-xlib_8.0.4.bbappend b/recipes-graphics/mesa/mesa-xlib_8.0.4.bbappend
new file mode 100644
index 0000000..164ec1b
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-xlib_8.0.4.bbappend
@@ -0,0 +1 @@ 
+require mesa-omap3-common.inc
diff --git a/recipes-graphics/mesa/mesa-xlib_git.bbappend b/recipes-graphics/mesa/mesa-xlib_git.bbappend
new file mode 100644
index 0000000..164ec1b
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-xlib_git.bbappend
@@ -0,0 +1 @@ 
+require mesa-omap3-common.inc