diff options
author | Denys Dmytriyenko <denys@ti.com> | 2013-08-31 21:56:47 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2013-09-03 13:07:27 -0400 |
commit | 338c5373aa201d8849c1892a0f58fe79e791684e (patch) | |
tree | b090a516e6fc37a0ff4f9f5f14bdc6768145888b /recipes-graphics | |
parent | a378dd0edc7470d3cb4a10e2ca1c5aadb2f011c7 (diff) | |
download | meta-ti-338c5373aa201d8849c1892a0f58fe79e791684e.tar.gz |
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 <denys@ti.com>
Acked-by: Chase Maupin <chase.maupin@ti.com>
Diffstat (limited to 'recipes-graphics')
-rw-r--r-- | recipes-graphics/libgles/libgles-omap3-no-x.inc | 14 | ||||
-rw-r--r-- | 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" | |||
3 | # 'TSPA.txt' might not be the best file to md5sum | 3 | # 'TSPA.txt' might not be the best file to md5sum |
4 | LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1" | 4 | LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1" |
5 | 5 | ||
6 | PR = "r35" | 6 | PR = "r36" |
7 | |||
8 | EXCLUDE_FROM_WORLD = "1" | ||
7 | 9 | ||
8 | COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)" | 10 | COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)" |
9 | 11 | ||
@@ -13,7 +15,15 @@ PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2" | |||
13 | 15 | ||
14 | RREPLACES_${PN} = "libegl libgles1 libgles2" | 16 | RREPLACES_${PN} = "libegl libgles1 libgles2" |
15 | RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" | 17 | RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" |
16 | RREPLACES_${PN}-dbg = "libegl-dbg" | 18 | RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" |
19 | |||
20 | RPROVIDES_${PN} = "libegl libgles1 libgles2" | ||
21 | RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" | ||
22 | RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" | ||
23 | |||
24 | RCONFLICTS_${PN} = "libegl libgles1 libgles2" | ||
25 | RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" | ||
26 | RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" | ||
17 | 27 | ||
18 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \ | 28 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \ |
19 | file://cputype \ | 29 | 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" | |||
3 | # 'TSPA.txt' might not be the best file to md5sum | 3 | # 'TSPA.txt' might not be the best file to md5sum |
4 | LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1" | 4 | LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1" |
5 | 5 | ||
6 | PR = "r35" | 6 | PR = "r36" |
7 | |||
8 | EXCLUDE_FROM_WORLD = "1" | ||
7 | 9 | ||
8 | COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)" | 10 | COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)" |
9 | 11 | ||
@@ -12,19 +14,19 @@ DEPENDS = "virtual/libx11 libxau libxdmcp libdrm" | |||
12 | export SUPPORT_XORG ?= "1" | 14 | export SUPPORT_XORG ?= "1" |
13 | PVR_INIT ?= "pvrsrvinit" | 15 | PVR_INIT ?= "pvrsrvinit" |
14 | 16 | ||
15 | PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2" | 17 | PROVIDES += "libgles-omap3 virtual/egl virtual/libgles1 virtual/libgles2" |
16 | 18 | ||
17 | RREPLACES_${PN} = "libegl libgles1 libgles2" | 19 | RREPLACES_${PN} = "libegl libgles1 libgles2" |
18 | RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" | 20 | RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" |
19 | RREPLACES_${PN}-dbg = "libegl-dbg" | 21 | RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" |
20 | 22 | ||
21 | RPROVIDES_${PN} = "libegl libgles1 libgles2" | 23 | RPROVIDES_${PN} = "libegl libgles1 libgles2" |
22 | RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" | 24 | RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" |
23 | RPROVIDES_${PN}-dbg = "libegl-dbg" | 25 | RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" |
24 | 26 | ||
25 | RCONFLICTS_${PN} = "libegl libgles1 libgles2" | 27 | RCONFLICTS_${PN} = "libegl libgles1 libgles2" |
26 | RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" | 28 | RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" |
27 | RCONFLICTS_${PN}-dbg = "libegl-dbg" | 29 | RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" |
28 | 30 | ||
29 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \ | 31 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \ |
30 | file://cputype \ | 32 | file://cputype \ |
@@ -47,6 +49,11 @@ export ES8LOCATION ?= "${S}/gfx_rel_es8.x" | |||
47 | 49 | ||
48 | LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_DRIWSEGL.so" | 50 | LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_DRIWSEGL.so" |
49 | 51 | ||
52 | python __anonymous() { | ||
53 | if "x11" not in d.getVar("DISTRO_FEATURES", True).split(): | ||
54 | raise bb.parse.SkipPackage("Recipe is x11-specific, skipping") | ||
55 | } | ||
56 | |||
50 | do_configure() { | 57 | do_configure() { |
51 | # Attempt to fix up the worst offenders for file permissions | 58 | # Attempt to fix up the worst offenders for file permissions |
52 | for i in $(find ${S} -name "*.h") $(find ${S} -name "*.c") $(find ${S} -name "Make*") ; do | 59 | for i in $(find ${S} -name "*.h") $(find ${S} -name "*.c") $(find ${S} -name "Make*") ; do |