From patchwork Tue Sep 4 16:20:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [meta-ti,1/2] mesa: add appends to avoid providing conflicts Date: Tue, 04 Sep 2012 16:20:57 -0000 From: =?utf-8?q?Andreas_M=C3=BCller_=3Cschnitzeltony=40googlemail=2Ecom=3E?= X-Patchwork-Id: 35819 Message-Id: <1346775658-23370-1-git-send-email-schnitzeltony@googlemail.com> To: meta-ti@yoctoproject.org Cc: openembedded-core@lists.openembedded.org For libgles-omap3 compatible machines mesa should only provide libgl. Signed-off-by: Andreas Müller --- 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 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