libgles-omap3: don't RCONFLICT/RREPLACE no-x version with x11 as it breaks non-X distros

* Enables building/installing both X11 and RAW libs/demos. Plus otherwise the
  build is broken for non-X distros, as it pulls in X11 deps due to RREPLACES...
* Fix broken DEPENDS copy/paste typo.
* Also, clean up after the previous changes - extra empty lines, indentation, etc.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>

3 files changed, 10 insertions, 15 deletions

diff --git a/recipes-graphics/libgles/libgles-omap3-no-x.inc b/recipes-graphics/libgles/libgles-omap3-no-x.inc
index 6d79bf6f..d4cb46bb 100644
--- a/recipes-graphics/libgles/libgles-omap3-no-x.inc
+++ b/recipes-graphics/libgles/libgles-omap3-no-x.inc
@@ -245,7 +245,7 @@ FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
                    ${libdir}/ES*/.debug ${bindir}/*/.debug\
                    ${bindir}/SGX/demos/*/.debug/* \
                    ${bindir}/SGX/trainingcourses/*/.debug/* \
-        "
+"
 
 FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*"
 
@@ -315,4 +315,3 @@ rm -f $D${sysconfdir}/powervr-esrev
 pkg_postinst_${PN}-linuxfbwsegl() {
 rm -f $D${sysconfdir}/powervr-esrev
 }
-
diff --git a/recipes-graphics/libgles/libgles-omap3-x11.inc b/recipes-graphics/libgles/libgles-omap3-x11.inc
index c4d08067..6621396d 100644
--- a/recipes-graphics/libgles/libgles-omap3-x11.inc
+++ b/recipes-graphics/libgles/libgles-omap3-x11.inc
@@ -7,27 +7,24 @@ PR = "r35"
 
 COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
 
-X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
-DEPENDS = "x11"
+DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
 
 export SUPPORT_XORG ?= "1"
 PVR_INIT ?= "pvrsrvinit"
 
 PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
 
-RREPLACES_${PN} = "libegl libgles1 libgles2 libgles-omap3"
-RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev"
-RREPLACES_${PN}-dbg = "libegl-dbg libgles-omap3-dbg"
+RREPLACES_${PN} = "libegl libgles1 libgles2"
+RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
+RREPLACES_${PN}-dbg = "libegl-dbg"
 
-RPROVIDES_${PN} = "libegl libgles1 libgles2 libgles-omap3"
-RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev"
-RPROVIDES_${PN}-dbg = "libegl-dbg libgles-omap3-dbg"
+RPROVIDES_${PN} = "libegl libgles1 libgles2"
+RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
+RPROVIDES_${PN}-dbg = "libegl-dbg"
 
 RCONFLICTS_${PN} = "libegl libgles1 libgles2"
-RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev"
-RCONFLICTS_${PN}-dbg = "libegl-dbg libgles-omap3-dbg"
-
-
+RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
+RCONFLICTS_${PN}-dbg = "libegl-dbg"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
                    file://cputype \
diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
index 9a90c561..f417b8ee 100644
--- a/recipes-graphics/libgles/libgles-omap3.inc
+++ b/recipes-graphics/libgles/libgles-omap3.inc
@@ -437,4 +437,3 @@ echo "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >> $D${sysconfdir}/powervr.ini
 pkg_postinst_${PN}-driwsegl() {
 rm -f $D${sysconfdir}/powervr-esrev
 }
-