All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/5] libgles-omap3: fix some conflicts between X11 and Raw versions
@ 2013-09-01  3:12 Denys Dmytriyenko
  2013-09-01  3:12 ` [PATCH 2/5] ompa3-sgx-modules-x11: fix some build failures with latest versions Denys Dmytriyenko
                   ` (4 more replies)
  0 siblings, 5 replies; 17+ messages in thread
From: Denys Dmytriyenko @ 2013-09-01  3:12 UTC (permalink / raw)
  To: meta-ti

From: Denys Dmytriyenko <denys@ti.com>

* Properly define all PROVIDES, RPROVIDES, RCONFLICTS and RREPLACES variables.
* Skip X11 recipe altogether in non-X11 distros to avoid broken dependencies
  for missing X libraries.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes-graphics/libgles/libgles-omap3-no-x.inc | 14 ++++++++++++--
 recipes-graphics/libgles/libgles-omap3-x11.inc  | 17 ++++++++++++-----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/recipes-graphics/libgles/libgles-omap3-no-x.inc b/recipes-graphics/libgles/libgles-omap3-no-x.inc
index d4cb46b..727c422 100644
--- a/recipes-graphics/libgles/libgles-omap3-no-x.inc
+++ b/recipes-graphics/libgles/libgles-omap3-no-x.inc
@@ -3,7 +3,9 @@ LICENSE = "proprietary-binary"
 # 'TSPA.txt' might not be the best file to md5sum
 LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
 
-PR = "r35"
+PR = "r36"
+
+EXCLUDE_FROM_WORLD = "1"
 
 COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
 
@@ -13,7 +15,15 @@ PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
 
 RREPLACES_${PN} = "libegl libgles1 libgles2"
 RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
-RREPLACES_${PN}-dbg = "libegl-dbg"
+RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg"
+
+RPROVIDES_${PN} = "libegl libgles1 libgles2"
+RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
+RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg"
+
+RCONFLICTS_${PN} = "libegl libgles1 libgles2"
+RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
+RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-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-x11.inc b/recipes-graphics/libgles/libgles-omap3-x11.inc
index 6621396..abe6e6f 100644
--- a/recipes-graphics/libgles/libgles-omap3-x11.inc
+++ b/recipes-graphics/libgles/libgles-omap3-x11.inc
@@ -3,7 +3,9 @@ LICENSE = "proprietary-binary"
 # 'TSPA.txt' might not be the best file to md5sum
 LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
 
-PR = "r35"
+PR = "r36"
+
+EXCLUDE_FROM_WORLD = "1"
 
 COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
 
@@ -12,19 +14,19 @@ DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
 export SUPPORT_XORG ?= "1"
 PVR_INIT ?= "pvrsrvinit"
 
-PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
+PROVIDES += "libgles-omap3 virtual/egl virtual/libgles1 virtual/libgles2"
 
 RREPLACES_${PN} = "libegl libgles1 libgles2"
 RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
-RREPLACES_${PN}-dbg = "libegl-dbg"
+RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg"
 
 RPROVIDES_${PN} = "libegl libgles1 libgles2"
 RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
-RPROVIDES_${PN}-dbg = "libegl-dbg"
+RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg"
 
 RCONFLICTS_${PN} = "libegl libgles1 libgles2"
 RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
-RCONFLICTS_${PN}-dbg = "libegl-dbg"
+RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
 		   file://cputype \
@@ -47,6 +49,11 @@ export ES8LOCATION ?= "${S}/gfx_rel_es8.x"
 
 LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_DRIWSEGL.so"
 
+python __anonymous() {
+    if "x11" not in d.getVar("DISTRO_FEATURES", True).split():
+        raise bb.parse.SkipPackage("Recipe is x11-specific, skipping")
+}
+
 do_configure() {
 	# Attempt to fix up the worst offenders for file permissions
 	for i in $(find ${S} -name "*.h") $(find ${S} -name "*.c") $(find ${S} -name "Make*") ; do
-- 
1.8.3.2



^ permalink raw reply related	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2013-09-04  5:39 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-01  3:12 [PATCH 1/5] libgles-omap3: fix some conflicts between X11 and Raw versions Denys Dmytriyenko
2013-09-01  3:12 ` [PATCH 2/5] ompa3-sgx-modules-x11: fix some build failures with latest versions Denys Dmytriyenko
2013-09-01  3:20   ` Denys Dmytriyenko
2013-09-03 15:19   ` Maupin, Chase
2013-09-01  3:12 ` [PATCH 3/5] libgles-omap3-x11: do not fail if pvr-init is not yet installed Denys Dmytriyenko
2013-09-03 15:19   ` Maupin, Chase
2013-09-01  3:12 ` [PATCH 4/5] libgles-omap3: introduce INC_PR Denys Dmytriyenko
2013-09-03 15:20   ` Maupin, Chase
2013-09-03 16:42     ` Denys Dmytriyenko
2013-09-01  3:13 ` [PATCH 5/5] libgles-omap3, omap3-sgx-modules: remove old 4.03.00.02 version Denys Dmytriyenko
2013-09-01  3:15   ` Denys Dmytriyenko
2013-09-02 12:06     ` Tasslehoff Kjappfot
2013-09-03 17:03       ` Denys Dmytriyenko
2013-09-04  4:33         ` Sundareson, Prabindh
2013-09-03 17:29       ` Cooper Jr., Franklin
2013-09-04  5:39         ` Tasslehoff Kjappfot
2013-09-03 15:18 ` [PATCH 1/5] libgles-omap3: fix some conflicts between X11 and Raw versions Maupin, Chase

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.