From 338c5373aa201d8849c1892a0f58fe79e791684e Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Sat, 31 Aug 2013 21:56:47 -0400 Subject: [PATCH] libgles-omap3: fix some conflicts between X11 and Raw versions * 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 Acked-by: Chase Maupin --- 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 d4cb46bb..727c422a 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 6621396d..abe6e6fe 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