diff options
author | Denys Dmytriyenko <denys@ti.com> | 2013-06-21 14:24:50 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2013-06-21 14:43:25 -0400 |
commit | b02c0284fbf695a5543b2d61630cd2a95cd36c66 (patch) | |
tree | 02b52dd75863d21cd32d7d8ab93ae783691397f1 | |
parent | df2d999252b17598671112f152a9ddbc079ea704 (diff) | |
download | meta-ti-b02c0284fbf695a5543b2d61630cd2a95cd36c66.tar.gz |
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>
5 files changed, 10 insertions, 17 deletions
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb index 84938141..d439d838 100644 --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb | |||
@@ -71,4 +71,3 @@ do_install() { | |||
71 | 71 | ||
72 | cp ${S}/services4/3rdparty/linux_drm/drm.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr | 72 | cp ${S}/services4/3rdparty/linux_drm/drm.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr |
73 | } | 73 | } |
74 | |||
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb index 923e6a55..399374d4 100644 --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb | |||
@@ -48,4 +48,3 @@ do_install() { | |||
48 | ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \ | 48 | ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \ |
49 | ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr | 49 | ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr |
50 | } | 50 | } |
51 | |||
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/* \ | |||
245 | ${libdir}/ES*/.debug ${bindir}/*/.debug\ | 245 | ${libdir}/ES*/.debug ${bindir}/*/.debug\ |
246 | ${bindir}/SGX/demos/*/.debug/* \ | 246 | ${bindir}/SGX/demos/*/.debug/* \ |
247 | ${bindir}/SGX/trainingcourses/*/.debug/* \ | 247 | ${bindir}/SGX/trainingcourses/*/.debug/* \ |
248 | " | 248 | " |
249 | 249 | ||
250 | FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*" | 250 | FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*" |
251 | 251 | ||
@@ -315,4 +315,3 @@ rm -f $D${sysconfdir}/powervr-esrev | |||
315 | pkg_postinst_${PN}-linuxfbwsegl() { | 315 | pkg_postinst_${PN}-linuxfbwsegl() { |
316 | rm -f $D${sysconfdir}/powervr-esrev | 316 | rm -f $D${sysconfdir}/powervr-esrev |
317 | } | 317 | } |
318 | |||
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" | |||
7 | 7 | ||
8 | COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)" | 8 | COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)" |
9 | 9 | ||
10 | X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm" | 10 | DEPENDS = "virtual/libx11 libxau libxdmcp libdrm" |
11 | DEPENDS = "x11" | ||
12 | 11 | ||
13 | export SUPPORT_XORG ?= "1" | 12 | export SUPPORT_XORG ?= "1" |
14 | PVR_INIT ?= "pvrsrvinit" | 13 | PVR_INIT ?= "pvrsrvinit" |
15 | 14 | ||
16 | PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2" | 15 | PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2" |
17 | 16 | ||
18 | RREPLACES_${PN} = "libegl libgles1 libgles2 libgles-omap3" | 17 | RREPLACES_${PN} = "libegl libgles1 libgles2" |
19 | RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev" | 18 | RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" |
20 | RREPLACES_${PN}-dbg = "libegl-dbg libgles-omap3-dbg" | 19 | RREPLACES_${PN}-dbg = "libegl-dbg" |
21 | 20 | ||
22 | RPROVIDES_${PN} = "libegl libgles1 libgles2 libgles-omap3" | 21 | RPROVIDES_${PN} = "libegl libgles1 libgles2" |
23 | RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev" | 22 | RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" |
24 | RPROVIDES_${PN}-dbg = "libegl-dbg libgles-omap3-dbg" | 23 | RPROVIDES_${PN}-dbg = "libegl-dbg" |
25 | 24 | ||
26 | RCONFLICTS_${PN} = "libegl libgles1 libgles2" | 25 | RCONFLICTS_${PN} = "libegl libgles1 libgles2" |
27 | RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev" | 26 | RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev" |
28 | RCONFLICTS_${PN}-dbg = "libegl-dbg libgles-omap3-dbg" | 27 | RCONFLICTS_${PN}-dbg = "libegl-dbg" |
29 | |||
30 | |||
31 | 28 | ||
32 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \ | 29 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \ |
33 | file://cputype \ | 30 | 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 | |||
437 | pkg_postinst_${PN}-driwsegl() { | 437 | pkg_postinst_${PN}-driwsegl() { |
438 | rm -f $D${sysconfdir}/powervr-esrev | 438 | rm -f $D${sysconfdir}/powervr-esrev |
439 | } | 439 | } |
440 | |||