From bef66dc21a80d237028e003abdc71c66eb0078f9 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 4 Sep 2012 18:20:57 +0200 Subject: mesa: add appends to avoid providing conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For libgles-omap3 compatible machines mesa should only provide libgl. Signed-off-by: Andreas Müller Rebased to squash removal of mesa-xlib. Signed-off-by: Denys Dmytriyenko --- 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 +++++++ 3 files changed, 9 insertions(+) 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 (limited to 'recipes-graphics') 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 @@ +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" -- cgit v1.2.3-54-g00ecf